Changeset 3565 for trunk/kStuff/kProfile/kPrf2Read.cpp

Timestamp:

Aug 27, 2007, 6:06:17 AM (18 years ago)

Author:

bird

Message:

Use kStuff.

File:

• trunk/kStuff/kProfile/kPrf2Read.cpp (modified) (11 diffs)

trunk/kStuff/kProfile/kPrf2Read.cpp

@@ -1 +1 @@
 /* $Id: $ */
 /** @file
- *
- * kProfiler Mark 2 - The reader and statistics producer.
- *
- * Copyright (c) 2006 knut st. osmundsen <bird-src-spam@anduin.net.de>
- *
- *
- * This file is part of kLIBC.
- *
- * kLIBC is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * kLIBC is distributed in the hope that it will be useful,
+ * kProfiler Mark 2 - The reader and producer of statistics.
+ */
+
+/*
+ * Copyright (c) 2006-2007 knut st. osmundsen <bird-src-spam@anduin.net>
+ *
+ * This file is part of kProfiler.
+ *
+ * kProfiler is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * kProfiler is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with kLIBC; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- */
-
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with kProfiler; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
 
 
@@ -34 +33 @@
 #include <string.h>
 #include <stdarg.h>
-#if 0
-# ifdef KPRF_OS_WINDOWS
-#  include <malloc.h>
-typedef unsigned char uint8_t;
-typedef signed char int8_t;
-typedef unsigned short uint16_t;
-typedef signed short int16_t;
-typedef unsigned int uint32_t;
-typedef signed int int32_t;
-typedef unsigned _int64 uint64_t;
-typedef signed _int64 int64_t;
-typedef size_t uintptr_t;
-# else
-#  include <stdint.h>
-# endif
-#else
-    /* iprt mode */
-#include <iprt/types.h>
-#include <iprt/err.h>
-#include <iprt/avl.h>
-#if 1
-# include <iprt/alloc.h>
-# define malloc(cb) RTMemAlloc(cb)
-# define free(pv) RTMemFree(pv)
-#endif
-#endif
-
-#include "dbg.h"
+#include <k/kDbg.h>
 
 
@@ -69 +41 @@
  */
 #define KPRF_OFF2PTR(TypePrefix, TypeName, off, pHdr) \
-    ( (KPRF_TYPE(TypePrefix, TypeName)) ((off) + (uintptr_t)pHdr) )
+    ( (KPRF_TYPE(TypePrefix, TypeName)) ((off) + (KUPTR)pHdr) )
 
 /** @def KPRF_ALIGN
@@ -78 +50 @@
 
 /** @def KPRF_OFFSETOF
- * My usual extended OFFSETOF macro, except this returns uint32_t and mangles the type name.
+ * My usual extended offsetof macro, except this returns KU32 and mangles the type name.
  * @internal
  */
-#define KPRF_OFFSETOF(kPrfType, Member) ( (uint32_t)(uintptr_t)&((KPRF_TYPE(P,kPrfType))0)->Member )
+#define KPRF_OFFSETOF(kPrfType, Member) ( (KU32)(KUPTR)&((KPRF_TYPE(P,kPrfType))0)->Member )
 
 /** @def PRF_SIZEOF
@@ -161 +133 @@
  * @param   pOut                Where to write errors.
  */
-PKPRFHDR kPrfLoad(const char *pszFilename, uint32_t *pcb, FILE *pOut)
+PKPRFHDR kPrfLoad(const char *pszFilename, KU32 *pcb, FILE *pOut)
 {
     FILE *pFile = fopen(pszFilename, "rb");
@@ -215 +187 @@
  * @param   pOut        Where to write error messages.
  */
-static bool kPrfIsValidate(PCKPRFHDR pHdr, uint32_t cb, FILE *pOut)
+static bool kPrfIsValidate(PCKPRFHDR pHdr, KU32 cb, FILE *pOut)
 {
     /*
@@ -254 +226 @@
     KPRF_VALIDATE_SIZE(Thread, sizeof(KPRF32THREAD), sizeof(KPRF64THREAD));
     KPRF_VALIDATE_SIZE(Stack,
-                       (uint32_t)&((PKPRF32STACK)0)->aFrames[pHdr->Hdr32.cMaxStackFrames],
-                       (uint32_t)&((PKPRF64STACK)0)->aFrames[pHdr->Hdr32.cMaxStackFrames]);
-
-    uintptr_t cbHeader = (uintptr_t)&pHdr->Hdr32.aiFunctions[pHdr->Hdr32.cFunctions] - (uintptr_t)pHdr;
-    if (    cbHeader != (uint32_t)cbHeader
+                       (KU32)&((PKPRF32STACK)0)->aFrames[pHdr->Hdr32.cMaxStackFrames],
+                       (KU32)&((PKPRF64STACK)0)->aFrames[pHdr->Hdr32.cMaxStackFrames]);
+
+    KUPTR cbHeader = (KUPTR)&pHdr->Hdr32.aiFunctions[pHdr->Hdr32.cFunctions] - (KUPTR)pHdr;
+    if (    cbHeader != (KU32)cbHeader
         ||  cbHeader >= cb)
     {
@@ -267 +239 @@
 
     /* The space assignment is hereby required to be equal to the member order in the header. */
-    uint32_t offMin = cbHeader;
+    KU32 offMin = cbHeader;
 #define KPRF_VALIDATE_OFF(off, name) do {\
         if (    off > 0 \
@@ -322 +294 @@
      * Validate the function lookup table
      */
-    for (uint32_t i = 0; i < pHdr->Hdr32.cFunctions; i++)
+    for (KU32 i = 0; i < pHdr->Hdr32.cFunctions; i++)
         if (pHdr->Hdr32.aiFunctions[i] >= pHdr->Hdr32.cFunctions)
         {
@@ -362 +334 @@
      * Load and validate the data set.
      */
-    uint32_t cb;
+    KU32 cb;
     PKPRFHDR pHdr = kPrfLoad(pszFilename, &cb, pOut);
     if (!pHdr)
@@ -407 +379 @@
      * Load and validate the data set.
      */
-    uint32_t cb;
+    KU32 cb;
     PKPRFHDR pHdr = kPrfLoad(pszFilename, &cb, pOut);
     if (!pHdr)