NDT-DEV email list created

Revision: 775
Author:   

Date:     Wed Aug  1 12:30:33 2012
Log:      Changes to collect CWNS peaks data correctly
http://code.google.com/p/ndt/source/detail?r=775

Modified:
 /trunk/src/heuristics.c
 /trunk/src/test_c2s_srv.c
 /trunk/src/test_s2c_srv.c
 /trunk/src/testoptions.c

=======================================
--- /trunk/src/heuristics.c     Mon Apr 30 13:46:39 2012
+++ /trunk/src/heuristics.c     Wed Aug  1 12:30:33 2012
@@ -231,8 +231,8 @@
        *cwin = (double) MaxCwnd * BITS_8 / KILO_BITS / KILO_BITS;
        log_println(
                        log_lvl_heur,
-			"--window sizes: SndWinScale= %d, RcvwinScale=%d, rwin=%f, swin=%f,  
cwin=%f",
-                       SndWinScale, RcvWinScale, rwin, swin, cwin);
+			"--window sizes: SndWinScale= %d, RcvwinScale=%d, MaxRwinRcvd=%d,  
maxCwnd=%d,rwin=%f, swin=%f, cwin=%f",
+                       *SndWinScale, *RcvWinScale, MaxRwinRcvd, MaxCwnd 
,*rwin, *swin, *cwin);
 }

 /**
@@ -278,7 +278,7 @@
  *
  */
 double calc_sendlimited_sndrfault(int SndLimTimeSender, int totaltime) {
-       double sendlimitedtime = (double) SndLimTimeSender / totaltime;
+       double sendlimitedtime = ((double) SndLimTimeSender) / totaltime;
        log_println(log_lvl_heur, "--Send limited time: %d over %d=%f ",
                        SndLimTimeSender, totaltime, sendlimitedtime);
        return sendlimitedtime;
@@ -293,7 +293,7 @@
  *
  */
 double calc_sendlimited_rcvrfault(int SndLimTimeRwin, int totaltime) {
-       double sendlimitedtime = (double) SndLimTimeRwin / totaltime;
+       double sendlimitedtime = ((double) SndLimTimeRwin) / totaltime;
        log_println(log_lvl_heur, "--Send limited time: %d over %d=%f ",
                        SndLimTimeRwin, totaltime, sendlimitedtime);
        return sendlimitedtime;
@@ -306,7 +306,7 @@
  * @return sender limited time ratio
  */
 double calc_sendlimited_cong(int SndLimTimeCwnd, int totaltime) {
-       double sendlimitedtime = (double) SndLimTimeCwnd / totaltime;
+       double sendlimitedtime = ((double) SndLimTimeCwnd) / totaltime;
        log_println(log_lvl_heur, "--Send limited time: %d over %d=%f ",
                        SndLimTimeCwnd, totaltime, sendlimitedtime);
        return sendlimitedtime;
=======================================
--- /trunk/src/test_c2s_srv.c   Mon Apr 30 13:46:39 2012
+++ /trunk/src/test_c2s_srv.c   Wed Aug  1 12:30:33 2012
@@ -318,7 +318,7 @@
                                        &workerThreadId, meta.c2s_snaplog, 
options->c2s_logname,
                                        conn, group); */
                }
-               start_snap_worker(&snapArgs, agent, options->snaplog, 
&workerThreadId,
+		start_snap_worker(&snapArgs, agent, NULL, options->snaplog,  
&workerThreadId,
                                        meta.c2s_snaplog, 
options->c2s_logname,      conn, group);
                // Wait on listening socket and read data once ready.
                tmptime = secs();
=======================================
--- /trunk/src/test_s2c_srv.c   Mon Apr 30 13:46:39 2012
+++ /trunk/src/test_s2c_srv.c   Wed Aug  1 12:30:33 2012
@@ -363,7 +363,7 @@
                        /*start_snap_worker(&snapArgs, agent, options->snaplog, 
&workerLoop,
                         &workerThreadId, meta.s2c_snaplog, 
options->s2c_logname,
                         conn, group);*///new file changes
-                       start_snap_worker(&snapArgs, agent, options->snaplog,
+                       start_snap_worker(&snapArgs, agent, peaks, 
options->snaplog,
                                        &workerThreadId, meta.s2c_snaplog, 
options->s2c_logname,
                                        conn, group);

@@ -534,6 +534,7 @@
                }

 		// Wait for message from client. Client sends its calculated throughput  
value
+               log_println(6,"S2CSPD reception starts");
                msgLen = sizeof(buff);
                if (recv_msg(ctlsockfd, &msgType, buff, &msgLen)) {
                        log_println(0, "Protocol error!");
@@ -561,7 +562,7 @@
                }
                buff[msgLen] = 0;
                *s2cspd = atoi(buff); // save Throughput value as seen by 
client
-
+               log_println(6, "S2CSPD from client %f", *s2cspd);
                // Final activities of ending tests. Close sockets, file 
descriptors,
                //    send finalise message to client
                close(xmitsfd);
=======================================
--- /trunk/src/testoptions.c    Mon Apr 30 13:46:39 2012
+++ /trunk/src/testoptions.c    Wed Aug  1 12:30:33 2012
@@ -254,7 +254,7 @@
  * @param web100_connection connection pointer
  * @param web100_group group web100_group pointer
  */
-void start_snap_worker(SnapArgs *snaparg, web100_agent *agentarg,
+void start_snap_worker(SnapArgs *snaparg, web100_agent *agentarg,  
CwndPeaks* peaks,
                char snaplogenabled,  pthread_t *wrkrthreadidarg,
                char *metafilevariablename, char *metafilename, 
web100_connection* conn,
                web100_group* group) {
@@ -263,7 +263,7 @@
        WorkerArgs workerArgs;
        workerArgs.snapArgs = snaparg;
        workerArgs.agent = agentarg;
-       workerArgs.peaks = NULL;
+       workerArgs.peaks = peaks;
        workerArgs.writeSnap = snaplogenabled;

        group = web100_group_find(agentarg, "read");