From 4bf1fc0a7e9a4611fc322ebe1cb39a671aa2ed57 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期二, 21 七月 2020 11:59:23 +0800
Subject: [PATCH] reconstruct

---
 src/queue/include/array_lock_free_queue.h  |    0 
 src/queue/include/hashtable.h              |    0 
 src/queue/include/shm_mm.h                 |    0 
 Makefile                                   |    2 +-
 src/queue/shm_queue_wrapper.c              |    0 
 src/queue/include/mem_pool.h               |    0 
 src/queue/mm.c                             |    0 
 src/socket/mod_socket.c                    |    0 
 src/util/sem_util.h                        |    0 
 src/queue/include/linked_lock_free_queue.h |    0 
 src/queue/socket.c.bk                      |    0 
 src/queue/include/lock_free_queue.h        |    0 
 src/socket/include/shm_socket.h            |    0 
 src/libshm_queue.a                         |    0 
 src/socket/shm_socket.c                    |    0 
 src/queue/include/shm_queue.h              |    0 
 src/queue/libshm_queue.so                  |    0 
 src/util/sem_util.c                        |    0 
 src/queue/include/array_lock_free_queue2.h |    0 
 src/queue/libshm_queue.a                   |    0 
 src/socket/include/mod_socket.h            |    0 
 src/queue/shm_mm.c                         |    0 
 src/queue/include/mm.h                     |    0 
 src/queue/include/shm_allocator.h          |    0 
 src/queue/hashtable.c                      |    0 
 src/queue/include/shm_queue_wrapper.h      |    0 
 src/Makefile                               |    7 ++++---
 src/logger_factory.h                       |    0 
 28 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 783077a..adac55f 100755
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-DIRS = queue test test2 demo
+DIRS = src test test2 demo
 
 all:
 	for i in $(DIRS); do \
diff --git a/queue/Makefile b/src/Makefile
similarity index 81%
rename from queue/Makefile
rename to src/Makefile
index 3c8a4e2..2ab0bb5 100644
--- a/queue/Makefile
+++ b/src/Makefile
@@ -9,7 +9,8 @@
 # 寮�婧愬伐鍏峰寘
 LDLIBS += -lusgcommon
 
-#INCLUDE += -I$(ROOT)/device/include
+MINCLUDE := -I./queue -I./queue/include -I./socket -I./socket/include -I./util -I./util/include
+INCLUDE += $(MINCLUDE)
 
 PLATFORM=$(shell $(ROOT)/systype.sh)
 include $(ROOT)/Make.defines.$(PLATFORM)
@@ -17,7 +18,7 @@
 LIBSQUEUE = libshm_queue.a
 DLIBSQUEUE = libshm_queue.so
 
-SOURCES := $(wildcard *.c)
+SOURCES := $(wildcard *.c ./queue/*.c ./socket/*.c ./util/*.c)
 OBJS   = $(patsubst %.c, %.o, $(SOURCES)) 
 
 MYLIBS = $(LIBSQUEUE) $(DLIBSQUEUE)
@@ -54,7 +55,7 @@
 	install -d $(PREFIX)/lib/
 	install -m 644 $^ $(PREFIX)/lib/
 	install -d $(PREFIX)/include/
-	install -m 644 include/* $(PREFIX)/include/
+	install -m 644 $(MINCLUDE)/* $(PREFIX)/include/
 
 clean:
 	rm -f $(TEMPFILES)
diff --git a/src/libshm_queue.a b/src/libshm_queue.a
new file mode 100644
index 0000000..1406c9b
--- /dev/null
+++ b/src/libshm_queue.a
Binary files differ
diff --git a/queue/logger_factory.h b/src/logger_factory.h
similarity index 100%
rename from queue/logger_factory.h
rename to src/logger_factory.h
diff --git a/queue/hashtable.c b/src/queue/hashtable.c
similarity index 100%
rename from queue/hashtable.c
rename to src/queue/hashtable.c
diff --git a/queue/include/array_lock_free_queue.h b/src/queue/include/array_lock_free_queue.h
similarity index 100%
rename from queue/include/array_lock_free_queue.h
rename to src/queue/include/array_lock_free_queue.h
diff --git a/queue/include/array_lock_free_queue2.h b/src/queue/include/array_lock_free_queue2.h
similarity index 100%
rename from queue/include/array_lock_free_queue2.h
rename to src/queue/include/array_lock_free_queue2.h
diff --git a/queue/hashtable.h b/src/queue/include/hashtable.h
similarity index 100%
rename from queue/hashtable.h
rename to src/queue/include/hashtable.h
diff --git a/queue/include/linked_lock_free_queue.h b/src/queue/include/linked_lock_free_queue.h
similarity index 100%
rename from queue/include/linked_lock_free_queue.h
rename to src/queue/include/linked_lock_free_queue.h
diff --git a/queue/include/lock_free_queue.h b/src/queue/include/lock_free_queue.h
similarity index 100%
rename from queue/include/lock_free_queue.h
rename to src/queue/include/lock_free_queue.h
diff --git a/queue/include/mem_pool.h b/src/queue/include/mem_pool.h
similarity index 100%
rename from queue/include/mem_pool.h
rename to src/queue/include/mem_pool.h
diff --git a/queue/include/mm.h b/src/queue/include/mm.h
similarity index 100%
rename from queue/include/mm.h
rename to src/queue/include/mm.h
diff --git a/queue/include/shm_allocator.h b/src/queue/include/shm_allocator.h
similarity index 100%
rename from queue/include/shm_allocator.h
rename to src/queue/include/shm_allocator.h
diff --git a/queue/include/shm_mm.h b/src/queue/include/shm_mm.h
similarity index 100%
rename from queue/include/shm_mm.h
rename to src/queue/include/shm_mm.h
diff --git a/queue/include/shm_queue.h b/src/queue/include/shm_queue.h
similarity index 100%
rename from queue/include/shm_queue.h
rename to src/queue/include/shm_queue.h
diff --git a/queue/include/shm_queue_wrapper.h b/src/queue/include/shm_queue_wrapper.h
similarity index 100%
rename from queue/include/shm_queue_wrapper.h
rename to src/queue/include/shm_queue_wrapper.h
diff --git a/queue/libshm_queue.a b/src/queue/libshm_queue.a
similarity index 100%
rename from queue/libshm_queue.a
rename to src/queue/libshm_queue.a
Binary files differ
diff --git a/queue/libshm_queue.so b/src/queue/libshm_queue.so
similarity index 100%
rename from queue/libshm_queue.so
rename to src/queue/libshm_queue.so
Binary files differ
diff --git a/queue/mm.c b/src/queue/mm.c
similarity index 100%
rename from queue/mm.c
rename to src/queue/mm.c
diff --git a/queue/shm_mm.c b/src/queue/shm_mm.c
similarity index 100%
rename from queue/shm_mm.c
rename to src/queue/shm_mm.c
diff --git a/queue/shm_queue_wrapper.c b/src/queue/shm_queue_wrapper.c
similarity index 100%
rename from queue/shm_queue_wrapper.c
rename to src/queue/shm_queue_wrapper.c
diff --git a/queue/socket.c.bk b/src/queue/socket.c.bk
similarity index 100%
rename from queue/socket.c.bk
rename to src/queue/socket.c.bk
diff --git a/queue/include/mod_socket.h b/src/socket/include/mod_socket.h
similarity index 100%
rename from queue/include/mod_socket.h
rename to src/socket/include/mod_socket.h
diff --git a/queue/include/shm_socket.h b/src/socket/include/shm_socket.h
similarity index 100%
rename from queue/include/shm_socket.h
rename to src/socket/include/shm_socket.h
diff --git a/queue/mod_socket.c b/src/socket/mod_socket.c
similarity index 100%
rename from queue/mod_socket.c
rename to src/socket/mod_socket.c
diff --git a/queue/shm_socket.c b/src/socket/shm_socket.c
similarity index 100%
rename from queue/shm_socket.c
rename to src/socket/shm_socket.c
diff --git a/queue/sem_util.c b/src/util/sem_util.c
similarity index 100%
rename from queue/sem_util.c
rename to src/util/sem_util.c
diff --git a/queue/sem_util.h b/src/util/sem_util.h
similarity index 100%
rename from queue/sem_util.h
rename to src/util/sem_util.h

--
Gitblit v1.8.0