cleaning the code

ITpC · May 19, 2018 · fdc50fe · fdc50fe
1 parent bdab8ab
commit fdc50fe
Show file tree

Hide file tree

Showing 11 changed files with 38 additions and 25 deletions.
diff --git a/include/Application.h b/include/Application.h
@@ -96,7 +96,7 @@ namespace LAppS
     }
 
     explicit Application(const std::string& appName,const std::string& target,const size_t mims)
-    :  mMayRun(true),mMutex(),mName(appName), mTarget(target),
+    :  mMayRun{true},mMutex(),mName(appName), mTarget(target),
         max_inbound_message_size(mims),mAppContext(appName,this)
     {
       itc::Singleton<WSWorkersPool<TLSEnable,StatsEnable>>::getInstance()->getWorkers(mWorkers);
@@ -155,7 +155,7 @@ namespace LAppS
       { 
         try
         {
-          auto te=mEvents.recv();
+          auto te=std::move(mEvents.recv());
           switch(te.event.type)
           {
             case WebSocketProtocol::OpCode::CLOSE:
@@ -166,13 +166,6 @@ namespace LAppS
               const bool exec_result=mAppContext.onMessage(te.wid,te.sockfd,te.event);
               if(!exec_result)
               {
-                /*
-                MSGBufferTypeSPtr outBuffer=std::make_shared<MSGBufferType>();
-
-                WebSocketProtocol::ServerCloseMessage(*outBuffer,WebSocketProtocol::DefiniteCloseCode::SHUTDOWN);
-
-                getWorker(te.wid)->submitResponse(te.sockfd,outBuffer);
-                 **/
                 mMayRun.store(false);
               }
             }

diff --git a/include/ApplicationContext.h b/include/ApplicationContext.h
@@ -292,7 +292,7 @@ namespace LAppS
     ApplicationContext(ApplicationContext&)=delete;
 
     explicit ApplicationContext(const std::string& appname, abstract::Application* parent)
-    : ::abstract::ApplicationContext(appname), mParent(parent),mMutex(),mustStop(false)
+    : ::abstract::ApplicationContext(appname), mParent(parent),mMutex(),mustStop{false}
     {
       luaL_openlibs(mLState);
 

diff --git a/include/Balancer.h b/include/Balancer.h
@@ -59,7 +59,7 @@ namespace LAppS
       mInbound.send(data);
     }
 
-    Balancer(const float connw=0.7):mConnectionWeight(connw),mMayRun(true),mWorkersCache(0)
+    Balancer(const float connw=0.7):mConnectionWeight(connw),mMayRun{true},mWorkersCache(0)
     {
       itc::Singleton<WSWorkersPool<TLSEnable,StatsEnable>>::getInstance()->getWorkers(mWorkersCache);
     }

diff --git a/include/IOWorker.h b/include/IOWorker.h
@@ -74,10 +74,10 @@ namespace LAppS
 
     explicit IOWorker(const size_t id, const size_t maxConnections,const bool af)
     : Worker(id,maxConnections,af), enableTLS(),        enableStatsUpdate(), 
-      mMayRun(true),                mCanStop(false),    mConnectionsMutex(), 
+      mMayRun{true},                mCanStop{false},    mConnectionsMutex(), 
       mInboundMutex(),              mShakespeer(),      mEPoll(std::make_shared<ePoll>()),
       mInboundConnections(),        mConnections(),     mEvents(1000),
-      mNap(), haveConnections(false),haveNewConnections(false)
+      mNap(), haveConnections{false},haveNewConnections{false}
     {
       mConnections.clear();
     }
@@ -130,6 +130,7 @@ namespace LAppS
               {
                 if(error_bit(mEvents[i].events))
                 {
+                  SyncLock sync(mConnectionsMutex);
                   deleteConnection(mEvents[i].data.fd);
                 }
                 else 

diff --git a/include/InternalAppContext.h b/include/InternalAppContext.h
@@ -96,7 +96,7 @@ namespace LAppS
   public:
 
     InternalAppContext(const std::string& name):
-    ::abstract::ApplicationContext(name)
+    ::abstract::ApplicationContext(name), mMustStop{false},mCanStop{false}
     {
       luaL_openlibs(mLState);
 

diff --git a/include/WebSocket.h b/include/WebSocket.h
@@ -447,7 +447,8 @@ template <bool TLSEnable=false, bool StatsEnable=false> class WebSocket
   int send(const std::vector<uint8_t>& buff)
   {
     updateOutStats(buff.size());
-    return this->send(buff,enableTLS);  
+    int ret=this->send(buff,enableTLS);  
+    return ret;
   }
 
   void updateInStats(const size_t sz)
@@ -823,7 +824,7 @@ RFC 6455                 The WebSocket Protocol            December 2011
     }while(outCursor!=buff.size());
 
     return outCursor;
-  }
+  }  
 };
 
 #endif /* __WEBSOCKET_H__ */

diff --git a/include/ePollController.h b/include/ePollController.h
@@ -20,6 +20,17 @@
  * 
  **/
 
+/***
+ * DEPRECATED       DEPRECATED   DEPRECATED     DEPRECATED
+ * DE     CATED     DE           DE    CATED    DE    CATED
+ * DE     CATED     DE           DE    CATED    DE    CATED
+ * DE     CATED     DEPRECATED   DEPRECATED     DEPRECATED
+ * DE     CATED     DE           DE             DE REC
+ * DE     CATED     DE           DE             DE  ECA
+ * DEPRECATED       DEPRECATED   DE             DE   CATED  
+ * 
+ * ... you've got the idea. this sht is deprecated.
+ ***/
 
 #ifndef __EPOLLCONTROLLER_H__
 #  define __EPOLLCONTROLLER_H__

diff --git a/nbproject/Makefile-Debug.mk b/nbproject/Makefile-Debug.mk
@@ -67,17 +67,17 @@ ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/lapps: ../utils/dist/Debug/GNU-Linux/
 
 ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/lapps: ${OBJECTFILES}
 	${MKDIR} -p ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}
-	g++ -pipe -Wall -pthread -O2 -mtune=native -march=native -fPIC -fstack-check -fstack-protector-strong -mfpmath=sse -msse2avx -ftree-vectorize -funroll-loops -o ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/lapps ${OBJECTFILES} ${LDLIBSOPTIONS} -latomic -lcryptopp -ltls -lcrypto -lluajit-5.1 -lprofiler
+	g++ -pipe -Wall -pthread -O2 -mtune=native -march=native -fPIC -fstack-check -fstack-protector-strong -mfpmath=sse -msse2avx -ftree-vectorize -funroll-loops -o ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/lapps ${OBJECTFILES} ${LDLIBSOPTIONS} -latomic -lcryptopp -ltls -lcrypto -lluajit-5.1
 
 ${OBJECTDIR}/src/getLog.o: src/getLog.cpp nbproject/Makefile-${CND_CONF}.mk
 	${MKDIR} -p ${OBJECTDIR}/src
 	${RM} "$@.d"
-	$(COMPILE.cc) -g -DAPP_NAME=\"LAppS\" -DLOG_FILE=\"lapps.log\" -DLOG_INFO -DMAX_BUFF_SIZE=512 -DSTATS_ENABLE -DTSAFE_LOG=1 -DLAPPS_TLS_ENABLE -I../libressl/include -I../ITCFramework/include -I../ITCLib/include -I../utils/include -Iinclude -Iinclude/modules -I/usr/local/include -I/usr/local/include/luajit-2.0 -std=c++14 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/getLog.o src/getLog.cpp
+	$(COMPILE.cc) -g -DAPP_NAME=\"LAppS\" -DLOG_FILE=\"lapps.log\" -DLOG_INFO -DMAX_BUFF_SIZE=512 -DSTATS_ENABLE -DTSAFE_LOG=1 -I../libressl/include -I../ITCFramework/include -I../ITCLib/include -I../utils/include -Iinclude -Iinclude/modules -I/usr/local/include -I/usr/local/include/luajit-2.0 -std=c++14 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/getLog.o src/getLog.cpp
 
 ${OBJECTDIR}/src/main.o: src/main.cpp nbproject/Makefile-${CND_CONF}.mk
 	${MKDIR} -p ${OBJECTDIR}/src
 	${RM} "$@.d"
-	$(COMPILE.cc) -g -DAPP_NAME=\"LAppS\" -DLOG_FILE=\"lapps.log\" -DLOG_INFO -DMAX_BUFF_SIZE=512 -DSTATS_ENABLE -DTSAFE_LOG=1 -DLAPPS_TLS_ENABLE -I../libressl/include -I../ITCFramework/include -I../ITCLib/include -I../utils/include -Iinclude -Iinclude/modules -I/usr/local/include -I/usr/local/include/luajit-2.0 -std=c++14 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/main.o src/main.cpp
+	$(COMPILE.cc) -g -DAPP_NAME=\"LAppS\" -DLOG_FILE=\"lapps.log\" -DLOG_INFO -DMAX_BUFF_SIZE=512 -DSTATS_ENABLE -DTSAFE_LOG=1 -I../libressl/include -I../ITCFramework/include -I../ITCLib/include -I../utils/include -Iinclude -Iinclude/modules -I/usr/local/include -I/usr/local/include/luajit-2.0 -std=c++14 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/main.o src/main.cpp
 
 # Subprojects
 .build-subprojects:

diff --git a/nbproject/Package-Debug.bash b/nbproject/Package-Debug.bash
@@ -271,6 +271,10 @@ cd "${TOP}"
 makeDirectory "${NBTMPDIR}//usr/bin"
 copyFileToTmpDir "${OUTPUT_PATH}" "${NBTMPDIR}/${PACKAGE_TOP_DIR}bin/${OUTPUT_BASENAME}" 0755
 
+cd "${TOP}"
+makeDirectory "${NBTMPDIR}//usr/bin"
+copyFileToTmpDir "${OUTPUT_PATH}" "${NBTMPDIR}/${PACKAGE_TOP_DIR}bin/${OUTPUT_BASENAME}" 0755
+
 
 # Create control file
 cd "${TOP}"

diff --git a/nbproject/configurations.xml b/nbproject/configurations.xml
@@ -114,7 +114,6 @@
           <commandLine>-pipe -Wall -pthread -O2 -fPIC -march=native -mtune=native -fstack-check -fstack-protector-strong -mfpmath=sse -ftree-vectorize -funroll-loops</commandLine>
           <preprocessorList>
             <Elem>APP_NAME="LAppS"</Elem>
-            <Elem>LAPPS_TLS_ENABLE</Elem>
             <Elem>LOG_FILE="lapps.log"</Elem>
             <Elem>LOG_INFO</Elem>
             <Elem>MAX_BUFF_SIZE=512</Elem>
@@ -166,7 +165,7 @@
               </makeArtifact>
             </linkerLibProjectItem>
           </linkerLibItems>
-          <commandLine>-latomic -lcryptopp -ltls -lcrypto -lluajit-5.1 -lprofiler</commandLine>
+          <commandLine>-latomic -lcryptopp -ltls -lcrypto -lluajit-5.1</commandLine>
         </linkerTool>
         <requiredProjects>
           <makeArtifact PL="../utils"
@@ -522,6 +521,12 @@
                             perm="755"
                             owner="root"
                             group="bin"/>
+          <packFileListElem type="File"
+                            to="${PACKAGE_TOP_DIR}bin/${OUTPUT_BASENAME}"
+                            from="${OUTPUT_PATH}"
+                            perm="755"
+                            owner="root"
+                            group="bin"/>
         </packFileList>
         <packInfoList>
           <packInfoListElem name="Package" value="lapps" mandatory="true"/>

diff --git a/nbproject/private/private.xml b/nbproject/private/private.xml
@@ -10,11 +10,9 @@
     <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:/home/pk/workspace/docker/luadev.env/workspace/LAppS/include/Config.h</file>
             <file>file:/home/pk/workspace/docker/luadev.env/workspace/LAppS/include/IOWorker.h</file>
-            <file>file:/home/pk/workspace/docker/luadev.env/workspace/LAppS/include/WSStreamProcessor.h</file>
-            <file>file:/home/pk/workspace/docker/luadev.env/workspace/LAppS/include/WebSocket.h</file>
-            <file>file:/home/pk/workspace/docker/luadev.env/workspace/LAppS/include/WSServerMessage.h</file>
+            <file>file:/home/pk/workspace/docker/luadev.env/workspace/LAppS/include/ApplicationContext.h</file>
+            <file>file:/home/pk/workspace/docker/luadev.env/workspace/LAppS/include/ePollController.h</file>
         </group>
     </open-files>
 </project-private>