Source: split code into new directories: mk_bin, mk_server & mk_core

Signed-off-by: Eduardo Silva <eduardo@monkey.io>
monkey · Jun 7, 2015 · 2d09462 · 2d09462
1 parent 67278ac
commit 2d09462
Show file tree

Hide file tree

Showing 47 changed files with 23 additions and 29 deletions.
diff --git a/.gitignore b/.gitignore
@@ -23,3 +23,5 @@ lib/python/bin/*
 lib/python/conf/*
 lib/python/jemalloc.config
 src/include/
+build/
+include/monkey/mk_static_plugins.h
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -290,16 +290,28 @@ configure_file(
 
 
 # General Headers
-include_directories(include/)
-include_directories(src/)
-
-add_subdirectory(plugins/)
+include_directories(./)
+include_directories(include)
+include_directories(monkey)
+
+# Instruct CMake to build the the code base
+# =========================================
+# plugins  : plugins for mk_server
+# mk_core  : generic utilities
+# mk_server: server code base: plugins, protocols, scheduler.. (no executable)
+# mk_bin   : server executable
+#
+add_subdirectory(plugins)
+add_subdirectory(mk_core)
+add_subdirectory(mk_server)
+if(NOT WITHOUT_BIN)
+  add_subdirectory(mk_bin)
+endif()
 
-# Instruct CMake to build the Monkey Core
-add_subdirectory(src/)
-add_subdirectory(conf/)
-add_subdirectory(htdocs/)
-add_subdirectory(include/)
+# Configuration, headers generation and others
+add_subdirectory(conf)
+add_subdirectory(htdocs)
+add_subdirectory(include)
 
 # Install (missings ?) paths
 install(DIRECTORY DESTINATION ${MK_PATH_LOG})

diff --git a/src/monkey.c → mk_bin/monkey.c b/src/monkey.c → mk_bin/monkey.c
@@ -47,8 +47,6 @@ static const char MONKEY_BUILT[] = __DATE__ " " __TIME__;
 static const char MONKEY_BUILT[] = "Unknown";
 #endif
 
-const mk_ptr_t mk_monkey_protocol = mk_ptr_init(MK_HTTP_PROTOCOL_11_STR);
-
 void mk_thread_keys_init(void)
 {
     /* Create thread keys */

diff --git a/src/mk_core/CMakeLists.txt → mk_core/CMakeLists.txt b/src/mk_core/CMakeLists.txt → mk_core/CMakeLists.txt
diff --git a/src/mk_core/include/mk_event.h → mk_core/include/mk_event.h b/src/mk_core/include/mk_event.h → mk_core/include/mk_event.h
diff --git a/src/mk_core/include/mk_event_epoll.h → mk_core/include/mk_event_epoll.h b/src/mk_core/include/mk_event_epoll.h → mk_core/include/mk_event_epoll.h
diff --git a/src/mk_core/include/mk_event_kqueue.h → mk_core/include/mk_event_kqueue.h b/src/mk_core/include/mk_event_kqueue.h → mk_core/include/mk_event_kqueue.h
diff --git a/src/mk_core/include/mk_iov.h → mk_core/include/mk_iov.h b/src/mk_core/include/mk_iov.h → mk_core/include/mk_iov.h
diff --git a/src/mk_core/include/mk_limits.h → mk_core/include/mk_limits.h b/src/mk_core/include/mk_limits.h → mk_core/include/mk_limits.h
diff --git a/src/mk_core/include/mk_list.h → mk_core/include/mk_list.h b/src/mk_core/include/mk_list.h → mk_core/include/mk_list.h
diff --git a/src/mk_core/include/mk_macros.h → mk_core/include/mk_macros.h b/src/mk_core/include/mk_macros.h → mk_core/include/mk_macros.h
diff --git a/src/mk_core/include/mk_memory.h → mk_core/include/mk_memory.h b/src/mk_core/include/mk_memory.h → mk_core/include/mk_memory.h
diff --git a/src/mk_core/include/mk_rbtree.h → mk_core/include/mk_rbtree.h b/src/mk_core/include/mk_rbtree.h → mk_core/include/mk_rbtree.h
diff --git a/src/mk_core/include/mk_rbtree_augmented.h → mk_core/include/mk_rbtree_augmented.h b/src/mk_core/include/mk_rbtree_augmented.h → mk_core/include/mk_rbtree_augmented.h
diff --git a/src/mk_core/include/mk_rconf.h → mk_core/include/mk_rconf.h b/src/mk_core/include/mk_rconf.h → mk_core/include/mk_rconf.h
diff --git a/src/mk_core/include/mk_string.h → mk_core/include/mk_string.h b/src/mk_core/include/mk_string.h → mk_core/include/mk_string.h
diff --git a/src/mk_core/include/mk_utils.h → mk_core/include/mk_utils.h b/src/mk_core/include/mk_utils.h → mk_core/include/mk_utils.h
diff --git a/src/mk_core/mk_core.h → mk_core/mk_core.h b/src/mk_core/mk_core.h → mk_core/mk_core.h
diff --git a/src/mk_core/mk_event.c → mk_core/mk_event.c b/src/mk_core/mk_event.c → mk_core/mk_event.c
diff --git a/src/mk_core/mk_event_epoll.c → mk_core/mk_event_epoll.c b/src/mk_core/mk_event_epoll.c → mk_core/mk_event_epoll.c
diff --git a/src/mk_core/mk_event_kqueue.c → mk_core/mk_event_kqueue.c b/src/mk_core/mk_event_kqueue.c → mk_core/mk_event_kqueue.c
diff --git a/src/mk_core/mk_iov.c → mk_core/mk_iov.c b/src/mk_core/mk_iov.c → mk_core/mk_iov.c
diff --git a/src/mk_core/mk_memory.c → mk_core/mk_memory.c b/src/mk_core/mk_memory.c → mk_core/mk_memory.c
diff --git a/src/mk_core/mk_rbtree.c → mk_core/mk_rbtree.c b/src/mk_core/mk_rbtree.c → mk_core/mk_rbtree.c
diff --git a/src/mk_core/mk_rconf.c → mk_core/mk_rconf.c b/src/mk_core/mk_rconf.c → mk_core/mk_rconf.c
diff --git a/src/mk_core/mk_string.c → mk_core/mk_string.c b/src/mk_core/mk_string.c → mk_core/mk_string.c
diff --git a/src/mk_core/mk_utils.c → mk_core/mk_utils.c b/src/mk_core/mk_utils.c → mk_core/mk_utils.c
diff --git a/src/CMakeLists.txt → mk_server/CMakeLists.txt b/src/CMakeLists.txt → mk_server/CMakeLists.txt
@@ -20,10 +20,6 @@ set(src
   )
 
 
-add_subdirectory(mk_core)
-
-include_directories(./)
-
 # Always build a static library, thats our core :)
 add_library(monkey-core-static STATIC ${src})
 set_target_properties(monkey-core-static PROPERTIES OUTPUT_NAME monkey)
@@ -37,17 +33,3 @@ endif()
 if(WITH_LINUX_KQUEUE)
   target_link_libraries(monkey-core-static kqueue)
 endif()
-
-# Build the binary
-if(NOT WITHOUT_BIN)
-  add_executable(monkey-bin monkey.c)
-  target_link_libraries(monkey-bin monkey-core-static)
-  set_target_properties(monkey-bin PROPERTIES OUTPUT_NAME monkey)
-endif()
-
-
-if(BUILD_LOCAL)
-  set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/")
-else()
-  install(TARGETS monkey-bin RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_SBINDIR})
-endif()
diff --git a/src/contrib/uclib/sys_siglist.h → mk_server/contrib/uclib/sys_siglist.h b/src/contrib/uclib/sys_siglist.h → mk_server/contrib/uclib/sys_siglist.h
diff --git a/src/mk_cache.c → mk_server/mk_cache.c b/src/mk_cache.c → mk_server/mk_cache.c
diff --git a/src/mk_clock.c → mk_server/mk_clock.c b/src/mk_clock.c → mk_server/mk_clock.c
diff --git a/src/mk_config.c → mk_server/mk_config.c b/src/mk_config.c → mk_server/mk_config.c
diff --git a/src/mk_file.c → mk_server/mk_file.c b/src/mk_file.c → mk_server/mk_file.c
diff --git a/src/mk_header.c → mk_server/mk_header.c b/src/mk_header.c → mk_server/mk_header.c
diff --git a/src/mk_http.c → mk_server/mk_http.c b/src/mk_http.c → mk_server/mk_http.c
diff --git a/src/mk_http_parser.c → mk_server/mk_http_parser.c b/src/mk_http_parser.c → mk_server/mk_http_parser.c
diff --git a/src/mk_kernel.c → mk_server/mk_kernel.c b/src/mk_kernel.c → mk_server/mk_kernel.c
diff --git a/src/mk_mimetype.c → mk_server/mk_mimetype.c b/src/mk_mimetype.c → mk_server/mk_mimetype.c
diff --git a/src/mk_plugin.c → mk_server/mk_plugin.c b/src/mk_plugin.c → mk_server/mk_plugin.c
diff --git a/src/mk_scheduler.c → mk_server/mk_scheduler.c b/src/mk_scheduler.c → mk_server/mk_scheduler.c
diff --git a/src/mk_server.c → mk_server/mk_server.c b/src/mk_server.c → mk_server/mk_server.c
diff --git a/src/mk_signals.c → mk_server/mk_signals.c b/src/mk_signals.c → mk_server/mk_signals.c
diff --git a/src/mk_socket.c → mk_server/mk_socket.c b/src/mk_socket.c → mk_server/mk_socket.c
diff --git a/src/mk_stream.c → mk_server/mk_stream.c b/src/mk_stream.c → mk_server/mk_stream.c
diff --git a/src/mk_user.c → mk_server/mk_user.c b/src/mk_user.c → mk_server/mk_user.c
diff --git a/src/mk_utils.c → mk_server/mk_utils.c b/src/mk_utils.c → mk_server/mk_utils.c
diff --git a/src/mk_vhost.c → mk_server/mk_vhost.c b/src/mk_vhost.c → mk_server/mk_vhost.c