Changeset 2254 for trunk/src/emx/include/InnoTekLIBC/logstrict.h

Timestamp:

Jul 17, 2005, 2:25:44 PM (20 years ago)

Author:

bird

Message:

o LIBC_ASSERT*() are for internal libc errors, LIBCLOG_ERROR*() are

for user related error. Big code adjustements.

o Fixed a few smaller issues.
o Started fixing exec() backend.

File:

• trunk/src/emx/include/InnoTekLIBC/logstrict.h (modified) (9 diffs, 1 prop)

trunk/src/emx/include/InnoTekLIBC/logstrict.h

@@ -7 +7 @@
  *
  * Copyright (c) 2004 InnoTek Systemberatung GmbH
+ * Copyright (c) 2004-2005 knut st. osmundsen <bird-srcspam@anduin.net>
  * Author: knut st. osmundsen <bird-srcspam@anduin.net>
  *
@@ -76 +77 @@
     unsigned __libclog_uEnterTS__ = __libc_LogEnter(__LIBC_LOG_INSTANCE, __LIBC_LOG_GROUP, __PRETTY_FUNCTION__, __VA_ARGS__)
 #else
-#define LIBCLOG_ENTER(...)  //hmm
+#define LIBCLOG_ENTER(...)      //...
 #endif
 
@@ -84 +85 @@
     __libc_LogMsg(__libclog_uEnterTS__, __LIBC_LOG_INSTANCE, __LIBC_LOG_GROUP, __PRETTY_FUNCTION__, __VA_ARGS__)
 #else
-#define LIBCLOG_MSG(...)    do {} while (0)
-#endif
-
-/** Macro to log a generic message within a functionw. */
+#define LIBCLOG_MSG(...)        ((void)0)
+#endif
+
+/** Macro to log a generic message within a function. */
 #ifdef DEBUG_LOGGING
 #define LIBCLOG_MSG2(...) \
     __libc_LogMsg(~0, __LIBC_LOG_INSTANCE, __LIBC_LOG_GROUP, __PRETTY_FUNCTION__, __VA_ARGS__)
 #else
-#define LIBCLOG_MSG2(...)   do {} while (0)
+#define LIBCLOG_MSG2(...)       ((void)0)
+#endif
+
+/** Macro to log an user error within a function entered by LIBCLOG_ENTER(). */
+#ifdef DEBUG_LOGGING
+#define LIBCLOG_ERROR(...) \
+    __libc_LogError(__libclog_uEnterTS__, __LIBC_LOG_INSTANCE, __LIBC_LOG_GROUP, __PRETTY_FUNCTION__, __FILE__, __LINE__, __VA_ARGS__)
+#else
+#define LIBCLOG_ERROR(...)      ((void)0)
+#endif
+
+/** Macro to log an user error within a function. */
+#ifdef DEBUG_LOGGING
+#define LIBCLOG_ERROR2(...) \
+    __libc_LogError(~0, __LIBC_LOG_INSTANCE, __LIBC_LOG_GROUP, __PRETTY_FUNCTION__, __FILE__, __LINE__, __VA_ARGS__)
+#else
+#define LIBCLOG_ERROR2(...)     ((void)0)
+#endif
+
+/** Macro to check for and log an user error within a function entered by LIBCLOG_ENTER(). */
+#ifdef DEBUG_LOGGING
+#define LIBCLOG_ERROR_CHECK(expr, ...) \
+    (!(expr) ? __libc_LogError(__libclog_uEnterTS__, __LIBC_LOG_INSTANCE, __LIBC_LOG_GROUP, __PRETTY_FUNCTION__, __FILE__, __LINE__, __VA_ARGS__) : ((void)0) )
+#else
+#define LIBCLOG_ERROR_CHECK(expr, ...) ((void)0)
+#endif
+
+/** Macro to check for and log an user error within a function. */
+#ifdef DEBUG_LOGGING
+#define LIBCLOG_ERROR2_CHECK(expr, ...) \
+    (!(expr) ? __libc_LogError(~0, __LIBC_LOG_INSTANCE, __LIBC_LOG_GROUP, __PRETTY_FUNCTION__, __FILE__, __LINE__, __VA_ARGS__) : ((void)0) )
+#else
+#define LIBCLOG_ERROR2_CHECK(expr, ...) ((void)0)
 #endif
 
@@ -100 +133 @@
     __libc_LogRaw(__LIBC_LOG_INSTANCE, __LIBC_LOG_GROUP, string, maxlen)
 #else
-#define LIBCLOG_RAW(...)    do {} while (0)
-#endif
-
-/** Macro to log a function exit. */
+#define LIBCLOG_RAW(...)        ((void)0)
+#endif
+
+/** Macro to leave a function entered by LIBCLOG_ENTER(). */
 #ifdef DEBUG_LOGGING
 #define LIBCLOG_LEAVE(...) \
     __libc_LogLeave(__libclog_uEnterTS__, __LIBC_LOG_INSTANCE, __LIBC_LOG_GROUP, __PRETTY_FUNCTION__, __VA_ARGS__)
 #else
-#define LIBCLOG_LEAVE(...)  do {} while (0)
+#define LIBCLOG_LEAVE(...)      ((void)0)
 #endif
 
 /** Macro to log a custom message and return. */
-#define LIBCLOG_RETURN_MSG(rc,...)      do { LIBCLOG_LEAVE(__VA_ARGS__);                       return (rc); } while (0)
+#define LIBCLOG_RETURN_MSG(rc,...)      do { LIBCLOG_LEAVE(__VA_ARGS__); return (rc); } while (0)
 /** Macro to log a custom message and return. */
-#define LIBCLOG_RETURN_MSG_VOID(...)    do { LIBCLOG_LEAVE(__VA_ARGS__);                       return; } while (0)
+#define LIBCLOG_RETURN_MSG_VOID(...)    do { LIBCLOG_LEAVE(__VA_ARGS__); return; } while (0)
 
 /** Macro to log a void return and do the return. */
@@ -128 +161 @@
 /** Macro to log a pointer return and do the return. */
 #define LIBCLOG_RETURN_P(rc)            LIBCLOG_RETURN_MSG((rc), "ret %p\n", (void*)(rc));
+
+
+/** Macro to leave a function entered by LIBCLOG_ENTER() on user error. */
+#ifdef DEBUG_LOGGING
+#define LIBCLOG_ERROR_LEAVE(...) \
+    __libc_LogErrorLeave(__libclog_uEnterTS__, __LIBC_LOG_INSTANCE, __LIBC_LOG_GROUP, __PRETTY_FUNCTION__, __FILE__, __LINE__, __VA_ARGS__)
+#else
+#define LIBCLOG_ERROR_LEAVE(...)      ((void)0)
+#endif
+
+/** Macro to log a user error and return. */
+#define LIBCLOG_ERROR_RETURN(rc,...)          do { LIBCLOG_ERROR_LEAVE(__VA_ARGS__); return (rc); } while (0)
+#define LIBCLOG_ERROR_RETURN_MSG              LIBCLOG_ERROR_RETURN
+/** Macro to log a user error and return. */
+#define LIBCLOG_ERROR_RETURN_MSG_VOID(...)    do { LIBCLOG_ERROR_LEAVE(__VA_ARGS__); return; } while (0)
+
+/** Macro to log a void return user error and do the return. */
+#define LIBCLOG_ERROR_RETURN_VOID()           LIBCLOG_ERROR_RETURN_MSG_VOID( "ret void\n")
+/** Macro to log an int return user error and do the return. */
+#define LIBCLOG_ERROR_RETURN_INT(rc)          LIBCLOG_ERROR_RETURN_MSG((rc), "ret %d (%#x)\n", (rc), (rc))
+/** Macro to log an unsigned int return user error and do the return. */
+#define LIBCLOG_ERROR_RETURN_UINT(rc)         LIBCLOG_ERROR_RETURN_MSG((rc), "ret %u (%#x)\n", (rc), (rc));
+/** Macro to log an long int return user error and do the return. */
+#define LIBCLOG_ERROR_RETURN_LONG(rc)         LIBCLOG_ERROR_RETURN_MSG((rc), "ret %ld (%#lx)\n", (rc), (rc));
+/** Macro to log an unsigned long int return user error and do the return. */
+#define LIBCLOG_ERROR_RETURN_ULONG(rc)        LIBCLOG_ERROR_RETURN_MSG((rc), "ret %lu (%#lx)\n", (rc), (rc));
+/** Macro to log a pointer return user error and do the return. */
+#define LIBCLOG_ERROR_RETURN_P(rc)            LIBCLOG_ERROR_RETURN_MSG((rc), "ret %p\n", (void*)(rc));
+
 
 /** @defgroup   __libc_log_flags    Message Flags (to be combined with group)
@@ -183 +245 @@
 /** Memory Manager APIs. */
 #define __LIBC_LOG_GRP_MMAN         16
+/** Load APIs. */
+#define __LIBC_LOG_GRP_LDR          1 /** @todo fix me */
 
 /** Backend SysV IPC APIs. */
@@ -467 +531 @@
 /**
  * Output a leave function log message.
+ *
  * A leave message is considered to be one line and is appended a newline if
  * none was given.
@@ -481 +546 @@
 
 /**
+ * Output a leave function log message upon a user error.
+ *
+ * The function may breakpoint if configured to do so. A leave message is
+ * considered to be one line and is appended a newline if none was given.
+ *
+ * @param   uEnterTS        The timestamp returned by LogEnter.
+ * @param   pvInstance      Logger instance. If NULL the message goes to the
+ *                          default log instance.
+ * @param   fGroupAndFlags  Logging group and logging flags.
+ * @param   pszFunction     Name of the function which was entered.
+ * @param   pszFile         Source filename.
+ * @param   uLine           Line number.
+ * @param   pszFormat       Format string to display the result.
+ * @param   ...             Arguments to the format string.
+ */
+extern void     __libc_LogErrorLeave(unsigned uEnterTS, void *pvInstance, unsigned fGroupAndFlags, const char *pszFunction, const char *pszFile, unsigned uLine, const char *pszFormat, ...) __printflike(7, 8);
+
+/**
  * Output a log message.
+ *
  * A log message is considered to be one line and is appended a newline if
  * none was given.
@@ -494 +578 @@
  */
 extern void     __libc_LogMsg(unsigned uEnterTS, void *pvInstance, unsigned fGroupAndFlags, const char *pszFunction, const char *pszFormat, ...) __printflike(5, 6);
+
+/**
+ * Output a log user error message.
+ *
+ * This may raise a breakpoint exception if configured so. A log message is
+ * considered to be one line and is appended a newline if none was given.
+ *
+ * @param   uEnterTS        The timestamp returned by LogEnter.
+ * @param   pvInstance      Logger instance. If NULL the message goes to the
+ *                          default log instance.
+ * @param   fGroupAndFlags  Logging group and logging flags.
+ * @param   pszFunction     Name of the function which was entered.
+ * @param   pszFile         Source filename.
+ * @param   uLine           Line number.
+ * @param   pszFormat       Format string for the message to log.
+ * @param   ...             Arguments to the format string.
+ */
+extern void     __libc_LogError(unsigned uEnterTS, void *pvInstance, unsigned fGroupAndFlags, const char *pszFunction, const char *pszFile, unsigned uLine, const char *pszFormat, ...) __printflike(7, 8);
 
 /**