From bedd1d4eadde9ab64f924c69eba716b015599e67 Mon Sep 17 00:00:00 2001 From: dimitri staessens Date: Thu, 12 Oct 2017 02:15:39 +0200 Subject: lib: Deprecate ouroboros_init and ourboros_fini This commit deprecates ouroboros_init and ouroboros_fini and adds them as a constructor or destructor, causing these function to be run automatically when a program that links to the library calls and exits main(). For this to fully work, the library had to be split so that we can avoid the irmd calling these functions (the IRMd has to create the shm structures on which these calls depend). The library is split in 3 parts: libouroboros-dev, libouroboros-irm and libouroboros-common. The latter is linked to the other two so that including libouroboros-dev or libouroboros-irm will also link libouroboros-common. --- src/tools/cbr/CMakeLists.txt | 2 +- src/tools/cbr/cbr.c | 13 ------------- 2 files changed, 1 insertion(+), 14 deletions(-) (limited to 'src/tools/cbr') diff --git a/src/tools/cbr/CMakeLists.txt b/src/tools/cbr/CMakeLists.txt index 1883141c..2a64a65b 100644 --- a/src/tools/cbr/CMakeLists.txt +++ b/src/tools/cbr/CMakeLists.txt @@ -11,6 +11,6 @@ set(SOURCE_FILES add_executable(cbr ${SOURCE_FILES}) -target_link_libraries(cbr LINK_PUBLIC ouroboros) +target_link_libraries(cbr LINK_PUBLIC ouroboros-dev) install(TARGETS cbr RUNTIME DESTINATION usr/bin) diff --git a/src/tools/cbr/cbr.c b/src/tools/cbr/cbr.c index 14613198..afa9b535 100644 --- a/src/tools/cbr/cbr.c +++ b/src/tools/cbr/cbr.c @@ -72,7 +72,6 @@ int main(int argc, char ** argv) int ret = 0; char * rem = NULL; char * s_apn = NULL; - char ** argv_dup = argv; bool server = false; @@ -129,18 +128,8 @@ int main(int argc, char ** argv) } if (server) { - if (ouroboros_init(argv_dup[0]) < 0) { - printf("Failed to init.\n"); - exit(EXIT_FAILURE); - } - ret = server_main(); } else { - if (ouroboros_init(NULL) < 0) { - printf("Failed to init.\n"); - exit(EXIT_FAILURE); - } - if (s_apn == NULL) { printf("No server specified.\n"); usage(); @@ -150,7 +139,5 @@ int main(int argc, char ** argv) ret = client_main(s_apn, duration, size, rate, flood, sleep); } - ouroboros_fini(); - return ret; } -- cgit v1.2.3