Changeset 1444

Timestamp:

May 16, 2004, 11:20:36 PM (21 years ago)

Author:

bird

Message:

libc_LogDumpHex.

Location:

trunk/src/emx

Files:

• include/InnoTekLIBC/logstrict.h (modified) (2 diffs, 1 prop)
• src/lib/sys/logstrict.c (modified) (11 diffs, 1 prop)

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

@@ -4 +4 @@
  * InnoTek LIBC - Debug Logging and Strict Checking Features.
  *
- * InnoTek Systemberatung GmbH confidential
+ * InnoTek Systemberatung GmbH
  *
  * Copyright (c) 2004 InnoTek Systemberatung GmbH
@@ -486 +486 @@
 
 /**
+ * Dumps a byte block.
+ *
+ * @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   pvData          Pointer to the bytes to dump.
+ * @param   cbData          Number of bytes to dump.
+ * @param   pszFormat       Format string for the message to log.
+ * @param   ...             Arguments to the format string.
+ */
+extern void     __libc_LogDumpHex(unsigned uEnterTS, void *pvInstance, unsigned fGroupAndFlags, const char *pszFunction, void *pvData, unsigned cbData, const char *pszFormat, ...);
+
+/**
  * Assertion helper.
  * Logs and displays (stderr) an assertion failed message.

trunk/src/emx/src/lib/sys/logstrict.c

@@ -93 +93 @@
 } __LIBC_XCPTREG, *__LIBC_PXCPTREG;
 
+
+/*******************************************************************************
+*   Global Variables                                                           *
+*******************************************************************************/
+/** Hex digits. */
+static const char gszHexDigits[17] = "0123456789abcdef";
+/** Uppercase hex digits. */
+static const char gszHexDigitsUpper[17] = "0123456789ABCDEF";
 
 
@@ -920 +928 @@
 
 /**
+ * Dumps a byte block.
+ *
+ * @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   pvData          Pointer to the bytes to dump.
+ * @param   cbData          Number of bytes to dump.
+ * @param   pszFormat       Format string for the message to log.
+ * @param   ...             Arguments to the format string.
+ */
+void     __libc_LogDumpHex(unsigned uEnterTS, void *pvInstance, unsigned fGroupAndFlags, const char *pszFunction, void *pvData, unsigned cbData, const char *pszFormat, ...)
+{
+    unsigned        uTS = getTimestamp();
+    __LIBC_PTHREAD  pThread = __libc_threadCurrentNoAuto();
+    char           *pszMsg;
+    int             cch;
+    va_list         args;
+    __LIBC_PLOGINST pInst;
+    unsigned        cDepth = 0xff;
+    char           *pszOffset;
+    char           *pbData;
+    unsigned        off;
+
+    /*
+     * Check instance, get default.
+     */
+    if (!pvInstance)
+    {
+        pvInstance = __libc_logDefault();
+        if (!pvInstance)
+            return;
+        if (pThread)
+            cDepth = pThread->cDefLoggerDepth;
+    }
+    pInst = (__LIBC_PLOGINST)pvInstance;
+
+    /*
+     * Check if this group is enabled.
+     */
+    if (pInst->pGroups)
+    {
+        int iGroup = __LIBC_LOG_GETGROUP(fGroupAndFlags);
+        if (    iGroup >= 0
+            &&  iGroup < pInst->pGroups->cGroups
+            &&  !pInst->pGroups->paGroups[iGroup].fEnabled)
+            return;
+    }
+
+    /*
+     * Allocate logging buffer and format the message.
+     */
+    pszMsg = alloca(CCHTMPMSGBUFFER);
+    if (!pszMsg)
+        return;
+
+    va_start(args, pszFormat);
+    if (uEnterTS != ~0)
+        cch = __libc_logBuildMsg(pszMsg, pszFormat, args, "%08x %02x %02x %04x Dump %04x %s (%2d ms): ",
+                                 uTS, getTid(), cDepth, __LIBC_LOG_GETGROUP(fGroupAndFlags),
+                                 pThread ? pThread->iErrNo : 0xface, pszFunction, uTS - uEnterTS);
+    else
+        cch = __libc_logBuildMsg(pszMsg, pszFormat, args, "%08x %02x %02x %04x Dump %04x %s: ",
+                                 uTS, getTid(), cDepth, __LIBC_LOG_GETGROUP(fGroupAndFlags),
+                                 pThread ? pThread->iErrNo : 0xface, pszFunction);
+    va_end(args);
+
+    /*
+     * Write the message.
+     */
+    __libc_logWrite(pInst, fGroupAndFlags, pszMsg, cch, 0);
+
+
+    /*
+     * Init the dumping.
+     *  (Reusing the first part of the message, skipping past the 'Dump' here.)
+     */
+    pszOffset = pszMsg;
+    while (pszOffset[0] != 'D' && pszOffset[1] != 'u')
+        pszOffset++;
+    pszOffset += 4;
+    *pszOffset++ = ':';
+    *pszOffset++ = ' ';
+
+    /*
+     * Do the dumping.
+     */
+    off = 0;
+    pbData = (char *)pvData;
+    while (cbData > 0)
+    {
+        char *pszHex, *pszChar, *pszHexEnd;
+        /* print offsets. */
+        pszHex = pszOffset + __libc_logSNPrintf(pszOffset, 64, "%08x %08x  ", (unsigned)pvData, off); /* !portability! */
+        pszHexEnd = pszChar = pszHex + 16 * 3 + 2;  /* 16 chars with on space, two space before chars column. */
+
+        /* output chars. */
+        while (cbData > 0)
+        {
+            char ch = *pbData++;
+            cbData--;
+            *pszHex++ = gszHexDigits[(unsigned)ch >> 4];
+            *pszHex++ = gszHexDigits[(unsigned)ch & 4];
+            *pszHex++ = ' ';
+            if (ch < 0x30 /*|| more unprintables */)
+                *pszChar++ = '.';
+            else
+                *pszChar++ = ch;
+        }
+
+        /* finish it */
+        while (pszHex < pszHexEnd)
+            *pszHex++ = ' ';
+        pszHexEnd[-(8 * 3)] = '-';
+        *pszChar++ = '\n';
+        *pszChar = '\0';
+
+        /* write line */
+        __libc_logWrite(pInst, fGroupAndFlags, pszMsg, pszChar - pszMsg, 0);
+        
+        /* next */
+        off += 16;
+    }
+}
+
+
+/**
  * Assertion helper.
  * Logs and displays (stderr) an assertion failed message.
@@ -1227 +1363 @@
                        int cchWidth, int cchPrecision, unsigned int fFlags)
 {
-    char *          achDigits = "0123456789abcdef";
+    const char     *pszDigits = gszHexDigits;
     int             cchValue;
     unsigned long   ul;
@@ -1236 +1372 @@
         return NULL;
     if (fFlags & NTSF_CAPITAL)
-        achDigits = "0123456789ABCDEF";
+        pszDigits = gszHexDigitsUpper;
     if (fFlags & NTSF_LEFT)
         fFlags &= ~NTSF_ZEROPAD;
@@ -1297 +1433 @@
     do
     {
-        psz[i--] = achDigits[lValue % uiBase];
+        psz[i--] = pszDigits[lValue % uiBase];
         lValue /= uiBase;
     } while (lValue > 0);
@@ -1325 +1461 @@
                          int cchWidth, int cchPrecision, unsigned int fFlags)
 {
-    char *              achDigits = "0123456789abcdef";
+    const char         *pszDigits = gszHexDigits;
     int                 cchValue;
     unsigned long long  ull;
@@ -1334 +1470 @@
         return NULL;
     if (fFlags & NTSF_CAPITAL)
-        achDigits = "0123456789ABCDEF";
+        pszDigits = gszHexDigitsUpper;
     if (fFlags & NTSF_LEFT)
         fFlags &= ~NTSF_ZEROPAD;
@@ -1397 +1533 @@
     do
     {
-        psz[i--] = achDigits[llValue % uiBase];
+        psz[i--] = pszDigits[llValue % uiBase];
         llValue /= uiBase;
     } while (llValue > 0);
@@ -1421 +1557 @@
 static int      __libc_logVSNPrintf(char *pszBuffer, size_t cchBuffer, const char *pszFormat, va_list args)
 {
-    static const char szHexChars[17] = "0123456789abcdef";
     int             rc;
     char           *pszBufferIn = pszBuffer;
@@ -1683 +1818 @@
                                         {
                                             char ch = *pb++;
-                                            *pszBuffer++ = szHexChars[(unsigned)ch >> 4];
-                                            *pszBuffer++ = szHexChars[(unsigned)ch & 0xf];
+                                            *pszBuffer++ = gszHexDigits[(unsigned)ch >> 4];
+                                            *pszBuffer++ = gszHexDigits[(unsigned)ch & 0xf];
                                             cb--;
                                             cchBuffer -= 2;
@@ -1694 +1829 @@
                                                 cb--;
                                                 *pszBuffer++ = ' ';
-                                                *pszBuffer++ = szHexChars[(unsigned)ch >> 4];
-                                                *pszBuffer++ = szHexChars[(unsigned)ch & 0xf];
+                                                *pszBuffer++ = gszHexDigits[(unsigned)ch >> 4];
+                                                *pszBuffer++ = gszHexDigits[(unsigned)ch & 0xf];
                                                 cchBuffer -= 3;
                                                 cch += 3;