diff options
| author | dimitri staessens <dimitri.staessens@ugent.be> | 2017-10-12 02:15:39 +0200 |
|---|---|---|
| committer | dimitri staessens <dimitri.staessens@ugent.be> | 2017-10-14 13:19:10 +0200 |
| commit | bedd1d4eadde9ab64f924c69eba716b015599e67 (patch) | |
| tree | b521ef89c8752334448bee1582b51dbe97851839 /include | |
| parent | a483bc8597e5c19e796dc55c0587f1a045bc7281 (diff) | |
| download | ouroboros-bedd1d4eadde9ab64f924c69eba716b015599e67.zip ouroboros-bedd1d4eadde9ab64f924c69eba716b015599e67.tar.gz | |
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.
Diffstat (limited to 'include')
| -rw-r--r-- | include/ouroboros/dev.h | 5 | ||||
| -rw-r--r-- | include/ouroboros/wrap/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | include/ouroboros/wrap/ouroboros.i | 3 |
3 files changed, 4 insertions, 7 deletions
diff --git a/include/ouroboros/dev.h b/include/ouroboros/dev.h index 0441179..f64221d 100644 --- a/include/ouroboros/dev.h +++ b/include/ouroboros/dev.h @@ -31,11 +31,6 @@ __BEGIN_DECLS -/* These calls should be removed once we write the ouroboros OS. */ -int ouroboros_init(const char * ap_name); - -void ouroboros_fini(void); - /* Returns flow descriptor, qs updates to supplied QoS. */ int flow_alloc(const char * dst_name, qosspec_t * qs, diff --git a/include/ouroboros/wrap/CMakeLists.txt b/include/ouroboros/wrap/CMakeLists.txt index 4ec42b9..4ffc54a 100644 --- a/include/ouroboros/wrap/CMakeLists.txt +++ b/include/ouroboros/wrap/CMakeLists.txt @@ -32,7 +32,8 @@ else () TYPE MODULE) endif() - swig_link_libraries(ouroboros ${PYTHON_LIBRARIES} ouroboros) + swig_link_libraries(ouroboros ${PYTHON_LIBRARIES} ouroboros-common + ouroboros-dev ouroboros-irm) # Installation directives if (CMAKE_INSTALL_PREFIX STREQUAL "") diff --git a/include/ouroboros/wrap/ouroboros.i b/include/ouroboros/wrap/ouroboros.i index db5e09f..42d78c1 100644 --- a/include/ouroboros/wrap/ouroboros.i +++ b/include/ouroboros/wrap/ouroboros.i @@ -3,7 +3,8 @@ * * SWIG wrapper file * - * Sander Vrijders <sander.vrijders@intec.ugent.be> + * Dimitri Staessens <dimitri.staessens@ugent.be> + * Sander Vrijders <sander.vrijders@ugent.be> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License |