MinGW

[oweals/gnunet.git] / src / util / common_allocation.c

diff --git a/src/util/common_allocation.c b/src/util/common_allocation.c
index f39d84cb3693504efbe45b3fd9b2473992876e20..5be7caaa705b1d484cca8dc68d77fce144d077b1 100644 (file)
--- a/src/util/common_allocation.c
+++ b/src/util/common_allocation.c
@@ -31,6 +31,14 @@
 #define INT_MAX 0x7FFFFFFF
 #endif
 
+#if 0
+#define W32_MEM_LIMIT 200000000
+#endif
+
+#ifdef W32_MEM_LIMIT
+static LONG mem_used = 0;
+#endif
+
 /**
  * Allocate memory. Checks the return value, aborts if no more
  * memory is available.
@@ -48,8 +56,7 @@ GNUNET_xmalloc_ (size_t size, const char *filename, int linenumber)
 {
   /* As a security precaution, we generally do not allow very large
      allocations using the default 'GNUNET_malloc' macro */
-  GNUNET_assert_at (size <= GNUNET_MAX_MALLOC_CHECKED, filename,
-                    linenumber);
+  GNUNET_assert_at (size <= GNUNET_MAX_MALLOC_CHECKED, filename, linenumber);
   return GNUNET_xmalloc_unchecked_ (size, filename, linenumber);
 }
 
@@ -58,6 +65,12 @@ GNUNET_xmalloc_unchecked_ (size_t size, const char *filename, int linenumber)
 {
   void *result;
 
+#ifdef W32_MEM_LIMIT
+  size += sizeof (size_t);
+  if (mem_used + size > W32_MEM_LIMIT)
+    return NULL;
+#endif
+
   GNUNET_assert_at (size < INT_MAX, filename, linenumber);
   result = malloc (size);
   if (result == NULL)
@@ -66,6 +79,13 @@ GNUNET_xmalloc_unchecked_ (size_t size, const char *filename, int linenumber)
       abort ();
     }
   memset (result, 0, size);
+
+#ifdef W32_MEM_LIMIT
+  *((size_t *) result) = size;
+  result = &((size_t *) result)[1];
+  mem_used += size;
+#endif
+
   return result;
 }
 
@@ -73,22 +93,35 @@ GNUNET_xmalloc_unchecked_ (size_t size, const char *filename, int linenumber)
  * Reallocate memory. Checks the return value, aborts if no more
  * memory is available.
  *
- * @ptr the pointer to reallocate
- * @param size how many bytes of memory to allocate
+ * @param ptr the pointer to reallocate
+ * @param n how many bytes of memory to allocate
  * @param filename where in the code was the call to GNUNET_realloc
  * @param linenumber where in the code was the call to GNUNET_realloc
  * @return pointer to size bytes of memory
  */
 void *
 GNUNET_xrealloc_ (void *ptr,
-                  const size_t n, const char *filename, int linenumber)
+#ifndef W32_MEM_LIMIT
+                  const size_t n,
+#else
+                  size_t n,
+#endif
+                  const char *filename, int linenumber)
 {
+#ifdef W32_MEM_LIMIT
+  n += sizeof (size_t);
+  ptr = &((size_t *) ptr)[-1];
+  mem_used = mem_used - *((size_t *) ptr) + n;
+#endif
   ptr = realloc (ptr, n);
   if (!ptr)
     {
       GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "realloc");
       abort ();
     }
+#ifdef W32_MEM_LIMIT
+  ptr = &((size_t *) ptr)[1];
+#endif
   return ptr;
 }
 
@@ -104,6 +137,10 @@ void
 GNUNET_xfree_ (void *ptr, const char *filename, int linenumber)
 {
   GNUNET_assert_at (ptr != NULL, filename, linenumber);
+#ifdef W32_MEM_LIMIT
+  ptr = &((size_t *) ptr)[-1];
+  mem_used -= *((size_t *) ptr);
+#endif
   free (ptr);
 }
 
@@ -171,6 +208,14 @@ GNUNET_xgrow_ (void **old,
 }
 
 
+/**
+ * Like asprintf, just portable.
+ *
+ * @param buf set to a buffer of sufficient size (allocated, caller must free)
+ * @param format format string (see printf, fprintf, etc.)
+ * @param ... data for format string
+ * @return number of bytes in "*buf" excluding 0-termination
+ */
 int
 GNUNET_asprintf (char **buf, const char *format, ...)
 {
@@ -187,6 +232,16 @@ GNUNET_asprintf (char **buf, const char *format, ...)
   return ret;
 }
 
+
+/**
+ * Like snprintf, just aborts if the buffer is of insufficient size.
+ *
+ * @param buf pointer to buffer that is written to
+ * @param size number of bytes in buf
+ * @param format format strings
+ * @param ... data for format string
+ * @return number of bytes written to buf or negative value on error
+ */
 int
 GNUNET_snprintf (char *buf, size_t size, const char *format, ...)
 {
@@ -200,5 +255,4 @@ GNUNET_snprintf (char *buf, size_t size, const char *format, ...)
   return ret;
 }
 
-
 /* end of common_allocation.c */