[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r38084 - in gnunet/src: include util
From: |
gnunet |
Subject: |
[GNUnet-SVN] r38084 - in gnunet/src: include util |
Date: |
Sun, 9 Oct 2016 13:51:12 +0200 |
Author: teichm
Date: 2016-10-09 13:51:12 +0200 (Sun, 09 Oct 2016)
New Revision: 38084
Modified:
gnunet/src/include/gnunet_common.h
gnunet/src/util/common_allocation.c
Log:
libgnunetutil: add file, line debug info to multidimensional array allocators
Modified: gnunet/src/include/gnunet_common.h
===================================================================
--- gnunet/src/include/gnunet_common.h 2016-10-09 11:38:55 UTC (rev 38083)
+++ gnunet/src/include/gnunet_common.h 2016-10-09 11:51:12 UTC (rev 38084)
@@ -807,7 +807,7 @@
* @param m size of the second dimension
* @param type name of the struct or union, i.e. pass 'struct Foo'.
*/
-#define GNUNET_new_array_2d(n, m, type) (type **) GNUNET_xnew_array_2d_ (n, m,
sizeof (type))
+#define GNUNET_new_array_2d(n, m, type) (type **) GNUNET_xnew_array_2d_ (n, m,
sizeof (type), __FILE__, __LINE__)
/**
* @ingroup memory
@@ -819,7 +819,7 @@
* @param o size of the third dimension
* @param type name of the struct or union, i.e. pass 'struct Foo'.
*/
-#define GNUNET_new_array_3d(n, m, o, type) (type ***) GNUNET_xnew_array_3d_
(n, m, o, sizeof (type))
+#define GNUNET_new_array_3d(n, m, o, type) (type ***) GNUNET_xnew_array_3d_
(n, m, o, sizeof (type), __FILE__, __LINE__)
/**
* @ingroup memory
@@ -1001,10 +1001,13 @@
* @param n size of the first dimension
* @param m size of the second dimension
* @param elementSize size of a single element in bytes
+ * @param filename where is this call being made (for debugging)
+ * @param linenumber line where this call is being made (for debugging)
* @return allocated memory, never NULL
*/
void **
-GNUNET_xnew_array_2d_ (size_t n, size_t m, size_t elementSize);
+GNUNET_xnew_array_2d_ (size_t n, size_t m, size_t elementSize,
+ const char *filename, int linenumber);
/**
@@ -1018,10 +1021,13 @@
* @param m size of the second dimension
* @param o size of the third dimension
* @param elementSize size of a single element in bytes
+ * @param filename where is this call being made (for debugging)
+ * @param linenumber line where this call is being made (for debugging)
* @return allocated memory, never NULL
*/
void ***
-GNUNET_xnew_array_3d_ (size_t n, size_t m, size_t o, size_t elementSize);
+GNUNET_xnew_array_3d_ (size_t n, size_t m, size_t o, size_t elementSize,
+ const char *filename, int linenumber);
/**
Modified: gnunet/src/util/common_allocation.c
===================================================================
--- gnunet/src/util/common_allocation.c 2016-10-09 11:38:55 UTC (rev 38083)
+++ gnunet/src/util/common_allocation.c 2016-10-09 11:51:12 UTC (rev 38084)
@@ -95,14 +95,18 @@
* @param n size of the first dimension
* @param m size of the second dimension
* @param elementSize size of a single element in bytes
+ * @param filename where is this call being made (for debugging)
+ * @param linenumber line where this call is being made (for debugging)
* @return allocated memory, never NULL
*/
void **
-GNUNET_xnew_array_2d_ (size_t n, size_t m, size_t elementSize)
+GNUNET_xnew_array_2d_ (size_t n, size_t m, size_t elementSize,
+ const char *filename, int linenumber)
{
/* use char pointer internally to avoid void pointer arithmetic
warnings */
- char **ret = GNUNET_malloc (n * sizeof (void *) + /* 1. dim header */
- n * m * elementSize); /* element data */
+ char **ret = GNUNET_xmalloc_ (n * sizeof (void *) + /* 1. dim header */
+ n * m * elementSize, /* element data */
+ filename, linenumber);
for (size_t i = 0; i < n; i++)
ret[i] = (char *)ret + /* base address */
@@ -123,15 +127,19 @@
* @param m size of the second dimension
* @param o size of the third dimension
* @param elementSize size of a single element in bytes
+ * @param filename where is this call being made (for debugging)
+ * @param linenumber line where this call is being made (for debugging)
* @return allocated memory, never NULL
*/
void ***
-GNUNET_xnew_array_3d_ (size_t n, size_t m, size_t o, size_t elementSize)
+GNUNET_xnew_array_3d_ (size_t n, size_t m, size_t o, size_t elementSize,
+ const char *filename, int linenumber)
{
/* use char pointer internally to avoid void pointer arithmetic
warnings */
- char ***ret = GNUNET_malloc (n * sizeof (void **) + /* 1. dim
header */
- n * m * sizeof (void *) + /* 2. dim
header */
- n * m * o * elementSize); /* element data
*/
+ char ***ret = GNUNET_xmalloc_ (n * sizeof (void **) + /* 1. dim
header */
+ n * m * sizeof (void *) + /* 2. dim
header */
+ n * m * o * elementSize, /* element
data */
+ filename, linenumber);
for (size_t i = 0; i < n; i++)
{
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r38084 - in gnunet/src: include util,
gnunet <=