Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
at release-16.03 615 lines 28 kB view raw
1diff -rup accelio/benchmarks/usr/xio_perftest/xio_perftest_client.c accelio.new/benchmarks/usr/xio_perftest/xio_perftest_client.c 2--- accelio/benchmarks/usr/xio_perftest/xio_perftest_client.c 2015-09-03 19:36:25.610337514 -0400 3+++ accelio.new/benchmarks/usr/xio_perftest/xio_perftest_client.c 2015-09-03 19:59:13.258697472 -0400 4@@ -246,7 +246,7 @@ static void *worker_thread(void *data) 5 } else { 6 vmsg_sglist_set_nents(&msg->out, 0); 7 } 8- msg->user_context = (void *)get_cycles(); 9+ msg->user_context = (void *)(intptr_t)get_cycles(); 10 /* send first message */ 11 if (xio_send_request(tdata->conn, msg) == -1) { 12 if (xio_errno() != EAGAIN) 13@@ -330,7 +330,7 @@ static int on_response(struct xio_sessio 14 { 15 struct thread_data *tdata = (struct thread_data *)cb_user_context; 16 17- cycles_t rtt = (get_cycles()-(cycles_t)msg->user_context); 18+ cycles_t rtt = (get_cycles()-(cycles_t)(intptr_t)msg->user_context); 19 20 if (tdata->do_stat) { 21 if (rtt > tdata->stat.max_rtt) 22@@ -358,7 +358,7 @@ static int on_response(struct xio_sessio 23 msg->in.header.iov_len = 0; 24 vmsg_sglist_set_nents(&msg->in, 0); 25 26- msg->user_context = (void *)get_cycles(); 27+ msg->user_context = (void *)(intptr_t)get_cycles(); 28 if (xio_send_request(tdata->conn, msg) == -1) { 29 if (xio_errno() != EAGAIN) 30 printf("**** [%p] Error - xio_send_request " \ 31@@ -559,7 +559,7 @@ int run_client_test(struct perf_paramete 32 sess_data.min_lat_us, 33 sess_data.max_lat_us); 34 if (fd) 35- fprintf(fd, "%lu, %d, %lu, %.2lf, %.2lf\n", 36+ fprintf(fd, "%" PRIu64 ", %d, %" PRIu64 ", %.2lf, %.2lf\n", 37 data_len, 38 threads_iter, 39 sess_data.tps, 40diff -rup accelio/benchmarks/usr/xio_perftest/xio_perftest_parameters.h accelio.new/benchmarks/usr/xio_perftest/xio_perftest_parameters.h 41--- accelio/benchmarks/usr/xio_perftest/xio_perftest_parameters.h 2015-09-03 19:36:25.610337514 -0400 42+++ accelio.new/benchmarks/usr/xio_perftest/xio_perftest_parameters.h 2015-09-03 19:57:30.856215123 -0400 43@@ -90,7 +90,7 @@ typedef enum { READ, WRITE} Verb; 44 /* The format of the results */ 45 #define RESULT_FMT " #bytes #threads #TPS BW average[MBps] Latency average[usecs] Latency low[usecs] Latency peak[usecs]\n" 46 /* Result print format */ 47-#define REPORT_FMT " %-7lu %-2d %-9.2lu %-9.2lf %-9.2lf %-9.2lf %-9.2lf\n" 48+#define REPORT_FMT " %-7" PRIu64 " %-2d %-9.2" PRIu64 " %-9.2lf %-9.2lf %-9.2lf %-9.2lf\n" 49 50 51 struct perf_parameters { 52diff -rup accelio/examples/usr/hello_world_iov/xio_client.c accelio.new/examples/usr/hello_world_iov/xio_client.c 53--- accelio/examples/usr/hello_world_iov/xio_client.c 2015-09-03 19:36:25.611337519 -0400 54+++ accelio.new/examples/usr/hello_world_iov/xio_client.c 2015-09-03 19:42:19.983984370 -0400 55@@ -224,7 +224,7 @@ static void process_response(struct sess 56 len = 64; 57 tmp = str[len]; 58 str[len] = '\0'; 59- printf("message header : [%lu] - %s\n", 60+ printf("message header : [%" PRIu64 "] - %s\n", 61 (rsp->request->sn + 1), str); 62 str[len] = tmp; 63 } 64@@ -236,7 +236,7 @@ static void process_response(struct sess 65 len = 64; 66 tmp = str[len]; 67 str[len] = '\0'; 68- printf("message data: [%lu][%d][%zd] - %s\n", 69+ printf("message data: [%" PRIu64 "][%d][%zd] - %s\n", 70 (rsp->request->sn + 1), i, sglist[i].iov_len, str); 71 str[len] = tmp; 72 } 73diff -rup accelio/examples/usr/hello_world_iov/xio_server.c accelio.new/examples/usr/hello_world_iov/xio_server.c 74--- accelio/examples/usr/hello_world_iov/xio_server.c 2015-09-03 19:36:25.611337519 -0400 75+++ accelio.new/examples/usr/hello_world_iov/xio_server.c 2015-09-03 19:43:07.353204184 -0400 76@@ -203,7 +203,7 @@ static void process_request(struct serve 77 len = 64; 78 tmp = str[len]; 79 str[len] = '\0'; 80- printf("message header : [%lu] - %s\n", 81+ printf("message header : [%" PRIu64 "] - %s\n", 82 (req->sn + 1), str); 83 str[len] = tmp; 84 } 85@@ -215,7 +215,7 @@ static void process_request(struct serve 86 len = 64; 87 tmp = str[len]; 88 str[len] = '\0'; 89- printf("message data: [%lu][%d][%zd] - %s\n", 90+ printf("message data: [%" PRIu64 "][%d][%zd] - %s\n", 91 (req->sn + 1), i, sglist[i].iov_len, str); 92 str[len] = tmp; 93 } 94@@ -360,11 +360,11 @@ static int on_msg_error(struct xio_sessi 95 struct server_data *sdata = (struct server_data *)cb_user_context; 96 97 if (direction == XIO_MSG_DIRECTION_OUT) { 98- printf("**** [%p] message %lu failed. reason: %s\n", 99+ printf("**** [%p] message %" PRIu64 " failed. reason: %s\n", 100 session, msg->sn, xio_strerror(error)); 101 } else { 102 xio_release_response(msg); 103- printf("**** [%p] message %lu failed. reason: %s\n", 104+ printf("**** [%p] message %" PRIu64 " failed. reason: %s\n", 105 session, msg->request->sn, xio_strerror(error)); 106 } 107 108diff -rup accelio/examples/usr/hello_world_libevent/xio_client.c accelio.new/examples/usr/hello_world_libevent/xio_client.c 109--- accelio/examples/usr/hello_world_libevent/xio_client.c 2015-09-03 19:36:25.612337524 -0400 110+++ accelio.new/examples/usr/hello_world_libevent/xio_client.c 2015-09-03 19:43:32.748322028 -0400 111@@ -87,7 +87,7 @@ static void process_response(struct sess 112 { 113 if (++session_data->cnt == PRINT_COUNTER) { 114 ((char *)(rsp->in.header.iov_base))[rsp->in.header.iov_len] = 0; 115- printf("message: [%lu] - %s\n", 116+ printf("message: [%" PRIu64 "] - %s\n", 117 (rsp->request->sn + 1), (char *)rsp->in.header.iov_base); 118 session_data->cnt = 0; 119 } 120diff -rup accelio/examples/usr/hello_world_libevent/xio_server.c accelio.new/examples/usr/hello_world_libevent/xio_server.c 121--- accelio/examples/usr/hello_world_libevent/xio_server.c 2015-09-03 19:36:25.612337524 -0400 122+++ accelio.new/examples/usr/hello_world_libevent/xio_server.c 2015-09-03 19:43:50.556404665 -0400 123@@ -82,7 +82,7 @@ static void process_request(struct serve 124 len = 64; 125 tmp = str[len]; 126 str[len] = '\0'; 127- printf("message header : [%lu] - %s\n", 128+ printf("message header : [%" PRIu64 "] - %s\n", 129 (req->sn + 1), str); 130 str[len] = tmp; 131 } 132@@ -94,7 +94,7 @@ static void process_request(struct serve 133 len = 64; 134 tmp = str[len]; 135 str[len] = '\0'; 136- printf("message data: [%lu][%d][%d] - %s\n", 137+ printf("message data: [%" PRIu64 "][%d][%d] - %s\n", 138 (req->sn + 1), i, len, str); 139 str[len] = tmp; 140 } 141diff -rup accelio/examples/usr/hello_world_mt/xio_mt_client.c accelio.new/examples/usr/hello_world_mt/xio_mt_client.c 142--- accelio/examples/usr/hello_world_mt/xio_mt_client.c 2015-09-03 19:36:25.611337519 -0400 143+++ accelio.new/examples/usr/hello_world_mt/xio_mt_client.c 2015-09-03 19:41:13.493675827 -0400 144@@ -40,6 +40,7 @@ 145 #include <string.h> 146 #include <inttypes.h> 147 #include <sched.h> 148+#include <inttypes.h> 149 150 #include "libxio.h" 151 152@@ -133,7 +134,7 @@ static void process_response(struct thre 153 { 154 if (++tdata->cnt == PRINT_COUNTER) { 155 ((char *)(rsp->in.header.iov_base))[rsp->in.header.iov_len] = 0; 156- printf("thread [%d] - tid:%p - message: [%lu] - %s\n", 157+ printf("thread [%d] - tid:%p - message: [%" PRIu64 "] - %s\n", 158 tdata->affinity, 159 (void *)pthread_self(), 160 (rsp->request->sn + 1), (char *)rsp->in.header.iov_base); 161diff -rup accelio/examples/usr/hello_world_mt/xio_mt_server.c accelio.new/examples/usr/hello_world_mt/xio_mt_server.c 162--- accelio/examples/usr/hello_world_mt/xio_mt_server.c 2015-09-03 19:36:25.611337519 -0400 163+++ accelio.new/examples/usr/hello_world_mt/xio_mt_server.c 2015-09-03 19:41:31.730760455 -0400 164@@ -104,7 +104,7 @@ static void process_request(struct threa 165 struct xio_msg *req) 166 { 167 if (++tdata->cnt == PRINT_COUNTER) { 168- printf("thread [%d] tid:%p - message: [%lu] - %s\n", 169+ printf("thread [%d] tid:%p - message: [%" PRIu64 "] - %s\n", 170 tdata->affinity, 171 (void *)pthread_self(), 172 (req->sn + 1), (char *)req->in.header.iov_base); 173diff -rup accelio/regression/usr/reg_basic_mt/reg_basic_mt_client.c accelio.new/regression/usr/reg_basic_mt/reg_basic_mt_client.c 174--- accelio/regression/usr/reg_basic_mt/reg_basic_mt_client.c 2015-09-03 19:36:25.603337482 -0400 175+++ accelio.new/regression/usr/reg_basic_mt/reg_basic_mt_client.c 2015-09-03 20:00:15.169989095 -0400 176@@ -416,11 +416,11 @@ static int on_msg_error(struct xio_sessi 177 struct thread_data *tdata = conn_entry->tdata; 178 179 if (direction == XIO_MSG_DIRECTION_OUT) { 180- DEBUG("**** [%p] message %lu failed. reason: %s\n", 181+ DEBUG("**** [%p] message %" PRIu64 " failed. reason: %s\n", 182 session, req->sn, xio_strerror(error)); 183 } else { 184 xio_release_response(req); 185- DEBUG("**** [%p] message %lu failed. reason: %s\n", 186+ DEBUG("**** [%p] message %" PRIu64 " failed. reason: %s\n", 187 session, req->request->sn, xio_strerror(error)); 188 } 189 obj_pool_put(tdata->req_pool, req); 190diff -rup accelio/src/tools/usr/xio_if_numa_cpus.c accelio.new/src/tools/usr/xio_if_numa_cpus.c 191--- accelio/src/tools/usr/xio_if_numa_cpus.c 2015-09-03 19:36:25.603337482 -0400 192+++ accelio.new/src/tools/usr/xio_if_numa_cpus.c 2015-09-03 19:40:06.398364476 -0400 193@@ -43,6 +43,7 @@ 194 #include <net/if.h> 195 #include <stdio.h> 196 #include <numa.h> 197+#include <inttypes.h> 198 199 #define cpusmask_test_bit(nr, addr) (*(addr) & (1ULL << (nr))) 200 #define cpusmask_set_bit(nr, addr) (*(addr) |= (1ULL << (nr))) 201@@ -244,7 +245,7 @@ int main(int argc, char *argv[]) 202 } 203 intf_cpusmask_str(cpusmask, cpusnum, cpus_str); 204 205- printf("%-10s %-16s %-30s %-5d 0x%-8lx %-4s[%d] - %s\n", 206+ printf("%-10s %-16s %-30s %-5d 0x%-8" PRIx64 " %-4s[%d] - %s\n", 207 ifa->ifa_name, host, flags, numa_node, cpusmask, 208 "cpus", cpusnum, cpus_str); 209 } 210diff -rup accelio/src/tools/usr/xio_mem_usage.c accelio.new/src/tools/usr/xio_mem_usage.c 211--- accelio/src/tools/usr/xio_mem_usage.c 2015-09-03 19:36:25.603337482 -0400 212+++ accelio.new/src/tools/usr/xio_mem_usage.c 2015-09-03 19:38:57.596044838 -0400 213@@ -73,7 +73,7 @@ 214 while (i++ < 48) { \ 215 printf("."); \ 216 } \ 217- printf(" %6lu\n", sizeof(type)); \ 218+ printf(" %zu\n", sizeof(type)); \ 219 } 220 221 int main(int argc, char **argv) 222diff -rup accelio/tests/portable/direct_rdma_test/xio_rdma_common.c accelio.new/tests/portable/direct_rdma_test/xio_rdma_common.c 223--- accelio/tests/portable/direct_rdma_test/xio_rdma_common.c 2015-09-03 19:36:25.610337514 -0400 224+++ accelio.new/tests/portable/direct_rdma_test/xio_rdma_common.c 2015-09-03 19:56:25.521908028 -0400 225@@ -90,7 +90,7 @@ static int publish_our_buffer(struct xio 226 * this flag must be on */ 227 rsp->flags = XIO_MSG_FLAG_IMM_SEND_COMP; 228 229- rdma_test_buf.addr = (uint64_t)rdma_reg_mem.addr; 230+ rdma_test_buf.addr = (intptr_t)rdma_reg_mem.addr; 231 rdma_test_buf.length = rdma_reg_mem.length; 232 rdma_test_buf.rkey = xio_lookup_rkey_by_response(&rdma_reg_mem, rsp); 233 234diff -rup accelio/tests/usr/hello_test/xio_client.c accelio.new/tests/usr/hello_test/xio_client.c 235--- accelio/tests/usr/hello_test/xio_client.c 2015-09-03 19:36:25.608337505 -0400 236+++ accelio.new/tests/usr/hello_test/xio_client.c 2015-09-03 19:45:43.055926711 -0400 237@@ -181,13 +181,13 @@ static void process_response(struct test 238 239 double txbw = (1.0*pps*test_params->stat.txlen/ONE_MB); 240 double rxbw = (1.0*pps*test_params->stat.rxlen/ONE_MB); 241- printf("transactions per second: %lu, bandwidth: " \ 242+ printf("transactions per second: %" PRIu64 ", bandwidth: " \ 243 "TX %.2f MB/s, RX: %.2f MB/s, length: TX: %zd B, RX: %zd B\n", 244 pps, txbw, rxbw, 245 test_params->stat.txlen, test_params->stat.rxlen); 246 get_time(timeb, 40); 247 248- printf("**** [%s] - message [%zd] %s - %s\n", 249+ printf("**** [%s] - message [%" PRIu64 "] %s - %s\n", 250 timeb, (rsp->request->sn + 1), 251 (char *)rsp->in.header.iov_base, 252 (char *)(inents > 0 ? isglist[0].iov_base : NULL)); 253@@ -212,8 +212,8 @@ static int on_session_event(struct xio_s 254 255 switch (event_data->event) { 256 case XIO_SESSION_CONNECTION_TEARDOWN_EVENT: 257- printf("nsent:%lu, nrecv:%lu, " \ 258- "delta:%lu\n", 259+ printf("nsent:%" PRIu64 ", nrecv:%" PRIu64 ", " \ 260+ "delta:%" PRIu64 "\n", 261 test_params->nsent, test_params->nrecv, 262 test_params->nsent-test_params->nrecv); 263 264@@ -370,11 +370,11 @@ static int on_msg_error(struct xio_sessi 265 struct test_params *test_params = (struct test_params *)cb_user_context; 266 267 if (direction == XIO_MSG_DIRECTION_OUT) { 268- printf("**** [%p] message %lu failed. reason: %s\n", 269+ printf("**** [%p] message %" PRIu64 " failed. reason: %s\n", 270 session, msg->sn, xio_strerror(error)); 271 } else { 272 xio_release_response(msg); 273- printf("**** [%p] message %lu failed. reason: %s\n", 274+ printf("**** [%p] message %" PRIu64 " failed. reason: %s\n", 275 session, msg->request->sn, xio_strerror(error)); 276 } 277 278diff -rup accelio/tests/usr/hello_test/xio_server.c accelio.new/tests/usr/hello_test/xio_server.c 279--- accelio/tests/usr/hello_test/xio_server.c 2015-09-03 19:36:25.608337505 -0400 280+++ accelio.new/tests/usr/hello_test/xio_server.c 2015-09-03 19:46:35.777171360 -0400 281@@ -112,7 +112,7 @@ static void process_request(struct xio_m 282 if (++cnt == PRINT_COUNTER) { 283 struct xio_iovec_ex *sglist = vmsg_sglist(&msg->in); 284 285- printf("**** message [%lu] %s - %s\n", 286+ printf("**** message [%" PRIu64 "] %s - %s\n", 287 (msg->sn+1), 288 (char *)msg->in.header.iov_base, 289 (char *)sglist[0].iov_base); 290@@ -146,8 +146,8 @@ static int on_session_event(struct xio_s 291 break; 292 case XIO_SESSION_CONNECTION_TEARDOWN_EVENT: 293 if (event_data->reason != XIO_E_SESSION_REJECTED) { 294- printf("last sent:%lu, last comp:%lu, " \ 295- "delta:%lu\n", 296+ printf("last sent:%" PRIu64 ", last comp:%" PRIu64 ", " \ 297+ "delta:%" PRIu64 "\n", 298 test_params->nsent, test_params->ncomp, 299 test_params->nsent-test_params->ncomp); 300 test_params->connection = NULL; 301@@ -257,7 +257,7 @@ static int on_msg_error(struct xio_sessi 302 { 303 struct test_params *test_params = (struct test_params *)cb_user_context; 304 305- printf("**** [%p] message [%lu] failed. reason: %s\n", 306+ printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n", 307 session, msg->request->sn, xio_strerror(error)); 308 309 msg_pool_put(test_params->pool, msg); 310diff -rup accelio/tests/usr/hello_test_bidi/xio_bidi_client.c accelio.new/tests/usr/hello_test_bidi/xio_bidi_client.c 311--- accelio/tests/usr/hello_test_bidi/xio_bidi_client.c 2015-09-03 19:36:25.608337505 -0400 312+++ accelio.new/tests/usr/hello_test_bidi/xio_bidi_client.c 2015-09-03 19:49:10.164887785 -0400 313@@ -114,7 +114,7 @@ static void process_request(struct xio_m 314 if (++cnt == print_counter) { 315 struct xio_iovec_ex *sglist = vmsg_sglist(&req->in); 316 317- printf("**** request [%lu] %s - %s\n", 318+ printf("**** request [%" PRIu64 "] %s - %s\n", 319 (req->sn+1), 320 (char *)req->in.header.iov_base, 321 (char *)sglist[0].iov_base); 322@@ -171,11 +171,11 @@ static void process_response(struct xio_ 323 double txbw = (1.0*pps*txlen/ONE_MB); 324 double rxbw = (1.0*pps*rxlen/ONE_MB); 325 326- printf("transactions per second: %lu, bandwidth: " \ 327+ printf("transactions per second: %" PRIu64 ", bandwidth: " \ 328 "TX %.2f MB/s, RX: %.2f MB/s, length: TX: %zd B, RX: %zd B\n", 329 pps, txbw, rxbw, txlen, rxlen); 330 get_time(timeb, 40); 331- printf("**** [%s] - response [%lu] %s - %s\n", 332+ printf("**** [%s] - response [%" PRIu64 "] %s - %s\n", 333 timeb, (rsp->request->sn + 1), 334 (char *)rsp->in.header.iov_base, 335 (char *)(inents > 0 ? isglist[0].iov_base : NULL)); 336@@ -357,7 +357,7 @@ static int on_msg_error(struct xio_sessi 337 { 338 switch (msg->type) { 339 case XIO_MSG_TYPE_REQ: 340- printf("**** [%p] message [%lu] failed. reason: %s\n", 341+ printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n", 342 session, msg->sn, xio_strerror(error)); 343 msg_pool_put(pool, msg); 344 switch (error) { 345@@ -369,7 +369,7 @@ static int on_msg_error(struct xio_sessi 346 }; 347 break; 348 case XIO_MSG_TYPE_RSP: 349- printf("**** [%p] message [%lu] failed. reason: %s\n", 350+ printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n", 351 session, msg->request->sn, xio_strerror(error)); 352 /* message is no longer needed */ 353 switch (error) { 354diff -rup accelio/tests/usr/hello_test_bidi/xio_bidi_server.c accelio.new/tests/usr/hello_test_bidi/xio_bidi_server.c 355--- accelio/tests/usr/hello_test_bidi/xio_bidi_server.c 2015-09-03 19:36:25.608337505 -0400 356+++ accelio.new/tests/usr/hello_test_bidi/xio_bidi_server.c 2015-09-03 19:49:52.860085909 -0400 357@@ -143,11 +143,11 @@ static void process_response(struct xio_ 358 double txbw = (1.0*pps*txlen/ONE_MB); 359 double rxbw = (1.0*pps*rxlen/ONE_MB); 360 361- printf("transactions per second: %lu, bandwidth: " \ 362+ printf("transactions per second: %" PRIu64 ", bandwidth: " \ 363 "TX %.2f MB/s, RX: %.2f MB/s, length: TX: %zd B, RX: %zd B\n", 364 pps, txbw, rxbw, txlen, rxlen); 365 get_time(timeb, 40); 366- printf("**** [%s] - response complete [%lu] %s - %s\n", 367+ printf("**** [%s] - response complete [%" PRIu64 "] %s - %s\n", 368 timeb, (rsp->request->sn + 1), 369 (char *)rsp->in.header.iov_base, 370 (char *)(inents > 0 ? isglist[0].iov_base : NULL)); 371@@ -171,7 +171,7 @@ static void process_request(struct xio_m 372 if (++cnt == print_counter) { 373 struct xio_iovec_ex *sglist = vmsg_sglist(&req->in); 374 375- printf("**** request complete [%lu] %s - %s [%zd]\n", 376+ printf("**** request complete [%" PRIu64 "] %s - %s [%zd]\n", 377 (req->sn+1), 378 (char *)req->in.header.iov_base, 379 (char *)sglist[0].iov_base, 380@@ -409,7 +409,7 @@ static int on_msg_error(struct xio_sessi 381 { 382 switch (msg->type) { 383 case XIO_MSG_TYPE_REQ: 384- printf("**** [%p] message [%lu] failed. reason: %s\n", 385+ printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n", 386 session, msg->sn, xio_strerror(error)); 387 msg_pool_put(pool, msg); 388 switch (error) { 389@@ -422,7 +422,7 @@ static int on_msg_error(struct xio_sessi 390 }; 391 break; 392 case XIO_MSG_TYPE_RSP: 393- printf("**** [%p] message [%lu] failed. reason: %s\n", 394+ printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n", 395 session, msg->request->sn, xio_strerror(error)); 396 /* message is no longer needed */ 397 switch (error) { 398diff -rup accelio/tests/usr/hello_test_lat/xio_lat_client.c accelio.new/tests/usr/hello_test_lat/xio_lat_client.c 399--- accelio/tests/usr/hello_test_lat/xio_lat_client.c 2015-09-03 19:36:25.608337505 -0400 400+++ accelio.new/tests/usr/hello_test_lat/xio_lat_client.c 2015-09-03 19:50:51.111356220 -0400 401@@ -139,7 +139,7 @@ static void process_response(struct xio_ 402 double rxbw = (1.0*pps*rxlen/ONE_MB); 403 double lat = (1000000.0/pps); 404 405- printf("transactions per second: %lu, lat: %.2f us, bandwidth: " \ 406+ printf("transactions per second: %" PRIu64 ", lat: %.2f us, bandwidth: " \ 407 "TX %.2f MB/s, RX: %.2f MB/s, length: TX: %zd B, RX: %zd B\n", 408 pps, lat, txbw, rxbw, txlen, rxlen); 409 get_time(timeb, 40); 410@@ -312,7 +312,7 @@ static int on_msg_error(struct xio_sessi 411 struct xio_msg *msg, 412 void *cb_user_context) 413 { 414- printf("**** [%p] message [%lu] failed. reason: %s\n", 415+ printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n", 416 session, msg->sn, xio_strerror(error)); 417 418 msg_pool_put(pool, msg); 419diff -rup accelio/tests/usr/hello_test_lat/xio_lat_server.c accelio.new/tests/usr/hello_test_lat/xio_lat_server.c 420--- accelio/tests/usr/hello_test_lat/xio_lat_server.c 2015-09-03 19:36:25.608337505 -0400 421+++ accelio.new/tests/usr/hello_test_lat/xio_lat_server.c 2015-09-03 19:51:16.803475442 -0400 422@@ -103,7 +103,7 @@ static void process_request(struct xio_m 423 if (++cnt == PRINT_COUNTER) { 424 struct xio_iovec_ex *sglist = vmsg_sglist(&msg->in); 425 426- printf("**** message [%lu] %s - %s\n", 427+ printf("**** message [%" PRIu64 "] %s - %s\n", 428 (msg->sn+1), 429 (char *)msg->in.header.iov_base, 430 (char *)sglist[0].iov_base); 431@@ -209,7 +209,7 @@ static int on_msg_error(struct xio_sessi 432 struct xio_msg *msg, 433 void *cb_user_context) 434 { 435- printf("**** [%p] message [%lu] failed. reason: %s\n", 436+ printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n", 437 session, msg->sn, xio_strerror(error)); 438 439 msg_pool_put(pool, msg); 440diff -rup accelio/tests/usr/hello_test_mt/xio_mt_client.c accelio.new/tests/usr/hello_test_mt/xio_mt_client.c 441--- accelio/tests/usr/hello_test_mt/xio_mt_client.c 2015-09-03 19:36:25.608337505 -0400 442+++ accelio.new/tests/usr/hello_test_mt/xio_mt_client.c 2015-09-03 19:47:39.218465755 -0400 443@@ -179,12 +179,12 @@ static void process_response(struct thre 444 double txbw = (1.0*pps*tdata->stat.txlen/ONE_MB); 445 double rxbw = (1.0*pps*tdata->stat.rxlen/ONE_MB); 446 447- printf("transactions per second: %lu, bandwidth: " \ 448+ printf("transactions per second: %" PRIu64 ", bandwidth: " \ 449 "TX %.2f MB/s, RX: %.2f MB/s, length: TX: %zd B, " \ 450 "RX: %zd B\n", 451 pps, txbw, rxbw, tdata->stat.txlen, tdata->stat.rxlen); 452 get_time(timeb, 40); 453- printf("[%s] thread [%d] - tid:%p - message [%lu] " \ 454+ printf("[%s] thread [%d] - tid:%p - message [%" PRIu64 "] " \ 455 "%s - %s\n", 456 timeb, 457 tdata->affinity, 458@@ -416,11 +416,11 @@ static int on_msg_error(struct xio_sessi 459 struct thread_data *tdata = (struct thread_data *)cb_user_context; 460 461 if (direction == XIO_MSG_DIRECTION_OUT) { 462- printf("**** [%p] message %lu failed. reason: %s\n", 463+ printf("**** [%p] message %" PRIu64 " failed. reason: %s\n", 464 session, msg->sn, xio_strerror(error)); 465 } else { 466 xio_release_response(msg); 467- printf("**** [%p] message %lu failed. reason: %s\n", 468+ printf("**** [%p] message %" PRIu64 " failed. reason: %s\n", 469 session, msg->request->sn, xio_strerror(error)); 470 } 471 472diff -rup accelio/tests/usr/hello_test_mt/xio_mt_server.c accelio.new/tests/usr/hello_test_mt/xio_mt_server.c 473--- accelio/tests/usr/hello_test_mt/xio_mt_server.c 2015-09-03 19:36:25.608337505 -0400 474+++ accelio.new/tests/usr/hello_test_mt/xio_mt_server.c 2015-09-03 19:48:02.876575538 -0400 475@@ -171,7 +171,7 @@ static void process_request(struct threa 476 if (++tdata->stat.cnt == PRINT_COUNTER) { 477 struct xio_iovec_ex *sglist = vmsg_sglist(&msg->in); 478 479- printf("thread [%d] - message [%lu] %s - %s\n", 480+ printf("thread [%d] - message [%" PRIu64 "] %s - %s\n", 481 tdata->affinity, 482 (msg->sn+1), 483 (char *)msg->in.header.iov_base, 484@@ -260,7 +260,7 @@ static int on_msg_error(struct xio_sessi 485 { 486 struct thread_data *tdata = (struct thread_data *)cb_user_context; 487 488- printf("**** [%p] message [%lu] failed. reason: %s\n", 489+ printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n", 490 session, msg->request->sn, xio_strerror(error)); 491 492 msg_pool_put(tdata->pool, msg); 493diff -rup accelio/tests/usr/hello_test_oneway/xio_oneway_client.c accelio.new/tests/usr/hello_test_oneway/xio_oneway_client.c 494--- accelio/tests/usr/hello_test_oneway/xio_oneway_client.c 2015-09-03 19:36:25.609337510 -0400 495+++ accelio.new/tests/usr/hello_test_oneway/xio_oneway_client.c 2015-09-03 19:54:18.142316932 -0400 496@@ -150,11 +150,11 @@ static void process_rx_message(struct ow 497 498 double rxbw = (1.0*pps*ow_params->rx_stat.xlen/ONE_MB); 499 500- printf("transactions per second: %lu, bandwidth: " \ 501+ printf("transactions per second: %" PRIu64 ", bandwidth: " \ 502 "RX: %.2f MB/s, RX: %zd B\n", 503 pps, rxbw, ow_params->rx_stat.xlen); 504 get_time(timeb, 40); 505- printf("**** [%s] - message [%lu] %s - %s\n", 506+ printf("**** [%s] - message [%" PRIu64 "] %s - %s\n", 507 timeb, (msg->sn + 1), 508 (char *)msg->in.header.iov_base, 509 (char *)(inents > 0 ? isglist[0].iov_base : NULL)); 510@@ -202,11 +202,11 @@ static void process_tx_message(struct ow 511 512 double txbw = (1.0*pps*ow_params->tx_stat.xlen/ONE_MB); 513 514- printf("transactions per second: %lu, bandwidth: " \ 515+ printf("transactions per second: %" PRIu64 ", bandwidth: " \ 516 "TX %.2f MB/s,length: TX: %zd B\n", 517 pps, txbw, ow_params->tx_stat.xlen); 518 get_time(timeb, 40); 519- printf("**** [%s] - message [%lu] %s - %s\n", 520+ printf("**** [%s] - message [%" PRIu64 "] %s - %s\n", 521 timeb, (msg->sn + 1), 522 (char *)msg->out.header.iov_base, 523 (char *)(onents > 0 ? osglist[0].iov_base : NULL)); 524@@ -349,7 +349,7 @@ static int on_msg_error(struct xio_sessi 525 struct ow_test_params *ow_params = 526 (struct ow_test_params *)cb_user_context; 527 528- printf("**** [%p] message [%lu] failed. reason: %s\n", 529+ printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n", 530 session, msg->sn, xio_strerror(error)); 531 532 msg_pool_put(ow_params->pool, msg); 533diff -rup accelio/tests/usr/hello_test_oneway/xio_oneway_server.c accelio.new/tests/usr/hello_test_oneway/xio_oneway_server.c 534--- accelio/tests/usr/hello_test_oneway/xio_oneway_server.c 2015-09-03 19:36:25.609337510 -0400 535+++ accelio.new/tests/usr/hello_test_oneway/xio_oneway_server.c 2015-09-03 19:54:32.797384938 -0400 536@@ -112,7 +112,7 @@ static void process_request(struct xio_m 537 if (++cnt == PRINT_COUNTER) { 538 struct xio_iovec_ex *sglist = vmsg_sglist(&msg->in); 539 540- printf("**** message [%lu] %s - %s\n", 541+ printf("**** message [%" PRIu64 "] %s - %s\n", 542 (msg->sn+1), 543 (char *)msg->in.header.iov_base, 544 (char *)sglist[0].iov_base); 545@@ -299,7 +299,7 @@ static int on_msg_error(struct xio_sessi 546 struct ow_test_params *ow_params = 547 (struct ow_test_params *)cb_user_context; 548 549- printf("**** [%p] message [%lu] failed. reason: %s\n", 550+ printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n", 551 session, msg->sn, xio_strerror(error)); 552 553 msg_pool_put(ow_params->pool, msg); 554diff -rup accelio/tests/usr/hello_test_ow/xio_ow_client.c accelio.new/tests/usr/hello_test_ow/xio_ow_client.c 555--- accelio/tests/usr/hello_test_ow/xio_ow_client.c 2015-09-03 19:36:25.609337510 -0400 556+++ accelio.new/tests/usr/hello_test_ow/xio_ow_client.c 2015-09-03 19:52:24.905791466 -0400 557@@ -152,7 +152,7 @@ for (i = 0; i < onents; i++) 558 559 double txbw = (1.0*pps*test_params->stat.txlen/ONE_MB); 560 561- printf("transactions per second: %lu, bandwidth: " \ 562+ printf("transactions per second: %" PRIu64 ", bandwidth: " \ 563 "TX %.2f MB/s, length: TX: %zd B\n", 564 pps, txbw, 565 test_params->stat.txlen); 566@@ -181,8 +181,8 @@ static int on_session_event(struct xio_s 567 test_params->closed = 1; 568 break; 569 case XIO_SESSION_CONNECTION_TEARDOWN_EVENT: 570- printf("nsent:%lu, ncomp:%lu, " \ 571- "delta:%lu\n", 572+ printf("nsent:%" PRIu64 ", ncomp:%" PRIu64 ", " \ 573+ "delta:%" PRIu64 "\n", 574 test_params->nsent, test_params->ncomp, 575 test_params->nsent-test_params->ncomp); 576 577@@ -357,7 +357,7 @@ static int on_msg_error(struct xio_sessi 578 { 579 struct test_params *test_params = (struct test_params *)cb_user_context; 580 581- printf("**** [%p] message [%lu] failed. reason: %s\n", 582+ printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n", 583 session, msg->sn, xio_strerror(error)); 584 585 msg_pool_put(test_params->pool, msg); 586diff -rup accelio/tests/usr/hello_test_ow/xio_ow_server.c accelio.new/tests/usr/hello_test_ow/xio_ow_server.c 587--- accelio/tests/usr/hello_test_ow/xio_ow_server.c 2015-09-03 19:36:25.609337510 -0400 588+++ accelio.new/tests/usr/hello_test_ow/xio_ow_server.c 2015-09-03 19:52:57.947944796 -0400 589@@ -110,7 +110,7 @@ static void process_request(struct xio_m 590 if (++cnt == PRINT_COUNTER) { 591 struct xio_iovec_ex *sglist = vmsg_sglist(&msg->in); 592 593- printf("**** message [%lu] %s - %s\n", 594+ printf("**** message [%" PRIu64 "] %s - %s\n", 595 (msg->sn+1), 596 (char *)msg->in.header.iov_base, 597 (char *)sglist[0].iov_base); 598@@ -145,7 +145,7 @@ static int on_session_event(struct xio_s 599 xio_disconnect(event_data->conn); 600 break; 601 case XIO_SESSION_CONNECTION_TEARDOWN_EVENT: 602- printf("last recv:%lu\n", 603+ printf("last recv:%" PRIu64 "\n", 604 test_params->nrecv); 605 606 xio_connection_destroy(event_data->conn); 607@@ -215,7 +215,7 @@ static int on_msg_error(struct xio_sessi 608 struct xio_msg *msg, 609 void *cb_user_context) 610 { 611- printf("**** [%p] message [%lu] failed. reason: %s\n", 612+ printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n", 613 session, msg->request->sn, xio_strerror(error)); 614 615 return 0;