|
1 # This patch was developed in-house. Since it is Solaris-specific, |
|
2 # it is not suitable for upstream. |
|
3 # |
1 diff -r -u /tmp/perftest-1.3.0/Makefile perftest-1.3.0/Makefile |
4 diff -r -u /tmp/perftest-1.3.0/Makefile perftest-1.3.0/Makefile |
2 --- /tmp/perftest-1.3.0/Makefile Thu Jan 20 01:37:35 2011 |
5 --- /tmp/perftest-1.3.0/Makefile Thu Jan 20 01:37:35 2011 |
3 +++ perftest-1.3.0/Makefile Fri Feb 11 04:12:45 2011 |
6 +++ perftest-1.3.0/Makefile Fri Feb 11 04:12:45 2011 |
4 @@ -2,10 +2,11 @@ |
7 @@ -2,10 +2,11 @@ |
5 MCAST_TESTS = send_bw send_lat |
8 MCAST_TESTS = send_bw send_lat |
212 #include <time.h> |
215 #include <time.h> |
213 +#include <inttypes.h> |
216 +#include <inttypes.h> |
214 |
217 |
215 #include <infiniband/verbs.h> |
218 #include <infiniband/verbs.h> |
216 #include <rdma/rdma_cma.h> |
219 #include <rdma/rdma_cma.h> |
217 @@ -144,7 +147,7 @@ |
220 @@ -142,9 +145,9 @@ |
218 |
221 |
219 if (n < 0) { |
222 n = getaddrinfo(data->servername, service, &hints, &res); |
|
223 |
|
224 - if (n < 0) { |
|
225 + if (n != 0) { |
220 fprintf(stderr, "%d:%s: %s for %s:%d\n", |
226 fprintf(stderr, "%d:%s: %s for %s:%d\n", |
221 - pid, __func__, gai_strerror(n), |
227 - pid, __func__, gai_strerror(n), |
222 + (int)pid, __func__, gai_strerror(n), |
228 + (int)pid, __func__, gai_strerror(n), |
223 data->servername, data->port); |
229 data->servername, data->port); |
224 goto err4; |
230 goto err4; |
341 - pid, __func__, (int)sizeof msg, msg); |
347 - pid, __func__, (int)sizeof msg, msg); |
342 + (int)pid, __func__, (int)sizeof msg, msg); |
348 + (int)pid, __func__, (int)sizeof msg, msg); |
343 free(data->rem_dest); |
349 free(data->rem_dest); |
344 goto err; |
350 goto err; |
345 } |
351 } |
346 @@ -347,7 +350,7 @@ |
352 @@ -346,8 +349,8 @@ |
|
353 if (asprintf(&service, "%d", data->port) < 0) |
347 goto err5; |
354 goto err5; |
348 |
355 |
349 if ( (n = getaddrinfo(NULL, service, &hints, &res)) < 0 ) { |
356 - if ( (n = getaddrinfo(NULL, service, &hints, &res)) < 0 ) { |
350 - fprintf(stderr, "%d:%s: %s for port %d\n", pid, __func__, |
357 - fprintf(stderr, "%d:%s: %s for port %d\n", pid, __func__, |
|
358 + if ( (n = getaddrinfo(NULL, service, &hints, &res) != 0) ) { |
351 + fprintf(stderr, "%d:%s: %s for port %d\n", (int)pid, __func__, |
359 + fprintf(stderr, "%d:%s: %s for port %d\n", (int)pid, __func__, |
352 gai_strerror(n), data->port); |
360 gai_strerror(n), data->port); |
353 goto err5; |
361 goto err5; |
354 } |
362 } |
355 @@ -357,12 +360,12 @@ |
363 @@ -357,12 +360,12 @@ |
826 - pid, __func__, scnt, ccnt); |
834 - pid, __func__, scnt, ccnt); |
827 + (int)pid, __func__, scnt, ccnt); |
835 + (int)pid, __func__, scnt, ccnt); |
828 return 1; |
836 return 1; |
829 } |
837 } |
830 ccnt += 1; |
838 ccnt += 1; |
|
839 @@ -1265,7 +1277,7 @@ |
|
840 |
|
841 write(data.sockfd, "done", sizeof "done"); |
|
842 close(data.sockfd); |
|
843 - |
|
844 + |
|
845 } |
|
846 |
|
847 print_report(iters, data.size, duplex, tposted, tcompleted); |
831 diff -r -u /tmp/perftest-1.3.0/rdma_lat.c perftest-1.3.0/rdma_lat.c |
848 diff -r -u /tmp/perftest-1.3.0/rdma_lat.c perftest-1.3.0/rdma_lat.c |
832 --- /tmp/perftest-1.3.0/rdma_lat.c Wed Apr 7 09:44:33 2010 |
849 --- /tmp/perftest-1.3.0/rdma_lat.c Wed Apr 7 09:44:33 2010 |
833 +++ perftest-1.3.0/rdma_lat.c Fri Feb 11 04:12:46 2011 |
850 +++ perftest-1.3.0/rdma_lat.c Fri Feb 11 04:12:46 2011 |
834 @@ -50,8 +50,11 @@ |
851 @@ -50,8 +50,11 @@ |
835 #include <malloc.h> |
852 #include <malloc.h> |
872 - parsed = sscanf(msg, KEY_PRINT_FMT, &rem_dest->lid, &rem_dest->qpn, |
889 - parsed = sscanf(msg, KEY_PRINT_FMT, &rem_dest->lid, &rem_dest->qpn, |
873 + parsed = sscanf(msg, KEY_SCAN_FMT, &rem_dest->lid, &rem_dest->qpn, |
890 + parsed = sscanf(msg, KEY_SCAN_FMT, &rem_dest->lid, &rem_dest->qpn, |
874 &rem_dest->psn, &rem_dest->rkey, &rem_dest->vaddr); |
891 &rem_dest->psn, &rem_dest->rkey, &rem_dest->vaddr); |
875 |
892 |
876 if (parsed != 5) { |
893 if (parsed != 5) { |
877 @@ -220,7 +229,7 @@ |
894 @@ -218,9 +227,9 @@ |
878 |
895 |
879 if (n < 0) { |
896 n = getaddrinfo(data->servername, service, &hints, &res); |
|
897 |
|
898 - if (n < 0) { |
|
899 + if (n != 0) { |
880 fprintf(stderr, "%d:%s: %s for %s:%d\n", |
900 fprintf(stderr, "%d:%s: %s for %s:%d\n", |
881 - pid, __func__, gai_strerror(n), |
901 - pid, __func__, gai_strerror(n), |
882 + (int)pid, __func__, gai_strerror(n), |
902 + (int)pid, __func__, gai_strerror(n), |
883 data->servername, data->port); |
903 data->servername, data->port); |
884 goto err4; |
904 goto err4; |
960 - pid, __func__, data->servername, data->port); |
980 - pid, __func__, data->servername, data->port); |
961 + (int)pid, __func__, data->servername, data->port); |
981 + (int)pid, __func__, data->servername, data->port); |
962 goto err3; |
982 goto err3; |
963 } |
983 } |
964 ctx = pp_init_ctx(data->ib_dev, data); |
984 ctx = pp_init_ctx(data->ib_dev, data); |
965 @@ -393,7 +402,7 @@ |
985 @@ -392,8 +401,8 @@ |
|
986 if (asprintf(&service, "%d", data->port) < 0) |
966 goto err5; |
987 goto err5; |
967 |
988 |
968 if ( (n = getaddrinfo(NULL, service, &hints, &res)) < 0 ) { |
989 - if ( (n = getaddrinfo(NULL, service, &hints, &res)) < 0 ) { |
969 - fprintf(stderr, "%d:%s: %s for port %d\n", pid, __func__, |
990 - fprintf(stderr, "%d:%s: %s for port %d\n", pid, __func__, |
|
991 + if ( (n = getaddrinfo(NULL, service, &hints, &res) != 0) ) { |
970 + fprintf(stderr, "%d:%s: %s for port %d\n", (int)pid, __func__, |
992 + fprintf(stderr, "%d:%s: %s for port %d\n", (int)pid, __func__, |
971 gai_strerror(n), data->port); |
993 gai_strerror(n), data->port); |
972 goto err5; |
994 goto err5; |
973 } |
995 } |
974 @@ -403,12 +412,12 @@ |
996 @@ -403,12 +412,12 @@ |
1382 + } |
1404 + } |
1383 +#endif |
1405 +#endif |
1384 } else { |
1406 } else { |
1385 |
1407 |
1386 switch (params->mtu) { |
1408 switch (params->mtu) { |
|
1409 @@ -791,7 +807,7 @@ |
|
1410 |
|
1411 n = getaddrinfo(servername, service, &hints, &res); |
|
1412 |
|
1413 - if (n < 0) { |
|
1414 + if (n != 0) { |
|
1415 fprintf(stderr, "%s for %s:%d\n", gai_strerror(n), servername, port); |
|
1416 return n; |
|
1417 } |
|
1418 @@ -835,7 +851,7 @@ |
|
1419 |
|
1420 n = getaddrinfo(NULL, service, &hints, &res); |
|
1421 |
|
1422 - if (n < 0) { |
|
1423 + if (n != 0) { |
|
1424 fprintf(stderr, "%s for port %d\n", gai_strerror(n), port); |
|
1425 return n; |
|
1426 } |
1387 @@ -869,7 +885,6 @@ |
1427 @@ -869,7 +885,6 @@ |
1388 close(sockfd); |
1428 close(sockfd); |
1389 return connfd; |
1429 return connfd; |
1390 } |
1430 } |
1391 - |
1431 - |