Merge pull request #870 from openziti/misc-improvements

Misc improvements

Author: ekoby

inc_internal/internal_model.h

@@ -19,6 +19,12 @@
 #include "ziti/model_support.h"
 #include "ziti/ziti_model.h"
 
+// internal model is not exported
+#ifdef MODEL_VISIBILITY
+#undef MODEL_VISIBILITY
+#endif
+#define MODEL_VISIBILITY
+
 // extends ziti_identity
 #define ZITI_IDENTITY_DATA_MODEL(XX, ...) \
 ZITI_IDENTITY_MODEL(XX, __VA_ARGS__) \

inc_internal/utils.h

@@ -75,9 +75,12 @@ typedef int *(*cond_error_t)(int);
 
 #if __GNUC__
 #define UNUSED(x) UNUSED_ ## x __attribute__((__unused__))
+#define THREAD_LOCAL __thread
 #elif _MSC_VER
+#define THREAD_LOCAL __declspec(thread)
 #define UNUSED(x) UNUSED_ ## x
 #else
+#define THREAD_LOCAL
 #define UNUSED(x) UNUSED_ ## x
 #endif
 

includes/ziti/model_support.h

@@ -65,7 +65,7 @@ typedef intptr_t ssize_t;
  *              `indent` is used for printing nested model objects
  */
 
-#define MODEL_API
+#define MODEL_VISIBILITY
 
 #define MODEL_JSON_COMPACT 0x1
 
@@ -85,16 +85,16 @@ DECLARE_MODEL_FUNCS(type)
 
 #define DECLARE_MODEL_FUNCS(T) \
 typedef T ** T##_array; \
-MODEL_API const type_meta* get_##T##_meta();\
+MODEL_VISIBILITY const type_meta* get_##T##_meta();\
 static inline ptr(T) alloc_##T(){ return (ptr(T))model_alloc(get_##T##_meta()); }\
 static inline void free_##T(ptr(T) v) { model_free(v, get_##T##_meta()); }     \
 static inline void free_##T##_ptr(ptr(T) v) { model_free(v, get_##T##_meta()); free(v); }; \
 static inline int cmp_##T(const ptr(T) lh, const ptr(T) rh) { return model_cmp(lh, rh, get_##T##_meta()); } \
-MODEL_API void free_##T##_array(array(T) *ap);\
-MODEL_API int parse_##T(ptr(T) v, const char* json, size_t len);\
-MODEL_API int parse_##T##_ptr(ptr(T) *p, const char* json, size_t len);\
-MODEL_API int parse_##T##_array(array(T) *a, const char* json, size_t len); \
-MODEL_API int parse_##T##_list(list(T) *l, const char* json, size_t len); \
+MODEL_VISIBILITY void free_##T##_array(array(T) *ap);\
+MODEL_VISIBILITY int parse_##T(ptr(T) v, const char* json, size_t len);\
+MODEL_VISIBILITY int parse_##T##_ptr(ptr(T) *p, const char* json, size_t len);\
+MODEL_VISIBILITY int parse_##T##_array(array(T) *a, const char* json, size_t len); \
+MODEL_VISIBILITY int parse_##T##_list(list(T) *l, const char* json, size_t len); \
 static inline ssize_t T##_to_json_r(const ptr(T) v, int flags, char *outbuf, size_t max) { return model_to_json_r(v, get_##T##_meta(), flags, outbuf, max); } \
 static inline char* T##_to_json(const ptr(T) v, int flags, size_t *len) { return model_to_json(v, get_##T##_meta(), flags, len); }   \
 static inline int T##_from_json(ptr(T) v, struct json_object *j) { return model_from_json(v, j, get_##T##_meta()); } \
@@ -276,7 +276,7 @@ Enum (*value_of)(const char* n);                  \
 Enum (*value_ofn)(const char* s, size_t n);       \
 Values(enum_field, Enum)                          \
 };                                 \
-MODEL_API const type_meta* get_##Enum##_meta();\
+MODEL_VISIBILITY const type_meta* get_##Enum##_meta();\
 extern const struct Enum##_s Enum##s;
 
 #define get_value_of_ovrd(_1, _2, _3, _4, _5, NAME, ...) NAME

includes/ziti/ziti_model.h

@@ -224,10 +224,10 @@ typedef struct ziti_address_s {
 
 
 // make sure ziti model functions are properly exported
-#ifdef MODEL_API
-#undef MODEL_API
+#ifdef MODEL_VISIBILITY
+#undef MODEL_VISIBILITY
 #endif
-#define MODEL_API ZITI_FUNC
+#define MODEL_VISIBILITY ZITI_FUNC
 
 ZITI_FUNC int parse_ziti_address_str(ziti_address *addr, const char *addr_str);
 

library/CMakeLists.txt

@@ -124,6 +124,8 @@ function(config_ziti_library target)
     set_target_properties(${target} PROPERTIES
             C_STANDARD 11
             POSITION_INDEPENDENT_CODE ON
+            C_VISIBILITY_PRESET hidden
+            CXX_VISIBILITY_PRESET hidden
     )
 
     target_sources(${target} PRIVATE ${ZITI_PRIVATE_SRC_FILES})

library/utils.c

@@ -132,8 +132,6 @@ static uint64_t starttime;
 static uint64_t last_update;
 static char log_timestamp[32];
 
-static uv_key_t logbufs;
-
 static log_writer logger = NULL;
 
 static void init_debug(uv_loop_t *loop);
@@ -262,7 +260,6 @@ static void init_debug(uv_loop_t *loop) {
 #if defined(PTHREAD_ONCE_INIT)
     pthread_atfork(NULL, NULL, child_init);
 #endif
-    uv_key_create(&logbufs);
     log_pid = uv_os_getpid();
     get_elapsed = get_elapsed_time;
     char *ts_format = getenv("ZITI_TIME_FORMAT");
@@ -320,22 +317,18 @@ static const char *basename(const char *path) {
     return path;
 }
 
-void ziti_logger(int level, const char *module, const char *file, unsigned int line, const char *func, FORMAT_STRING(const char *fmt), ...) {
 #ifdef ZITI_DEBUG
-    static size_t loglinelen = 32768;
+#define LOG_LINE_LENGTH 32768
 #else
-    static size_t loglinelen = 1024;
+#define LOG_LINE_LENGTH 1024
 #endif
 
+static THREAD_LOCAL char log_buf[LOG_LINE_LENGTH];
+
+void ziti_logger(int level, const char *module, const char *file, unsigned int line, const char *func, FORMAT_STRING(const char *fmt), ...) {
     log_writer logfunc = logger;
     if (logfunc == NULL) { return; }
 
-    char *logbuf = (char *) uv_key_get(&logbufs);
-    if (!logbuf) {
-        logbuf = malloc(loglinelen);
-        uv_key_set(&logbufs, logbuf);
-    }
-
     char location[128];
     char *last_slash = strrchr(file, DIR_SEP);
 
@@ -370,14 +363,14 @@ void ziti_logger(int level, const char *module, const char *file, unsigned int l
 
     va_list argp;
     va_start(argp, fmt);
-    int len = vsnprintf(logbuf, loglinelen, fmt, argp);
+    int len = vsnprintf(log_buf, sizeof(log_buf), fmt, argp);
     va_end(argp);
 
-    if (len > loglinelen) {
-        len = (int) loglinelen;
+    if (len > sizeof(log_buf)) {
+        len = (int) sizeof(log_buf);
     }
 
-    logfunc(level, location, logbuf, len);
+    logfunc(level, location, log_buf, len);
 }
 
 static void default_log_writer(int level, const char *loc, const char *msg, size_t msglen) {