From 5bb7b7629d6ca854820a09d09b5938187c8c4336 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期五, 08 一月 2021 12:51:21 +0800
Subject: [PATCH] update
---
src/queue/lock_free_queue.h | 4
Makefile | 234 +++++++++
src/Makefile | 799 +++++++++++++++++++++++++++++++---
test_net_socket/Makefile | 290 +++++++++++-
4 files changed, 1,208 insertions(+), 119 deletions(-)
diff --git a/Makefile b/Makefile
old mode 100755
new mode 100644
index df8a65d..a9c9f8c
--- a/Makefile
+++ b/Makefile
@@ -1,18 +1,224 @@
-# debug "make --just-print"
-DIRS = src test_net_socket
-TAR_NAME = shm_queue.tar.gz
+# CMAKE generated file: DO NOT EDIT!
+# Generated by "Unix Makefiles" Generator, CMake Version 3.5
-all:
- @for i in $(DIRS); do \
- (cd $$i && echo ">>>>>> making $$i ..." && $(MAKE) ) || exit 1; \
- done
+# Default target executed when no arguments are given to make.
+default_target: all
+.PHONY : default_target
+
+# Allow only one "make -f Makefile2" at a time, but pass parallelism.
+.NOTPARALLEL:
+
+
+#=============================================================================
+# Special targets provided by cmake.
+
+# Disable implicit rules so canonical targets will work.
+.SUFFIXES:
+
+
+# Remove some rules from gmake that .SUFFIXES does not remove.
+SUFFIXES =
+
+.SUFFIXES: .hpux_make_needs_suffix_list
+
+
+# Suppress display of executed commands.
+$(VERBOSE).SILENT:
+
+
+# A target that is always out of date.
+cmake_force:
+
+.PHONY : cmake_force
+
+#=============================================================================
+# Set environment variables for the build.
+
+# The shell in which to execute make rules.
+SHELL = /bin/sh
+
+# The CMake executable.
+CMAKE_COMMAND = /usr/bin/cmake
+
+# The command to remove a file.
+RM = /usr/bin/cmake -E remove -f
+
+# Escaping for special characters.
+EQUALS = =
+
+# The top-level source directory on which CMake was run.
+CMAKE_SOURCE_DIR = /home/wzq/wk/c_softbus
+
+# The top-level build directory on which CMake was run.
+CMAKE_BINARY_DIR = /home/wzq/wk/c_softbus
+
+#=============================================================================
+# Targets provided globally by CMake.
+
+# Special rule for the target install
+install: preinstall
+ @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
+ /usr/bin/cmake -P cmake_install.cmake
+.PHONY : install
+
+# Special rule for the target install
+install/fast: preinstall/fast
+ @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
+ /usr/bin/cmake -P cmake_install.cmake
+.PHONY : install/fast
+
+# Special rule for the target list_install_components
+list_install_components:
+ @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Available install components are: \"Unspecified\""
+.PHONY : list_install_components
+
+# Special rule for the target list_install_components
+list_install_components/fast: list_install_components
+
+.PHONY : list_install_components/fast
+
+# Special rule for the target install/strip
+install/strip: preinstall
+ @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..."
+ /usr/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
+.PHONY : install/strip
+
+# Special rule for the target install/strip
+install/strip/fast: install/strip
+
+.PHONY : install/strip/fast
+
+# Special rule for the target install/local
+install/local: preinstall
+ @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
+ /usr/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
+.PHONY : install/local
+
+# Special rule for the target install/local
+install/local/fast: install/local
+
+.PHONY : install/local/fast
+
+# Special rule for the target rebuild_cache
+rebuild_cache:
+ @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
+ /usr/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+.PHONY : rebuild_cache
+
+# Special rule for the target rebuild_cache
+rebuild_cache/fast: rebuild_cache
+
+.PHONY : rebuild_cache/fast
+
+# Special rule for the target edit_cache
+edit_cache:
+ @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "No interactive CMake dialog available..."
+ /usr/bin/cmake -E echo No\ interactive\ CMake\ dialog\ available.
+.PHONY : edit_cache
+
+# Special rule for the target edit_cache
+edit_cache/fast: edit_cache
+
+.PHONY : edit_cache/fast
+
+# The main all target
+all: cmake_check_build_system
+ $(CMAKE_COMMAND) -E cmake_progress_start /home/wzq/wk/c_softbus/CMakeFiles /home/wzq/wk/c_softbus/CMakeFiles/progress.marks
+ $(MAKE) -f CMakeFiles/Makefile2 all
+ $(CMAKE_COMMAND) -E cmake_progress_start /home/wzq/wk/c_softbus/CMakeFiles 0
+.PHONY : all
+
+# The main clean target
clean:
- @for i in $(DIRS); do \
- (cd $$i && echo ">>>>>> cleaning $$i ..." && $(MAKE) clean) || exit 1; \
- done
-
+ $(MAKE) -f CMakeFiles/Makefile2 clean
+.PHONY : clean
-tar:
- rm -f $(TAR_NAME)
- git archive --format tar.gz --output $(TAR_NAME) master
\ No newline at end of file
+# The main clean target
+clean/fast: clean
+
+.PHONY : clean/fast
+
+# Prepare targets for installation.
+preinstall: all
+ $(MAKE) -f CMakeFiles/Makefile2 preinstall
+.PHONY : preinstall
+
+# Prepare targets for installation.
+preinstall/fast:
+ $(MAKE) -f CMakeFiles/Makefile2 preinstall
+.PHONY : preinstall/fast
+
+# clear depends
+depend:
+ $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
+.PHONY : depend
+
+#=============================================================================
+# Target rules for targets named shm_queue
+
+# Build rule for target.
+shm_queue: cmake_check_build_system
+ $(MAKE) -f CMakeFiles/Makefile2 shm_queue
+.PHONY : shm_queue
+
+# fast build rule for target.
+shm_queue/fast:
+ $(MAKE) -f src/CMakeFiles/shm_queue.dir/build.make src/CMakeFiles/shm_queue.dir/build
+.PHONY : shm_queue/fast
+
+#=============================================================================
+# Target rules for targets named test_net_mod_socket
+
+# Build rule for target.
+test_net_mod_socket: cmake_check_build_system
+ $(MAKE) -f CMakeFiles/Makefile2 test_net_mod_socket
+.PHONY : test_net_mod_socket
+
+# fast build rule for target.
+test_net_mod_socket/fast:
+ $(MAKE) -f test_net_socket/CMakeFiles/test_net_mod_socket.dir/build.make test_net_socket/CMakeFiles/test_net_mod_socket.dir/build
+.PHONY : test_net_mod_socket/fast
+
+#=============================================================================
+# Target rules for targets named heart_beat
+
+# Build rule for target.
+heart_beat: cmake_check_build_system
+ $(MAKE) -f CMakeFiles/Makefile2 heart_beat
+.PHONY : heart_beat
+
+# fast build rule for target.
+heart_beat/fast:
+ $(MAKE) -f test_net_socket/CMakeFiles/heart_beat.dir/build.make test_net_socket/CMakeFiles/heart_beat.dir/build
+.PHONY : heart_beat/fast
+
+# Help Target
+help:
+ @echo "The following are some of the valid targets for this Makefile:"
+ @echo "... all (the default if no target is provided)"
+ @echo "... clean"
+ @echo "... depend"
+ @echo "... install"
+ @echo "... list_install_components"
+ @echo "... install/strip"
+ @echo "... install/local"
+ @echo "... rebuild_cache"
+ @echo "... edit_cache"
+ @echo "... shm_queue"
+ @echo "... test_net_mod_socket"
+ @echo "... heart_beat"
+.PHONY : help
+
+
+
+#=============================================================================
+# Special targets to cleanup operation of make.
+
+# Special rule to run CMake to check the build system integrity.
+# No rule that depends on this can have commands that come from listfiles
+# because they might be regenerated.
+cmake_check_build_system:
+ $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
+.PHONY : cmake_check_build_system
+
diff --git a/src/Makefile b/src/Makefile
index b126aa1..c39cb2f 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,91 +1,738 @@
-#
-# Makefile for common library.
-#
-ROOT := ..
-PLATFORM=$(shell $(ROOT)/systype.sh)
-include $(ROOT)/Make.defines.$(PLATFORM)
+# CMAKE generated file: DO NOT EDIT!
+# Generated by "Unix Makefiles" Generator, CMake Version 3.5
-PREFIX = $(DEST)
+# Default target executed when no arguments are given to make.
+default_target: all
-LIBSQUEUE = $(DEST)/lib/libshm_queue.a
-DLIBSQUEUE = $(DEST)/lib/libshm_queue.so
+.PHONY : default_target
+
+# Allow only one "make -f Makefile2" at a time, but pass parallelism.
+.NOTPARALLEL:
-# 寮�婧愬伐鍏峰寘
-LDLIBS += -lusgcommon
+#=============================================================================
+# Special targets provided by cmake.
-#-I$(ROOT)/include/usgcommon
-
-INCLUDES += -I./shm -I./queue -I./socket -I$(ROOT)/include/usgcommon
-
-SOURCES := $(wildcard *.cpp ./**/*.cpp)
-OBJS = $(patsubst %.cpp, $(DEST)/%.o, $(SOURCES))
-DEPENDENCES = $(patsubst %.cpp, $(DEST)/%.d, $(SOURCES))
-
-# MYLIBS = $(LIBCOMMON) $(DLIBCOMMON)
-
-ifeq ($(DEBUG),y)
- MYLIBS = $(LIBSQUEUE)
-else
- MYLIBS = $(LIBSQUEUE) $(DLIBSQUEUE)
-endif
-
-#PREFIX is environment variable, but if it is not set, then set default value
-ifeq ($(PREFIX),)
- PREFIX := /usr/local
-endif
-
-all: build
-
-
-.PHONY: build
-build: prebuild $(MYLIBS)
- cp $(ROOT)/.gdbinit $(DEST)
- # mkdir -p $(DEST)/lib
- # cp $(MYLIBS) $(DEST)/lib
- # mkdir -p $(DEST)/include/shmqueue
- # cp ./*.h ./queue/*.h ./socket/*.h $(DEST)/include/shmqueue
- # cp $(ROOT)/lib/* $(DEST)/lib
-
-.PHONY: prebuild
-prebuild:
- @test -d $(DEST)/lib || mkdir -p $(DEST)/lib
-
-#static lib
-$(LIBSQUEUE): $(OBJS)
- @echo '>>>>>>' generating $@ ...
- @$(AR) rv $@ $?
- @$(RANLIB) $@
-
-#dynamic lib
-$(DLIBSQUEUE): $(SOURCES)
- @echo '>>>>>>' generating $@ ...
- $(CC) -fPIC -shared $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $^ -o $@ $(LDLIBS)
+# Disable implicit rules so canonical targets will work.
+.SUFFIXES:
+# Remove some rules from gmake that .SUFFIXES does not remove.
+SUFFIXES =
-# 浣跨敤鏂瑰紡锛� g++ test1.cpp -lcommon
-.PHONY: install
-install: $(MYLIBS)
- @echo '>>>>>>' installing $^ ...
- install -d $(PREFIX)/lib/
- install -m 644 $^ $(PREFIX)/lib/
- install -d $(PREFIX)/include/shmqueue
- install -m 644 ./*.h ./shm/*.h ./queue/*.h ./socket/*.h $(PREFIX)/include/shmqueue
+.SUFFIXES: .hpux_make_needs_suffix_list
-.PHONY: uninstall
-uninstall:
- @echo '>>>>>>' uninstalling ...
- rm -rf $(PREFIX)/include/shmqueue
- rm -f $(PREFIX)/lib/shmqueue.*
+# Suppress display of executed commands.
+$(VERBOSE).SILENT:
-.PHONY: clean
+# A target that is always out of date.
+cmake_force:
+
+.PHONY : cmake_force
+
+#=============================================================================
+# Set environment variables for the build.
+
+# The shell in which to execute make rules.
+SHELL = /bin/sh
+
+# The CMake executable.
+CMAKE_COMMAND = /usr/bin/cmake
+
+# The command to remove a file.
+RM = /usr/bin/cmake -E remove -f
+
+# Escaping for special characters.
+EQUALS = =
+
+# The top-level source directory on which CMake was run.
+CMAKE_SOURCE_DIR = /home/wzq/wk/c_softbus
+
+# The top-level build directory on which CMake was run.
+CMAKE_BINARY_DIR = /home/wzq/wk/c_softbus
+
+#=============================================================================
+# Targets provided globally by CMake.
+
+# Special rule for the target rebuild_cache
+rebuild_cache:
+ @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
+ /usr/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+.PHONY : rebuild_cache
+
+# Special rule for the target rebuild_cache
+rebuild_cache/fast: rebuild_cache
+
+.PHONY : rebuild_cache/fast
+
+# Special rule for the target install
+install: preinstall
+ @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
+ /usr/bin/cmake -P cmake_install.cmake
+.PHONY : install
+
+# Special rule for the target install
+install/fast: preinstall/fast
+ @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
+ /usr/bin/cmake -P cmake_install.cmake
+.PHONY : install/fast
+
+# Special rule for the target list_install_components
+list_install_components:
+ @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Available install components are: \"Unspecified\""
+.PHONY : list_install_components
+
+# Special rule for the target list_install_components
+list_install_components/fast: list_install_components
+
+.PHONY : list_install_components/fast
+
+# Special rule for the target install/strip
+install/strip: preinstall
+ @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..."
+ /usr/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
+.PHONY : install/strip
+
+# Special rule for the target install/strip
+install/strip/fast: install/strip
+
+.PHONY : install/strip/fast
+
+# Special rule for the target install/local
+install/local: preinstall
+ @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
+ /usr/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
+.PHONY : install/local
+
+# Special rule for the target install/local
+install/local/fast: install/local
+
+.PHONY : install/local/fast
+
+# Special rule for the target edit_cache
+edit_cache:
+ @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "No interactive CMake dialog available..."
+ /usr/bin/cmake -E echo No\ interactive\ CMake\ dialog\ available.
+.PHONY : edit_cache
+
+# Special rule for the target edit_cache
+edit_cache/fast: edit_cache
+
+.PHONY : edit_cache/fast
+
+# The main all target
+all: cmake_check_build_system
+ cd /home/wzq/wk/c_softbus && $(CMAKE_COMMAND) -E cmake_progress_start /home/wzq/wk/c_softbus/CMakeFiles /home/wzq/wk/c_softbus/src/CMakeFiles/progress.marks
+ cd /home/wzq/wk/c_softbus && $(MAKE) -f CMakeFiles/Makefile2 src/all
+ $(CMAKE_COMMAND) -E cmake_progress_start /home/wzq/wk/c_softbus/CMakeFiles 0
+.PHONY : all
+
+# The main clean target
clean:
- rm -f $(OBJS) $(MYLIBS) $(DEPENDENCES) $(TEMPFILES)
- rm -rf $(DEST)/*
+ cd /home/wzq/wk/c_softbus && $(MAKE) -f CMakeFiles/Makefile2 src/clean
+.PHONY : clean
+
+# The main clean target
+clean/fast: clean
+
+.PHONY : clean/fast
+
+# Prepare targets for installation.
+preinstall: all
+ cd /home/wzq/wk/c_softbus && $(MAKE) -f CMakeFiles/Makefile2 src/preinstall
+.PHONY : preinstall
+
+# Prepare targets for installation.
+preinstall/fast:
+ cd /home/wzq/wk/c_softbus && $(MAKE) -f CMakeFiles/Makefile2 src/preinstall
+.PHONY : preinstall/fast
+
+# clear depends
+depend:
+ cd /home/wzq/wk/c_softbus && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
+.PHONY : depend
+
+# Convenience name for target.
+src/CMakeFiles/shm_queue.dir/rule:
+ cd /home/wzq/wk/c_softbus && $(MAKE) -f CMakeFiles/Makefile2 src/CMakeFiles/shm_queue.dir/rule
+.PHONY : src/CMakeFiles/shm_queue.dir/rule
+
+# Convenience name for target.
+shm_queue: src/CMakeFiles/shm_queue.dir/rule
+
+.PHONY : shm_queue
+
+# fast build rule for target.
+shm_queue/fast:
+ cd /home/wzq/wk/c_softbus && $(MAKE) -f src/CMakeFiles/shm_queue.dir/build.make src/CMakeFiles/shm_queue.dir/build
+.PHONY : shm_queue/fast
+
+bus_error.o: bus_error.cpp.o
+
+.PHONY : bus_error.o
+
+# target to build an object file
+bus_error.cpp.o:
+ cd /home/wzq/wk/c_softbus && $(MAKE) -f src/CMakeFiles/shm_queue.dir/build.make src/CMakeFiles/shm_queue.dir/bus_error.cpp.o
+.PHONY : bus_error.cpp.o
+
+bus_error.i: bus_error.cpp.i
+
+.PHONY : bus_error.i
+
+# target to preprocess a source file
+bus_error.cpp.i:
+ cd /home/wzq/wk/c_softbus && $(MAKE) -f src/CMakeFiles/shm_queue.dir/build.make src/CMakeFiles/shm_queue.dir/bus_error.cpp.i
+.PHONY : bus_error.cpp.i
+
+bus_error.s: bus_error.cpp.s
+
+.PHONY : bus_error.s
+
+# target to generate assembly for a file
+bus_error.cpp.s:
+ cd /home/wzq/wk/c_softbus && $(MAKE) -f src/CMakeFiles/shm_queue.dir/build.make src/CMakeFiles/shm_queue.dir/bus_error.cpp.s
+.PHONY : bus_error.cpp.s
+
+logger_factory.o: logger_factory.cpp.o
+
+.PHONY : logger_factory.o
+
+# target to build an object file
+logger_factory.cpp.o:
+ cd /home/wzq/wk/c_softbus && $(MAKE) -f src/CMakeFiles/shm_queue.dir/build.make src/CMakeFiles/shm_queue.dir/logger_factory.cpp.o
+.PHONY : logger_factory.cpp.o
+
+logger_factory.i: logger_factory.cpp.i
+
+.PHONY : logger_factory.i
+
+# target to preprocess a source file
+logger_factory.cpp.i:
+ cd /home/wzq/wk/c_softbus && $(MAKE) -f src/CMakeFiles/shm_queue.dir/build.make src/CMakeFiles/shm_queue.dir/logger_factory.cpp.i
+.PHONY : logger_factory.cpp.i
+
+logger_factory.s: logger_factory.cpp.s
+
+.PHONY : logger_factory.s
+
+# target to generate assembly for a file
+logger_factory.cpp.s:
+ cd /home/wzq/wk/c_softbus && $(MAKE) -f src/CMakeFiles/shm_queue.dir/build.make src/CMakeFiles/shm_queue.dir/logger_factory.cpp.s
+.PHONY : logger_factory.cpp.s
+
+px_sem_util.o: px_sem_util.cpp.o
+
+.PHONY : px_sem_util.o
+
+# target to build an object file
+px_sem_util.cpp.o:
+ cd /home/wzq/wk/c_softbus && $(MAKE) -f src/CMakeFiles/shm_queue.dir/build.make src/CMakeFiles/shm_queue.dir/px_sem_util.cpp.o
+.PHONY : px_sem_util.cpp.o
+
+px_sem_util.i: px_sem_util.cpp.i
+
+.PHONY : px_sem_util.i
+
+# target to preprocess a source file
+px_sem_util.cpp.i:
+ cd /home/wzq/wk/c_softbus && $(MAKE) -f src/CMakeFiles/shm_queue.dir/build.make src/CMakeFiles/shm_queue.dir/px_sem_util.cpp.i
+.PHONY : px_sem_util.cpp.i
+
+px_sem_util.s: px_sem_util.cpp.s
+
+.PHONY : px_sem_util.s
+
+# target to generate assembly for a file
+px_sem_util.cpp.s:
+ cd /home/wzq/wk/c_softbus && $(MAKE) -f src/CMakeFiles/shm_queue.dir/build.make src/CMakeFiles/shm_queue.dir/px_sem_util.cpp.s
+.PHONY : px_sem_util.cpp.s
+
+queue/shm_queue_wrapper.o: queue/shm_queue_wrapper.cpp.o
+
+.PHONY : queue/shm_queue_wrapper.o
+
+# target to build an object file
+queue/shm_queue_wrapper.cpp.o:
+ cd /home/wzq/wk/c_softbus && $(MAKE) -f src/CMakeFiles/shm_queue.dir/build.make src/CMakeFiles/shm_queue.dir/queue/shm_queue_wrapper.cpp.o
+.PHONY : queue/shm_queue_wrapper.cpp.o
+
+queue/shm_queue_wrapper.i: queue/shm_queue_wrapper.cpp.i
+
+.PHONY : queue/shm_queue_wrapper.i
+
+# target to preprocess a source file
+queue/shm_queue_wrapper.cpp.i:
+ cd /home/wzq/wk/c_softbus && $(MAKE) -f src/CMakeFiles/shm_queue.dir/build.make src/CMakeFiles/shm_queue.dir/queue/shm_queue_wrapper.cpp.i
+.PHONY : queue/shm_queue_wrapper.cpp.i
+
+queue/shm_queue_wrapper.s: queue/shm_queue_wrapper.cpp.s
+
+.PHONY : queue/shm_queue_wrapper.s
+
+# target to generate assembly for a file
+queue/shm_queue_wrapper.cpp.s:
+ cd /home/wzq/wk/c_softbus && $(MAKE) -f src/CMakeFiles/shm_queue.dir/build.make src/CMakeFiles/shm_queue.dir/queue/shm_queue_wrapper.cpp.s
+.PHONY : queue/shm_queue_wrapper.cpp.s
+
+shm/hashtable.o: shm/hashtable.cpp.o
+
+.PHONY : shm/hashtable.o
+
+# target to build an object file
+shm/hashtable.cpp.o:
+ cd /home/wzq/wk/c_softbus && $(MAKE) -f src/CMakeFiles/shm_queue.dir/build.make src/CMakeFiles/shm_queue.dir/shm/hashtable.cpp.o
+.PHONY : shm/hashtable.cpp.o
+
+shm/hashtable.i: shm/hashtable.cpp.i
+
+.PHONY : shm/hashtable.i
+
+# target to preprocess a source file
+shm/hashtable.cpp.i:
+ cd /home/wzq/wk/c_softbus && $(MAKE) -f src/CMakeFiles/shm_queue.dir/build.make src/CMakeFiles/shm_queue.dir/shm/hashtable.cpp.i
+.PHONY : shm/hashtable.cpp.i
+
+shm/hashtable.s: shm/hashtable.cpp.s
+
+.PHONY : shm/hashtable.s
+
+# target to generate assembly for a file
+shm/hashtable.cpp.s:
+ cd /home/wzq/wk/c_softbus && $(MAKE) -f src/CMakeFiles/shm_queue.dir/build.make src/CMakeFiles/shm_queue.dir/shm/hashtable.cpp.s
+.PHONY : shm/hashtable.cpp.s
+
+shm/mm.o: shm/mm.cpp.o
+
+.PHONY : shm/mm.o
+
+# target to build an object file
+shm/mm.cpp.o:
+ cd /home/wzq/wk/c_softbus && $(MAKE) -f src/CMakeFiles/shm_queue.dir/build.make src/CMakeFiles/shm_queue.dir/shm/mm.cpp.o
+.PHONY : shm/mm.cpp.o
+
+shm/mm.i: shm/mm.cpp.i
+
+.PHONY : shm/mm.i
+
+# target to preprocess a source file
+shm/mm.cpp.i:
+ cd /home/wzq/wk/c_softbus && $(MAKE) -f src/CMakeFiles/shm_queue.dir/build.make src/CMakeFiles/shm_queue.dir/shm/mm.cpp.i
+.PHONY : shm/mm.cpp.i
+
+shm/mm.s: shm/mm.cpp.s
+
+.PHONY : shm/mm.s
+
+# target to generate assembly for a file
+shm/mm.cpp.s:
+ cd /home/wzq/wk/c_softbus && $(MAKE) -f src/CMakeFiles/shm_queue.dir/build.make src/CMakeFiles/shm_queue.dir/shm/mm.cpp.s
+.PHONY : shm/mm.cpp.s
+
+shm/shm_mm_wrapper.o: shm/shm_mm_wrapper.cpp.o
+
+.PHONY : shm/shm_mm_wrapper.o
+
+# target to build an object file
+shm/shm_mm_wrapper.cpp.o:
+ cd /home/wzq/wk/c_softbus && $(MAKE) -f src/CMakeFiles/shm_queue.dir/build.make src/CMakeFiles/shm_queue.dir/shm/shm_mm_wrapper.cpp.o
+.PHONY : shm/shm_mm_wrapper.cpp.o
+
+shm/shm_mm_wrapper.i: shm/shm_mm_wrapper.cpp.i
+
+.PHONY : shm/shm_mm_wrapper.i
+
+# target to preprocess a source file
+shm/shm_mm_wrapper.cpp.i:
+ cd /home/wzq/wk/c_softbus && $(MAKE) -f src/CMakeFiles/shm_queue.dir/build.make src/CMakeFiles/shm_queue.dir/shm/shm_mm_wrapper.cpp.i
+.PHONY : shm/shm_mm_wrapper.cpp.i
+
+shm/shm_mm_wrapper.s: shm/shm_mm_wrapper.cpp.s
+
+.PHONY : shm/shm_mm_wrapper.s
+
+# target to generate assembly for a file
+shm/shm_mm_wrapper.cpp.s:
+ cd /home/wzq/wk/c_softbus && $(MAKE) -f src/CMakeFiles/shm_queue.dir/build.make src/CMakeFiles/shm_queue.dir/shm/shm_mm_wrapper.cpp.s
+.PHONY : shm/shm_mm_wrapper.cpp.s
+
+socket/bus_server_socket.o: socket/bus_server_socket.cpp.o
+
+.PHONY : socket/bus_server_socket.o
+
+# target to build an object file
+socket/bus_server_socket.cpp.o:
+ cd /home/wzq/wk/c_softbus && $(MAKE) -f src/CMakeFiles/shm_queue.dir/build.make src/CMakeFiles/shm_queue.dir/socket/bus_server_socket.cpp.o
+.PHONY : socket/bus_server_socket.cpp.o
+
+socket/bus_server_socket.i: socket/bus_server_socket.cpp.i
+
+.PHONY : socket/bus_server_socket.i
+
+# target to preprocess a source file
+socket/bus_server_socket.cpp.i:
+ cd /home/wzq/wk/c_softbus && $(MAKE) -f src/CMakeFiles/shm_queue.dir/build.make src/CMakeFiles/shm_queue.dir/socket/bus_server_socket.cpp.i
+.PHONY : socket/bus_server_socket.cpp.i
+
+socket/bus_server_socket.s: socket/bus_server_socket.cpp.s
+
+.PHONY : socket/bus_server_socket.s
+
+# target to generate assembly for a file
+socket/bus_server_socket.cpp.s:
+ cd /home/wzq/wk/c_softbus && $(MAKE) -f src/CMakeFiles/shm_queue.dir/build.make src/CMakeFiles/shm_queue.dir/socket/bus_server_socket.cpp.s
+.PHONY : socket/bus_server_socket.cpp.s
+
+socket/bus_server_socket_wrapper.o: socket/bus_server_socket_wrapper.cpp.o
+
+.PHONY : socket/bus_server_socket_wrapper.o
+
+# target to build an object file
+socket/bus_server_socket_wrapper.cpp.o:
+ cd /home/wzq/wk/c_softbus && $(MAKE) -f src/CMakeFiles/shm_queue.dir/build.make src/CMakeFiles/shm_queue.dir/socket/bus_server_socket_wrapper.cpp.o
+.PHONY : socket/bus_server_socket_wrapper.cpp.o
+
+socket/bus_server_socket_wrapper.i: socket/bus_server_socket_wrapper.cpp.i
+
+.PHONY : socket/bus_server_socket_wrapper.i
+
+# target to preprocess a source file
+socket/bus_server_socket_wrapper.cpp.i:
+ cd /home/wzq/wk/c_softbus && $(MAKE) -f src/CMakeFiles/shm_queue.dir/build.make src/CMakeFiles/shm_queue.dir/socket/bus_server_socket_wrapper.cpp.i
+.PHONY : socket/bus_server_socket_wrapper.cpp.i
+
+socket/bus_server_socket_wrapper.s: socket/bus_server_socket_wrapper.cpp.s
+
+.PHONY : socket/bus_server_socket_wrapper.s
+
+# target to generate assembly for a file
+socket/bus_server_socket_wrapper.cpp.s:
+ cd /home/wzq/wk/c_softbus && $(MAKE) -f src/CMakeFiles/shm_queue.dir/build.make src/CMakeFiles/shm_queue.dir/socket/bus_server_socket_wrapper.cpp.s
+.PHONY : socket/bus_server_socket_wrapper.cpp.s
+
+socket/net_conn_pool.o: socket/net_conn_pool.cpp.o
+
+.PHONY : socket/net_conn_pool.o
+
+# target to build an object file
+socket/net_conn_pool.cpp.o:
+ cd /home/wzq/wk/c_softbus && $(MAKE) -f src/CMakeFiles/shm_queue.dir/build.make src/CMakeFiles/shm_queue.dir/socket/net_conn_pool.cpp.o
+.PHONY : socket/net_conn_pool.cpp.o
+
+socket/net_conn_pool.i: socket/net_conn_pool.cpp.i
+
+.PHONY : socket/net_conn_pool.i
+
+# target to preprocess a source file
+socket/net_conn_pool.cpp.i:
+ cd /home/wzq/wk/c_softbus && $(MAKE) -f src/CMakeFiles/shm_queue.dir/build.make src/CMakeFiles/shm_queue.dir/socket/net_conn_pool.cpp.i
+.PHONY : socket/net_conn_pool.cpp.i
+
+socket/net_conn_pool.s: socket/net_conn_pool.cpp.s
+
+.PHONY : socket/net_conn_pool.s
+
+# target to generate assembly for a file
+socket/net_conn_pool.cpp.s:
+ cd /home/wzq/wk/c_softbus && $(MAKE) -f src/CMakeFiles/shm_queue.dir/build.make src/CMakeFiles/shm_queue.dir/socket/net_conn_pool.cpp.s
+.PHONY : socket/net_conn_pool.cpp.s
+
+socket/net_mod_server_socket.o: socket/net_mod_server_socket.cpp.o
+
+.PHONY : socket/net_mod_server_socket.o
+
+# target to build an object file
+socket/net_mod_server_socket.cpp.o:
+ cd /home/wzq/wk/c_softbus && $(MAKE) -f src/CMakeFiles/shm_queue.dir/build.make src/CMakeFiles/shm_queue.dir/socket/net_mod_server_socket.cpp.o
+.PHONY : socket/net_mod_server_socket.cpp.o
+
+socket/net_mod_server_socket.i: socket/net_mod_server_socket.cpp.i
+
+.PHONY : socket/net_mod_server_socket.i
+
+# target to preprocess a source file
+socket/net_mod_server_socket.cpp.i:
+ cd /home/wzq/wk/c_softbus && $(MAKE) -f src/CMakeFiles/shm_queue.dir/build.make src/CMakeFiles/shm_queue.dir/socket/net_mod_server_socket.cpp.i
+.PHONY : socket/net_mod_server_socket.cpp.i
+
+socket/net_mod_server_socket.s: socket/net_mod_server_socket.cpp.s
+
+.PHONY : socket/net_mod_server_socket.s
+
+# target to generate assembly for a file
+socket/net_mod_server_socket.cpp.s:
+ cd /home/wzq/wk/c_softbus && $(MAKE) -f src/CMakeFiles/shm_queue.dir/build.make src/CMakeFiles/shm_queue.dir/socket/net_mod_server_socket.cpp.s
+.PHONY : socket/net_mod_server_socket.cpp.s
+
+socket/net_mod_server_socket_wrapper.o: socket/net_mod_server_socket_wrapper.cpp.o
+
+.PHONY : socket/net_mod_server_socket_wrapper.o
+
+# target to build an object file
+socket/net_mod_server_socket_wrapper.cpp.o:
+ cd /home/wzq/wk/c_softbus && $(MAKE) -f src/CMakeFiles/shm_queue.dir/build.make src/CMakeFiles/shm_queue.dir/socket/net_mod_server_socket_wrapper.cpp.o
+.PHONY : socket/net_mod_server_socket_wrapper.cpp.o
+
+socket/net_mod_server_socket_wrapper.i: socket/net_mod_server_socket_wrapper.cpp.i
+
+.PHONY : socket/net_mod_server_socket_wrapper.i
+
+# target to preprocess a source file
+socket/net_mod_server_socket_wrapper.cpp.i:
+ cd /home/wzq/wk/c_softbus && $(MAKE) -f src/CMakeFiles/shm_queue.dir/build.make src/CMakeFiles/shm_queue.dir/socket/net_mod_server_socket_wrapper.cpp.i
+.PHONY : socket/net_mod_server_socket_wrapper.cpp.i
+
+socket/net_mod_server_socket_wrapper.s: socket/net_mod_server_socket_wrapper.cpp.s
+
+.PHONY : socket/net_mod_server_socket_wrapper.s
+
+# target to generate assembly for a file
+socket/net_mod_server_socket_wrapper.cpp.s:
+ cd /home/wzq/wk/c_softbus && $(MAKE) -f src/CMakeFiles/shm_queue.dir/build.make src/CMakeFiles/shm_queue.dir/socket/net_mod_server_socket_wrapper.cpp.s
+.PHONY : socket/net_mod_server_socket_wrapper.cpp.s
+
+socket/net_mod_socket.o: socket/net_mod_socket.cpp.o
+
+.PHONY : socket/net_mod_socket.o
+
+# target to build an object file
+socket/net_mod_socket.cpp.o:
+ cd /home/wzq/wk/c_softbus && $(MAKE) -f src/CMakeFiles/shm_queue.dir/build.make src/CMakeFiles/shm_queue.dir/socket/net_mod_socket.cpp.o
+.PHONY : socket/net_mod_socket.cpp.o
+
+socket/net_mod_socket.i: socket/net_mod_socket.cpp.i
+
+.PHONY : socket/net_mod_socket.i
+
+# target to preprocess a source file
+socket/net_mod_socket.cpp.i:
+ cd /home/wzq/wk/c_softbus && $(MAKE) -f src/CMakeFiles/shm_queue.dir/build.make src/CMakeFiles/shm_queue.dir/socket/net_mod_socket.cpp.i
+.PHONY : socket/net_mod_socket.cpp.i
+
+socket/net_mod_socket.s: socket/net_mod_socket.cpp.s
+
+.PHONY : socket/net_mod_socket.s
+
+# target to generate assembly for a file
+socket/net_mod_socket.cpp.s:
+ cd /home/wzq/wk/c_softbus && $(MAKE) -f src/CMakeFiles/shm_queue.dir/build.make src/CMakeFiles/shm_queue.dir/socket/net_mod_socket.cpp.s
+.PHONY : socket/net_mod_socket.cpp.s
+
+socket/net_mod_socket_io.o: socket/net_mod_socket_io.cpp.o
+
+.PHONY : socket/net_mod_socket_io.o
+
+# target to build an object file
+socket/net_mod_socket_io.cpp.o:
+ cd /home/wzq/wk/c_softbus && $(MAKE) -f src/CMakeFiles/shm_queue.dir/build.make src/CMakeFiles/shm_queue.dir/socket/net_mod_socket_io.cpp.o
+.PHONY : socket/net_mod_socket_io.cpp.o
+
+socket/net_mod_socket_io.i: socket/net_mod_socket_io.cpp.i
+
+.PHONY : socket/net_mod_socket_io.i
+
+# target to preprocess a source file
+socket/net_mod_socket_io.cpp.i:
+ cd /home/wzq/wk/c_softbus && $(MAKE) -f src/CMakeFiles/shm_queue.dir/build.make src/CMakeFiles/shm_queue.dir/socket/net_mod_socket_io.cpp.i
+.PHONY : socket/net_mod_socket_io.cpp.i
+
+socket/net_mod_socket_io.s: socket/net_mod_socket_io.cpp.s
+
+.PHONY : socket/net_mod_socket_io.s
+
+# target to generate assembly for a file
+socket/net_mod_socket_io.cpp.s:
+ cd /home/wzq/wk/c_softbus && $(MAKE) -f src/CMakeFiles/shm_queue.dir/build.make src/CMakeFiles/shm_queue.dir/socket/net_mod_socket_io.cpp.s
+.PHONY : socket/net_mod_socket_io.cpp.s
+
+socket/net_mod_socket_wrapper.o: socket/net_mod_socket_wrapper.cpp.o
+
+.PHONY : socket/net_mod_socket_wrapper.o
+
+# target to build an object file
+socket/net_mod_socket_wrapper.cpp.o:
+ cd /home/wzq/wk/c_softbus && $(MAKE) -f src/CMakeFiles/shm_queue.dir/build.make src/CMakeFiles/shm_queue.dir/socket/net_mod_socket_wrapper.cpp.o
+.PHONY : socket/net_mod_socket_wrapper.cpp.o
+
+socket/net_mod_socket_wrapper.i: socket/net_mod_socket_wrapper.cpp.i
+
+.PHONY : socket/net_mod_socket_wrapper.i
+
+# target to preprocess a source file
+socket/net_mod_socket_wrapper.cpp.i:
+ cd /home/wzq/wk/c_softbus && $(MAKE) -f src/CMakeFiles/shm_queue.dir/build.make src/CMakeFiles/shm_queue.dir/socket/net_mod_socket_wrapper.cpp.i
+.PHONY : socket/net_mod_socket_wrapper.cpp.i
+
+socket/net_mod_socket_wrapper.s: socket/net_mod_socket_wrapper.cpp.s
+
+.PHONY : socket/net_mod_socket_wrapper.s
+
+# target to generate assembly for a file
+socket/net_mod_socket_wrapper.cpp.s:
+ cd /home/wzq/wk/c_softbus && $(MAKE) -f src/CMakeFiles/shm_queue.dir/build.make src/CMakeFiles/shm_queue.dir/socket/net_mod_socket_wrapper.cpp.s
+.PHONY : socket/net_mod_socket_wrapper.cpp.s
+
+socket/shm_mod_socket.o: socket/shm_mod_socket.cpp.o
+
+.PHONY : socket/shm_mod_socket.o
+
+# target to build an object file
+socket/shm_mod_socket.cpp.o:
+ cd /home/wzq/wk/c_softbus && $(MAKE) -f src/CMakeFiles/shm_queue.dir/build.make src/CMakeFiles/shm_queue.dir/socket/shm_mod_socket.cpp.o
+.PHONY : socket/shm_mod_socket.cpp.o
+
+socket/shm_mod_socket.i: socket/shm_mod_socket.cpp.i
+
+.PHONY : socket/shm_mod_socket.i
+
+# target to preprocess a source file
+socket/shm_mod_socket.cpp.i:
+ cd /home/wzq/wk/c_softbus && $(MAKE) -f src/CMakeFiles/shm_queue.dir/build.make src/CMakeFiles/shm_queue.dir/socket/shm_mod_socket.cpp.i
+.PHONY : socket/shm_mod_socket.cpp.i
+
+socket/shm_mod_socket.s: socket/shm_mod_socket.cpp.s
+
+.PHONY : socket/shm_mod_socket.s
+
+# target to generate assembly for a file
+socket/shm_mod_socket.cpp.s:
+ cd /home/wzq/wk/c_softbus && $(MAKE) -f src/CMakeFiles/shm_queue.dir/build.make src/CMakeFiles/shm_queue.dir/socket/shm_mod_socket.cpp.s
+.PHONY : socket/shm_mod_socket.cpp.s
+
+socket/shm_socket.o: socket/shm_socket.cpp.o
+
+.PHONY : socket/shm_socket.o
+
+# target to build an object file
+socket/shm_socket.cpp.o:
+ cd /home/wzq/wk/c_softbus && $(MAKE) -f src/CMakeFiles/shm_queue.dir/build.make src/CMakeFiles/shm_queue.dir/socket/shm_socket.cpp.o
+.PHONY : socket/shm_socket.cpp.o
+
+socket/shm_socket.i: socket/shm_socket.cpp.i
+
+.PHONY : socket/shm_socket.i
+
+# target to preprocess a source file
+socket/shm_socket.cpp.i:
+ cd /home/wzq/wk/c_softbus && $(MAKE) -f src/CMakeFiles/shm_queue.dir/build.make src/CMakeFiles/shm_queue.dir/socket/shm_socket.cpp.i
+.PHONY : socket/shm_socket.cpp.i
+
+socket/shm_socket.s: socket/shm_socket.cpp.s
+
+.PHONY : socket/shm_socket.s
+
+# target to generate assembly for a file
+socket/shm_socket.cpp.s:
+ cd /home/wzq/wk/c_softbus && $(MAKE) -f src/CMakeFiles/shm_queue.dir/build.make src/CMakeFiles/shm_queue.dir/socket/shm_socket.cpp.s
+.PHONY : socket/shm_socket.cpp.s
+
+socket/shm_stream_mod_socket.o: socket/shm_stream_mod_socket.cpp.o
+
+.PHONY : socket/shm_stream_mod_socket.o
+
+# target to build an object file
+socket/shm_stream_mod_socket.cpp.o:
+ cd /home/wzq/wk/c_softbus && $(MAKE) -f src/CMakeFiles/shm_queue.dir/build.make src/CMakeFiles/shm_queue.dir/socket/shm_stream_mod_socket.cpp.o
+.PHONY : socket/shm_stream_mod_socket.cpp.o
+
+socket/shm_stream_mod_socket.i: socket/shm_stream_mod_socket.cpp.i
+
+.PHONY : socket/shm_stream_mod_socket.i
+
+# target to preprocess a source file
+socket/shm_stream_mod_socket.cpp.i:
+ cd /home/wzq/wk/c_softbus && $(MAKE) -f src/CMakeFiles/shm_queue.dir/build.make src/CMakeFiles/shm_queue.dir/socket/shm_stream_mod_socket.cpp.i
+.PHONY : socket/shm_stream_mod_socket.cpp.i
+
+socket/shm_stream_mod_socket.s: socket/shm_stream_mod_socket.cpp.s
+
+.PHONY : socket/shm_stream_mod_socket.s
+
+# target to generate assembly for a file
+socket/shm_stream_mod_socket.cpp.s:
+ cd /home/wzq/wk/c_softbus && $(MAKE) -f src/CMakeFiles/shm_queue.dir/build.make src/CMakeFiles/shm_queue.dir/socket/shm_stream_mod_socket.cpp.s
+.PHONY : socket/shm_stream_mod_socket.cpp.s
+
+# Help Target
+help:
+ @echo "The following are some of the valid targets for this Makefile:"
+ @echo "... all (the default if no target is provided)"
+ @echo "... clean"
+ @echo "... depend"
+ @echo "... rebuild_cache"
+ @echo "... install"
+ @echo "... list_install_components"
+ @echo "... shm_queue"
+ @echo "... install/strip"
+ @echo "... install/local"
+ @echo "... edit_cache"
+ @echo "... bus_error.o"
+ @echo "... bus_error.i"
+ @echo "... bus_error.s"
+ @echo "... logger_factory.o"
+ @echo "... logger_factory.i"
+ @echo "... logger_factory.s"
+ @echo "... px_sem_util.o"
+ @echo "... px_sem_util.i"
+ @echo "... px_sem_util.s"
+ @echo "... queue/shm_queue_wrapper.o"
+ @echo "... queue/shm_queue_wrapper.i"
+ @echo "... queue/shm_queue_wrapper.s"
+ @echo "... shm/hashtable.o"
+ @echo "... shm/hashtable.i"
+ @echo "... shm/hashtable.s"
+ @echo "... shm/mm.o"
+ @echo "... shm/mm.i"
+ @echo "... shm/mm.s"
+ @echo "... shm/shm_mm_wrapper.o"
+ @echo "... shm/shm_mm_wrapper.i"
+ @echo "... shm/shm_mm_wrapper.s"
+ @echo "... socket/bus_server_socket.o"
+ @echo "... socket/bus_server_socket.i"
+ @echo "... socket/bus_server_socket.s"
+ @echo "... socket/bus_server_socket_wrapper.o"
+ @echo "... socket/bus_server_socket_wrapper.i"
+ @echo "... socket/bus_server_socket_wrapper.s"
+ @echo "... socket/net_conn_pool.o"
+ @echo "... socket/net_conn_pool.i"
+ @echo "... socket/net_conn_pool.s"
+ @echo "... socket/net_mod_server_socket.o"
+ @echo "... socket/net_mod_server_socket.i"
+ @echo "... socket/net_mod_server_socket.s"
+ @echo "... socket/net_mod_server_socket_wrapper.o"
+ @echo "... socket/net_mod_server_socket_wrapper.i"
+ @echo "... socket/net_mod_server_socket_wrapper.s"
+ @echo "... socket/net_mod_socket.o"
+ @echo "... socket/net_mod_socket.i"
+ @echo "... socket/net_mod_socket.s"
+ @echo "... socket/net_mod_socket_io.o"
+ @echo "... socket/net_mod_socket_io.i"
+ @echo "... socket/net_mod_socket_io.s"
+ @echo "... socket/net_mod_socket_wrapper.o"
+ @echo "... socket/net_mod_socket_wrapper.i"
+ @echo "... socket/net_mod_socket_wrapper.s"
+ @echo "... socket/shm_mod_socket.o"
+ @echo "... socket/shm_mod_socket.i"
+ @echo "... socket/shm_mod_socket.s"
+ @echo "... socket/shm_socket.o"
+ @echo "... socket/shm_socket.i"
+ @echo "... socket/shm_socket.s"
+ @echo "... socket/shm_stream_mod_socket.o"
+ @echo "... socket/shm_stream_mod_socket.i"
+ @echo "... socket/shm_stream_mod_socket.s"
+.PHONY : help
--include $(DEPENDENCES)
-include $(ROOT)/Make.common.inc
+
+#=============================================================================
+# Special targets to cleanup operation of make.
+
+# Special rule to run CMake to check the build system integrity.
+# No rule that depends on this can have commands that come from listfiles
+# because they might be regenerated.
+cmake_check_build_system:
+ cd /home/wzq/wk/c_softbus && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
+.PHONY : cmake_check_build_system
+
diff --git a/src/queue/lock_free_queue.h b/src/queue/lock_free_queue.h
index 6a610dc..9e32373 100644
--- a/src/queue/lock_free_queue.h
+++ b/src/queue/lock_free_queue.h
@@ -282,7 +282,7 @@
else if(errno == EINTR)
continue;
else {
- LoggerFactory::getLogger()->error(errno, "LockFreeQueue push_timeout");
+ // LoggerFactory::getLogger()->error(errno, "LockFreeQueue push_timeout");
return false;
}
}
@@ -359,7 +359,7 @@
else if(errno == EINTR)
continue;
else {
- LoggerFactory::getLogger()->error(errno, "LockFreeQueue pop_timeout");
+ // LoggerFactory::getLogger()->error(errno, "LockFreeQueue pop_timeout");
return false;
}
}
diff --git a/test_net_socket/Makefile b/test_net_socket/Makefile
index 94734be..31bbec7 100644
--- a/test_net_socket/Makefile
+++ b/test_net_socket/Makefile
@@ -1,38 +1,274 @@
+# CMAKE generated file: DO NOT EDIT!
+# Generated by "Unix Makefiles" Generator, CMake Version 3.5
-ROOT := ..
-PLATFORM=$(shell $(ROOT)/systype.sh)
-include $(ROOT)/Make.defines.$(PLATFORM)
+# Default target executed when no arguments are given to make.
+default_target: all
-RPATH += -Wl,-rpath=$(ROOT)/lib:$(DEST)/lib
-# 寮�婧愬伐鍏峰寘璺緞
-LDDIR += -L$(DEST)/lib
+.PHONY : default_target
-#-lusgcommon
-# 寮�婧愬伐鍏峰寘
-LDLIBS += -lshm_queue -lpthread -lusgcommon
-
-#-I$(ROOT)/include/usgcommon
-INCLUDES += -I${ROOT}/src -I${ROOT}/src/shm -I${ROOT}/src/queue -I${ROOT}/src/socket -I${ROOT}/include/usgcommon
-
-PROGS = ${DEST}/test_net_mod_socket ${DEST}/test_bus_stop ${DEST}/heart_beat
-
-DEPENDENCES = $(patsubst %, %.d, $(PROGS))
-
-#LIBCOMMON=${ROOT}/lib/libusgcommon.a
-
-build: $(PROGS)
- cp -a net_mod_socket.sh ${DEST}
- cp -a heart_beat.sh ${DEST}
+# Allow only one "make -f Makefile2" at a time, but pass parallelism.
+.NOTPARALLEL:
+#=============================================================================
+# Special targets provided by cmake.
+
+# Disable implicit rules so canonical targets will work.
+.SUFFIXES:
+
+
+# Remove some rules from gmake that .SUFFIXES does not remove.
+SUFFIXES =
+
+.SUFFIXES: .hpux_make_needs_suffix_list
+
+
+# Suppress display of executed commands.
+$(VERBOSE).SILENT:
+
+
+# A target that is always out of date.
+cmake_force:
+
+.PHONY : cmake_force
+
+#=============================================================================
+# Set environment variables for the build.
+
+# The shell in which to execute make rules.
+SHELL = /bin/sh
+
+# The CMake executable.
+CMAKE_COMMAND = /usr/bin/cmake
+
+# The command to remove a file.
+RM = /usr/bin/cmake -E remove -f
+
+# Escaping for special characters.
+EQUALS = =
+
+# The top-level source directory on which CMake was run.
+CMAKE_SOURCE_DIR = /home/wzq/wk/c_softbus
+
+# The top-level build directory on which CMake was run.
+CMAKE_BINARY_DIR = /home/wzq/wk/c_softbus
+
+#=============================================================================
+# Targets provided globally by CMake.
+
+# Special rule for the target install
+install: preinstall
+ @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
+ /usr/bin/cmake -P cmake_install.cmake
+.PHONY : install
+
+# Special rule for the target install
+install/fast: preinstall/fast
+ @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
+ /usr/bin/cmake -P cmake_install.cmake
+.PHONY : install/fast
+
+# Special rule for the target list_install_components
+list_install_components:
+ @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Available install components are: \"Unspecified\""
+.PHONY : list_install_components
+
+# Special rule for the target list_install_components
+list_install_components/fast: list_install_components
+
+.PHONY : list_install_components/fast
+
+# Special rule for the target rebuild_cache
+rebuild_cache:
+ @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
+ /usr/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+.PHONY : rebuild_cache
+
+# Special rule for the target rebuild_cache
+rebuild_cache/fast: rebuild_cache
+
+.PHONY : rebuild_cache/fast
+
+# Special rule for the target edit_cache
+edit_cache:
+ @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "No interactive CMake dialog available..."
+ /usr/bin/cmake -E echo No\ interactive\ CMake\ dialog\ available.
+.PHONY : edit_cache
+
+# Special rule for the target edit_cache
+edit_cache/fast: edit_cache
+
+.PHONY : edit_cache/fast
+
+# Special rule for the target install/strip
+install/strip: preinstall
+ @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..."
+ /usr/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
+.PHONY : install/strip
+
+# Special rule for the target install/strip
+install/strip/fast: install/strip
+
+.PHONY : install/strip/fast
+
+# Special rule for the target install/local
+install/local: preinstall
+ @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
+ /usr/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
+.PHONY : install/local
+
+# Special rule for the target install/local
+install/local/fast: install/local
+
+.PHONY : install/local/fast
+
+# The main all target
+all: cmake_check_build_system
+ cd /home/wzq/wk/c_softbus && $(CMAKE_COMMAND) -E cmake_progress_start /home/wzq/wk/c_softbus/CMakeFiles /home/wzq/wk/c_softbus/test_net_socket/CMakeFiles/progress.marks
+ cd /home/wzq/wk/c_softbus && $(MAKE) -f CMakeFiles/Makefile2 test_net_socket/all
+ $(CMAKE_COMMAND) -E cmake_progress_start /home/wzq/wk/c_softbus/CMakeFiles 0
+.PHONY : all
+
+# The main clean target
clean:
- rm -f $(PROGS) $(DEPENDENCES) $(TEMPFILES)
+ cd /home/wzq/wk/c_softbus && $(MAKE) -f CMakeFiles/Makefile2 test_net_socket/clean
+.PHONY : clean
-# $(LIBCOMMON):
-# @(cd $(ROOT)/common && $(MAKE))
+# The main clean target
+clean/fast: clean
--include $(DEPENDENCES)
-include $(ROOT)/Make.common.inc
+.PHONY : clean/fast
+
+# Prepare targets for installation.
+preinstall: all
+ cd /home/wzq/wk/c_softbus && $(MAKE) -f CMakeFiles/Makefile2 test_net_socket/preinstall
+.PHONY : preinstall
+
+# Prepare targets for installation.
+preinstall/fast:
+ cd /home/wzq/wk/c_softbus && $(MAKE) -f CMakeFiles/Makefile2 test_net_socket/preinstall
+.PHONY : preinstall/fast
+
+# clear depends
+depend:
+ cd /home/wzq/wk/c_softbus && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
+.PHONY : depend
+
+# Convenience name for target.
+test_net_socket/CMakeFiles/test_net_mod_socket.dir/rule:
+ cd /home/wzq/wk/c_softbus && $(MAKE) -f CMakeFiles/Makefile2 test_net_socket/CMakeFiles/test_net_mod_socket.dir/rule
+.PHONY : test_net_socket/CMakeFiles/test_net_mod_socket.dir/rule
+
+# Convenience name for target.
+test_net_mod_socket: test_net_socket/CMakeFiles/test_net_mod_socket.dir/rule
+
+.PHONY : test_net_mod_socket
+
+# fast build rule for target.
+test_net_mod_socket/fast:
+ cd /home/wzq/wk/c_softbus && $(MAKE) -f test_net_socket/CMakeFiles/test_net_mod_socket.dir/build.make test_net_socket/CMakeFiles/test_net_mod_socket.dir/build
+.PHONY : test_net_mod_socket/fast
+
+# Convenience name for target.
+test_net_socket/CMakeFiles/heart_beat.dir/rule:
+ cd /home/wzq/wk/c_softbus && $(MAKE) -f CMakeFiles/Makefile2 test_net_socket/CMakeFiles/heart_beat.dir/rule
+.PHONY : test_net_socket/CMakeFiles/heart_beat.dir/rule
+
+# Convenience name for target.
+heart_beat: test_net_socket/CMakeFiles/heart_beat.dir/rule
+
+.PHONY : heart_beat
+
+# fast build rule for target.
+heart_beat/fast:
+ cd /home/wzq/wk/c_softbus && $(MAKE) -f test_net_socket/CMakeFiles/heart_beat.dir/build.make test_net_socket/CMakeFiles/heart_beat.dir/build
+.PHONY : heart_beat/fast
+
+heart_beat.o: heart_beat.cpp.o
+
+.PHONY : heart_beat.o
+
+# target to build an object file
+heart_beat.cpp.o:
+ cd /home/wzq/wk/c_softbus && $(MAKE) -f test_net_socket/CMakeFiles/heart_beat.dir/build.make test_net_socket/CMakeFiles/heart_beat.dir/heart_beat.cpp.o
+.PHONY : heart_beat.cpp.o
+
+heart_beat.i: heart_beat.cpp.i
+
+.PHONY : heart_beat.i
+
+# target to preprocess a source file
+heart_beat.cpp.i:
+ cd /home/wzq/wk/c_softbus && $(MAKE) -f test_net_socket/CMakeFiles/heart_beat.dir/build.make test_net_socket/CMakeFiles/heart_beat.dir/heart_beat.cpp.i
+.PHONY : heart_beat.cpp.i
+
+heart_beat.s: heart_beat.cpp.s
+
+.PHONY : heart_beat.s
+
+# target to generate assembly for a file
+heart_beat.cpp.s:
+ cd /home/wzq/wk/c_softbus && $(MAKE) -f test_net_socket/CMakeFiles/heart_beat.dir/build.make test_net_socket/CMakeFiles/heart_beat.dir/heart_beat.cpp.s
+.PHONY : heart_beat.cpp.s
+
+test_net_mod_socket.o: test_net_mod_socket.cpp.o
+
+.PHONY : test_net_mod_socket.o
+
+# target to build an object file
+test_net_mod_socket.cpp.o:
+ cd /home/wzq/wk/c_softbus && $(MAKE) -f test_net_socket/CMakeFiles/test_net_mod_socket.dir/build.make test_net_socket/CMakeFiles/test_net_mod_socket.dir/test_net_mod_socket.cpp.o
+.PHONY : test_net_mod_socket.cpp.o
+
+test_net_mod_socket.i: test_net_mod_socket.cpp.i
+
+.PHONY : test_net_mod_socket.i
+
+# target to preprocess a source file
+test_net_mod_socket.cpp.i:
+ cd /home/wzq/wk/c_softbus && $(MAKE) -f test_net_socket/CMakeFiles/test_net_mod_socket.dir/build.make test_net_socket/CMakeFiles/test_net_mod_socket.dir/test_net_mod_socket.cpp.i
+.PHONY : test_net_mod_socket.cpp.i
+
+test_net_mod_socket.s: test_net_mod_socket.cpp.s
+
+.PHONY : test_net_mod_socket.s
+
+# target to generate assembly for a file
+test_net_mod_socket.cpp.s:
+ cd /home/wzq/wk/c_softbus && $(MAKE) -f test_net_socket/CMakeFiles/test_net_mod_socket.dir/build.make test_net_socket/CMakeFiles/test_net_mod_socket.dir/test_net_mod_socket.cpp.s
+.PHONY : test_net_mod_socket.cpp.s
+
+# Help Target
+help:
+ @echo "The following are some of the valid targets for this Makefile:"
+ @echo "... all (the default if no target is provided)"
+ @echo "... clean"
+ @echo "... depend"
+ @echo "... install"
+ @echo "... list_install_components"
+ @echo "... rebuild_cache"
+ @echo "... edit_cache"
+ @echo "... test_net_mod_socket"
+ @echo "... heart_beat"
+ @echo "... install/strip"
+ @echo "... install/local"
+ @echo "... heart_beat.o"
+ @echo "... heart_beat.i"
+ @echo "... heart_beat.s"
+ @echo "... test_net_mod_socket.o"
+ @echo "... test_net_mod_socket.i"
+ @echo "... test_net_mod_socket.s"
+.PHONY : help
+#=============================================================================
+# Special targets to cleanup operation of make.
+
+# Special rule to run CMake to check the build system integrity.
+# No rule that depends on this can have commands that come from listfiles
+# because they might be regenerated.
+cmake_check_build_system:
+ cd /home/wzq/wk/c_softbus && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
+.PHONY : cmake_check_build_system
+
--
Gitblit v1.8.0