NDT-DEV email list created

Revision: 774
Author:   

Date:     Wed Aug  1 12:29:37 2012
Log:      Changes to log levels or imporved logging statements, also in  
response to comments form Andy
http://code.google.com/p/ndt/source/detail?r=774

Modified:
 /trunk/src/logging.c
 /trunk/src/runningtest.c
 /trunk/src/test_mid_srv.c
 /trunk/src/web100clt.c
 /trunk/src/web100srv.c

=======================================
--- /trunk/src/logging.c        Mon Apr 30 13:46:39 2012
+++ /trunk/src/logging.c        Wed Aug  1 12:29:37 2012
@@ -223,7 +223,7 @@
  * @return directory where protocol logs are placed
  */
 char* get_protologdir() {
-       printf("PV34: proto location=%s;\n", ProtocolLogDirName);
+       log_println(5," Protocol file location=%s;\n", ProtocolLogDirName);
        return ProtocolLogDirName;
 }

@@ -527,11 +527,8 @@
        fp = fopen(get_protologfile(socketnum, tmplogname), "a");

        if (fp == NULL) {
-               printf(
-				"--Unable to open protocol log file while trying to record process  
status message: %s for the %s test \n",
-                               procstatusdesc, currentprocname);
                log_println(
-                               3,
+                               5,
 				"--Unable to open protocol log file while trying to record process  
status message: %s for the %s test \n",
                                procstatusdesc, currentprocname);
        } else {
=======================================
--- /trunk/src/runningtest.c    Mon Apr 30 13:46:39 2012
+++ /trunk/src/runningtest.c    Wed Aug  1 12:29:37 2012
@@ -136,7 +136,7 @@
  *  */
 char *get_procstatusdesc(enum PROCESS_STATUS_INT procstatusarg, char  
*sprocarg) {
        sprocarg = _procstatusarray[procstatusarg];
-       printf("--current process status = %s for %d\n", sprocarg, 
procstatusarg);
+	log_println(7,"--current process status = %s for %d\n", sprocarg,  
procstatusarg);
        return sprocarg;
 }

@@ -148,7 +148,7 @@
  * */
 char *get_processtypedesc(enum PROCESS_TYPE_INT procidarg, char *snamearg)  
{
        snamearg = _proctypesarray[procidarg];
-       printf("--current process name = %s for %d\n", snamearg, procidarg);
+	log_println(7,"--current process name = %s for %d\n", snamearg,  
procidarg);
        return snamearg;
 }

=======================================
--- /trunk/src/test_mid_srv.c   Mon Apr 30 13:46:39 2012
+++ /trunk/src/test_mid_srv.c   Wed Aug  1 12:29:37 2012
@@ -88,7 +88,6 @@
                log_println(1, " <-- %d - Middlebox test -->", 
options->child0);

                // protocol validation logs indicating start of tests
-               printf(" <--- %d - Middlebox test --->", options->child0);
                thistestId = MIDDLEBOX;
                teststatusnow = TEST_STARTED;
                protolog_status(options->child0, thistestId, teststatusnow, 
ctlsockfd);
@@ -286,8 +285,6 @@
                send_msg(ctlsockfd, TEST_FINALIZE, "", 0);
                log_println(1, " <--------- %d ----------->", 
options->child0);

-               printf(" <--- %d - Middlebox test --->", options->child0);
-
                // log end of test into protocol doc, just to delimit.
                teststatusnow = TEST_ENDED;
                //protolog_status(1, options->child0, thistestId, 
teststatusnow);
=======================================
--- /trunk/src/web100clt.c      Wed May  2 10:13:30 2012
+++ /trunk/src/web100clt.c      Wed Aug  1 12:29:37 2012
@@ -493,7 +493,6 @@
 	while ((useroption = getopt_long(argc, argv,  
GETOPT_LONG_INET6("n:u:e:p:dhlvb:"),
                        long_options, 0)) != -1) {
                switch (useroption) {
-               printf("USER OPTION %c",useroption);
                case '4':
                        conn_options |= OPT_IPV4_ONLY;
                        break;
=======================================
--- /trunk/src/web100srv.c      Mon Apr 30 13:46:39 2012
+++ /trunk/src/web100srv.c      Wed Aug  1 12:29:37 2012
@@ -971,7 +971,7 @@
        int CurrentRTO, CurrentRwinRcvd, MaxCwnd, CongestionSignals, PktsOut,
                        MinRTT;
        int CongAvoid, CongestionOverCount, MaxRTT, OtherReductions,
-                       CurTimeoutCount;
+                       CurTimeoutCount=0;
        int AbruptTimeouts, SendStall, SlowStart, SubsequentTimeouts,
                        ThruBytesAcked;
        int RcvWinScale, SndWinScale;
@@ -1027,7 +1027,7 @@

        // start with a clean slate of currently running test and direction
        setCurrentTest(TEST_NONE);
-       printf("Remote host= %s", get_remotehost());
+       log_println(7,"Remote host= %s", get_remotehost());

        stime = time(0);
        log_println(4, "Child process %d started", getpid());
@@ -1160,7 +1160,6 @@
        // section to calculate duplex mismatch
        // Calculate average round trip time and convert to seconds
        rttsec = calc_avg_rtt(SumRTT, CountRTT, &avgrtt);
-
        // Calculate packet loss
 	packetloss_s2c = calc_packetloss(CongestionSignals, PktsOut,  
c2s_linkspeed_data);

@@ -1652,11 +1651,10 @@
                        set_logfile(optarg);
                        break;
                case 'u':
-                       printf("Calling set protolog from case-u");
                        set_protologdir(optarg);
                        break;
                case 'e':
-                       printf("Enabling protocol logging");
+                       log_println(7,"Enabling protocol logging");
                        enableprotocollogging();
                        break;
                case 'o':