modify some file name and directory structure

Author: zchuango

src/brpc/transport_factory.cpp

@@ -18,7 +18,7 @@
 #include "brpc/transport_factory.h"
 #include "brpc/tcp_transport.h"
 #include "brpc/rdma_transport.h"
-#include "brpc/ub_transport.h"
+#include "brpc/ubshm_transport.h"
 
 namespace brpc {
 int TransportFactory::ContextInitOrDie(SocketMode mode, bool serverOrNot, const void* _options) {

src/brpc/ubring/common/common.h src/brpc/ubshm/common/common.hsrc/brpc/ubring/common/common.h renamed to src/brpc/ubshm/common/common.h

@@ -22,7 +22,7 @@
 #include <fcntl.h>
 #include <semaphore.h>
 #include <pthread.h>
-#include "brpc/ubring/common/common.h"
+#include "brpc/ubshm/common/common.h"
 
 #ifdef __cplusplus
 extern "C" {

src/brpc/ubring/common/thread_lock.h src/brpc/ubshm/common/thread_lock.hsrc/brpc/ubring/common/thread_lock.h renamed to src/brpc/ubshm/common/thread_lock.h

@@ -23,9 +23,9 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <errno.h>
-#include "brpc/ubring/common/common.h"
-#include "brpc/ubring/shm/shm_def.h"
-#include "brpc/ubring/shm/shm_ipc.h"
+#include "brpc/ubshm/common/common.h"
+#include "brpc/ubshm/shm/shm_def.h"
+#include "brpc/ubshm/shm/shm_ipc.h"
 
 namespace brpc {
 namespace ubring {

src/brpc/ubring/shm/shm_def.h src/brpc/ubshm/shm/shm_def.hsrc/brpc/ubring/shm/shm_def.h renamed to src/brpc/ubshm/shm/shm_def.h

@@ -20,10 +20,10 @@
 #include <string.h>
 #include <stdbool.h>
 #include <stdint.h>
-#include "brpc/ubring/common/common.h"
-#include "brpc/ubring/shm/shm_ipc.h"
-#include "brpc/ubring/shm/shm_ubs.h"
-#include "brpc/ubring/shm/shm_mgr.h"
+#include "brpc/ubshm/common/common.h"
+#include "brpc/ubshm/shm/shm_ipc.h"
+#include "brpc/ubshm/shm/shm_ubs.h"
+#include "brpc/ubshm/shm/shm_mgr.h"
 
 namespace brpc {
 namespace ubring {

src/brpc/ubring/shm/shm_ipc.cpp src/brpc/ubshm/shm/shm_ipc.cppsrc/brpc/ubring/shm/shm_ipc.cpp renamed to src/brpc/ubshm/shm/shm_ipc.cpp

@@ -19,8 +19,8 @@
 #define BRPC_SHM_MGR_H
 
 #include <stdint.h>
-#include "brpc/ubring/common/common.h"
-#include "brpc/ubring/shm/shm_def.h"
+#include "brpc/ubshm/common/common.h"
+#include "brpc/ubshm/shm/shm_def.h"
 
 namespace brpc {
 namespace ubring {

src/brpc/ubring/shm/shm_ipc.h src/brpc/ubshm/shm/shm_ipc.hsrc/brpc/ubring/shm/shm_ipc.h renamed to src/brpc/ubshm/shm/shm_ipc.h

@@ -22,13 +22,13 @@
 #include <dlfcn.h>
 #include <time.h>
 #include <gflags/gflags.h>
-#include "brpc/ubring/timer/timer_mgr.h"
-#include "brpc/ubring/common/thread_lock.h"
-#include "brpc/ubring/common/common.h"
-#include "brpc/ubring/shm/shm_def.h"
-#include "brpc/ubring/ub_ring_manager.h"
-#include "brpc/ubring/rack_mem/ubs_mem.h"
-#include "brpc/ubring/rack_mem/ubs_mem_def.h"
+#include "brpc/ubshm/timer/timer_mgr.h"
+#include "brpc/ubshm/common/thread_lock.h"
+#include "brpc/ubshm/common/common.h"
+#include "brpc/ubshm/shm/shm_def.h"
+#include "brpc/ubshm/ub_ring_manager.h"
+#include "brpc/ubshm/ubs_mem/ubs_mem.h"
+#include "brpc/ubshm/ubs_mem/ubs_mem_def.h"
 #ifdef UT
 #include "ubs_mem.h"
 #endif
@@ -37,7 +37,7 @@
 namespace brpc {
 namespace ubring {
 #define UBRING_MK_UBSM(ret, fn, args) ret (*fn) args = NULL
-#include "brpc/ubring/rack_mem/declare_shm_ubs.h"
+#include "brpc/ubshm/ubs_mem/declare_shm_ubs.h"
 #define SHM_RIGHT_MODE 0666
 #define UBRING_REGION_NAME_PREFIX "UbrONE2ALLRegion"
 DEFINE_uint32(node_location, 1, "Location of the ub machine.");
@@ -81,7 +81,7 @@ RETURN_CODE UbsShmInterfacesLoad(void)
             return UBRING_ERR;                                                          \
         }                                                                            \
     } while (0)
-#include "brpc/ubring/rack_mem/declare_shm_ubs.h"
+#include "brpc/ubshm/ubs_mem/declare_shm_ubs.h"
 
     dlclose(dlhandler);
     dlhandler = NULL;