Make source compile / remove unneeded code

Author: clauspruefer

CMakeLists.txt

@@ -92,14 +92,8 @@ add_custom_target(
     ./src/Filesystem.hpp
     ./src/Configuration.hpp
     ./src/MemoryManager.hpp
-    ./src/ThreadHandler.hpp
-    ./src/IPCHandler.hpp
-    ./src/IPCHandlerAS.hpp
     ./src/ClientHandler.hpp
     ./src/ASProcessHandler.hpp
-    ./src/ASRequestHandler.hpp
-    ./src/ResultProcessor.hpp
-    ./src/ResultOrder.hpp
     ./src/Constant.hpp
     ./src/Vector.hpp
 )

src/ASBackend/PythonBackend.hpp

@@ -46,12 +46,14 @@ namespace Backend {
                 DBG(120, "Python call 'invoke()' method Error.");
             }
 
+            /*
             //- copy result into correct memory region
             char* Payload = new(ProcessHandlerPtr->getResultAddress(Index)) char[strlen(ResultCharArray)];
             memcpy(Payload, &ResultCharArray[0], strlen(ResultCharArray));
 
             //- set result payload length
             new(ProcessHandlerPtr->getMetaAddress(Index, 7)) HTTPPayloadLength_t(strlen(ResultCharArray));
+            */
         }
 
     };

src/ASProcessHandler.cpp

@@ -26,10 +26,12 @@ ASProcessHandler::~ASProcessHandler()
     DBG(120, "Destructor");
 }
 
+/*
 void ASProcessHandler::setASProcessHandlerOffsets(VHostOffsetsPrecalc_t Offsets)
 {
     _VHostOffsetsPrecalc = Offsets;
 }
+*/
 
 uint ASProcessHandler::getASInterpreterCount()
 {
@@ -65,10 +67,11 @@ void ASProcessHandler::forkProcessASHandler(ASProcessHandlerSHMPointer_t SHMAdre
     Signal::disableSignals();
 
     //- set shared mem address pointer
-    setBaseAddresses( { SHMAdresses.PostASMetaPtr, SHMAdresses.PostASRequestsPtr, SHMAdresses.PostASResultsPtr } );
+    //setBaseAddresses( { SHMAdresses.PostASMetaPtr, SHMAdresses.PostASRequestsPtr, SHMAdresses.PostASResultsPtr } );
 
     for (const auto& Namespace: ConfigRef.Namespaces) {
 
+        /*
         auto offsetIter = _VHostOffsetsPrecalc.find(Namespace.first);
         if (offsetIter == _VHostOffsetsPrecalc.end()) {
             ERR("_VHostOffsetsPrecalc does not contain Namespace:" << Namespace.first);
@@ -169,5 +172,7 @@ void ASProcessHandler::forkProcessASHandler(ASProcessHandlerSHMPointer_t SHMAdre
 
             }
         }
+        */
+
     }
 }

src/ASProcessHandler.hpp

@@ -1,5 +1,4 @@
-#ifndef ASProcessHandler_hpp
-#define ASProcessHandler_hpp
+#pragma once
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -17,9 +16,7 @@
 
 #include "CPU.hpp"
 #include "Global.hpp"
-#include "IPCHandlerAS.hpp"
 #include "Configuration.hpp"
-#include "ASRequestHandler.hpp"
 
 #define PY_SSIZE_T_CLEAN
 #define BOOST_BIND_GLOBAL_PLACEHOLDERS
@@ -39,7 +36,7 @@ typedef struct {
 } ASProcessHandlerSHMPointer_t;
 
 
-class ASProcessHandler : public SHMPythonAS, private CPU
+class ASProcessHandler : private CPU
 {
 
 public:
@@ -49,7 +46,7 @@ class ASProcessHandler : public SHMPythonAS, private CPU
 
     void forkProcessASHandler(ASProcessHandlerSHMPointer_t);
     void setTerminationHandler();
-    void setASProcessHandlerOffsets(VHostOffsetsPrecalc_t);
+    //void setASProcessHandlerOffsets(VHostOffsetsPrecalc_t);
     uint getASInterpreterCount();
 
     static void terminate(int);
@@ -66,7 +63,5 @@ class ASProcessHandler : public SHMPythonAS, private CPU
 
     private:
 
-    VHostOffsetsPrecalc_t _VHostOffsetsPrecalc;
+    //VHostOffsetsPrecalc_t _VHostOffsetsPrecalc;
 };
-
-#endif

src/ASRequestHandler.cpp

@@ -1,5 +1,4 @@
-#ifndef CPU_hpp
-#define CPU_hpp
+#pragma once
 
 #include <vector>
 #include <thread>
@@ -27,5 +26,3 @@ class CPU {
     CPUConfig_t _CPUs;
     cpu_set_t _cpuset;
 };
-
-#endif

src/ASRequestHandler.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "Debug.cpp"
-#include "../lib/http/httpparser.cpp"
+#include "../lib/http/httpparser.hpp"
 
 #include <cstdint>
 #include <string>

src/CPU.hpp

@@ -23,6 +23,7 @@ ClientHandler::~ClientHandler()
     DBG(120, "Destructor");
 }
 
+/*
 void ClientHandler::setSharedMemPointer(ClientHandlerSHMPointer_t SharedMemPointer) {
     _SHMStaticFS = SharedMemPointer.StaticFSPtr;
     _SHMPythonASMeta = SharedMemPointer.PostASMetaPtr;
@@ -40,6 +41,7 @@ void ClientHandler::setClientHandlerConfig() {
 ASRequestHandler& ClientHandler::getClientHandlerASRequestHandlerRef() {
     return *_ASRequestHandlerRef;
 }
+*/
 
 void ClientHandler::addClient(const uint16_t ClientFD)
 {
@@ -92,7 +94,7 @@ void ClientHandler::processClients()
     }
 
     //- process appserver queue
-    ProcessedClients += _ASRequestHandlerRef->processQueue();
+    //ProcessedClients += _ASRequestHandlerRef->processQueue();
 }
 
 void ClientHandler::readClientData(const uint16_t FDCount)
@@ -125,15 +127,7 @@ void ClientHandler::readClientData(const uint16_t FDCount)
         else {
             //- if filedescriptor exists in map, append buffer data
             if (Clients.contains(ReadFD)) {
-
                 //Clients[ReadFD].appendBuffer(Buffer, RcvBytes);
-                ClientsVector[0].appendBuffer(Buffer, RcvBytes);
-
-                /*
-                if (ClientRef->processRequests(SHMGetRequests, _ASRequestHandlerRef) > 0) {
-                    ++ProcessedClients;
-                }
-                */
             }
         }
     }