|WARNING| pw134167-134171 [PATCH] [v6, 5/5] test: cleanups to pcapng test

[dpdklab at iol.unh.edu]

Test-Label: iol-testing
Test-Status: WARNING
http://dpdk.org/patch/134167

_apply patch failure_

Submitter: Stephen Hemminger <stephen at networkplumber.org>
Date: Monday, November 13 2023 16:15:19 
Applied on: CommitID:d677a3eb1b4e2d38c193fabd755dac30ee04c2df
Apply patch set 134167-134171 failed:

Checking patch app/dumpcap/main.c...
Checking patch app/test/test_pcapng.c...
Checking patch lib/graph/graph_pcap.c...
Checking patch lib/pcapng/rte_pcapng.c...
Checking patch lib/pcapng/rte_pcapng.h...
Hunk #1 succeeded at 114 (offset -7 lines).
Hunk #2 succeeded at 126 (offset -8 lines).
error: while searching for:
 *  The handle to the packet capture file
 * @param port
 *  The Ethernet port to report stats on.
 * @param comment
 *   Optional comment to add to statistics.
 * @param start_time
 *  The time when packet capture was started in nanoseconds.
 *  Optional: can be zero if not known.
 * @param end_time
 *  The time when packet capture was stopped in nanoseconds.
 *  Optional: can be zero if not finished;
 * @param ifrecv
 *  The number of packets received by capture.
 *  Optional: use UINT64_MAX if not known.
 * @param ifdrop
 *  The number of packets missed by the capture process.
 *  Optional: use UINT64_MAX if not known.
 * @return
 *  number of bytes written to file, -1 on failure to write file
 */
__rte_experimental
ssize_t
rte_pcapng_write_stats(rte_pcapng_t *self, uint16_t port,
		       const char *comment,
		       uint64_t start_time, uint64_t end_time,
		       uint64_t ifrecv, uint64_t ifdrop);

#ifdef __cplusplus
}

error: patch failed: lib/pcapng/rte_pcapng.h:188
Checking patch lib/pdump/rte_pdump.c...
Applied patch app/dumpcap/main.c cleanly.
Applied patch app/test/test_pcapng.c cleanly.
Applied patch lib/graph/graph_pcap.c cleanly.
Applied patch lib/pcapng/rte_pcapng.c cleanly.
Applying patch lib/pcapng/rte_pcapng.h with 1 reject...
Hunk #1 applied cleanly.
Hunk #2 applied cleanly.
Rejected hunk #3.
Applied patch lib/pdump/rte_pdump.c cleanly.
hint: Use 'git am --show-current-patch' to see the failed patch
diff a/lib/pcapng/rte_pcapng.h b/lib/pcapng/rte_pcapng.h	(rejected hunks)
@@ -188,29 +186,22 @@ rte_pcapng_write_packets(rte_pcapng_t *self,
  *  The handle to the packet capture file
  * @param port
  *  The Ethernet port to report stats on.
- * @param comment
- *   Optional comment to add to statistics.
- * @param start_time
- *  The time when packet capture was started in nanoseconds.
- *  Optional: can be zero if not known.
- * @param end_time
- *  The time when packet capture was stopped in nanoseconds.
- *  Optional: can be zero if not finished;
  * @param ifrecv
  *  The number of packets received by capture.
  *  Optional: use UINT64_MAX if not known.
  * @param ifdrop
  *  The number of packets missed by the capture process.
  *  Optional: use UINT64_MAX if not known.
+ * @param comment
+ *  Optional comment to add to statistics.
  * @return
  *  number of bytes written to file, -1 on failure to write file
  */
 __rte_experimental
 ssize_t
 rte_pcapng_write_stats(rte_pcapng_t *self, uint16_t port,
-		       const char *comment,
-		       uint64_t start_time, uint64_t end_time,
-		       uint64_t ifrecv, uint64_t ifdrop);
+		       uint64_t ifrecv, uint64_t ifdrop,
+		       const char *comment);
 
 #ifdef __cplusplus
 }
Checking patch lib/pcapng/rte_pcapng.c...
error: lib/pcapng/rte_pcapng.c: does not match index
hint: Use 'git am --show-current-patch' to see the failed patch
Checking patch app/test/meson.build...
Checking patch app/test/test_pcapng.c...
error: app/test/test_pcapng.c: does not match index
Applied patch app/test/meson.build cleanly.
hint: Use 'git am --show-current-patch' to see the failed patch

https://lab.dpdk.org/results/dashboard/patchsets/28359/

UNH-IOL DPDK Community Lab