author | boris.chiu@oracle.com |
Wed, 30 Sep 2015 09:48:41 -0700 | |
changeset 4907 | 38c3e88acfc0 |
parent 4661 | 353f8a998732 |
child 4908 | 8eb64ba1b2ad |
permissions | -rw-r--r-- |
369
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
1 |
diff -r -u /tmp/730054/qperf-0.4.6/src/socket.c qperf-0.4.6/src/socket.c |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
2 |
--- /tmp/730054/qperf-0.4.6/src/socket.c Mon Aug 31 00:00:40 2009 |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
3 |
+++ qperf-0.4.6/src/socket.c Mon Nov 8 11:10:20 2010 |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
4 |
@@ -44,7 +44,9 @@ |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
5 |
/* |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
6 |
* Parameters. |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
7 |
*/ |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
8 |
+#if !(defined(__SVR4) && defined(__sun)) |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
9 |
#define AF_INET_SDP 27 /* Family for SDP */ |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
10 |
+#endif |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
11 |
|
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
12 |
|
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
13 |
/* |
1144
b219ca1112b6
15825425 - SUNBT7206756 qperf: sdp_bw doesn't work with IPv6
Sharath M Srinivasan <sharath.srinivasan@oracle.com>
parents:
741
diff
changeset
|
14 |
@@ -707,10 +709,14 @@ |
369
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
15 |
ailist = getaddrinfo_port(serverflag ? 0 : ServerName, port, &hints); |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
16 |
for (aip = ailist; aip; aip = aip->ai_next) { |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
17 |
if (kind == K_SDP) { |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
18 |
+#if (defined(__SVR4) && defined(__sun)) |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
19 |
+ aip->ai_protocol = PROTO_SDP; |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
20 |
+#else |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
21 |
if (aip->ai_family == AF_INET || aip->ai_family == AF_INET6) |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
22 |
aip->ai_family = AF_INET_SDP; |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
23 |
else |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
24 |
aip->ai_family = 0; |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
25 |
+#endif |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
26 |
} else if (kind == K_SCTP) { |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
27 |
if (aip->ai_protocol == IPPROTO_TCP) |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
28 |
aip->ai_protocol = IPPROTO_SCTP; |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
29 |
diff -r -u /tmp/730054/qperf-0.4.6/src/qperf.c qperf-0.4.6/src/qperf.c |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
30 |
--- /tmp/730054/qperf-0.4.6/src/qperf.c Mon Aug 31 00:00:40 2009 |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
31 |
+++ qperf-0.4.6/src/qperf.c Mon Nov 8 11:10:17 2010 |
715
eed3ed08f692
6926434 ib_read_bw, ib_read_lat: OFED utilities sometimes hang when using "-e" (event) flag
Boris Chiu <Boris.Chiu@oracle.COM>
parents:
369
diff
changeset
|
32 |
@@ -53,7 +53,17 @@ |
369
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
33 |
#include <sys/utsname.h> |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
34 |
#include "qperf.h" |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
35 |
|
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
36 |
+#if (defined(__SVR4) && defined(__sun)) |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
37 |
+#include <sys/filio.h> |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
38 |
+#include <limits.h> /* times() */ |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
39 |
+#include <sys/types.h> |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
40 |
+#include <sys/processor.h> |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
41 |
+#include <sys/procset.h> |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
42 |
+#include <strings.h> |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
43 |
+#include <infiniband/ofa_solaris.h> |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
44 |
|
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
45 |
+#endif |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
46 |
+ |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
47 |
/* |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
48 |
* Configurable parameters. If your change makes this version of qperf |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
49 |
* incompatible with previous versions (usually a change to the Req structure), |
4661
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
50 |
@@ -165,6 +175,10 @@ |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
51 |
char qperf[STRSIZE]; /* Qperf version */ |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
52 |
} CONF; |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
53 |
|
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
54 |
+char *t_bits[] ={ "bits/sec", "Kb/sec", "Mb/sec", "Gb/sec", "Tb/sec" }; |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
55 |
+int s_bits = cardof(t_bits); |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
56 |
+char *t_bytes[] ={ "bytes/sec", "KB/sec", "MB/sec", "GB/sec", "TB/sec" }; |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
57 |
+int s_bytes = cardof(t_bytes); |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
58 |
|
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
59 |
/* |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
60 |
* Function prototypes. |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
61 |
@@ -177,7 +191,9 @@ |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
62 |
static void calc_node(RESN *resn, STAT *stat); |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
63 |
static void calc_results(void); |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
64 |
static void client(TEST *test); |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
65 |
+#if !(defined(__SVR4) && defined(__sun)) |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
66 |
static int cmpsub(char *s2, char *s1); |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
67 |
+#endif |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
68 |
static char *commify(char *data); |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
69 |
static void dec_req_data(REQ *host); |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
70 |
static void dec_req_version(REQ *host); |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
71 |
@@ -224,7 +240,9 @@ |
369
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
72 |
static void sig_alrm(int signo, siginfo_t *siginfo, void *ucontext); |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
73 |
static void sig_quit(int signo, siginfo_t *siginfo, void *ucontext); |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
74 |
static void sig_urg(int signo, siginfo_t *siginfo, void *ucontext); |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
75 |
-static char *skip_colon(char *s); |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
76 |
+#if !(defined(__SVR4) && defined(__sun)) |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
77 |
+static char *skip_colon(char *s); |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
78 |
+#endif |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
79 |
static void start_test_timer(int seconds); |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
80 |
static long str_size(char *arg, char *str); |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
81 |
static void strncopy(char *d, char *s, int n); |
4661
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
82 |
@@ -257,9 +275,11 @@ |
369
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
83 |
static STAT IStat; |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
84 |
static int ListenFD; |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
85 |
static LOOP *Loops; |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
86 |
+#if !(defined(__SVR4) && defined(__sun)) |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
87 |
static int ProcStatFD; |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
88 |
+#endif |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
89 |
static STAT RStat; |
4661
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
90 |
-static int ShowIndex; |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
91 |
+volatile static int ShowIndex = 0; |
369
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
92 |
static SHOW ShowTable[256]; |
4661
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
93 |
static int UnifyUnits; |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
94 |
static int UnifyNodes; |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
95 |
@@ -281,7 +301,7 @@ |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
96 |
int ServerAddrLen; |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
97 |
int RemoteFD; |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
98 |
int Debug; |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
99 |
-volatile int Finished; |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
100 |
+volatile int Finished = 0; |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
101 |
|
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
102 |
|
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
103 |
/* |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
104 |
@@ -601,6 +621,9 @@ |
369
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
105 |
initialize(); |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
106 |
set_signals(); |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
107 |
do_args(&argv[1]); |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
108 |
+#if (defined(__SVR4) && defined(__sun)) |
715
eed3ed08f692
6926434 ib_read_bw, ib_read_lat: OFED utilities sometimes hang when using "-e" (event) flag
Boris Chiu <Boris.Chiu@oracle.COM>
parents:
369
diff
changeset
|
109 |
+ solaris_fini(); |
369
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
110 |
+#endif |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
111 |
return 0; |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
112 |
} |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
113 |
|
4661
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
114 |
@@ -617,14 +640,19 @@ |
369
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
115 |
for (i = 0; i < P_N; ++i) |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
116 |
if (ParInfo[i].index != i) |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
117 |
error(BUG, "initialize: ParInfo: out of order: %d", i); |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
118 |
+#if (defined(__SVR4) && defined(__sun)) |
715
eed3ed08f692
6926434 ib_read_bw, ib_read_lat: OFED utilities sometimes hang when using "-e" (event) flag
Boris Chiu <Boris.Chiu@oracle.COM>
parents:
369
diff
changeset
|
119 |
+ solaris_init(); |
369
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
120 |
+#else |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
121 |
ProcStatFD = open("/proc/stat", 0); |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
122 |
if (ProcStatFD < 0) |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
123 |
error(SYS, "cannot open /proc/stat"); |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
124 |
+#endif |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
125 |
IStat.no_cpus = sysconf(_SC_NPROCESSORS_ONLN); |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
126 |
IStat.no_ticks = sysconf(_SC_CLK_TCK); |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
127 |
} |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
128 |
|
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
129 |
|
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
130 |
+#if !(defined(__SVR4) && defined(__sun)) |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
131 |
/* |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
132 |
* Look for a colon and skip past it and any spaces. |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
133 |
*/ |
4661
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
134 |
@@ -643,6 +671,7 @@ |
369
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
135 |
s++; |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
136 |
return s; |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
137 |
} |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
138 |
+#endif |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
139 |
|
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
140 |
|
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
141 |
/* |
4661
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
142 |
@@ -649,6 +678,7 @@ |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
143 |
* A case insensitive string compare. s2 must at least contain all of s1 but |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
144 |
* can be longer. |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
145 |
*/ |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
146 |
+#if !(defined(__SVR4) && defined(__sun)) |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
147 |
static int |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
148 |
cmpsub(char *s2, char *s1) |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
149 |
{ |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
150 |
@@ -664,6 +694,7 @@ |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
151 |
return 0; |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
152 |
} |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
153 |
} |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
154 |
+#endif |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
155 |
|
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
156 |
|
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
157 |
/* |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
158 |
@@ -1667,13 +1698,18 @@ |
369
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
159 |
{ |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
160 |
char count[STRSIZE]; |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
161 |
char speed[STRSIZE]; |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
162 |
- char buf[BUFSIZE]; |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
163 |
char cpu[BUFSIZE]; |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
164 |
- char mhz[BUFSIZE]; |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
165 |
int cpus = 0; |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
166 |
+#if !(defined(__SVR4) && defined(__sun)) |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
167 |
+ char buf[BUFSIZE]; |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
168 |
+ char mhz[BUFSIZE]; |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
169 |
int mixed = 0; |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
170 |
FILE *fp = fopen("/proc/cpuinfo", "r"); |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
171 |
+#else |
715
eed3ed08f692
6926434 ib_read_bw, ib_read_lat: OFED utilities sometimes hang when using "-e" (event) flag
Boris Chiu <Boris.Chiu@oracle.COM>
parents:
369
diff
changeset
|
172 |
+ sol_cpu_info_t *info; |
369
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
173 |
+#endif |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
174 |
|
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
175 |
+#if !(defined(__SVR4) && defined(__sun)) |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
176 |
if (!fp) |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
177 |
error(0, "cannot open /proc/cpuinfo"); |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
178 |
cpu[0] = '\0'; |
4661
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
179 |
@@ -1732,6 +1768,7 @@ |
369
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
180 |
|
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
181 |
/* CPU speed */ |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
182 |
speed[0] = '\0'; |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
183 |
+ |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
184 |
if (!mixed) { |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
185 |
int n = strlen(cpu); |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
186 |
if (n < 3 || cpu[n-2] != 'H' || cpu[n-1] != 'z') { |
4661
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
187 |
@@ -1745,7 +1782,24 @@ |
369
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
188 |
} |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
189 |
} |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
190 |
} |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
191 |
+#else |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
192 |
+ cpu[0] = '\0'; |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
193 |
+ speed[0] = '\0'; |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
194 |
|
715
eed3ed08f692
6926434 ib_read_bw, ib_read_lat: OFED utilities sometimes hang when using "-e" (event) flag
Boris Chiu <Boris.Chiu@oracle.COM>
parents:
369
diff
changeset
|
195 |
+ if ((cpus = sol_get_cpu_info(&info)) > 0 ) { |
eed3ed08f692
6926434 ib_read_bw, ib_read_lat: OFED utilities sometimes hang when using "-e" (event) flag
Boris Chiu <Boris.Chiu@oracle.COM>
parents:
369
diff
changeset
|
196 |
+ (void) strcpy(cpu, info[0].cpu_name); |
369
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
197 |
+ |
715
eed3ed08f692
6926434 ib_read_bw, ib_read_lat: OFED utilities sometimes hang when using "-e" (event) flag
Boris Chiu <Boris.Chiu@oracle.COM>
parents:
369
diff
changeset
|
198 |
+ if (info[0].cpu_mhz < 1000) |
eed3ed08f692
6926434 ib_read_bw, ib_read_lat: OFED utilities sometimes hang when using "-e" (event) flag
Boris Chiu <Boris.Chiu@oracle.COM>
parents:
369
diff
changeset
|
199 |
+ snprintf(speed, sizeof(speed), " %dMHz", info[0].cpu_mhz); |
369
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
200 |
+ else |
715
eed3ed08f692
6926434 ib_read_bw, ib_read_lat: OFED utilities sometimes hang when using "-e" (event) flag
Boris Chiu <Boris.Chiu@oracle.COM>
parents:
369
diff
changeset
|
201 |
+ snprintf(speed, sizeof(speed), " %.1fGHz", |
eed3ed08f692
6926434 ib_read_bw, ib_read_lat: OFED utilities sometimes hang when using "-e" (event) flag
Boris Chiu <Boris.Chiu@oracle.COM>
parents:
369
diff
changeset
|
202 |
+ info[0].cpu_mhz/1000.0); |
eed3ed08f692
6926434 ib_read_bw, ib_read_lat: OFED utilities sometimes hang when using "-e" (event) flag
Boris Chiu <Boris.Chiu@oracle.COM>
parents:
369
diff
changeset
|
203 |
+ free(info); |
369
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
204 |
+ } else { |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
205 |
+ return; |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
206 |
+ } |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
207 |
+#endif |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
208 |
+ |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
209 |
/* Number of CPUs */ |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
210 |
if (cpus == 1) |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
211 |
count[0] = '\0'; |
4661
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
212 |
@@ -1776,11 +1830,10 @@ |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
213 |
static void |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
214 |
run_server_quit(void) |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
215 |
{ |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
216 |
- int z; |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
217 |
char buf[1]; |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
218 |
|
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
219 |
sync_test(); |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
220 |
- z = read(RemoteFD, buf, sizeof(buf)); |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
221 |
+ (void)read(RemoteFD, buf, sizeof(buf)); |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
222 |
kill(getppid(), SIGQUIT); |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
223 |
exit(0); |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
224 |
} |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
225 |
@@ -2296,6 +2349,7 @@ |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
226 |
char *tab[] ={ "ns/GB", "us/GB", "ms/GB", "sec/GB" }; |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
227 |
|
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
228 |
value *= 1E9; |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
229 |
+ |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
230 |
if (!verbose(type, value)) |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
231 |
return; |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
232 |
if (!UnifyUnits) { |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
233 |
@@ -2371,21 +2425,20 @@ |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
234 |
view_band(int type, char *pref, char *name, double value) |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
235 |
{ |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
236 |
int n, s; |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
237 |
- char **tab; |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
238 |
- |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
239 |
+ char **tab, **t; |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
240 |
+ n = s = 0; |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
241 |
if (!verbose(type, value)) |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
242 |
return; |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
243 |
if (UseBitsPerSec) { |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
244 |
- char *t[] ={ "bits/sec", "Kb/sec", "Mb/sec", "Gb/sec", "Tb/sec" }; |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
245 |
- s = cardof(t); |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
246 |
+ t=&t_bits[0]; |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
247 |
+ s = s_bits; |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
248 |
tab = t; |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
249 |
value *= 8; |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
250 |
} else { |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
251 |
- char *t[] ={ "bytes/sec", "KB/sec", "MB/sec", "GB/sec", "TB/sec" }; |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
252 |
- s = cardof(t); |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
253 |
+ t=&t_bytes[0]; |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
254 |
+ s = s_bytes; |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
255 |
tab = t; |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
256 |
} |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
257 |
- |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
258 |
n = 0; |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
259 |
if (!UnifyUnits) { |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
260 |
while (value >= 1000 && n < s-1) { |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
261 |
@@ -2515,10 +2568,13 @@ |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
262 |
static void |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
263 |
place_val(char *pref, char *name, char *unit, double value) |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
264 |
{ |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
265 |
- char *data = qasprintf("%.0f", value); |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
266 |
- char *p = data; |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
267 |
+ char *data; |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
268 |
+ char *p; |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
269 |
int n = Precision; |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
270 |
|
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
271 |
+ |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
272 |
+ data = qasprintf("%.0f", value); |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
273 |
+ p = data; |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
274 |
if (*p == '-') |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
275 |
++p; |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
276 |
while (isdigit(*p++)) |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
277 |
@@ -2570,6 +2626,7 @@ |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
278 |
for (i = 0; i < ShowIndex; ++i) { |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
279 |
int n; |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
280 |
SHOW *show = &ShowTable[i]; |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
281 |
+ |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
282 |
n = (show->pref ? strlen(show->pref) : 0) + strlen(show->name); |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
283 |
if (n > nameLen) |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
284 |
nameLen = n; |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
285 |
@@ -2615,14 +2672,20 @@ |
369
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
286 |
static void |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
287 |
set_affinity(void) |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
288 |
{ |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
289 |
+#if !(defined(__SVR4) && defined(__sun)) |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
290 |
cpu_set_t set; |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
291 |
+#endif |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
292 |
int a = Req.affinity; |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
293 |
|
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
294 |
if (!a) |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
295 |
return; |
1408
8bc5df437e67
16821677 qperf can not work between Solaris/Linux
Pramod Gunjikar <pramod.gunjikar@oracle.com>
parents:
1144
diff
changeset
|
296 |
+#if defined(__SVR4) && defined(__sun) |
8bc5df437e67
16821677 qperf can not work between Solaris/Linux
Pramod Gunjikar <pramod.gunjikar@oracle.com>
parents:
1144
diff
changeset
|
297 |
+ if (processor_bind(P_LWPID, P_MYID, a - 1, NULL) != 0) |
8bc5df437e67
16821677 qperf can not work between Solaris/Linux
Pramod Gunjikar <pramod.gunjikar@oracle.com>
parents:
1144
diff
changeset
|
298 |
+#else |
369
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
299 |
CPU_ZERO(&set); |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
300 |
CPU_SET(a-1, &set); |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
301 |
if (sched_setaffinity(0, sizeof(set), &set) < 0) |
1408
8bc5df437e67
16821677 qperf can not work between Solaris/Linux
Pramod Gunjikar <pramod.gunjikar@oracle.com>
parents:
1144
diff
changeset
|
302 |
+#endif |
715
eed3ed08f692
6926434 ib_read_bw, ib_read_lat: OFED utilities sometimes hang when using "-e" (event) flag
Boris Chiu <Boris.Chiu@oracle.COM>
parents:
369
diff
changeset
|
303 |
error(SYS, "cannot set processor affinity (cpu %d)", a-1); |
369
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
304 |
} |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
305 |
|
4661
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
306 |
@@ -2771,9 +2834,36 @@ |
369
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
307 |
/* |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
308 |
* Get various temporal parameters. |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
309 |
*/ |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
310 |
+#if (defined(__SVR4) && defined(__sun)) |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
311 |
+ |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
312 |
+#define NSEC_TO_TICK(v) (v * sysconf(_SC_CLK_TCK)/1000000000) |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
313 |
+ |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
314 |
static void |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
315 |
get_times(CLOCK timex[T_N]) |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
316 |
{ |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
317 |
+ struct tms tms; |
715
eed3ed08f692
6926434 ib_read_bw, ib_read_lat: OFED utilities sometimes hang when using "-e" (event) flag
Boris Chiu <Boris.Chiu@oracle.COM>
parents:
369
diff
changeset
|
318 |
+ sol_cpu_stats_t stats; |
eed3ed08f692
6926434 ib_read_bw, ib_read_lat: OFED utilities sometimes hang when using "-e" (event) flag
Boris Chiu <Boris.Chiu@oracle.COM>
parents:
369
diff
changeset
|
319 |
+ |
369
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
320 |
+ timex[T_REAL] = times(&tms); |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
321 |
+ |
715
eed3ed08f692
6926434 ib_read_bw, ib_read_lat: OFED utilities sometimes hang when using "-e" (event) flag
Boris Chiu <Boris.Chiu@oracle.COM>
parents:
369
diff
changeset
|
322 |
+ if ((sol_get_cpu_stats(&stats)) < 0) |
eed3ed08f692
6926434 ib_read_bw, ib_read_lat: OFED utilities sometimes hang when using "-e" (event) flag
Boris Chiu <Boris.Chiu@oracle.COM>
parents:
369
diff
changeset
|
323 |
+ return; |
369
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
324 |
+ |
715
eed3ed08f692
6926434 ib_read_bw, ib_read_lat: OFED utilities sometimes hang when using "-e" (event) flag
Boris Chiu <Boris.Chiu@oracle.COM>
parents:
369
diff
changeset
|
325 |
+ timex[T_USER] = stats.t_user; |
369
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
326 |
+ timex[T_NICE] = 0; |
715
eed3ed08f692
6926434 ib_read_bw, ib_read_lat: OFED utilities sometimes hang when using "-e" (event) flag
Boris Chiu <Boris.Chiu@oracle.COM>
parents:
369
diff
changeset
|
327 |
+ timex[T_KERNEL] = stats.t_kernel; |
eed3ed08f692
6926434 ib_read_bw, ib_read_lat: OFED utilities sometimes hang when using "-e" (event) flag
Boris Chiu <Boris.Chiu@oracle.COM>
parents:
369
diff
changeset
|
328 |
+ timex[T_IDLE] = stats.t_idle; |
eed3ed08f692
6926434 ib_read_bw, ib_read_lat: OFED utilities sometimes hang when using "-e" (event) flag
Boris Chiu <Boris.Chiu@oracle.COM>
parents:
369
diff
changeset
|
329 |
+ timex[T_IOWAIT] = stats.t_iowait; |
eed3ed08f692
6926434 ib_read_bw, ib_read_lat: OFED utilities sometimes hang when using "-e" (event) flag
Boris Chiu <Boris.Chiu@oracle.COM>
parents:
369
diff
changeset
|
330 |
+ timex[T_IRQ] = NSEC_TO_TICK(stats.t_intr); /* NSEC_TO_TICK */ |
369
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
331 |
+ timex[T_SOFTIRQ] = 0; |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
332 |
+ timex[T_STEAL] = 0; |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
333 |
+} |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
334 |
+ |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
335 |
+#else |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
336 |
+ |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
337 |
+static void |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
338 |
+get_times(CLOCK timex[T_N]) |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
339 |
+{ |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
340 |
int n; |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
341 |
char *p; |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
342 |
char buf[BUFSIZE]; |
4661
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
343 |
@@ -2802,6 +2892,7 @@ |
369
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
344 |
while (n < T_N) |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
345 |
timex[n++] = 0; |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
346 |
} |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
347 |
+#endif |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
348 |
|
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
349 |
|
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
350 |
/* |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
351 |
diff -r -u /tmp/730054/qperf-0.4.6/src/rdma.c qperf-0.4.6/src/rdma.c |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
352 |
--- /tmp/730054/qperf-0.4.6/src/rdma.c Mon Aug 31 00:00:40 2009 |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
353 |
+++ qperf-0.4.6/src/rdma.c Mon Nov 8 11:10:19 2010 |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
354 |
@@ -37,7 +37,11 @@ |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
355 |
#include <errno.h> |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
356 |
#include <stdio.h> |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
357 |
#include <stdlib.h> |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
358 |
+#if (defined(__SVR4) && defined(__sun)) |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
359 |
+#include <strings.h> |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
360 |
+#else |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
361 |
#include <string.h> |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
362 |
+#endif |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
363 |
#include <unistd.h> |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
364 |
#include <netinet/in.h> |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
365 |
#include <rdma/rdma_cma.h> |
715
eed3ed08f692
6926434 ib_read_bw, ib_read_lat: OFED utilities sometimes hang when using "-e" (event) flag
Boris Chiu <Boris.Chiu@oracle.COM>
parents:
369
diff
changeset
|
366 |
@@ -110,7 +114,8 @@ |
eed3ed08f692
6926434 ib_read_bw, ib_read_lat: OFED utilities sometimes hang when using "-e" (event) flag
Boris Chiu <Boris.Chiu@oracle.COM>
parents:
369
diff
changeset
|
367 |
uint32_t srqn; /* Shared queue number */ |
eed3ed08f692
6926434 ib_read_bw, ib_read_lat: OFED utilities sometimes hang when using "-e" (event) flag
Boris Chiu <Boris.Chiu@oracle.COM>
parents:
369
diff
changeset
|
368 |
uint32_t rkey; /* Remote key */ |
eed3ed08f692
6926434 ib_read_bw, ib_read_lat: OFED utilities sometimes hang when using "-e" (event) flag
Boris Chiu <Boris.Chiu@oracle.COM>
parents:
369
diff
changeset
|
369 |
uint32_t alt_lid; /* Alternate Path Local LID */ |
eed3ed08f692
6926434 ib_read_bw, ib_read_lat: OFED utilities sometimes hang when using "-e" (event) flag
Boris Chiu <Boris.Chiu@oracle.COM>
parents:
369
diff
changeset
|
370 |
- uint32_t rd_atomic; /* Number of read/atomics supported */ |
eed3ed08f692
6926434 ib_read_bw, ib_read_lat: OFED utilities sometimes hang when using "-e" (event) flag
Boris Chiu <Boris.Chiu@oracle.COM>
parents:
369
diff
changeset
|
371 |
+ uint32_t rd_atomic /* Number of read/atomics supported */ |
eed3ed08f692
6926434 ib_read_bw, ib_read_lat: OFED utilities sometimes hang when using "-e" (event) flag
Boris Chiu <Boris.Chiu@oracle.COM>
parents:
369
diff
changeset
|
372 |
+ __attribute__ ((aligned (8))); /* align struct size to 64-bit binary */ |
eed3ed08f692
6926434 ib_read_bw, ib_read_lat: OFED utilities sometimes hang when using "-e" (event) flag
Boris Chiu <Boris.Chiu@oracle.COM>
parents:
369
diff
changeset
|
373 |
} NODE; |
eed3ed08f692
6926434 ib_read_bw, ib_read_lat: OFED utilities sometimes hang when using "-e" (event) flag
Boris Chiu <Boris.Chiu@oracle.COM>
parents:
369
diff
changeset
|
374 |
|
eed3ed08f692
6926434 ib_read_bw, ib_read_lat: OFED utilities sometimes hang when using "-e" (event) flag
Boris Chiu <Boris.Chiu@oracle.COM>
parents:
369
diff
changeset
|
375 |
|
eed3ed08f692
6926434 ib_read_bw, ib_read_lat: OFED utilities sometimes hang when using "-e" (event) flag
Boris Chiu <Boris.Chiu@oracle.COM>
parents:
369
diff
changeset
|
376 |
@@ -566,11 +571,15 @@ |
369
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
377 |
void |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
378 |
run_client_uc_bi_bw(void) |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
379 |
{ |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
380 |
+#if (defined(__SVR4) && defined(__sun)) |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
381 |
+ error(RET, "UC Not Supported"); |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
382 |
+#else |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
383 |
par_use(L_ACCESS_RECV); |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
384 |
par_use(R_ACCESS_RECV); |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
385 |
rd_params(IBV_QPT_UC, K64, 1, 0); |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
386 |
rd_bi_bw(IBV_QPT_UC); |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
387 |
show_results(BANDWIDTH_SR); |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
388 |
+#endif |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
389 |
} |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
390 |
|
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
391 |
|
715
eed3ed08f692
6926434 ib_read_bw, ib_read_lat: OFED utilities sometimes hang when using "-e" (event) flag
Boris Chiu <Boris.Chiu@oracle.COM>
parents:
369
diff
changeset
|
392 |
@@ -580,7 +589,11 @@ |
369
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
393 |
void |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
394 |
run_server_uc_bi_bw(void) |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
395 |
{ |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
396 |
+#if (defined(__SVR4) && defined(__sun)) |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
397 |
+ error(RET, "UC Not Supported"); |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
398 |
+#else |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
399 |
rd_bi_bw(IBV_QPT_UC); |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
400 |
+#endif |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
401 |
} |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
402 |
|
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
403 |
|
715
eed3ed08f692
6926434 ib_read_bw, ib_read_lat: OFED utilities sometimes hang when using "-e" (event) flag
Boris Chiu <Boris.Chiu@oracle.COM>
parents:
369
diff
changeset
|
404 |
@@ -590,6 +603,9 @@ |
369
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
405 |
void |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
406 |
run_client_uc_bw(void) |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
407 |
{ |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
408 |
+#if (defined(__SVR4) && defined(__sun)) |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
409 |
+ error(RET, "UC Not Supported"); |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
410 |
+#else |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
411 |
par_use(L_ACCESS_RECV); |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
412 |
par_use(R_ACCESS_RECV); |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
413 |
par_use(L_NO_MSGS); |
715
eed3ed08f692
6926434 ib_read_bw, ib_read_lat: OFED utilities sometimes hang when using "-e" (event) flag
Boris Chiu <Boris.Chiu@oracle.COM>
parents:
369
diff
changeset
|
414 |
@@ -597,6 +613,7 @@ |
369
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
415 |
rd_params(IBV_QPT_UC, K64, 1, 0); |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
416 |
rd_client_bw(IBV_QPT_UC); |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
417 |
show_results(BANDWIDTH_SR); |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
418 |
+#endif |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
419 |
} |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
420 |
|
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
421 |
|
715
eed3ed08f692
6926434 ib_read_bw, ib_read_lat: OFED utilities sometimes hang when using "-e" (event) flag
Boris Chiu <Boris.Chiu@oracle.COM>
parents:
369
diff
changeset
|
422 |
@@ -606,7 +623,11 @@ |
369
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
423 |
void |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
424 |
run_server_uc_bw(void) |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
425 |
{ |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
426 |
+#if (defined(__SVR4) && defined(__sun)) |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
427 |
+ error(RET, "UC Not Supported"); |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
428 |
+#else |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
429 |
rd_server_def(IBV_QPT_UC); |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
430 |
+#endif |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
431 |
} |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
432 |
|
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
433 |
|
715
eed3ed08f692
6926434 ib_read_bw, ib_read_lat: OFED utilities sometimes hang when using "-e" (event) flag
Boris Chiu <Boris.Chiu@oracle.COM>
parents:
369
diff
changeset
|
434 |
@@ -616,8 +637,12 @@ |
369
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
435 |
void |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
436 |
run_client_uc_lat(void) |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
437 |
{ |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
438 |
+#if (defined(__SVR4) && defined(__sun)) |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
439 |
+ error(RET, "UC Not Supported"); |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
440 |
+#else |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
441 |
rd_params(IBV_QPT_UC, 1, 1, 0); |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
442 |
rd_pp_lat(IBV_QPT_UC, IO_SR); |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
443 |
+#endif |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
444 |
} |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
445 |
|
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
446 |
|
715
eed3ed08f692
6926434 ib_read_bw, ib_read_lat: OFED utilities sometimes hang when using "-e" (event) flag
Boris Chiu <Boris.Chiu@oracle.COM>
parents:
369
diff
changeset
|
447 |
@@ -627,7 +652,11 @@ |
369
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
448 |
void |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
449 |
run_server_uc_lat(void) |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
450 |
{ |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
451 |
+#if (defined(__SVR4) && defined(__sun)) |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
452 |
+ error(RET, "UC Not Supported"); |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
453 |
+#else |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
454 |
rd_pp_lat(IBV_QPT_UC, IO_SR); |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
455 |
+#endif |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
456 |
} |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
457 |
|
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
458 |
|
715
eed3ed08f692
6926434 ib_read_bw, ib_read_lat: OFED utilities sometimes hang when using "-e" (event) flag
Boris Chiu <Boris.Chiu@oracle.COM>
parents:
369
diff
changeset
|
459 |
@@ -637,9 +666,13 @@ |
369
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
460 |
void |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
461 |
run_client_uc_rdma_write_bw(void) |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
462 |
{ |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
463 |
+#if (defined(__SVR4) && defined(__sun)) |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
464 |
+ error(RET, "UC Not Supported"); |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
465 |
+#else |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
466 |
rd_params(IBV_QPT_UC, K64, 1, 0); |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
467 |
rd_client_rdma_bw(IBV_QPT_UC, IBV_WR_RDMA_WRITE_WITH_IMM); |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
468 |
show_results(BANDWIDTH_SR); |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
469 |
+#endif |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
470 |
} |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
471 |
|
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
472 |
|
715
eed3ed08f692
6926434 ib_read_bw, ib_read_lat: OFED utilities sometimes hang when using "-e" (event) flag
Boris Chiu <Boris.Chiu@oracle.COM>
parents:
369
diff
changeset
|
473 |
@@ -649,7 +682,11 @@ |
369
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
474 |
void |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
475 |
run_server_uc_rdma_write_bw(void) |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
476 |
{ |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
477 |
+#if (defined(__SVR4) && defined(__sun)) |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
478 |
+ error(RET, "UC Not Supported"); |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
479 |
+#else |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
480 |
rd_server_def(IBV_QPT_UC); |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
481 |
+#endif |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
482 |
} |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
483 |
|
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
484 |
|
715
eed3ed08f692
6926434 ib_read_bw, ib_read_lat: OFED utilities sometimes hang when using "-e" (event) flag
Boris Chiu <Boris.Chiu@oracle.COM>
parents:
369
diff
changeset
|
485 |
@@ -659,8 +696,12 @@ |
369
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
486 |
void |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
487 |
run_client_uc_rdma_write_lat(void) |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
488 |
{ |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
489 |
+#if (defined(__SVR4) && defined(__sun)) |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
490 |
+ error(RET, "UC Not Supported"); |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
491 |
+#else |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
492 |
rd_params(IBV_QPT_UC, 1, 1, 0); |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
493 |
rd_pp_lat(IBV_QPT_UC, IO_RDMA); |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
494 |
+#endif |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
495 |
} |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
496 |
|
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
497 |
|
715
eed3ed08f692
6926434 ib_read_bw, ib_read_lat: OFED utilities sometimes hang when using "-e" (event) flag
Boris Chiu <Boris.Chiu@oracle.COM>
parents:
369
diff
changeset
|
498 |
@@ -670,7 +711,11 @@ |
369
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
499 |
void |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
500 |
run_server_uc_rdma_write_lat(void) |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
501 |
{ |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
502 |
+#if (defined(__SVR4) && defined(__sun)) |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
503 |
+ error(RET, "UC Not Supported"); |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
504 |
+#else |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
505 |
rd_pp_lat(IBV_QPT_UC, IO_RDMA); |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
506 |
+#endif |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
507 |
} |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
508 |
|
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
509 |
|
715
eed3ed08f692
6926434 ib_read_bw, ib_read_lat: OFED utilities sometimes hang when using "-e" (event) flag
Boris Chiu <Boris.Chiu@oracle.COM>
parents:
369
diff
changeset
|
510 |
@@ -680,9 +725,13 @@ |
369
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
511 |
void |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
512 |
run_client_uc_rdma_write_poll_lat(void) |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
513 |
{ |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
514 |
+#if (defined(__SVR4) && defined(__sun)) |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
515 |
+ error(RET, "UC Not Supported"); |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
516 |
+#else |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
517 |
rd_params(IBV_QPT_UC, 1, 1, 0); |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
518 |
rd_rdma_write_poll_lat(IBV_QPT_UC); |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
519 |
show_results(LATENCY); |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
520 |
+#endif |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
521 |
} |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
522 |
|
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
523 |
|
715
eed3ed08f692
6926434 ib_read_bw, ib_read_lat: OFED utilities sometimes hang when using "-e" (event) flag
Boris Chiu <Boris.Chiu@oracle.COM>
parents:
369
diff
changeset
|
524 |
@@ -692,7 +741,11 @@ |
369
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
525 |
void |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
526 |
run_server_uc_rdma_write_poll_lat(void) |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
527 |
{ |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
528 |
+#if (defined(__SVR4) && defined(__sun)) |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
529 |
+ error(RET, "UC Not Supported"); |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
530 |
+#else |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
531 |
rd_rdma_write_poll_lat(IBV_QPT_UC); |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
532 |
+#endif |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
533 |
} |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
534 |
|
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
535 |
|
4907
38c3e88acfc0
21863393 qperf attempts to free the PD before freeing the MR associated with it
boris.chiu@oracle.com
parents:
4661
diff
changeset
|
536 |
@@ -1599,11 +1652,11 @@ |
38c3e88acfc0
21863393 qperf attempts to free the PD before freeing the MR associated with it
boris.chiu@oracle.com
parents:
4661
diff
changeset
|
537 |
ibv_destroy_ah(dev->ah); |
38c3e88acfc0
21863393 qperf attempts to free the PD before freeing the MR associated with it
boris.chiu@oracle.com
parents:
4661
diff
changeset
|
538 |
if (dev->cq) |
38c3e88acfc0
21863393 qperf attempts to free the PD before freeing the MR associated with it
boris.chiu@oracle.com
parents:
4661
diff
changeset
|
539 |
ibv_destroy_cq(dev->cq); |
38c3e88acfc0
21863393 qperf attempts to free the PD before freeing the MR associated with it
boris.chiu@oracle.com
parents:
4661
diff
changeset
|
540 |
+ rd_mrfree(dev); |
38c3e88acfc0
21863393 qperf attempts to free the PD before freeing the MR associated with it
boris.chiu@oracle.com
parents:
4661
diff
changeset
|
541 |
if (dev->pd) |
38c3e88acfc0
21863393 qperf attempts to free the PD before freeing the MR associated with it
boris.chiu@oracle.com
parents:
4661
diff
changeset
|
542 |
ibv_dealloc_pd(dev->pd); |
38c3e88acfc0
21863393 qperf attempts to free the PD before freeing the MR associated with it
boris.chiu@oracle.com
parents:
4661
diff
changeset
|
543 |
if (dev->channel) |
38c3e88acfc0
21863393 qperf attempts to free the PD before freeing the MR associated with it
boris.chiu@oracle.com
parents:
4661
diff
changeset
|
544 |
ibv_destroy_comp_channel(dev->channel); |
38c3e88acfc0
21863393 qperf attempts to free the PD before freeing the MR associated with it
boris.chiu@oracle.com
parents:
4661
diff
changeset
|
545 |
- rd_mrfree(dev); |
38c3e88acfc0
21863393 qperf attempts to free the PD before freeing the MR associated with it
boris.chiu@oracle.com
parents:
4661
diff
changeset
|
546 |
|
38c3e88acfc0
21863393 qperf attempts to free the PD before freeing the MR associated with it
boris.chiu@oracle.com
parents:
4661
diff
changeset
|
547 |
if (!Req.use_cm) |
38c3e88acfc0
21863393 qperf attempts to free the PD before freeing the MR associated with it
boris.chiu@oracle.com
parents:
4661
diff
changeset
|
548 |
ib_close2(dev); |
741
83cb76377624
7154908 IB_EVENT_LID_CHANGE should be IB_EVENT_GID_CHANGE
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
715
diff
changeset
|
549 |
@@ -1864,10 +1917,16 @@ |
715
eed3ed08f692
6926434 ib_read_bw, ib_read_lat: OFED utilities sometimes hang when using "-e" (event) flag
Boris Chiu <Boris.Chiu@oracle.COM>
parents:
369
diff
changeset
|
550 |
error(0, "rdma_bind_addr failed"); |
eed3ed08f692
6926434 ib_read_bw, ib_read_lat: OFED utilities sometimes hang when using "-e" (event) flag
Boris Chiu <Boris.Chiu@oracle.COM>
parents:
369
diff
changeset
|
551 |
port = ntohs(rdma_get_src_port(cm->id)); |
eed3ed08f692
6926434 ib_read_bw, ib_read_lat: OFED utilities sometimes hang when using "-e" (event) flag
Boris Chiu <Boris.Chiu@oracle.COM>
parents:
369
diff
changeset
|
552 |
encode_uint32(&port, port); |
eed3ed08f692
6926434 ib_read_bw, ib_read_lat: OFED utilities sometimes hang when using "-e" (event) flag
Boris Chiu <Boris.Chiu@oracle.COM>
parents:
369
diff
changeset
|
553 |
+#if !(defined(__SVR4) && defined(__sun)) |
eed3ed08f692
6926434 ib_read_bw, ib_read_lat: OFED utilities sometimes hang when using "-e" (event) flag
Boris Chiu <Boris.Chiu@oracle.COM>
parents:
369
diff
changeset
|
554 |
send_mesg(&port, sizeof(port), "RDMA CM TCP IPv4 server port"); |
eed3ed08f692
6926434 ib_read_bw, ib_read_lat: OFED utilities sometimes hang when using "-e" (event) flag
Boris Chiu <Boris.Chiu@oracle.COM>
parents:
369
diff
changeset
|
555 |
+#endif |
eed3ed08f692
6926434 ib_read_bw, ib_read_lat: OFED utilities sometimes hang when using "-e" (event) flag
Boris Chiu <Boris.Chiu@oracle.COM>
parents:
369
diff
changeset
|
556 |
|
eed3ed08f692
6926434 ib_read_bw, ib_read_lat: OFED utilities sometimes hang when using "-e" (event) flag
Boris Chiu <Boris.Chiu@oracle.COM>
parents:
369
diff
changeset
|
557 |
if (rdma_listen(cm->id, 0) != 0) |
eed3ed08f692
6926434 ib_read_bw, ib_read_lat: OFED utilities sometimes hang when using "-e" (event) flag
Boris Chiu <Boris.Chiu@oracle.COM>
parents:
369
diff
changeset
|
558 |
error(0, "rdma_listen failed"); |
eed3ed08f692
6926434 ib_read_bw, ib_read_lat: OFED utilities sometimes hang when using "-e" (event) flag
Boris Chiu <Boris.Chiu@oracle.COM>
parents:
369
diff
changeset
|
559 |
+ |
eed3ed08f692
6926434 ib_read_bw, ib_read_lat: OFED utilities sometimes hang when using "-e" (event) flag
Boris Chiu <Boris.Chiu@oracle.COM>
parents:
369
diff
changeset
|
560 |
+#if (defined(__SVR4) && defined(__sun)) |
eed3ed08f692
6926434 ib_read_bw, ib_read_lat: OFED utilities sometimes hang when using "-e" (event) flag
Boris Chiu <Boris.Chiu@oracle.COM>
parents:
369
diff
changeset
|
561 |
+ send_mesg(&port, sizeof(port), "RDMA CM TCP IPv4 server port"); |
eed3ed08f692
6926434 ib_read_bw, ib_read_lat: OFED utilities sometimes hang when using "-e" (event) flag
Boris Chiu <Boris.Chiu@oracle.COM>
parents:
369
diff
changeset
|
562 |
+#endif |
eed3ed08f692
6926434 ib_read_bw, ib_read_lat: OFED utilities sometimes hang when using "-e" (event) flag
Boris Chiu <Boris.Chiu@oracle.COM>
parents:
369
diff
changeset
|
563 |
cm_expect_event(dev, RDMA_CM_EVENT_CONNECT_REQUEST); |
eed3ed08f692
6926434 ib_read_bw, ib_read_lat: OFED utilities sometimes hang when using "-e" (event) flag
Boris Chiu <Boris.Chiu@oracle.COM>
parents:
369
diff
changeset
|
564 |
rd_create_qp(dev, cm->event->id->verbs, cm->event->id); |
eed3ed08f692
6926434 ib_read_bw, ib_read_lat: OFED utilities sometimes hang when using "-e" (event) flag
Boris Chiu <Boris.Chiu@oracle.COM>
parents:
369
diff
changeset
|
565 |
|
369
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
566 |
diff -r -u /tmp/730054/qperf-0.4.6/src/rds.c qperf-0.4.6/src/rds.c |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
567 |
--- /tmp/730054/qperf-0.4.6/src/rds.c Mon Aug 31 00:00:40 2009 |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
568 |
+++ qperf-0.4.6/src/rds.c Mon Nov 8 11:10:19 2010 |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
569 |
@@ -44,6 +44,9 @@ |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
570 |
#include <netinet/in.h> |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
571 |
#include "qperf.h" |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
572 |
|
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
573 |
+#if (defined(__SVR4) && defined(__sun)) |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
574 |
+#include <sys/rds.h> |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
575 |
+#else |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
576 |
|
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
577 |
/* |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
578 |
* Parameters. |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
579 |
@@ -50,6 +53,7 @@ |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
580 |
*/ |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
581 |
#define AF_INET_RDS 28 /* Family for RDS */ |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
582 |
|
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
583 |
+#endif |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
584 |
|
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
585 |
/* |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
586 |
* Function prototypes. |
1144
b219ca1112b6
15825425 - SUNBT7206756 qperf: sdp_bw doesn't work with IPv6
Sharath M Srinivasan <sharath.srinivasan@oracle.com>
parents:
741
diff
changeset
|
587 |
@@ -298,13 +302,19 @@ |
b219ca1112b6
15825425 - SUNBT7206756 qperf: sdp_bw doesn't work with IPv6
Sharath M Srinivasan <sharath.srinivasan@oracle.com>
parents:
741
diff
changeset
|
588 |
if (bind(lfd, (SA *)&laddr, sizeof(laddr)) < 0) |
b219ca1112b6
15825425 - SUNBT7206756 qperf: sdp_bw doesn't work with IPv6
Sharath M Srinivasan <sharath.srinivasan@oracle.com>
parents:
741
diff
changeset
|
589 |
error(SYS, "bind INET failed"); |
b219ca1112b6
15825425 - SUNBT7206756 qperf: sdp_bw doesn't work with IPv6
Sharath M Srinivasan <sharath.srinivasan@oracle.com>
parents:
741
diff
changeset
|
590 |
|
b219ca1112b6
15825425 - SUNBT7206756 qperf: sdp_bw doesn't work with IPv6
Sharath M Srinivasan <sharath.srinivasan@oracle.com>
parents:
741
diff
changeset
|
591 |
+ /* |
b219ca1112b6
15825425 - SUNBT7206756 qperf: sdp_bw doesn't work with IPv6
Sharath M Srinivasan <sharath.srinivasan@oracle.com>
parents:
741
diff
changeset
|
592 |
+ * OFED generic fix - listen() should be setup first before sending server |
b219ca1112b6
15825425 - SUNBT7206756 qperf: sdp_bw doesn't work with IPv6
Sharath M Srinivasan <sharath.srinivasan@oracle.com>
parents:
741
diff
changeset
|
593 |
+ * port message to the client. There is a window that the client's |
b219ca1112b6
15825425 - SUNBT7206756 qperf: sdp_bw doesn't work with IPv6
Sharath M Srinivasan <sharath.srinivasan@oracle.com>
parents:
741
diff
changeset
|
594 |
+ * connect() would fail after receiving the "server port" message if the |
b219ca1112b6
15825425 - SUNBT7206756 qperf: sdp_bw doesn't work with IPv6
Sharath M Srinivasan <sharath.srinivasan@oracle.com>
parents:
741
diff
changeset
|
595 |
+ * server hasn't completed the listen(). |
b219ca1112b6
15825425 - SUNBT7206756 qperf: sdp_bw doesn't work with IPv6
Sharath M Srinivasan <sharath.srinivasan@oracle.com>
parents:
741
diff
changeset
|
596 |
+ */ |
b219ca1112b6
15825425 - SUNBT7206756 qperf: sdp_bw doesn't work with IPv6
Sharath M Srinivasan <sharath.srinivasan@oracle.com>
parents:
741
diff
changeset
|
597 |
+ if (listen(lfd, 1) < 0) |
b219ca1112b6
15825425 - SUNBT7206756 qperf: sdp_bw doesn't work with IPv6
Sharath M Srinivasan <sharath.srinivasan@oracle.com>
parents:
741
diff
changeset
|
598 |
+ error(SYS, "listen failed"); |
b219ca1112b6
15825425 - SUNBT7206756 qperf: sdp_bw doesn't work with IPv6
Sharath M Srinivasan <sharath.srinivasan@oracle.com>
parents:
741
diff
changeset
|
599 |
+ |
b219ca1112b6
15825425 - SUNBT7206756 qperf: sdp_bw doesn't work with IPv6
Sharath M Srinivasan <sharath.srinivasan@oracle.com>
parents:
741
diff
changeset
|
600 |
port = get_socket_port(lfd); |
b219ca1112b6
15825425 - SUNBT7206756 qperf: sdp_bw doesn't work with IPv6
Sharath M Srinivasan <sharath.srinivasan@oracle.com>
parents:
741
diff
changeset
|
601 |
encode_uint32(&port, port); |
b219ca1112b6
15825425 - SUNBT7206756 qperf: sdp_bw doesn't work with IPv6
Sharath M Srinivasan <sharath.srinivasan@oracle.com>
parents:
741
diff
changeset
|
602 |
send_mesg(&port, sizeof(port), "TCP IPv4 server port"); |
b219ca1112b6
15825425 - SUNBT7206756 qperf: sdp_bw doesn't work with IPv6
Sharath M Srinivasan <sharath.srinivasan@oracle.com>
parents:
741
diff
changeset
|
603 |
|
b219ca1112b6
15825425 - SUNBT7206756 qperf: sdp_bw doesn't work with IPv6
Sharath M Srinivasan <sharath.srinivasan@oracle.com>
parents:
741
diff
changeset
|
604 |
- if (listen(lfd, 1) < 0) |
b219ca1112b6
15825425 - SUNBT7206756 qperf: sdp_bw doesn't work with IPv6
Sharath M Srinivasan <sharath.srinivasan@oracle.com>
parents:
741
diff
changeset
|
605 |
- error(SYS, "listen failed"); |
b219ca1112b6
15825425 - SUNBT7206756 qperf: sdp_bw doesn't work with IPv6
Sharath M Srinivasan <sharath.srinivasan@oracle.com>
parents:
741
diff
changeset
|
606 |
- |
b219ca1112b6
15825425 - SUNBT7206756 qperf: sdp_bw doesn't work with IPv6
Sharath M Srinivasan <sharath.srinivasan@oracle.com>
parents:
741
diff
changeset
|
607 |
rlen = sizeof(raddr); |
b219ca1112b6
15825425 - SUNBT7206756 qperf: sdp_bw doesn't work with IPv6
Sharath M Srinivasan <sharath.srinivasan@oracle.com>
parents:
741
diff
changeset
|
608 |
fd = accept(lfd, (SA *)&raddr, &rlen); |
b219ca1112b6
15825425 - SUNBT7206756 qperf: sdp_bw doesn't work with IPv6
Sharath M Srinivasan <sharath.srinivasan@oracle.com>
parents:
741
diff
changeset
|
609 |
if (fd < 0) |
b219ca1112b6
15825425 - SUNBT7206756 qperf: sdp_bw doesn't work with IPv6
Sharath M Srinivasan <sharath.srinivasan@oracle.com>
parents:
741
diff
changeset
|
610 |
@@ -352,7 +362,11 @@ |
369
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
611 |
SS sockaddr; |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
612 |
socklen_t socklen; |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
613 |
|
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
614 |
+#if (defined(__SVR4) && defined(__sun)) |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
615 |
+ sockfd = socket(PF_RDS, SOCK_SEQPACKET, 0); |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
616 |
+#else |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
617 |
sockfd = socket(AF_INET_RDS, SOCK_SEQPACKET, 0); |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
618 |
+#endif |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
619 |
if (sockfd < 0) |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
620 |
error(SYS, "socket failed"); |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
621 |
setsockopt_one(sockfd, SO_REUSEADDR); |
1144
b219ca1112b6
15825425 - SUNBT7206756 qperf: sdp_bw doesn't work with IPv6
Sharath M Srinivasan <sharath.srinivasan@oracle.com>
parents:
741
diff
changeset
|
622 |
@@ -373,7 +387,11 @@ |
369
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
623 |
struct sockaddr_in *sap = (struct sockaddr_in *)addr; |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
624 |
|
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
625 |
memset(sap, 0, sizeof(*sap)); |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
626 |
+#if (defined(__SVR4) && defined(__sun)) |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
627 |
+ sap->sin_family = AF_INET_OFFLOAD; |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
628 |
+#else |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
629 |
sap->sin_family = AF_INET; |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
630 |
+#endif |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
631 |
inet_pton(AF_INET, host, &sap->sin_addr.s_addr); |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
632 |
sap->sin_port = htons(port); |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
633 |
*len = sizeof(struct sockaddr_in); |
1144
b219ca1112b6
15825425 - SUNBT7206756 qperf: sdp_bw doesn't work with IPv6
Sharath M Srinivasan <sharath.srinivasan@oracle.com>
parents:
741
diff
changeset
|
634 |
@@ -431,6 +449,14 @@ |
369
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
635 |
|
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
636 |
if (getsockname(fd, (SA *)&sa, &salen) < 0) |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
637 |
error(SYS, "getsockname failed"); |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
638 |
+#if (defined(__SVR4) && defined(__sun)) |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
639 |
+ /* |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
640 |
+ * getnameinfo() does not support AF_INET_OFFLOAD, so |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
641 |
+ * use ss_family as AF_INET to get port info. |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
642 |
+ */ |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
643 |
+ if (sa.ss_family == AF_INET_OFFLOAD) |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
644 |
+ sa.ss_family = AF_INET; |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
645 |
+#endif |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
646 |
qgetnameinfo((SA *)&sa, salen, 0, 0, p, sizeof(p), NI_NUMERICSERV); |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
647 |
port = atoi(p); |
cc8c00719da9
PSARC 2011/165 OFUV update of existing components
Boris Chiu <Boris.Chiu@Sun.COM>
parents:
diff
changeset
|
648 |
if (!port) |
715
eed3ed08f692
6926434 ib_read_bw, ib_read_lat: OFED utilities sometimes hang when using "-e" (event) flag
Boris Chiu <Boris.Chiu@oracle.COM>
parents:
369
diff
changeset
|
649 |
diff -r -u /tmp/730054/qperf-0.4.6/src/qperf.h qperf-0.4.6/src/qperf.h |
eed3ed08f692
6926434 ib_read_bw, ib_read_lat: OFED utilities sometimes hang when using "-e" (event) flag
Boris Chiu <Boris.Chiu@oracle.COM>
parents:
369
diff
changeset
|
650 |
--- /tmp/730054/qperf-0.4.6/src/qperf.h Mon Aug 31 00:00:40 2009 |
eed3ed08f692
6926434 ib_read_bw, ib_read_lat: OFED utilities sometimes hang when using "-e" (event) flag
Boris Chiu <Boris.Chiu@oracle.COM>
parents:
369
diff
changeset
|
651 |
+++ qperf-0.4.6/src/qperf.h Tue Oct 18 16:40:59 2011 |
eed3ed08f692
6926434 ib_read_bw, ib_read_lat: OFED utilities sometimes hang when using "-e" (event) flag
Boris Chiu <Boris.Chiu@oracle.COM>
parents:
369
diff
changeset
|
652 |
@@ -193,6 +193,7 @@ |
eed3ed08f692
6926434 ib_read_bw, ib_read_lat: OFED utilities sometimes hang when using "-e" (event) flag
Boris Chiu <Boris.Chiu@oracle.COM>
parents:
369
diff
changeset
|
653 |
uint32_t no_cpus; /* Number of processors */ |
eed3ed08f692
6926434 ib_read_bw, ib_read_lat: OFED utilities sometimes hang when using "-e" (event) flag
Boris Chiu <Boris.Chiu@oracle.COM>
parents:
369
diff
changeset
|
654 |
uint32_t no_ticks; /* Ticks per second */ |
eed3ed08f692
6926434 ib_read_bw, ib_read_lat: OFED utilities sometimes hang when using "-e" (event) flag
Boris Chiu <Boris.Chiu@oracle.COM>
parents:
369
diff
changeset
|
655 |
uint32_t max_cqes; /* Maximum CQ entries */ |
eed3ed08f692
6926434 ib_read_bw, ib_read_lat: OFED utilities sometimes hang when using "-e" (event) flag
Boris Chiu <Boris.Chiu@oracle.COM>
parents:
369
diff
changeset
|
656 |
+ __attribute__ ((aligned (8))) /* align with 32-bit & 64-bit binary */ |
eed3ed08f692
6926434 ib_read_bw, ib_read_lat: OFED utilities sometimes hang when using "-e" (event) flag
Boris Chiu <Boris.Chiu@oracle.COM>
parents:
369
diff
changeset
|
657 |
CLOCK time_s[T_N]; /* Start times */ |
eed3ed08f692
6926434 ib_read_bw, ib_read_lat: OFED utilities sometimes hang when using "-e" (event) flag
Boris Chiu <Boris.Chiu@oracle.COM>
parents:
369
diff
changeset
|
658 |
CLOCK time_e[T_N]; /* End times */ |
eed3ed08f692
6926434 ib_read_bw, ib_read_lat: OFED utilities sometimes hang when using "-e" (event) flag
Boris Chiu <Boris.Chiu@oracle.COM>
parents:
369
diff
changeset
|
659 |
USTAT s; /* Send statistics */ |
4661
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
660 |
diff -r -u /tmp/730054/qperf-0.4.6/src/support.c qperf-0.4.6/src/support.c |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
661 |
--- /tmp/730054/qperf-0.4.6/src/support.c Mon Aug 31 00:00:40 2009 |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
662 |
+++ qperf-0.4.6/src/support.c Mon Jun 8 15:01:41 2015 |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
663 |
@@ -212,18 +212,17 @@ |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
664 |
void |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
665 |
touch_data(void *p, int n) |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
666 |
{ |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
667 |
- uint64_t a; |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
668 |
volatile uint64_t *p64 = p; |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
669 |
|
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
670 |
while (n >= sizeof(*p64)) { |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
671 |
- a = *p64++; |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
672 |
n -= sizeof(*p64); |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
673 |
+ *p64++; |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
674 |
} |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
675 |
if (n) { |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
676 |
volatile uint8_t *p8 = (uint8_t *)p64; |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
677 |
while (n >= sizeof(*p8)) { |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
678 |
- a = *p8++; |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
679 |
n -= sizeof(*p8); |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
680 |
+ *p8++; |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
681 |
} |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
682 |
} |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
683 |
} |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
684 |
@@ -419,7 +418,6 @@ |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
685 |
void |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
686 |
urgent(void) |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
687 |
{ |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
688 |
- int z; |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
689 |
char *p, *q; |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
690 |
char buffer[256]; |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
691 |
|
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
692 |
@@ -471,7 +469,7 @@ |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
693 |
remote_failure_error(); |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
694 |
if (s) |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
695 |
break; |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
696 |
- z = read(RemoteFD, p, q-p); |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
697 |
+ (void)read(RemoteFD, p, q-p); |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
698 |
} |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
699 |
|
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
700 |
while (p < q) { |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
701 |
@@ -484,7 +482,7 @@ |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
702 |
timeout_end(); |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
703 |
|
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
704 |
buf_end(&p, q); |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
705 |
- z = write(2, buffer, p+1-buffer); |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
706 |
+ (void)write(2, buffer, p+1-buffer); |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
707 |
die(); |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
708 |
} |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
709 |
|
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
710 |
@@ -505,7 +503,6 @@ |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
711 |
static void |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
712 |
remote_failure_error(void) |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
713 |
{ |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
714 |
- int z; |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
715 |
char buffer[256]; |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
716 |
char *p = buffer; |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
717 |
char *q = p + sizeof(buffer); |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
718 |
@@ -513,7 +510,7 @@ |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
719 |
buf_app(&p, q, remote_name()); |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
720 |
buf_app(&p, q, " failure"); |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
721 |
buf_end(&p, q); |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
722 |
- z = write(2, buffer, p+1-buffer); |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
723 |
+ (void)write(2, buffer, p+1-buffer); |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
724 |
die(); |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
725 |
} |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
726 |
|
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
727 |
@@ -539,7 +536,6 @@ |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
728 |
int |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
729 |
error(int actions, char *fmt, ...) |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
730 |
{ |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
731 |
- int z; |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
732 |
va_list alist; |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
733 |
char buffer[256]; |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
734 |
char *p = buffer; |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
735 |
@@ -561,7 +557,7 @@ |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
736 |
|
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
737 |
if (RemoteFD >= 0) { |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
738 |
send(RemoteFD, "?", 1, MSG_OOB); |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
739 |
- z = write(RemoteFD, buffer, p-buffer); |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
740 |
+ (void)write(RemoteFD, buffer, p-buffer); |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
741 |
shutdown(RemoteFD, SHUT_WR); |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
742 |
timeout_set(ERROR_TIMEOUT, sig_alrm_die); |
353f8a998732
PSARC 2015/310 IBTF and OFUV updates
boris.chiu@oracle.com
parents:
1408
diff
changeset
|
743 |
while (read(RemoteFD, buffer, sizeof(buffer)) > 0) |