This commit is contained in:
gabime 2014-02-20 22:52:22 +02:00
parent 3feba27f8b
commit 2f6a5eabe0
3 changed files with 21 additions and 58 deletions

View File

@ -73,9 +73,6 @@ int main(int argc, char* argv[])
} }
int qsize = atoi(argv[1]); int qsize = atoi(argv[1]);
int pushers = atoi(argv[2]); int pushers = atoi(argv[2]);
//int poppers = atoi(argv[3]);
//testq(qsize, pushers, poppers);
using namespace std::chrono; using namespace std::chrono;
@ -84,14 +81,13 @@ int main(int argc, char* argv[])
auto null_sink = std::make_shared<c11log::sinks::null_sink>(); auto null_sink = std::make_shared<c11log::sinks::null_sink>();
auto stdout_sink = std::make_shared<c11log::sinks::stdout_sink>(); auto stdout_sink = std::make_shared<c11log::sinks::stdout_sink>();
auto async = std::make_shared<c11log::sinks::async_sink>(1000); auto async = std::make_shared<c11log::sinks::async_sink>(1000);
auto fsink = std::make_shared<c11log::sinks::rotating_file_sink>("newlog", "txt", 1024*1024*50 , 5); auto fsink = std::make_shared<c11log::sinks::rotating_file_sink>("log", "txt", 1024*1024*50 , 5);
//auto fsink = std::make_shared<c11log::sinks::daily_file_sink>("daily", "txt");
async->add_sink(null_sink);
async->add_sink(fsink);
auto &logger = c11log::get_logger("async"); auto &logger = c11log::get_logger("async");
logger.add_sink(async); logger.add_sink(async);
testq(qsize, pushers); testq(qsize, pushers);
} }

View File

@ -3,19 +3,19 @@ CXXFLAGS = -march=native -Wall -Wextra -Wshadow -pedantic -std=c++11 -pthread -I
CXX_RELEASE_FLAGS = -O3 -flto CXX_RELEASE_FLAGS = -O3 -flto
CXX_DEBUG_FLAGS= -g CXX_DEBUG_FLAGS= -g
OUTBIN = testme OUTBIN = example
all: test.cpp all: example.cpp
$(CXX) test.cpp -o $(OUTBIN) $(CXXFLAGS) $(CXX_RELEASE_FLAGS) $(CXX) example.cpp -o $(OUTBIN) $(CXXFLAGS) $(CXX_RELEASE_FLAGS)
debug: test.cpp debug: example.cpp
$(CXX) test.cpp -o $(OUTBIN)-debug $(CXXFLAGS) $(CXX_DEBUG_FLAFS) $(CXX) example.cpp -o $(OUTBIN)-debug $(CXXFLAGS) $(CXX_DEBUG_FLAFS)
clean: clean:
rm -f *.text $(OUTBIN) $(OUTBIN)-debug rm -f *.txt $(OUTBIN) $(OUTBIN)-debug
rebuild: clean all rebuild: clean all
rebuild-debug: clean debug rebuild-debug: clean debug

View File

@ -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++ CXX = clang++
CXXFLAGS = -march=native -Wall -Wextra -Wshadow -pedantic -std=c++11 -pthread -I../../include CXXFLAGS = -march=native -Wall -Wextra -Wshadow -pedantic -std=c++11 -pthread -I../include -B/usr/lib/gold-ld/
CXX_RELEASE_FLAGS = -O3 -flto CXX_RELEASE_FLAGS = -O3 -flto
CXX_DEBUG_FLAGS= -g CXX_DEBUG_FLAGS= -g
OUTLIB_RELEASE = libc11log.a OUTBIN = example-clang
OUTLIB_DEBUG = libc11log-debug.a
TEST_RELEASE = testme-clang all: example.cpp
TEST_DEBUG = testme-debug-clang $(CXX) example.cpp -o $(OUTBIN) $(CXXFLAGS) $(CXX_RELEASE_FLAGS)
.PHONY: all mkdirs release debug build clean rebuild
all: release
release: CXXFLAGS += $(CXX_RELEASE_FLAGS)
release: mkdirs build-release
debug: CXXFLAGS += $(CXX_DEBUG_FLAGS) debug: example.cpp
debug: mkdirs build-debug $(CXX) example.cpp -o $(OUTBIN)-debug $(CXXFLAGS) $(CXX_DEBUG_FLAFS)
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/
release/%.o: $(SRC_DIR)/%.cpp
$(CXX) -c $< -o $@ $(CXXFLAGS)
debug/%.o: $(SRC_DIR)/%.cpp
$(CXX) -c $< -o $@ $(CXXFLAGS)
clean: clean:
rm -rf release debug daily.* $(TEST_RELEASE) $(TEST_DEBUG) $(OUTLIB_RELEASE) $(OUTLIB_DEBUG) rm -f *.txt $(OUTBIN) $(OUTBIN)-debug
rebuild: clean all rebuild: clean all
rebuild-debug: clean debug