Changeset 826 for soft/giet_vm/applications/rosenfeld/nrc2/src/nralloc2.c

Timestamp:

Jul 13, 2017, 11:01:58 AM (7 years ago)

Author:

meunier

Message:

• Mise à jour NR2 et Rosenfeld

File:

• soft/giet_vm/applications/rosenfeld/nrc2/src/nralloc2.c (modified) (3 diffs)

soft/giet_vm/applications/rosenfeld/nrc2/src/nralloc2.c

@@ -160 +160 @@
 #undef remote_type_matrix
 #define remote_type_matrix(t) \
-t ** short_name(t,remote_,matrix)(int32_t nrl, int32_t nrh, int32_t ncl, int32_t nch) \
+t ** short_name(t,remote_,matrix)(int32_t nrl, int32_t nrh, int32_t ncl, int32_t nch, int32_t x, int32_t y) \
 {                                                                              \
     int32_t nrow = nrh - nrl + 1;                                              \
@@ -166 +166 @@
     t ** m;                                                                    \
     /* allocate pointers to row */                                             \
-    m = malloc((nrow + NR_END) * sizeof(t *));                                 \
+    m = remote_malloc((nrow + NR_END) * sizeof(t *), x, y);                    \
     if (m == NULL) {                                                           \
         nrerror("*** Error: allocation failure in %s\n", __func__);            \
@@ -173 +173 @@
     m -= nrl;                                                                  \
     /* allocate rows and set pointers to them */                               \
-    m[nrl] = malloc((nrow * ncol + NR_END) * sizeof(t));                       \
+    m[nrl] = remote_malloc((nrow * ncol + NR_END) * sizeof(t), x, y);          \
     if (m[nrl] == NULL) {                                                      \
         nrerror("*** Error: allocation failure in %s\n", __func__);            \