diff --git a/example/test.cpp b/example/example.cpp similarity index 89% rename from example/test.cpp rename to example/example.cpp index cb8afb04..d3f0a4b9 100644 --- a/example/test.cpp +++ b/example/example.cpp @@ -73,10 +73,7 @@ int main(int argc, char* argv[]) } int qsize = atoi(argv[1]); int pushers = atoi(argv[2]); - //int poppers = atoi(argv[3]); - - //testq(qsize, pushers, poppers); - + using namespace std::chrono; @@ -84,14 +81,13 @@ int main(int argc, char* argv[]) auto null_sink = std::make_shared(); auto stdout_sink = std::make_shared(); auto async = std::make_shared(1000); - auto fsink = std::make_shared("newlog", "txt", 1024*1024*50 , 5); - //auto fsink = std::make_shared("daily", "txt"); + auto fsink = std::make_shared("log", "txt", 1024*1024*50 , 5); + - async->add_sink(null_sink); + async->add_sink(fsink); auto &logger = c11log::get_logger("async"); logger.add_sink(async); testq(qsize, pushers); - } diff --git a/example/makefile b/example/makefile index 7b308944..330d3af0 100644 --- a/example/makefile +++ b/example/makefile @@ -3,19 +3,19 @@ CXXFLAGS = -march=native -Wall -Wextra -Wshadow -pedantic -std=c++11 -pthread -I CXX_RELEASE_FLAGS = -O3 -flto CXX_DEBUG_FLAGS= -g -OUTBIN = testme +OUTBIN = example -all: test.cpp - $(CXX) test.cpp -o $(OUTBIN) $(CXXFLAGS) $(CXX_RELEASE_FLAGS) +all: example.cpp + $(CXX) example.cpp -o $(OUTBIN) $(CXXFLAGS) $(CXX_RELEASE_FLAGS) -debug: test.cpp - $(CXX) test.cpp -o $(OUTBIN)-debug $(CXXFLAGS) $(CXX_DEBUG_FLAFS) +debug: example.cpp + $(CXX) example.cpp -o $(OUTBIN)-debug $(CXXFLAGS) $(CXX_DEBUG_FLAFS) clean: - rm -f *.text $(OUTBIN) $(OUTBIN)-debug + rm -f *.txt $(OUTBIN) $(OUTBIN)-debug rebuild: clean all rebuild-debug: clean debug diff --git a/example/makefile.clang b/example/makefile.clang index d9b25f3b..b68f4848 100644 --- a/example/makefile.clang +++ b/example/makefile.clang @@ -1,56 +1,23 @@ -SRC_DIR=../../src - -_SOURCES = factory.cpp formatters.cpp os.cpp - -SOURCES = $(patsubst %,$(SRC_DIR)/%,$(_SOURCES)) -OBJS_RELEASE = $(patsubst %.cpp,release/%.o,$(_SOURCES)) -OBJS_DEBUG = $(patsubst %.cpp,debug/%.o,$(_SOURCES)) - - -CXX = clang++ -CXXFLAGS = -march=native -Wall -Wextra -Wshadow -pedantic -std=c++11 -pthread -I../../include -CXX_RELEASE_FLAGS = -O3 -flto +CXX = clang++ +CXXFLAGS = -march=native -Wall -Wextra -Wshadow -pedantic -std=c++11 -pthread -I../include -B/usr/lib/gold-ld/ +CXX_RELEASE_FLAGS = -O3 -flto CXX_DEBUG_FLAGS= -g -OUTLIB_RELEASE = libc11log.a -OUTLIB_DEBUG = libc11log-debug.a +OUTBIN = example-clang -TEST_RELEASE = testme-clang -TEST_DEBUG = testme-debug-clang - -.PHONY: all mkdirs release debug build clean rebuild - -all: release - -release: CXXFLAGS += $(CXX_RELEASE_FLAGS) -release: mkdirs build-release +all: example.cpp + $(CXX) example.cpp -o $(OUTBIN) $(CXXFLAGS) $(CXX_RELEASE_FLAGS) -debug: CXXFLAGS += $(CXX_DEBUG_FLAGS) -debug: mkdirs build-debug - -mkdirs: - @mkdir -p release debug - -build-release: $(OBJS_RELEASE) - ar rs $(OUTLIB_RELEASE) $^ - $(CXX) $(SRC_DIR)/test.cpp $(OBJS_RELEASE) -o $(TEST_RELEASE) $(CXXFLAGS) -B/usr/lib/gold-ld/ - -build-debug: $(OBJS_DEBUG) - ar --plugin /usr/local/lib/LLVMgold.so rs $(OUTLIB_DEBUG) $^ - $(CXX) $(SRC_DIR)/test.cpp $(OBJS_RELEASE) -o $(TEST_DEBUG) $(CXXFLAGS) -B/usr/lib/gold-ld/ +debug: example.cpp + $(CXX) example.cpp -o $(OUTBIN)-debug $(CXXFLAGS) $(CXX_DEBUG_FLAFS) -release/%.o: $(SRC_DIR)/%.cpp - $(CXX) -c $< -o $@ $(CXXFLAGS) - - - -debug/%.o: $(SRC_DIR)/%.cpp - $(CXX) -c $< -o $@ $(CXXFLAGS) clean: - rm -rf release debug daily.* $(TEST_RELEASE) $(TEST_DEBUG) $(OUTLIB_RELEASE) $(OUTLIB_DEBUG) + rm -f *.txt $(OUTBIN) $(OUTBIN)-debug rebuild: clean all +rebuild-debug: clean debug +