summaryrefslogtreecommitdiffstats
path: root/meta-networking/recipes-support/netperf/files/0001-Fix-too-many-arguments-error-occurring-in-gcc-15.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-networking/recipes-support/netperf/files/0001-Fix-too-many-arguments-error-occurring-in-gcc-15.patch')
-rw-r--r--meta-networking/recipes-support/netperf/files/0001-Fix-too-many-arguments-error-occurring-in-gcc-15.patch168
1 files changed, 168 insertions, 0 deletions
diff --git a/meta-networking/recipes-support/netperf/files/0001-Fix-too-many-arguments-error-occurring-in-gcc-15.patch b/meta-networking/recipes-support/netperf/files/0001-Fix-too-many-arguments-error-occurring-in-gcc-15.patch
new file mode 100644
index 0000000000..51313d8055
--- /dev/null
+++ b/meta-networking/recipes-support/netperf/files/0001-Fix-too-many-arguments-error-occurring-in-gcc-15.patch
@@ -0,0 +1,168 @@
1From fd4f2099efd378a3e00809b485ae22ebf20ab0f7 Mon Sep 17 00:00:00 2001
2From: "mark.yang" <mark.yang@lge.com>
3Date: Wed, 16 Apr 2025 20:02:36 +0900
4Subject: [PATCH] Fix too many arguments error occurring in gcc-15
5
6* See more details in http://errors.yoctoproject.org/Errors/Details/851803/
7../../git/src/nettest_bsd.c:4497:19: error: too many arguments to function 'alloc_sendfile_buf_ring'; expected 0, have 4
8 4497 | send_ring = alloc_sendfile_buf_ring(send_width,
9 | ^~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~
10In file included from ../../git/src/nettest_bsd.c:175:
11../../git/src/netlib.h:690:26: note: declared here
12 690 | extern struct ring_elt *alloc_sendfile_buf_ring();
13 | ^~~~~~~~~~~~~~~~~~~~~~~
14In file included from ../../git/src/nettest_omni.c:184:
15../../git/src/hist.h:135:6: error: conflicting types for 'HIST_purge'; have 'void(struct histogram_struct *)'
16 135 | void HIST_purge(HIST h);
17 | ^~~~~~~~~~
18In file included from ../../git/src/nettest_omni.c:166:
19../../git/src/netlib.h:651:17: note: previous declaration of 'HIST_purge' with type 'void(void)'
20 651 | extern void HIST_purge();
21 | ^~~~~~~~~~
22../../git/src/nettest_bsd.c: In function 'recv_tcp_stream':
23../../git/src/nettest_bsd.c:5197:15: error: too many arguments to function 'allocate_buffer_ring'; expected 0, have 4
24 5197 | recv_ring = allocate_buffer_ring(recv_width,
25 | ^~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~
26../../git/src/netlib.h:679:26: note: declared here
27 679 | extern struct ring_elt *allocate_buffer_ring();
28 | ^~~~~~~~~~~~~~~~~~~~
29../../git/src/nettest_bsd.c: In function 'recv_tcp_maerts':
30../../git/src/nettest_bsd.c:5617:15: error: too many arguments to function 'allocate_buffer_ring'; expected 0, have 4
31 5617 | send_ring = allocate_buffer_ring(send_width,
32 | ^~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~
33../../git/src/netlib.h:679:26: note: declared here
34 679 | extern struct ring_elt *allocate_buffer_ring();
35 | ^~~~~~~~~~~~~~~~~~~~
36../../git/src/nettest_bsd.c: In function 'recv_udp_stream':
37../../git/src/nettest_bsd.c:7345:15: error: too many arguments to function 'allocate_buffer_ring'; expected 0, have 4
38 7345 | recv_ring = allocate_buffer_ring(recv_width,
39 | ^~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~
40../../git/src/netlib.h:679:26: note: declared here
41 679 | extern struct ring_elt *allocate_buffer_ring();
42 | ^~~~~~~~~~~~~~~~~~~~
43../../git/src/nettest_bsd.c: In function 'recv_udp_rr':
44../../git/src/nettest_bsd.c:8360:15: error: too many arguments to function 'allocate_buffer_ring'; expected 0, have 4
45 8360 | recv_ring = allocate_buffer_ring(recv_width,
46 | ^~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~
47../../git/src/netlib.h:679:26: note: declared here
48 679 | extern struct ring_elt *allocate_buffer_ring();
49 | ^~~~~~~~~~~~~~~~~~~~
50../../git/src/nettest_bsd.c:8365:15: error: too many arguments to function 'allocate_buffer_ring'; expected 0, have 4
51 8365 | send_ring = allocate_buffer_ring(send_width,
52 | ^~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~
53../../git/src/netlib.h:679:26: note: declared here
54 679 | extern struct ring_elt *allocate_buffer_ring();
55 | ^~~~~~~~~~~~~~~~~~~~
56../../git/src/nettest_bsd.c: In function 'recv_tcp_rr':
57../../git/src/nettest_bsd.c:8677:15: error: too many arguments to function 'allocate_buffer_ring'; expected 0, have 4
58 8677 | send_ring = allocate_buffer_ring(send_width,
59 | ^~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~
60../../git/src/netlib.h:679:26: note: declared here
61 679 | extern struct ring_elt *allocate_buffer_ring();
62 | ^~~~~~~~~~~~~~~~~~~~
63../../git/src/nettest_bsd.c:8682:15: error: too many arguments to function 'allocate_buffer_ring'; expected 0, have 4
64 8682 | recv_ring = allocate_buffer_ring(recv_width,
65 | ^~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~
66../../git/src/netlib.h:679:26: note: declared here
67 679 | extern struct ring_elt *allocate_buffer_ring();
68 | ^~~~~~~~~~~~~~~~~~~~
69../../git/src/nettest_omni.c: In function 'send_omni_inner':
70../../git/src/nettest_omni.c:4044:21: error: too many arguments to function 'allocate_buffer_ring'; expected 0, have 4
71 4044 | send_ring = allocate_buffer_ring(send_width,
72 | ^~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~
73../../git/src/netlib.h:679:26: note: declared here
74 679 | extern struct ring_elt *allocate_buffer_ring();
75 | ^~~~~~~~~~~~~~~~~~~~
76../../git/src/nettest_omni.c:4086:21: error: too many arguments to function 'allocate_buffer_ring'; expected 0, have 4
77 4086 | recv_ring = allocate_buffer_ring(recv_width,
78 | ^~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~
79../../git/src/netlib.h:679:26: note: declared here
80 679 | extern struct ring_elt *allocate_buffer_ring();
81 | ^~~~~~~~~~~~~~~~~~~~
82../../git/src/nettest_omni.c:5050:5: error: too many arguments to function 'HIST_get_stats'; expected 0, have 5
83 5050 | HIST_get_stats(time_hist,
84 | ^~~~~~~~~~~~~~ ~~~~~~~~~
85../../git/src/netlib.h:650:17: note: declared here
86 650 | extern void HIST_get_stats();
87 | ^~~~~~~~~~~~~~
88../../git/src/nettest_omni.c:5055:19: error: too many arguments to function 'HIST_get_percentile'; expected 0, have 2
89 5055 | p50_latency = HIST_get_percentile(time_hist, 0.50);
90 | ^~~~~~~~~~~~~~~~~~~ ~~~~~~~~~
91../../git/src/netlib.h:649:17: note: declared here
92 649 | extern int HIST_get_percentile();
93 | ^~~~~~~~~~~~~~~~~~~
94../../git/src/nettest_omni.c:5056:19: error: too many arguments to function 'HIST_get_percentile'; expected 0, have 2
95 5056 | p90_latency = HIST_get_percentile(time_hist, 0.90);
96 | ^~~~~~~~~~~~~~~~~~~ ~~~~~~~~~
97../../git/src/netlib.h:649:17: note: declared here
98 649 | extern int HIST_get_percentile();
99 | ^~~~~~~~~~~~~~~~~~~
100../../git/src/nettest_omni.c:5057:19: error: too many arguments to function 'HIST_get_percentile'; expected 0, have 2
101 5057 | p99_latency = HIST_get_percentile(time_hist, 0.99);
102 | ^~~~~~~~~~~~~~~~~~~ ~~~~~~~~~
103../../git/src/netlib.h:649:17: note: declared here
104 649 | extern int HIST_get_percentile();
105 | ^~~~~~~~~~~~~~~~~~~
106../../git/src/nettest_omni.c: In function 'recv_omni':
107../../git/src/nettest_omni.c:5354:17: error: too many arguments to function 'allocate_buffer_ring'; expected 0, have 4
108 5354 | send_ring = allocate_buffer_ring(send_width,
109 | ^~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~
110../../git/src/netlib.h:679:26: note: declared here
111 679 | extern struct ring_elt *allocate_buffer_ring();
112 | ^~~~~~~~~~~~~~~~~~~~
113../../git/src/nettest_omni.c:5396:17: error: too many arguments to function 'allocate_buffer_ring'; expected 0, have 4
114 5396 | recv_ring = allocate_buffer_ring(recv_width,
115 | ^~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~
116../../git/src/netlib.h:679:26: note: declared here
117 679 | extern struct ring_elt *allocate_buffer_ring();
118 | ^~~~~~~~~~~~~~~~~~~~
119
120Upstream-Status: Submitted [https://github.com/HewlettPackard/netperf/pull/86]
121Signed-off-by: mark.yang <mark.yang@lge.com>
122---
123 src/netlib.h | 11 ++++++-----
124 1 file changed, 6 insertions(+), 5 deletions(-)
125
126diff --git a/src/netlib.h b/src/netlib.h
127index b1f4199..8e1f6fe 100644
128--- a/src/netlib.h
129+++ b/src/netlib.h
130@@ -564,6 +564,7 @@ extern void demo_interval_final();
131 #endif
132 #endif
133
134+#include "hist.h"
135 extern void netlib_init();
136 extern int netlib_get_page_size();
137 extern void install_signal_catchers();
138@@ -646,9 +647,9 @@ extern char *find_interface_slot(char *interface_name);
139 extern void find_interface_ids(char *interface_name, int *vendor, int *device, int *sub_vend, int *sub_dev);
140 extern void find_driver_info(char *ifname, char *driver, char *version, char *firmware, char *bus, int len);
141 extern void find_system_info(char **system_model, char **cpu_model, int *cpu_frequency);
142-extern int HIST_get_percentile();
143-extern void HIST_get_stats();
144-extern void HIST_purge();
145+extern int HIST_get_percentile(HIST h, const double percentile);
146+extern void HIST_get_stats(HIST h, int *min, int *max, double *mean, double *stddev);
147+extern void HIST_purge(HIST h);
148 extern void find_security_info(int *enabled, int *type, char **specific);
149 extern void demo_first_timestamp();
150 extern void demo_reset();
151@@ -676,7 +677,7 @@ extern void catcher(int, siginfo_t *,void *);
152 #else
153 extern void catcher(int);
154 #endif /* __hpux */
155-extern struct ring_elt *allocate_buffer_ring();
156+extern struct ring_elt *allocate_buffer_ring(int recv_width, int recv_size, int local_recv_align, int local_recv_offset);
157 extern void access_buffer(char *buffer_ptr,
158 int length,
159 int dirty_count,
160@@ -687,7 +688,7 @@ extern struct ring_elt *allocate_exs_buffer_ring();
161 #endif /* HAVE_ICSC_EXS */
162
163 #ifdef HAVE_SENDFILE
164-extern struct ring_elt *alloc_sendfile_buf_ring();
165+extern struct ring_elt *alloc_sendfile_buf_ring(int send_width, int send_size, int local_send_align, int local_send_offset);
166 extern int netperf_sendfile(SOCKET send_socket, struct ring_elt *send_ring);
167 #endif /* HAVE_SENDFILE */
168
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-07-01 11:54:06 +0000