Prevent double-definition of ASSERT macro (#1490)

* Prevent double-definition of ASSERT macro In case the sinsp library is used inside a codebase that already defines its own ASSERT.
draios · Aug 20, 2019 · cf05c15 · cf05c15
1 parent 017a25e
commit cf05c15
Showing 1 changed file with 123 additions and 122 deletions.
diff --git a/userspace/libsinsp/sinsp_int.h b/userspace/libsinsp/sinsp_int.h
@@ -17,126 +17,127 @@ limitations under the License.
 
 */
 
-
-////////////////////////////////////////////////////////////////////////////
-// Public definitions for the scap library
-////////////////////////////////////////////////////////////////////////////
-#pragma once
-
-#ifdef _WIN32
-#include <Windows.h>
-#else
-#include <csignal>
-#endif
-#include <assert.h>
-
-#include <string>
-#include <memory>
-#include <iostream>
-#include <fstream>
-#include <exception>
-#include <sstream>
-#include <deque>
-#include <queue>
-#include <list>
-#include <vector>
-#include <iostream>
-#include <limits>
-
-using namespace std;
-
-#include "../libscap/scap.h"
-#include "settings.h"
-#include "utils.h"
-#include "../libscap/scap.h"
-#include "parsers.h"
-#include "ifinfo.h"
-#include "internal_metrics.h"
+
+////////////////////////////////////////////////////////////////////////////
+// Public definitions for the scap library
+////////////////////////////////////////////////////////////////////////////
+#pragma once
+
+#ifdef _WIN32
+#include <Windows.h>
+#else
+#include <csignal>
+#endif
+#include <assert.h>
+
+#include <string>
+#include <memory>
+#include <iostream>
+#include <fstream>
+#include <exception>
+#include <sstream>
+#include <deque>
+#include <queue>
+#include <list>
+#include <vector>
+#include <iostream>
+#include <limits>
+
+using namespace std;
+
+#include "../libscap/scap.h"
+#include "settings.h"
+#include "utils.h"
+#include "../libscap/scap.h"
+#include "parsers.h"
+#include "ifinfo.h"
+#include "internal_metrics.h"
 #include "sinsp_public.h"
-
-#ifndef MIN
-#define MIN(X,Y) ((X) < (Y)? (X):(Y))
-#define MAX(X,Y) ((X) > (Y)? (X):(Y))
-#endif
-
-//
-// ASSERT implementation
-//
-#ifdef _DEBUG
-#ifdef ASSERT_TO_LOG
-#define ASSERT(X) \
-	if(!(X)) \
-	{ \
-		g_logger.format(sinsp_logger::SEV_ERROR, "ASSERTION %s at %s:%d", #X , __FILE__, __LINE__); \
-		assert(X); \
-	} 
-#else
-#define ASSERT(X) assert(X)
-#endif // ASSERT_TO_LOG
-#else // _DEBUG
-#define ASSERT(X)
-#endif // _DEBUG
-
-//
-// Public export macro
-//
-#ifdef _WIN32
-#define BRK(X) {if(evt != NULL && evt->get_num() == X)__debugbreak();}
-#else
-#define BRK(X)
-#endif
-
-//
-// Path separator
-//
-#ifdef _WIN32
-#define DIR_PATH_SEPARATOR '\\'
-#else
-#define DIR_PATH_SEPARATOR '/'
-#endif
-
-//
-// The logger
-//
-extern sinsp_logger g_logger;
-#define glogf g_logger.format
-
-//
-// Prototype of the callback invoked by the thread table when a thread is 
-// created or destroyed
-//
-class sinsp_threadtable_listener
-{
-public:
-	virtual ~sinsp_threadtable_listener()
-	{
-	}
-	virtual void on_thread_created(sinsp_threadinfo* tinfo) = 0;
-	virtual void on_thread_destroyed(sinsp_threadinfo* tinfo) = 0;
-};
-
-//
-// Prototype of the callback invoked by the thread table when a thread is 
-// created or destroyed
-//
-class sinsp_fd_listener
-{
-public:
-	virtual ~sinsp_fd_listener()
-	{
-	}
-	virtual void on_read(sinsp_evt* evt, int64_t tid, int64_t fd, sinsp_fdinfo_t* fdinfo, char *data, uint32_t original_len, uint32_t len) = 0;
-	virtual void on_write(sinsp_evt* evt, int64_t tid, int64_t fd, sinsp_fdinfo_t* fdinfo, char *data, uint32_t original_len, uint32_t len) = 0;
-	virtual void on_sendfile(sinsp_evt* evt, int64_t fdin, uint32_t len) = 0;
-	virtual void on_connect(sinsp_evt* evt, uint8_t* packed_data) = 0;
-	virtual void on_accept(sinsp_evt* evt, int64_t newfd, uint8_t* packed_data, sinsp_fdinfo_t* new_fdinfo) = 0;
-	virtual void on_file_open(sinsp_evt* evt, const string& fullpath, uint32_t flags) = 0;
-	virtual void on_error(sinsp_evt* evt) = 0;
-	virtual void on_erase_fd(erase_fd_params* params) = 0;
-	virtual void on_socket_shutdown(sinsp_evt *evt) = 0;
-	virtual void on_execve(sinsp_evt* evt) = 0;
-	virtual void on_clone(sinsp_evt* evt, sinsp_threadinfo* newtinfo) = 0;
-	virtual void on_bind(sinsp_evt* evt) = 0;
-	virtual bool on_resolve_container(sinsp_container_manager* manager, sinsp_threadinfo* tinfo, bool query_os_for_missing_info) = 0;
-	virtual void on_socket_status_changed(sinsp_evt *evt) = 0;
-};
+
+#ifndef MIN
+#define MIN(X,Y) ((X) < (Y)? (X):(Y))
+#define MAX(X,Y) ((X) > (Y)? (X):(Y))
+#endif
+
+//
+// ASSERT implementation
+//
+#ifdef _DEBUG
+#undef ASSERT
+#ifdef ASSERT_TO_LOG
+#define ASSERT(X) \
+	if(!(X)) \
+	{ \
+		g_logger.format(sinsp_logger::SEV_ERROR, "ASSERTION %s at %s:%d", #X , __FILE__, __LINE__); \
+		assert(X); \
+	}
+#else
+#define ASSERT(X) assert(X)
+#endif // ASSERT_TO_LOG
+#else // _DEBUG
+#define ASSERT(X)
+#endif // _DEBUG
+
+//
+// Public export macro
+//
+#ifdef _WIN32
+#define BRK(X) {if(evt != NULL && evt->get_num() == X)__debugbreak();}
+#else
+#define BRK(X)
+#endif
+
+//
+// Path separator
+//
+#ifdef _WIN32
+#define DIR_PATH_SEPARATOR '\\'
+#else
+#define DIR_PATH_SEPARATOR '/'
+#endif
+
+//
+// The logger
+//
+extern sinsp_logger g_logger;
+#define glogf g_logger.format
+
+//
+// Prototype of the callback invoked by the thread table when a thread is 
+// created or destroyed
+//
+class sinsp_threadtable_listener
+{
+public:
+	virtual ~sinsp_threadtable_listener()
+	{
+	}
+	virtual void on_thread_created(sinsp_threadinfo* tinfo) = 0;
+	virtual void on_thread_destroyed(sinsp_threadinfo* tinfo) = 0;
+};
+
+//
+// Prototype of the callback invoked by the thread table when a thread is 
+// created or destroyed
+//
+class sinsp_fd_listener
+{
+public:
+	virtual ~sinsp_fd_listener()
+	{
+	}
+	virtual void on_read(sinsp_evt* evt, int64_t tid, int64_t fd, sinsp_fdinfo_t* fdinfo, char *data, uint32_t original_len, uint32_t len) = 0;
+	virtual void on_write(sinsp_evt* evt, int64_t tid, int64_t fd, sinsp_fdinfo_t* fdinfo, char *data, uint32_t original_len, uint32_t len) = 0;
+	virtual void on_sendfile(sinsp_evt* evt, int64_t fdin, uint32_t len) = 0;
+	virtual void on_connect(sinsp_evt* evt, uint8_t* packed_data) = 0;
+	virtual void on_accept(sinsp_evt* evt, int64_t newfd, uint8_t* packed_data, sinsp_fdinfo_t* new_fdinfo) = 0;
+	virtual void on_file_open(sinsp_evt* evt, const string& fullpath, uint32_t flags) = 0;
+	virtual void on_error(sinsp_evt* evt) = 0;
+	virtual void on_erase_fd(erase_fd_params* params) = 0;
+	virtual void on_socket_shutdown(sinsp_evt *evt) = 0;
+	virtual void on_execve(sinsp_evt* evt) = 0;
+	virtual void on_clone(sinsp_evt* evt, sinsp_threadinfo* newtinfo) = 0;
+	virtual void on_bind(sinsp_evt* evt) = 0;
+	virtual bool on_resolve_container(sinsp_container_manager* manager, sinsp_threadinfo* tinfo, bool query_os_for_missing_info) = 0;
+	virtual void on_socket_status_changed(sinsp_evt *evt) = 0;
+};