Changeset 224 in tmcsimulator for branches/FEPSimulator

Timestamp:

11/04/2017 01:48:46 PM (8 years ago)

Author:

jdalbey

Message:

FEPSim.cpp Added a comment containing code to let ATMS server catch up.

Location:

branches/FEPSimulator

Files:

• .dep.inc (modified) (1 diff)
• FEPSim.cpp (modified) (2 diffs)
• dist/Debug/GNU-MacOSX (deleted)
• nbproject/Makefile-Release.mk (modified) (4 diffs)
• nbproject/Makefile-impl.mk (modified) (1 diff)
• nbproject/Makefile-variables.mk (modified) (1 diff)
• nbproject/Package-Release.bash (modified) (4 diffs)
• nbproject/private/private.xml (modified) (1 diff)

branches/FEPSimulator/.dep.inc

@@ -1 +1 @@
 # This code depends on make tool being used
-DEPFILES=$(wildcard $(addsuffix .d, ${OBJECTFILES}))
+DEPFILES=$(wildcard $(addsuffix .d, ${OBJECTFILES} ${TESTOBJECTFILES}))
 ifneq (${DEPFILES},)
 include ${DEPFILES}

branches/FEPSimulator/FEPSim.cpp

@@ -33 +33 @@
     vector<STATION*> ldsMap = highwaysParser.stations;
 
+    cout << "Starting sendReplys for " << lines.size() << " lines." << endl;
     // Send one reply for every FEPLine
     for (int i = 0; i < lines.size(); i++) {
@@ -98 +99 @@
             handleCallResponse(fep_reply_xfer_32(&fepReply, clnt));
         }
-    }
+        // pause to let ATMS server catch up
+        //unsigned int sleepseconds = 220000;
+        //usleep(sleepseconds);
+    }
+    cout << "Finished." << endl;
 }
 

branches/FEPSimulator/nbproject/Makefile-Release.mk

@@ -22 +22 @@
 
 # Macros
-CND_PLATFORM=GNU-Linux-x86
+CND_PLATFORM=GNU-Linux
 CND_DLIB_EXT=so
 CND_CONF=Release
@@ -37 +37 @@
 OBJECTFILES= \
         ${OBJECTDIR}/DataPacker.o \
-        ${OBJECTDIR}/FEPClient.o \
-        ${OBJECTDIR}/NetworkReader.o \
+        ${OBJECTDIR}/FEPSim.o \
+        ${OBJECTDIR}/HighwaysParser.o \
+        ${OBJECTDIR}/Main.o \
         ${OBJECTDIR}/fep_clnt.o \
         ${OBJECTDIR}/fep_xdr.o
@@ -61 +62 @@
 # Build Targets
 .build-conf: ${BUILD_SUBPROJECTS}
-        "${MAKE}"  -f nbproject/Makefile-${CND_CONF}.mk ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fep_rpc_client
+        "${MAKE}"  -f nbproject/Makefile-${CND_CONF}.mk ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fepsimulator
 
-${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fep_rpc_client: ${OBJECTFILES}
+${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fepsimulator: ${OBJECTFILES}
         ${MKDIR} -p ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}
-        ${LINK.cc} -o ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fep_rpc_client ${OBJECTFILES} ${LDLIBSOPTIONS}
+        ${LINK.cc} -o ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fepsimulator ${OBJECTFILES} ${LDLIBSOPTIONS}
 
-${OBJECTDIR}/DataPacker.o: DataPacker.cpp 
+${OBJECTDIR}/DataPacker.o: DataPacker.cpp
         ${MKDIR} -p ${OBJECTDIR}
         ${RM} "$@.d"
         $(COMPILE.cc) -O2 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/DataPacker.o DataPacker.cpp
 
-${OBJECTDIR}/FEPClient.o: FEPClient.cpp 
+${OBJECTDIR}/FEPSim.o: FEPSim.cpp
         ${MKDIR} -p ${OBJECTDIR}
         ${RM} "$@.d"
-        $(COMPILE.cc) -O2 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/FEPClient.o FEPClient.cpp
+        $(COMPILE.cc) -O2 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/FEPSim.o FEPSim.cpp
 
-${OBJECTDIR}/NetworkReader.o: NetworkReader.cpp 
+${OBJECTDIR}/HighwaysParser.o: HighwaysParser.cpp
         ${MKDIR} -p ${OBJECTDIR}
         ${RM} "$@.d"
-        $(COMPILE.cc) -O2 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/NetworkReader.o NetworkReader.cpp
+        $(COMPILE.cc) -O2 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/HighwaysParser.o HighwaysParser.cpp
 
-${OBJECTDIR}/fep_clnt.o: fep_clnt.c 
+${OBJECTDIR}/Main.o: Main.cpp
+        ${MKDIR} -p ${OBJECTDIR}
+        ${RM} "$@.d"
+        $(COMPILE.cc) -O2 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/Main.o Main.cpp
+
+${OBJECTDIR}/fep_clnt.o: fep_clnt.c
         ${MKDIR} -p ${OBJECTDIR}
         ${RM} "$@.d"
         $(COMPILE.c) -O2 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/fep_clnt.o fep_clnt.c
 
-${OBJECTDIR}/fep_xdr.o: fep_xdr.c 
+${OBJECTDIR}/fep_xdr.o: fep_xdr.c
         ${MKDIR} -p ${OBJECTDIR}
         ${RM} "$@.d"
@@ -98 +104 @@
 .clean-conf: ${CLEAN_SUBPROJECTS}
         ${RM} -r ${CND_BUILDDIR}/${CND_CONF}
-        ${RM} ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fep_rpc_client
 
 # Subprojects

branches/FEPSimulator/nbproject/Makefile-impl.mk

@@ -77 +77 @@
         @echo "# This code depends on make tool being used" >.dep.inc
         @if [ -n "${MAKE_VERSION}" ]; then \
-            echo "DEPFILES=\$$(wildcard \$$(addsuffix .d, \$${OBJECTFILES}))" >>.dep.inc; \
+            echo "DEPFILES=\$$(wildcard \$$(addsuffix .d, \$${OBJECTFILES} \$${TESTOBJECTFILES}))" >>.dep.inc; \
             echo "ifneq (\$${DEPFILES},)" >>.dep.inc; \
             echo "include \$${DEPFILES}" >>.dep.inc; \

branches/FEPSimulator/nbproject/Makefile-variables.mk

@@ -16 +16 @@
 CND_PACKAGE_PATH_Debug=dist/Debug/GNU-MacOSX/package/fepsimulator.tar
 # Release configuration
-CND_PLATFORM_Release=GNU-Linux-x86
-CND_ARTIFACT_DIR_Release=dist/Release/GNU-Linux-x86
-CND_ARTIFACT_NAME_Release=fep_rpc_client
-CND_ARTIFACT_PATH_Release=dist/Release/GNU-Linux-x86/fep_rpc_client
-CND_PACKAGE_DIR_Release=dist/Release/GNU-Linux-x86/package
-CND_PACKAGE_NAME_Release=feprpcclient.tar
-CND_PACKAGE_PATH_Release=dist/Release/GNU-Linux-x86/package/feprpcclient.tar
+CND_PLATFORM_Release=GNU-Linux
+CND_ARTIFACT_DIR_Release=dist/Release/GNU-Linux
+CND_ARTIFACT_NAME_Release=fepsimulator
+CND_ARTIFACT_PATH_Release=dist/Release/GNU-Linux/fepsimulator
+CND_PACKAGE_DIR_Release=dist/Release/GNU-Linux/package
+CND_PACKAGE_NAME_Release=fepsimulator.tar
+CND_PACKAGE_PATH_Release=dist/Release/GNU-Linux/package/fepsimulator.tar
 # testHighwaysParser configuration
 CND_PLATFORM_testHighwaysParser=GNU-MacOSX

branches/FEPSimulator/nbproject/Package-Release.bash

@@ -7 +7 @@
 # Macros
 TOP=`pwd`
-CND_PLATFORM=GNU-Linux-x86
+CND_PLATFORM=GNU-Linux
 CND_CONF=Release
 CND_DISTDIR=dist
@@ -14 +14 @@
 NBTMPDIR=${CND_BUILDDIR}/${CND_CONF}/${CND_PLATFORM}/tmp-packaging
 TMPDIRNAME=tmp-packaging
-OUTPUT_PATH=${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fep_rpc_client
-OUTPUT_BASENAME=fep_rpc_client
-PACKAGE_TOP_DIR=feprpcclient/
+OUTPUT_PATH=${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fepsimulator
+OUTPUT_BASENAME=fepsimulator
+PACKAGE_TOP_DIR=fepsimulator/
 
 # Functions
@@ -61 +61 @@
 # Copy files and create directories and links
 cd "${TOP}"
-makeDirectory "${NBTMPDIR}/feprpcclient/bin"
+makeDirectory "${NBTMPDIR}/fepsimulator/bin"
 copyFileToTmpDir "${OUTPUT_PATH}" "${NBTMPDIR}/${PACKAGE_TOP_DIR}bin/${OUTPUT_BASENAME}" 0755
 
@@ -67 +67 @@
 # Generate tar file
 cd "${TOP}"
-rm -f ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package/feprpcclient.tar
+rm -f ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package/fepsimulator.tar
 cd ${NBTMPDIR}
-tar -vcf ../../../../${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package/feprpcclient.tar *
+tar -vcf ../../../../${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package/fepsimulator.tar *
 checkReturnCode
 

branches/FEPSimulator/nbproject/private/private.xml

@@ -3 +3 @@
     <data xmlns="http://www.netbeans.org/ns/make-project-private/1">
         <activeConfTypeElem>1</activeConfTypeElem>
-        <activeConfIndexElem>0</activeConfIndexElem>
+        <activeConfIndexElem>1</activeConfIndexElem>
     </data>
     <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
     <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>
-        </group>
+        <group/>
     </open-files>
 </project-private>