Making MPSCRingBuffer and Logging common

Makefile

@@ -1,10 +1,12 @@
 all: libs
+tls: libs
 OUTDIR=./sdk
 LIBDIR=$(OUTDIR)/lib
 INCLUDEDIR=$(OUTDIR)/include
 MODULES=$(sort $(patsubst ./%/,%,$(dir $(wildcard ./*/Makefile))))
 LIBS=$(addprefix $(LIBDIR)/,$(MODULES))
 LIBS:=$(addsuffix .a,$(LIBS))
+tls:TLS=tls
 
 clean-%:
 	-cd $* && make clean
@@ -13,8 +15,8 @@ clean: $(addprefix clean-,$(MODULES))
 	-rm -R $(OUTDIR)
 
 $(LIBDIR)/%.a:%
-	cd $< && make
-	mv $</$<.a $@
+	cd $< && make $(TLS)
+	-mv $</$<.a $@
 	mkdir -p $(INCLUDEDIR)/$<
 	cp $</*.h $(INCLUDEDIR)/$<
 

json/Makefile

@@ -1,4 +1,5 @@
 all: tests
+tls: tests
 OBJECTS = JSON.o List.o Object.o Value.o Parser.o
 SOURCES=$(OBJECTS:.o=.cpp)
 

rest/Makefile

@@ -1,4 +1,5 @@
 all: lib
+tls: lib
 
 
 SOURCESCPP = RESTEngine.cpp RESTCallBack.cpp RESTParameters.cpp

websocket/Logging.cpp → utils/Logging.cpp

@@ -26,7 +26,7 @@ SOFTWARE.
 #include <stdio.h>
 #include <stdarg.h>
 
-using namespace Dumais::WebSocket;
+using namespace Dumais::Utils;
 
 ILogger* Logging::logger = 0;
 

websocket/Logging.h → utils/Logging.h

@@ -25,11 +25,11 @@ SOFTWARE.
 #pragma once
 #include <sstream>
 
-#define LOG(x) {std::stringstream logss; logss << x; Dumais::WebSocket::Logging::log(logss.str());}
+#define LOG(x) {std::stringstream logss; logss << x; Dumais::Utils::Logging::log(logss.str());}
 
 namespace Dumais
 {
-    namespace WebSocket
+    namespace Utils
     {
         class ILogger
         {

websocket/MPSCRingBuffer.h → utils/MPSCRingBuffer.h

@@ -28,7 +28,7 @@ typedef unsigned int uint32_t;
 
 namespace Dumais
 {
-    namespace WebSocket
+    namespace Utils
     {
 
         // Multi-Producer, Single-Consumer, lock-free ring buffer
@@ -96,4 +96,4 @@ namespace Dumais
 
         };
     }
-}
+}

utils/Makefile

@@ -0,0 +1,19 @@
+tls:lib
+EXCEPTIONS=./main.cpp
+SOURCES=$(filter-out $(EXCEPTIONS),$(wildcard ./*.cpp))
+OBJECTS=$(SOURCES:.cpp=.o)
+CFLAGS=-std=c++11 -g
+LDFLAGS=-lpthread -lcurl
+
+clean:
+	-rm *.o
+	-rm *.a
+
+.cpp.o:
+	$(CXX) $(CFLAGS) -c $< -o $@
+
+lib: $(OBJECTS)
+	$(AR) rcs utils.a $(OBJECTS) 
+
+all: lib 
+	#g++ main.o webserver.a -std=c++0x -o test $(LDFLAGS)

webserver/Makefile

@@ -1,10 +1,10 @@
-all: tests
-tls: tests
+all: lib
+tls: lib
 EXCEPTIONS=./main.cpp
 SOURCES=$(filter-out $(EXCEPTIONS),$(wildcard ./*.cpp))
 OBJECTS=$(SOURCES:.cpp=.o)
-CFLAGS=-std=c++11 -g
-LDFLAGS=-lpthread -lcurl
+CFLAGS+=-std=c++11 -g -I ../
+LDFLAGS+=-lpthread -lcurl
 tls:CFLAGS+=-DUSING_OPENSSL
 tls:LDFLAGS+=-lssl -lcrypto
 
@@ -20,4 +20,4 @@ lib: $(OBJECTS)
 	$(AR) rcs webserver.a $(OBJECTS) 
 
 tests: lib main.o
-	g++ main.o webserver.a -std=c++0x -o test $(LDFLAGS)
+	g++ main.o webserver.a ../utils/utils.a -std=c++0x -o test $(LDFLAGS)

webserver/TcpClient.cpp

@@ -8,6 +8,7 @@
 
 #define MAX_INTERNAL_TX_COUNT 4000
 using namespace Dumais::WebServer;
+using namespace Dumais::Utils;
 
 
 TcpClient::TcpClient(ITcpClientContext* ctx, IFramingStrategy* fs)

webserver/TcpClient.h

@@ -4,7 +4,7 @@
 #include <queue>
 #include "ITcpClientContext.h"
 #include "IFramingStrategy.h"
-#include "MPSCRingBuffer.h"
+#include "utils/MPSCRingBuffer.h"
 #include "ISocket.h"
 
 namespace Dumais{
@@ -48,7 +48,7 @@ class TcpClient
         bool mustDeleteBuffer;
     };
 
-    MPSCRingBuffer<SendBuffer>* txList;
+    Dumais::Utils::MPSCRingBuffer<SendBuffer>* txList;
     SendBuffer currentSendBuffer;
     ITcpClientContext* context;
     IFramingStrategy *framingStrategy; 

webserver/TcpServer.cpp

@@ -10,7 +10,7 @@
 #include <netdb.h>
 #include "PlainSocket.h"
 #include "SecureSocket.h"
-#include "WebServerLogging.h"
+#include "utils/Logging.h"
 
 using namespace Dumais::WebServer;
 

websocket/HTTPProtocolParser.cpp

@@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 #include "HTTPProtocolParser.h"
-#include "Logging.h"
+#include "utils/Logging.h"
 #include "sha1.h"
 #include "base64.h"
 #include <sstream>

websocket/Makefile

@@ -1,12 +1,15 @@
-SOURCES = WebSocketServer.cpp WebSocket.cpp Logging.cpp sha1.cpp base64.cpp HTTPProtocolParser.cpp WSProtocolParser.cpp
+SOURCES = WebSocketServer.cpp WebSocket.cpp sha1.cpp base64.cpp HTTPProtocolParser.cpp WSProtocolParser.cpp
 OBJECTS=$(SOURCES:.cpp=.o)
-
+CFLAGS=-I ../ -g -std=c++11
 .cpp.o:
-	g++ -g -std=c++11 -c $< -o $@
+	g++ $(CFLAGS) -c $< -o $@
 
 
 all: lib
-	g++ -g -std=c++11 main.cpp websocket.a
+tls: lib
+
+test: lib
+	g++ -g $(CFLAGS) main.cpp websocket.a
 
 lib: $(OBJECTS)
 	$(AR) rcs websocket.a $(OBJECTS)

websocket/WSProtocolParser.cpp

@@ -1,5 +1,5 @@
 #include "WSProtocolParser.h"
-#include "Logging.h"
+#include "utils/Logging.h"
 #include <string.h>
 
 #define DEFAULT_DATA_SIZE 1024

websocket/WebSocket.cpp

@@ -21,7 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
-#include "Logging.h"
+#include "utils/Logging.h"
 #include "WebSocket.h"
 #include <string.h>
 #include <sstream>
@@ -32,6 +32,7 @@ SOFTWARE.
 #define CLOSING_TIMEOUT 5
 
 using namespace Dumais::WebSocket;
+using namespace Dumais::Utils;
 
 WebSocket::WebSocket(std::function<bool(const std::string& request,
                                          std::map<std::string,std::string> protocols,