Remove minor bug with null log.

Author: viferga

source/benchmarks/metacall_py_call_bench/source/metacall_py_call_bench.cpp

@@ -30,10 +30,7 @@ class metacall_py_call_bench : public benchmark::Fixture
 	{
 		metacall_print_info();
 
-		if (metacall_log(METACALL_LOG_NULL, NULL) != 0)
-		{
-			state.SkipWithError("Error setting up MetaCall logs");
-		}
+		metacall_log_null();
 
 		if (metacall_initialize() != 0)
 		{

source/benchmarks/metacall_py_init_bench/source/metacall_py_init_bench.cpp

@@ -26,14 +26,11 @@
 class metacall_py_init_bench : public benchmark::Fixture
 {
 public:
-	void SetUp(benchmark::State & state)
+	void SetUp(benchmark::State &)
 	{
 		metacall_print_info();
 
-		if (metacall_log(METACALL_LOG_NULL, NULL) != 0)
-		{
-			state.SkipWithError("Error setting up MetaCall logs");
-		}
+		metacall_log_null();
 	}
 
 	void TearDown(benchmark::State & state)

source/metacall/include/metacall/metacall.h

@@ -70,6 +70,12 @@ extern void * metacall_null_args[1];
 */
 METACALL_API const char * metacall_serial(void);
 
+/**
+*  @brief
+*    Disables MetaCall logs, must be called before @metacall_initialize
+*/
+METACALL_API void metacall_log_null(void);
+
 /**
 *  @brief
 *    Initialize MetaCall library
@@ -432,20 +438,20 @@ METACALL_API int metacall_register(const char * name, void * (*invoke)(void *[])
 *    Array of pointers to the values to be passed to the function
 *
 *  @param[in] resolve_callback
-*    Pointer to function that will be executed when task completion
+*    Pointer to function that will be executed when task completion
 *      @param[in] void *
-*        Value representing the result of the future resolution
+*        Value representing the result of the future resolution
 *      @param[in] void *
-*        A reference to @data that will be used as a closure for the chain 
+*        A reference to @data that will be used as a closure for the chain 
 *      @return
-*        Value containing the result of the operation,
+*        Value containing the result of the operation,
 *        it will be wrapped into a future later on to be returned by the function
 *
 *  @param[in] reject_callback
 *    Pointer to function that will be executed when task error (signature is identical as resolve_callback)
 *
 *  @param[in] data
-*    Pointer to a context that will act as a closure for the chain
+*    Pointer to a context that will act as a closure for the chain
 *
 *  @return
 *    Pointer to value containing the result of the call returned by @resolve_callback or @reject_callback wrapped in a future

source/metacall/include/metacall/metacall_log.h

@@ -43,8 +43,7 @@ enum metacall_log_id
 	METACALL_LOG_SOCKET,
 	METACALL_LOG_SYSLOG,
 	METACALL_LOG_NGINX,
-	METACALL_LOG_CUSTOM,
-	METACALL_LOG_NULL
+	METACALL_LOG_CUSTOM
 };
 
 /* -- Forward Declarations -- */

source/metacall/source/metacall.c

@@ -49,6 +49,7 @@ void * metacall_null_args[1];
 /* -- Private Variables -- */
 
 static int metacall_initialize_flag = 1;
+static int metacall_log_null_flag = 1;
 
 /* -- Methods -- */
 
@@ -59,14 +60,19 @@ const char * metacall_serial()
 	return metacall_serial_str;
 }
 
+void metacall_log_null()
+{
+	metacall_log_null_flag = 0;
+}
+
 int metacall_initialize()
 {
 	loader l = loader_singleton();
 
 	memory_allocator allocator;
 
 	/* Initialize logs by default to stdout if none has been defined */
-	if (log_size() == 0)
+	if (metacall_log_null_flag != 0 && log_size() == 0)
 	{
 		struct metacall_log_stdio_type log_stdio =
 		{

source/metacall/source/metacall_log.c

@@ -24,73 +24,6 @@
 
 #include <log/log.h>
 
-/* -- Private Methods -- */
-
-size_t format_size_null(void * context, const char * time, size_t thread_id, size_t line, const char * func, const char * file, const char * level, const char * message, log_policy_format_custom_va_list args)
-{
-	(void)context;
-	(void)time;
-	(void)thread_id;
-	(void)line;
-	(void)func;
-	(void)file;
-	(void)level;
-	(void)message;
-	(void)args;
-
-	return 0;
-}
-
-size_t format_serialize_null(void * context, void * buffer, const size_t size, const char * time, size_t thread_id, size_t line, const char * func, const char * file, const char * level, const char * message, log_policy_format_custom_va_list args)
-{
-	(void)context;
-	(void)buffer;
-	(void)size;
-	(void)time;
-	(void)thread_id;
-	(void)line;
-	(void)func;
-	(void)file;
-	(void)level;
-	(void)message;
-	(void)args;
-
-	return 0;
-}
-
-size_t format_deserialize_null(void * context, const void * buffer, const size_t size, const char * time, size_t thread_id, size_t line, const char * func, const char * file, const char * level, const char * message, log_policy_format_custom_va_list args)
-{
-	(void)context;
-	(void)buffer;
-	(void)size;
-	(void)time;
-	(void)thread_id;
-	(void)line;
-	(void)func;
-	(void)file;
-	(void)level;
-	(void)message;
-	(void)args;
-
-	return 0;
-}
-
-int stream_flush_null(void * context)
-{
-	(void)context;
-
-	return 0;
-}
-
-int stream_write_null(void * context, const char * buffer, const size_t size)
-{
-	(void)context;
-	(void)buffer;
-	(void)size;
-
-	return 0;
-}
-
 /* -- Methods -- */
 
 int metacall_log(enum metacall_log_id log_id, void * ctx)
@@ -162,15 +95,6 @@ int metacall_log(enum metacall_log_id log_id, void * ctx)
 				log_policy_storage_sequential(),
 				log_policy_stream_custom(custom_ctx->context, custom_ctx->stream_write, custom_ctx->stream_flush));
 		}
-
-		case METACALL_LOG_NULL :
-		{
-			return log_configure("metacall",
-				log_policy_format_custom(NULL, &format_size_null, &format_serialize_null, &format_deserialize_null),
-				log_policy_schedule_sync(),
-				log_policy_storage_sequential(),
-				log_policy_stream_custom(NULL, &stream_write_null, &stream_flush_null));
-		}
 	}
 
 	return 1;

source/tests/metacall_node_call_test/source/metacall_node_call_test.cpp

@@ -35,7 +35,7 @@ TEST_F(metacall_node_call_test, DefaultConstructor)
 {
 	metacall_print_info();
 
-	ASSERT_EQ((int) 0, (int) metacall_log(METACALL_LOG_NULL, NULL));
+	metacall_log_null();
 
 	ASSERT_EQ((int) 0, (int) metacall_initialize());