NDT-DEV email list created

Revision: 1140
Author:   

Date:     Wed Nov  5 13:15:12 2014 UTC
Log:      minor changes
https://code.google.com/p/ndt/source/detail?r=1140

Modified:
 /branches/MultiplePorts/Applet/src/edu/internet2/ndt/Tcpbw100.java
 /branches/MultiplePorts/src/test_c2s_clt.c
 /branches/MultiplePorts/src/test_c2s_srv.c
 /branches/MultiplePorts/src/test_meta_srv.c
 /branches/MultiplePorts/src/web100-util.c
 /branches/MultiplePorts/src/web100srv.c
 /branches/MultiplePorts/src/web100srv.h

=======================================
--- /branches/MultiplePorts/Applet/src/edu/internet2/ndt/Tcpbw100.java	Wed  
Nov  5 10:25:27 2014 UTC
+++ /branches/MultiplePorts/Applet/src/edu/internet2/ndt/Tcpbw100.java	Wed  
Nov  5 13:15:12 2014 UTC
@@ -1879,7 +1879,7 @@
                                final Socket outSocket = (Socket) 
outSockets.get(i);

                                C2SWriterWorker worker = new C2SWriterWorker(
-                                       i, outSocket, yabuff2Write, 
iTestDuration
+                                       i, outSocket, _yabuff2Write, 
iTestDuration
                                );

                                threads[i] = new Thread(worker);
=======================================
--- /branches/MultiplePorts/src/test_c2s_clt.c  Wed Nov  5 10:25:27 2014 UTC
+++ /branches/MultiplePorts/src/test_c2s_clt.c  Wed Nov  5 13:15:12 2014 UTC
@@ -28,7 +28,7 @@
   int socketDescriptor;
   double stopTime;
   char* buff;
-} WriteWorkerArgs;
+} C2SWriteWorkerArgs;

 void* c2sWriteWorker(void* arg);

=======================================
--- /branches/MultiplePorts/src/test_c2s_srv.c  Wed Nov  5 10:25:27 2014 UTC
+++ /branches/MultiplePorts/src/test_c2s_srv.c  Wed Nov  5 13:15:12 2014 UTC
@@ -73,7 +73,7 @@
   int threadsNum = 1;
   int activeThreads = 1;

-  struct sockaddr_storage cli_addr;
+  struct sockaddr_storage cli_addr[7];

   socklen_t clilen;
   char tmpstr[256];  // string array used for all sorts of temp storage  
purposes
@@ -173,9 +173,6 @@
                           options->uthroughputsnaps ? "true" : "false",  
options->usnapsdelay, options->usnapsoffset);
       log_println(1, "  -- c2s ext -- number of threads: %d",  
options->uthreadsnum);
     }
-
-
-169
 #endif
     pair.port1 = testOptions->c2ssockport;
     pair.port2 = -1;
=======================================
--- /branches/MultiplePorts/src/test_meta_srv.c Wed Nov  5 10:25:27 2014 UTC
+++ /branches/MultiplePorts/src/test_meta_srv.c Wed Nov  5 13:15:12 2014 UTC
@@ -49,7 +49,7 @@
   int msgLen, msgType;
   char buff[BUFFSIZE + 1];
   struct metaentry *new_entry = NULL;
-  char* value;
+  char* value, *jsonMsgValue;

   // protocol validation logs
   enum TEST_ID testids = META;
=======================================
--- /branches/MultiplePorts/src/web100-util.c   Wed Nov  5 10:25:27 2014 UTC
+++ /branches/MultiplePorts/src/web100-util.c   Wed Nov  5 13:15:12 2014 UTC
@@ -106,7 +106,7 @@
 #if USE_WEB100
   FILE * fp;
   char line[256], trimmedline[256];
-  int count_vars = 0;
+  int count_vars = 0, i;

   assert(VarFileName);

@@ -746,28 +746,28 @@
     }

     /* PktsRetrans -> SegsRetrans */
-    print_10gvar_renamed("SegsRetrans", "PktsRetrans", snap[t], line,  
sizeof(line), ctlsock);
+    print_10gvar_renamed("SegsRetrans", "PktsRetrans", snap[t], line,  
sizeof(line), ctlsock, jsonSupport);

     /* DataPktsOut -> DataSegsOut */
-    print_10gvar_renamed("DataSegsOut", "DataPktsOut", snap[t], line,  
sizeof(line), ctlsock);
+    print_10gvar_renamed("DataSegsOut", "DataPktsOut", snap[t], line,  
sizeof(line), ctlsock, jsonSupport);

     /* MaxCwnd -> MAX(MaxSsCwnd, MaxCaCwnd) */
-    print_10gvar_renamed("MaxCwnd", "MaxCwnd", snap[t], line,  
sizeof(line), ctlsock);
+    print_10gvar_renamed("MaxCwnd", "MaxCwnd", snap[t], line,  
sizeof(line), ctlsock, jsonSupport);

     /* SndLimTimeSender -> SndLimTimeSnd */
-    print_10gvar_renamed("SndLimTimeSnd", "SndLimTimeSender", snap[t],  
line, sizeof(line), ctlsock);
+    print_10gvar_renamed("SndLimTimeSnd", "SndLimTimeSender", snap[t],  
line, sizeof(line), ctlsock, jsonSupport);

     /* DataBytesOut -> DataOctetsOut */
-    print_10gvar_renamed("HCDataOctetsOut", "DataBytesOut", snap[t], line,  
sizeof(line), ctlsock);
+    print_10gvar_renamed("HCDataOctetsOut", "DataBytesOut", snap[t], line,  
sizeof(line), ctlsock, jsonSupport);

     /* SndLimTransSender -> SndLimTransSnd */
-    print_10gvar_renamed("SndLimTransSnd", "SndLimTransSender", snap[t],  
line, sizeof(line), ctlsock);
+    print_10gvar_renamed("SndLimTransSnd", "SndLimTransSender", snap[t],  
line, sizeof(line), ctlsock, jsonSupport);

     /* PktsOut -> SegsOut */
-    print_10gvar_renamed("SegsOut", "PktsOut", snap[t], line,  
sizeof(line), ctlsock);
+    print_10gvar_renamed("SegsOut", "PktsOut", snap[t], line,  
sizeof(line), ctlsock, jsonSupport);

     /* CongestionSignals -> CongSignals */
-    print_10gvar_renamed("CongSignals", "CongestionSignals", snap[t],  
line, sizeof(line), ctlsock);
+    print_10gvar_renamed("CongSignals", "CongestionSignals", snap[t],  
line, sizeof(line), ctlsock, jsonSupport);

     /* RcvWinScale -> Same as WinScaleSent if WinScaleSent != -1 */
     type = web10g_find_val(snap[t], "WinScaleSent", &val);
=======================================
--- /branches/MultiplePorts/src/web100srv.c     Wed Nov  5 10:25:27 2014 UTC
+++ /branches/MultiplePorts/src/web100srv.c     Wed Nov  5 13:15:12 2014 UTC
@@ -1340,7 +1340,7 @@
   snprintf(tmpstr, sizeof(tmpstr), "%d,%d,%d,%"VARtype",%"VARtype",%"
            VARtype",%"VARtype",%"VARtype",%"VARtype",%"VARtype",%"
            VARtype",%"VARtype",%"VARtype",",
-           (int) s2c2spd, (int) s2cspd, (int) c2sspd, vars.Timeouts,
+           (int) s2c2spd, (int) s2cspd, (int) c2sspd, vars[0].Timeouts,
            vars[0].SumRTT, vars[0].CountRTT, vars[0].PktsRetrans,  
vars[0].FastRetran,
            vars[0].DataPktsOut, vars[0].AckPktsOut, vars[0].CurrentMSS,  
vars[0].DupAcksIn,
            vars[0].AckPktsIn);
=======================================
--- /branches/MultiplePorts/src/web100srv.h     Wed Nov  5 10:25:27 2014 UTC
+++ /branches/MultiplePorts/src/web100srv.h     Wed Nov  5 13:15:12 2014 UTC
@@ -323,7 +323,7 @@
                    int autotune);/* Not used so no web10g version */
 void tcp_stat_get_data_recv(int sock, tcp_stat_agent* agent,
                             tcp_stat_connection cn, int count_vars);
-int tcp_stat_get_data(tcp_stat_snap* snap, int* testsock, int threadsNum,  
int ctlsock,
+int tcp_stat_get_data(tcp_stat_snap** snap, int* testsock, int threadsNum,  
int ctlsock,
                       tcp_stat_agent* agent, int count_vars, int  
jsonSupport);

 int CwndDecrease(char* logname,
@@ -332,7 +332,7 @@

 void tcp_stat_logvars_to_file(char* webVarsValuesLog, int connNum, struct  
tcp_vars* vars);

-void tcp_stat_log_agg_vars_to_file(webVarsValuesLog,  
testopt->exttestsopt ? options.dthreadsnum : 1, vars);
+void tcp_stat_log_agg_vars_to_file(char* webVarsValuesLog, int connNum,  
struct tcp_vars* vars);

 int KillHung(void);
 void writeMeta(int compress, int cputime, int snaplog, int tcpdump);