Changeset 71 in tmcsimulator for branches/fep_client_cpp

Timestamp:

09/07/2017 12:59:00 AM (9 years ago)

Author:

jtorres

Message:

corrected compile errors, minor housekeeping

Location:

branches/fep_client_cpp

Files:

• build (modified) (1 diff)
• dummyserver/dumbserver (deleted)
• dummyserver/fep.h (added)
• dummyserver/server (added)
• fep_client.cpp (modified) (9 diffs)
• network.h (modified) (1 diff)
• network_factory.cpp (modified) (1 diff)

branches/fep_client_cpp/build

@@ -1 +1 @@
 #!/bin/bash
 
-g++ -g fep_client.cpp fep_clnt.c fep_xdr.c control.cpp -o client && gcc fep_server.c fep_svc.c fep_xdr.c -o server
+g++ -g fep_client.cpp fep_clnt.c fep_xdr.c -o client && gcc ./dummyserver/fep_server.c ./dummyserver/fep_svc.c fep_xdr.c -o ./dummyserver/server

branches/fep_client_cpp/fep_client.cpp

@@ -32 +32 @@
 {
         int i, j; // i == line_index, j == lds_index
-
+        void *rv;
         // Send one reply for every "line" in the FEP
         for (i = 0; i < lines_size; i++)
@@ -40 +40 @@
                 // populate reply
                 fepReply.reply = SHORTPOLL;
-                fepReply.schedule = fepLine[i].schedule;
-                fepReply.lineinfo = fepLine[i].lineInfo;
+                fepReply.schedule = lines[i].schedule;
+                fepReply.lineinfo = lines[i].lineInfo;
                 fepReply.kind = (enum polltype) 0;
                 fepReply.flag = (enum replykind) 0;
@@ -47 +47 @@
                 /***********************************
                          This is an update to an extern, this should happen on the Java driver side?? 
-                fepLine[i].schedleSeq += 1;
-                fepLine[i].globalSeq += 51;
+                lines[i].schedleSeq += 1;
+                lines[i].globalSeq += 51;
                 */
 
-                fepReply.schedule_sequence = fepLine[i].schedleSeq;
-                fepReply.global_sequence = fepLine[i].globalSeq;
+                fepReply.schedule_sequence = lines[i].schedleSeq;
+                fepReply.global_sequence = lines[i].globalSeq;
                 /************************************
                          Need to find out what appropriate schedule time is: look at uci_unix_simulation_time src code          
@@ -58 +58 @@
                         uci_unix_simulation_time(uci_simulation_time());        // GMT time
                 */
-                fepReply.user_info1 = fepLine[i].lineNum;
-                fepReply.user_info2 = fepLine[i].lineNum;
-                fepReply.system_key = fepLine[i].systemKey;
+                fepReply.user_info1 = lines[i].lineNum;
+                fepReply.user_info2 = lines[i].lineNum;
+                fepReply.system_key = lines[i].systemKey;
 
                 fepReply.answers.size = 1;
@@ -66 +66 @@
                 
                 /* for each LDS in the Line.... (constructs the short_answer message) */
-                for (j = 0; j < fepLine[i].ldsNum; j++)
+                for (j = 0; j < lines[i].ldsNum; j++)
                 {
                         fep_shortanswer fsa;
-                        int index = fepLine[i].ldsIndex[j];
+                        int index = lines[i].ldsIndex[j];
 
                         // msg: oa, od, ldsMap[index].dataPack, od, ff
@@ -90 +90 @@
                         fsa.info.poll_user_info2 = 1;   //always 1
                         fsa.info.retries = 0;
-                        fsa.info.status = REPLY_DONE;
+                        fsa.info.status = (enum replystatus) 1;
                         
                         //fepReply.answers.fep_answer_list_u.shortp.answers[j] = fsa;   
@@ -96 +96 @@
                         
                         // send out data
-                        printf("line=%d, lds=%d\n", fepLine[i].lineNum, ldsMap[index].drop);
+                        printf("line=%d, lds=%d\n", lines[i].lineNum, ldsMap[index].drop);
                         rv = fep_reply_xfer_32(&fepReply, clnt);
 
@@ -107 +107 @@
 
 /* Creates an RPC Client which communicates with the ATMS through RPC Calls */
-CLIENT * create_client()
+CLIENT * create_client(char *host)
 {
         CLIENT *clnt;
@@ -131 +131 @@
 void update_ATMS(char *host)
 {
-        CLIENT *clnt = create_client();
+        CLIENT *clnt = create_client(host);
         
         /* Load data to be xfered to ATMS */
-        FEP_LINE_LDS *lines;
-        int lines_size = load_lines(&lines, "./lines_atms.txt");
-        FEP_LDS *ldsMap = load_lds("./lds_atms.txt");
+        int lines_size;
+        FEP_LINE_LDS *lines = load_lines(&lines_size, "./lines_atms.txt");
+        LDS_LOOP *ldsMap = load_lds("./lds_atms.txt");
 
         /* Transfer data to ATMS */
         xfer_replys(clnt, lines, lines_size, ldsMap);
+
+        /* Free allocated memory */
+        free(lines);
+        free(ldsMap);
 
         /* Destroy client */

branches/fep_client_cpp/network.h

@@ -1 +1 @@
 #ifndef NETWORK_H
 #define NETWORK_H
+#include <vector>
+using namespace std;
 
 typedef struct loopagg LOOPAGG;

branches/fep_client_cpp/network_factory.cpp

@@ -3 +3 @@
 FEP_LINE_LDS * load_lines(int *size, const char * fName)
 {
-        FEP_LINE_LDS lines[1];
+        FEP_LINE_LDS *lines = (FEP_LINE_LDS *) malloc(sizeof(FEP_LINE_LDS));
         *size = 1;
         return lines;   
 }
 
-FEP_LDS * load_lds(const char * fName)
+LDS_LOOP * load_lds(const char * fName)
 {
-        FEP_LDS lds[1];
-        return lds;
+        LDS_LOOP *lds_map = (LDS_LOOP *) malloc(sizeof(LDS_LOOP));
+        return lds_map;
 }