Hi This patchset brings the symbol visibility of all monkey plugins up to speed. This means smaller .so files and faster startup.
- Lauri
>From 88f8cd997460d59338f2c11eab95a9f0c1833d5a Mon Sep 17 00:00:00 2001 From: Lauri Kasanen <[email protected]> Date: Mon, 21 May 2012 19:17:52 +0300 Subject: [PATCH 01/13] logger: don't export unnecessary symbols, save startup time and few kb size Signed-off-by: Lauri Kasanen <[email protected]> --- plugins/logger/logger.c | 15 ++++++--------- plugins/logger/logger.h | 8 +++----- plugins/logger/pointers.h | 11 ++++++++++- 3 files changed, 19 insertions(+), 15 deletions(-) diff --git a/plugins/logger/logger.c b/plugins/logger/logger.c index e412059..9c476e3 100644 --- a/plugins/logger/logger.c +++ b/plugins/logger/logger.c @@ -33,9 +33,6 @@ #include <pthread.h> #include <unistd.h> -/* Monkey Plugin Interface */ -#include "MKPlugin.h" - /* Local Headers */ #include "logger.h" #include "pointers.h" @@ -70,7 +67,7 @@ static struct status_response response_codes[] = { }; -char *mk_logger_match_by_fd(int fd) +static char *mk_logger_match_by_fd(int fd) { struct mk_list *head; struct log_target *entry; @@ -89,7 +86,7 @@ char *mk_logger_match_by_fd(int fd) return NULL; } -struct log_target *mk_logger_match_by_host(struct host *host) +static struct log_target *mk_logger_match_by_host(struct host *host) { struct mk_list *head; struct log_target *entry; @@ -104,12 +101,12 @@ struct log_target *mk_logger_match_by_host(struct host *host) return NULL; } -struct iov *mk_logger_get_cache() +static struct iov *mk_logger_get_cache() { return pthread_getspecific(_mkp_data); } -void *mk_logger_worker_init(void *args) +static void *mk_logger_worker_init(void *args) { int efd, max_events = mk_api->config->nhosts; int i, bytes, err; @@ -231,7 +228,7 @@ void *mk_logger_worker_init(void *args) } } -int mk_logger_read_config(char *path) +static int mk_logger_read_config(char *path) { int timeout; char *logfilename = NULL; @@ -275,7 +272,7 @@ int mk_logger_read_config(char *path) return 0; } -void mk_logger_print_details(void) +static void mk_logger_print_details(void) { time_t now; struct tm *current; diff --git a/plugins/logger/logger.h b/plugins/logger/logger.h index 0189a61..6c4cb53 100644 --- a/plugins/logger/logger.h +++ b/plugins/logger/logger.h @@ -29,6 +29,8 @@ #define MK_LOGGER_PIPE_LIMIT 0.75 #define MK_LOGGER_TIMEOUT_DEFAULT 3 +#pragma GCC visibility push(hidden) + int mk_logger_timeout; /* MasterLog variables */ @@ -59,10 +61,6 @@ struct mk_list targets_list; //struct log_target *lt; -/* Global Monkey core API */ -struct plugin_api *mk_api; - -void *mk_logger_worker_init(void *args); -void mk_logger_target_add(int fd, char *target); +#pragma GCC visibility pop #endif diff --git a/plugins/logger/pointers.h b/plugins/logger/pointers.h index 862d540..e021e22 100644 --- a/plugins/logger/pointers.h +++ b/plugins/logger/pointers.h @@ -19,7 +19,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "memory.h" +#ifndef MK_LOGGER_POINTERS_H +#define MK_LOGGER_POINTERS_H + +#include <memory.h> /* Request error messages for log file */ #define ERROR_MSG_400 "[error 400] Bad Request" @@ -37,6 +40,8 @@ #define MK_LOGGER_IOV_SPACE " " #define MK_LOGGER_IOV_EMPTY "-" +#pragma GCC visibility push(hidden) + /* mk pointers for errors */ mk_pointer error_msg_400; mk_pointer error_msg_403; @@ -57,3 +62,7 @@ mk_pointer mk_logger_iov_empty; /* functions */ void mk_logger_init_pointers(); + +#pragma GCC visibility pop + +#endif -- 1.7.2.1
_______________________________________________ Monkey mailing list [email protected] http://lists.monkey-project.com/listinfo/monkey
