Commit: 413aa1297e01ff71d29ac47319dad485c2139acf - FlyingHttpServer (git)

C++ベースのLightweightなHTTPサーバー

Commit MetaInfo

• Revision: 413aa1297e01ff71d29ac47319dad485c2139acf (tree)
• Time: 2013-03-17 13:51:41
• Author: Michio Hirai <smg_ykz@user...>
• Commiter: Michio Hirai

Log Message

[Function] Addition of PROCESS macro in conjunction with cm_main library introduction.
1:

Change Summary

• modified: CMakeLists.txt
• modified: cm/CMakeLists.txt
• add: cm/cm_main.cpp
• add: cm/test/cm_main_sample.cpp
• add: inc/cm_process.h

Incremental Difference

--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,6 +40,20 @@ function(cxx_library_static libname link_libs)
   set_property(DIRECTORY APPEND PROPERTY DIR_LIB_TARGETS "${libname}")
 endfunction(cxx_library_static)
 
+# function cxx_executable(<executable_name> "lib1;lib2;..."
+#                         followed by source files"
+function(cxx_executable exename link_libs)
+  add_executable(${exename} ${ARGN})
+  target_link_libraries(${exename} "cm_main")
+  target_link_libraries(${exename} "stdc++")
+  foreach(li ${link_libs})
+    target_link_libraries(${exename} ${li})
+  endforeach(li)
+  set_property(DIRECTORY APPEND PROPERTY DIR_TEST_TARGETS "${exename}")
+  add_test(${exename} ${CMAKE_CURRENT_BINARY_DIR}/${exename})
+endfunction(cxx_executable)
+
+
 # function gmock_executable(<executable_name> "lib1;lib2;..."
 #                           followed by source files)
 function(gmock_executable exename link_libs)

--- a/cm/CMakeLists.txt
+++ b/cm/CMakeLists.txt
@@ -25,6 +25,10 @@ cxx_library_static(cm_socket ""
   cm_vector_socket.cpp
 )
 
+cxx_library_static(cm_main ""
+  cm_main.cpp
+)
+
 gmock_executable(cm_thread_test "cm_thread"
   test/cm_thread_test.cpp
   test/cm_mutex_test.cpp
@@ -43,5 +47,9 @@ gmock_executable(cm_vector_socket_test "cm_socket;"
   test/cm_vector_socket_test.cpp
 )
 
+cxx_executable(cm_main_test ""
+  test/cm_main_sample.cpp
+)
+
 enable_coverage()
 

--- /dev/null
+++ b/cm/cm_main.cpp
@@ -0,0 +1,14 @@
+
+#include "cm_process.h"
+#include "cm_thread_name_macro.h"
+
+const char* getProcessName();
+
+int doProcess(int argc, char *argv[]);
+
+int main(int argc, char *argv[])
+{
+    SETNAME(gettid(), getProcessName());
+    return doProcess(argc, argv);
+}
+

--- /dev/null
+++ b/cm/test/cm_main_sample.cpp
@@ -0,0 +1,13 @@
+
+#include <iostream>
+
+#include "cm_process.h"
+#include "mt_unuse.h"
+
+PROCESS(hello_sample)
+{
+    mt::unuse(argc);
+    mt::unuse(argv);
+    std::cout << "Hello World!!" << std::endl;
+}
+

--- /dev/null
+++ b/inc/cm_process.h
@@ -0,0 +1,14 @@
+
+#ifndef INC_CM_PROCESS_H_
+#define INC_CM_PROCESS_H_
+
+#include "cm_thread_name_macro.h"
+
+#define PROCESS(procname) \
+const char* getProcessName() \
+{ \
+    return "#procname" ; \
+} \
+int doProcess(int argc, char *argv[])
+
+#endif // INC_CM_PROCESS_H_