Changeset 3452 for trunk/packages/vizservers/nanovis/Trace.h

Timestamp:

Mar 4, 2013, 8:57:13 PM (11 years ago)

Author:

ldelgass

Message:

Remove XINETD define from nanovis. We only support server mode now, no glut
interaction loop with mouse/keyboard handlers. Fixes for trace logging to make
output closer to vtkvis: inlcude function name for trace messages, remove
newlines from format strings in macros since newlines get added by syslog.

File:

• trunk/packages/vizservers/nanovis/Trace.h (modified) (2 diffs)

trunk/packages/vizservers/nanovis/Trace.h

@@ -1 +1 @@
 /* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/*
+ * Copyright (C) 2004-2013  HUBzero Foundation, LLC
+ *
+ * Author: George A. Howlett <gah@purdue.edu>
+ */
+
 #ifndef __TRACE_H__
 #define __TRACE_H__
@@ -12 +18 @@
 #define AT __FILE__ ":" NEWSTRING(__LINE__)
 
-extern void LogMessage(int priority, const char *fileName, int lineNum,
-                         const char* format, ...);
+extern void LogMessage(int priority, const char *funcname, const char *fileName,
+                       int lineNum, const char* format, ...);
 
-#define ERROR(...)      LogMessage(LOG_ERR, __FILE__, __LINE__, __VA_ARGS__)
+#define ERROR(...)      LogMessage(LOG_ERR, __FUNCTION__, __FILE__, __LINE__, __VA_ARGS__)
 #ifdef WANT_TRACE
-#define TRACE(...)      LogMessage(LOG_DEBUG, __FILE__, __LINE__, __VA_ARGS__)
+#define TRACE(...)      LogMessage(LOG_DEBUG, __FUNCTION__, __FILE__, __LINE__, __VA_ARGS__)
 #else 
 #define TRACE(...) 
 #endif
-#define WARN(...)       LogMessage(LOG_WARNING, __FILE__, __LINE__, __VA_ARGS__)
-#define INFO(...)       LogMessage(LOG_INFO, __FILE__, __LINE__, __VA_ARGS__)
-
+#define WARN(...)       LogMessage(LOG_WARNING, __FUNCTION__, __FILE__, __LINE__, __VA_ARGS__)
+#define INFO(...)       LogMessage(LOG_INFO, __FUNCTION__, __FILE__, __LINE__, __VA_ARGS__)
 
 extern bool CheckFBO(GLenum *statusPtr);