Renamed stacktrace to memtrace

[runtime.git] / lib / silcutil / silcmemory.c

diff --git a/lib/silcutil/silcmemory.c b/lib/silcutil/silcmemory.c
index cd09a903124ba58687c7461b158c99b9f4104f27..082ac06d4953eba80b0cf2d49993e0e80a9faa34 100644 (file)
--- a/lib/silcutil/silcmemory.c
+++ b/lib/silcutil/silcmemory.c
@@ -4,7 +4,7 @@
 
   Author: Pekka Riikonen <priikone@silcnet.org>
 
-  Copyright (C) 1999 - 2007 Pekka Riikonen
+  Copyright (C) 1999 - 2008 Pekka Riikonen
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -16,37 +16,50 @@
   GNU General Public License for more details.
 
 */
-/* $Id$ */
 
-#include "silc.h"
+#include "silcruntime.h"
 
-#ifndef SILC_STACKTRACE
+#ifndef SILC_MEMTRACE
 
 #define SILC_MAX_ALLOC (1024 * 1024L * 1024L)
 
 void *silc_malloc(size_t size)
 {
   void *addr;
+
   if (silc_unlikely(size <= 0 || size >= SILC_MAX_ALLOC)) {
-    SILC_LOG_ERROR(("Invalid memory allocation"));
+    if (size == 0)
+      silc_set_errno_nofail(SILC_ERR_ZERO_ALLOCATION);
+    else
+      silc_set_errno_reason_nofail(SILC_ERR_TOO_LARGE_ALLOCATION,
+                                  "Allocation by %d", size);
     return NULL;
   }
+
   addr = malloc(size);
   if (silc_unlikely(!addr))
-    SILC_LOG_ERROR(("System out of memory"));
+    silc_set_errno_nofail(SILC_ERR_OUT_OF_MEMORY);
+
   return addr;
 }
 
 void *silc_calloc(size_t items, size_t size)
 {
   void *addr;
+
   if (silc_unlikely(size * items <= 0 || size * items >= SILC_MAX_ALLOC)) {
-    SILC_LOG_ERROR(("Invalid memory allocation"));
+    if (size == 0)
+      silc_set_errno_nofail(SILC_ERR_ZERO_ALLOCATION);
+    else
+      silc_set_errno_reason_nofail(SILC_ERR_TOO_LARGE_ALLOCATION,
+                                  "Allocation by %d", size);
     return NULL;
   }
+
   addr = calloc(items, size);
   if (silc_unlikely(!addr))
-    SILC_LOG_ERROR(("System out of memory"));
+    silc_set_errno_nofail(SILC_ERR_OUT_OF_MEMORY);
+
   return addr;
 }
 
@@ -54,12 +67,18 @@ void *silc_realloc(void *ptr, size_t size)
 {
   void *addr;
   if (silc_unlikely(size <= 0 || size >= SILC_MAX_ALLOC)) {
-    SILC_LOG_ERROR(("Invalid memory allocation"));
+    if (size == 0)
+      silc_set_errno_nofail(SILC_ERR_ZERO_ALLOCATION);
+    else
+      silc_set_errno_reason_nofail(SILC_ERR_TOO_LARGE_ALLOCATION,
+                                  "Allocation by %d", size);
     return NULL;
   }
+
   addr = realloc(ptr, size);
   if (silc_unlikely(!addr))
-    SILC_LOG_ERROR(("System out of memory"));
+    silc_set_errno_nofail(SILC_ERR_OUT_OF_MEMORY);
+
   return addr;
 }
 
@@ -71,9 +90,10 @@ void silc_free(void *ptr)
 void *silc_memdup(const void *ptr, size_t size)
 {
   unsigned char *addr;
+
   addr = silc_malloc(size + 1);
   if (silc_unlikely(!addr)) {
-    SILC_LOG_ERROR(("System out of memory"));
+    silc_set_errno_nofail(SILC_ERR_OUT_OF_MEMORY);
     return NULL;
   }
   memcpy((void *)addr, ptr, size);
@@ -81,7 +101,12 @@ void *silc_memdup(const void *ptr, size_t size)
   return (void *)addr;
 }
 
-#endif /* !SILC_STACKTRACE */
+char *silc_strdup(const char *str)
+{
+  return silc_memdup(str, strlen(str));
+}
+
+#endif /* !SILC_MEMTRACE */
 
 /* SilcStack aware routines */
 
@@ -92,8 +117,13 @@ void *silc_smalloc(SilcStack stack, SilcUInt32 size)
 
 void silc_sfree(SilcStack stack, void *ptr)
 {
-  if (stack)
+  if (stack) {
+#ifdef SILC_DEBUG
+    if (ptr)
+      *(unsigned char *)ptr = 'F';
+#endif /* SILC_DEBUG */
     return;
+  }
   silc_free(ptr);
 }
 
@@ -114,8 +144,20 @@ void *silc_scalloc(SilcStack stack, SilcUInt32 items, SilcUInt32 size)
 void *silc_srealloc(SilcStack stack, SilcUInt32 old_size,
                    void *ptr, SilcUInt32 size)
 {
-  return stack ? silc_stack_realloc(stack, old_size, ptr, size) :
-    silc_realloc(ptr, size);
+  void *new_ptr;
+
+  if (!stack)
+    return silc_realloc(ptr, size);
+
+  new_ptr = silc_stack_realloc(stack, old_size, ptr, size);
+  if (!new_ptr) {
+    new_ptr = silc_smalloc(stack, size);
+    if (!new_ptr)
+      return NULL;
+    memcpy(new_ptr, ptr, old_size > size ? size : old_size);
+  }
+
+  return new_ptr;
 }
 
 void *silc_smemdup(SilcStack stack, const void *ptr, SilcUInt32 size)