Changeset 217 in tmcsimulator for branches/FEPSimulator

Timestamp:

11/02/2017 10:53:38 PM (9 years ago)

Author:

jtorres

Message:

Implemented logging into FEPSimulator. Now logs output into FEPSimLog.txt. Error messages are still output to console so you know immediately if there is an error. The log file is cleared upon FEPSim start-up.

Location:

branches/FEPSimulator

Files:

• FEPSim.cpp (modified) (8 diffs)
• FEPSim.h (modified) (4 diffs)
• HighwaysParser.cpp (modified) (1 diff)
• nbproject/private/private.xml (modified) (1 diff)

branches/FEPSimulator/FEPSim.cpp

@@ -7 +7 @@
     this->FEP_REV = FEP_REV;
     this->SOCK_PORT = SOCK_PORT;
+    
+    // clear log file
+    FEPLogFile.open(FEPLogFileName, ios::trunc);
+    FEPLogFile.close();
 }
 
-FEPSim::~FEPSim() { 
+FEPSim::~FEPSim() {
+    FEPLogFile.close();
 }
 
 void FEPSim::handleCallResponse(void *response) {
     // Failed RPC Call 
-    if (response == NULL) { clnt_perror(clnt, "RPC call failed");
+    if (response == NULL) { 
+        clnt_perror(clnt, "RPC call failed");
     }
     // Successful RPC Call
-    else { cout << "Successful RPC call to ATMS..." << endl;
+    else { 
+        FEPLogFile << "Successful RPC call to ATMS..." << endl;
     }
 }
@@ -30 +37 @@
     for (int i = 0; i < lines.size(); i++) {
         fep_reply fepReply;
-        cout << "Sending fepReply for line #" << lines.at(i)->lineNum << endl;
+        
         // populate reply
         fepReply.reply = SHORTPOLL;
@@ -37 +44 @@
         fepReply.kind = (enum polltype) 0;
         fepReply.flag = (enum replykind) 0;
-
-        /***********************************
-         * We might need to handle this on the java side if its an
-         * issue
-        lines.at(i).schedleSeq += 1;
-        lines.at(i).globalSeq += 51;
-         */
 
         fepReply.schedule_sequence = lines.at(i)->schedleSeq;
@@ -90 +90 @@
             fepReply.answers.fep_answer_list_u.shortp.answers[0] = fsa;
             // send out data
-            //printf("Transferring line=%d, lds_drop_no=%d...\n", lines.at(i)->lineNum, (int)ldsMap.at(index)->drop);
-            // Make RPC Call and handle response
-            // printf("Handling ATMS response...\n");
+            
+            FEPLogFile << "Sending fepReply for line #" << lines.at(i)->lineNum 
+                    << " station number #" 
+                    << ldsMap.at(lines.at(i)->ldsIndex.at(j)) << endl;
+            
             // Transfer the station data to ATMS and listen for response
             handleCallResponse(fep_reply_xfer_32(&fepReply, clnt));
-            unsigned int sleepseconds = 50000;
-            usleep(sleepseconds);
         }
     }
@@ -108 +108 @@
         // Prepare and send the highway status as FEP replies
         sendReplys(buffer);
-        cout << "Destroying client..." << endl;
+        FEPLogFile << "Destroying client..." << endl;
         clnt_destroy(clnt);
         int startTime = time(NULL);
-        cout << "time is: " << startTime << endl;
+        FEPLogFile << "time is: " << startTime << endl;
     }
 }
@@ -127 +127 @@
         success = false;
     } else {
-        cout << "Client created" << endl;
+        FEPLogFile << "Client created" << endl;
     }
     return success;
@@ -185 +185 @@
             totBytes += n;
         }
-        HighwaysParser highwaysParser = HighwaysParser(buffer);
-
 
         if (n < 0) {
@@ -192 +190 @@
             exit(1);
         }
-
+        
+        FEPLogFile.open(FEPLogFileName, ios::app);
         // send data to atms
         manageClientConnection(buffer);
+        FEPLogFile << "attempt" << endl;
+        FEPLogFile.close();
     }
 }

branches/FEPSimulator/FEPSim.h

@@ -33 +33 @@
 #include "fep.h"
 #include <iostream>
+#include <fstream>
 #include <stdio.h>
 #include <stdlib.h>
@@ -44 +45 @@
 
 const int BUFF_SIZE = 1266341;
-
+const string FEPLogFileName = "FEPSimLog.txt";
+static ofstream FEPLogFile;
+    
 class FEPSim {
 public:
@@ -84 +87 @@
     int FEP_REV;
     int SOCK_PORT;
-
+    
     /**
      * Handler for the ATMS RPC Response (to the client RPC Call)
@@ -102 +105 @@
      */
     void sendReplys(char * xml);
-
+    
 };
 

branches/FEPSimulator/HighwaysParser.cpp

@@ -99 +99 @@
             newStation->length = newStation->loops.size() * 2 + CONTROL_DATA_LEN;
             newStation->dataPack = DataPacker::packData(newStation);
-            for(int byte = 0; byte < newStation->length; byte++)
-            {
-                printf("%02X", (unsigned char) newStation->dataPack[byte]);
-            }
-            printf("\n");
             
             this->stations.push_back(newStation);

branches/FEPSimulator/nbproject/private/private.xml

@@ -8 +8 @@
     <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
         <group>
+            <file>file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/network.h</file>
+            <file>file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/FEPSim.cpp</file>
+            <file>file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/fep.h</file>
+            <file>file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/FEPSim.h</file>
             <file>file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/HighwaysParser.cpp</file>
-            <file>file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/fep.h</file>
-            <file>file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/DataPacker.cpp</file>
-            <file>file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/HighwaysParser.h</file>
-            <file>file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/FEPSim.cpp</file>
-            <file>file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/network.h</file>
-            <file>file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/Makefile</file>
-            <file>file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/tests/HighwaysParserTest.cpp</file>
         </group>
     </open-files>