[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r9433 - gnunet/src/util
From: |
gnunet |
Subject: |
[GNUnet-SVN] r9433 - gnunet/src/util |
Date: |
Mon, 9 Nov 2009 06:24:50 -0700 |
Author: durner
Date: 2009-11-09 06:24:50 -0700 (Mon, 09 Nov 2009)
New Revision: 9433
Modified:
gnunet/src/util/common_allocation.c
Log:
hard memory limit for safe buildbot'ing on Windows
Modified: gnunet/src/util/common_allocation.c
===================================================================
--- gnunet/src/util/common_allocation.c 2009-11-09 11:16:38 UTC (rev 9432)
+++ gnunet/src/util/common_allocation.c 2009-11-09 13:24:50 UTC (rev 9433)
@@ -31,6 +31,14 @@
#define INT_MAX 0x7FFFFFFF
#endif
+#ifdef MINGW
+ #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.
@@ -57,6 +65,12 @@
{
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)
@@ -65,6 +79,13 @@
abort ();
}
memset (result, 0, size);
+
+#ifdef W32_MEM_LIMIT
+ *((size_t *) result) = size;
+ result = &((size_t *) result)[1];
+ mem_used += size;
+#endif
+
return result;
}
@@ -80,14 +101,27 @@
*/
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;
}
@@ -103,6 +137,10 @@
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);
}
@@ -217,5 +255,4 @@
return ret;
}
-
/* end of common_allocation.c */
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r9433 - gnunet/src/util,
gnunet <=