Ignore:
Timestamp:
Mar 4, 2013, 11:57:13 PM (7 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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/packages/vizservers/nanovis/Trace.h

    r2841 r3452  
    11/* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- */
     2/*
     3 * Copyright (C) 2004-2013  HUBzero Foundation, LLC
     4 *
     5 * Author: George A. Howlett <gah@purdue.edu>
     6 */
     7
    28#ifndef __TRACE_H__
    39#define __TRACE_H__
     
    1218#define AT __FILE__ ":" NEWSTRING(__LINE__)
    1319
    14 extern void LogMessage(int priority, const char *fileName, int lineNum,
    15                         const char* format, ...);
     20extern void LogMessage(int priority, const char *funcname, const char *fileName,
     21                       int lineNum, const char* format, ...);
    1622
    17 #define ERROR(...)      LogMessage(LOG_ERR, __FILE__, __LINE__, __VA_ARGS__)
     23#define ERROR(...)      LogMessage(LOG_ERR, __FUNCTION__, __FILE__, __LINE__, __VA_ARGS__)
    1824#ifdef WANT_TRACE
    19 #define TRACE(...)      LogMessage(LOG_DEBUG, __FILE__, __LINE__, __VA_ARGS__)
     25#define TRACE(...)      LogMessage(LOG_DEBUG, __FUNCTION__, __FILE__, __LINE__, __VA_ARGS__)
    2026#else
    2127#define TRACE(...)
    2228#endif
    23 #define WARN(...)       LogMessage(LOG_WARNING, __FILE__, __LINE__, __VA_ARGS__)
    24 #define INFO(...)       LogMessage(LOG_INFO, __FILE__, __LINE__, __VA_ARGS__)
    25 
     29#define WARN(...)       LogMessage(LOG_WARNING, __FUNCTION__, __FILE__, __LINE__, __VA_ARGS__)
     30#define INFO(...)       LogMessage(LOG_INFO, __FUNCTION__, __FILE__, __LINE__, __VA_ARGS__)
    2631
    2732extern bool CheckFBO(GLenum *statusPtr);
Note: See TracChangeset for help on using the changeset viewer.