Changeset: 144be5a79cec for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=144be5a79cec
Modified Files:
monetdb5/extras/crackers/crackers_multicore_unordered.mx
monetdb5/extras/crackers/crackers_parallelselect_ops.mx
Branch: holindex
Log Message:
Replace malloc and free with GDKmalloc and GDKfree respectively.
diffs (216 lines):
diff --git a/monetdb5/extras/crackers/crackers_multicore_unordered.mx
b/monetdb5/extras/crackers/crackers_multicore_unordered.mx
--- a/monetdb5/extras/crackers/crackers_multicore_unordered.mx
+++ b/monetdb5/extras/crackers/crackers_multicore_unordered.mx
@@ -167,11 +167,11 @@ CRKscanUnorderedZeroParallel_@2_@1(BAT *
oid partition_elements;
thread_data_t *data;
- pthread_t **thread = (pthread_t **) malloc (sizeof(pthread_t *) *
nthreads);
+ pthread_t **thread = (pthread_t **) GDKmalloc (sizeof(pthread_t *) *
nthreads);
for (i = 0; i < nthreads; i++)
- thread[i] = (pthread_t *) malloc (sizeof(pthread_t));
+ thread[i] = (pthread_t *) GDKmalloc (sizeof(pthread_t));
- data = malloc (nthreads * sizeof(thread_data_t));
+ data = GDKmalloc (nthreads * sizeof(thread_data_t));
partition_elements=(last-first+1)/nthreads;
@@ -206,9 +206,9 @@ CRKscanUnorderedZeroParallel_@2_@1(BAT *
/* Clean up. */
for (i = 0; i < nthreads; i++)
- free (thread[i]);
+ GDKfree(thread[i]);
- free (thread);
+ GDKfree(thread);
return MAL_SUCCEED;
}
@@ -219,14 +219,14 @@ CRKreorganizeUnorderedZeroParallel_@2_@1
oid partition_elements;
thread_data_new_t *data;
- pthread_t **thread = (pthread_t **) malloc (sizeof(pthread_t *) *
nthreads);
+ pthread_t **thread = (pthread_t **) GDKmalloc (sizeof(pthread_t *) *
nthreads);
/* Allocate memory for the pthread_ts. */
for (i = 0; i < nthreads; i++)
- thread[i] = (pthread_t *) malloc (sizeof(pthread_t));
+ thread[i] = (pthread_t *) GDKmalloc (sizeof(pthread_t));
/* Allocate memory for thread data. */
- data = malloc (nthreads * sizeof(thread_data_new_t));
+ data = GDKmalloc (nthreads * sizeof(thread_data_new_t));
/* Now create the threads. */
partition_elements=(last-first+1)/nthreads;
@@ -265,9 +265,9 @@ CRKreorganizeUnorderedZeroParallel_@2_@1
/* Clean up. */
for (i = 0; i < nthreads; i++)
- free (thread[i]);
+ GDKfree(thread[i]);
- free (thread);
+ GDKfree(thread);
return MAL_SUCCEED;
}
@@ -279,16 +279,16 @@ CRKrestoreUnorderedZeroParallel_@2_@1(BA
oid partition_elements, position=0;
thread_data_restore_t *data;
- pthread_t **thread = (pthread_t **) malloc (sizeof(pthread_t *) *
nthreads);
+ pthread_t **thread = (pthread_t **) GDKmalloc (sizeof(pthread_t *) *
nthreads);
(void) data_greater;
/* Allocate memory for the pthread_ts. */
for (i = 0; i < nthreads; i++)
- thread[i] = (pthread_t *) malloc (sizeof(pthread_t));
+ thread[i] = (pthread_t *) GDKmalloc (sizeof(pthread_t));
/* Allocate memory for thread data. */
- data = malloc (nthreads * sizeof(thread_data_restore_t));
+ data = GDKmalloc (nthreads * sizeof(thread_data_restore_t));
/* Now create the threads. */
partition_elements=(last-first+1)/nthreads;
@@ -328,16 +328,15 @@ CRKrestoreUnorderedZeroParallel_@2_@1(BA
/* Clean up. */
for (i = 0; i < nthreads; i++)
- free (thread[i]);
+ GDKfree(thread[i]);
- free (thread);
+ GDKfree(thread);
for (i = 0; i < nthreads; i++)
position=position+data_less[i];
t0 = (@1 *)Tloc(b, BUNfirst(b));
lt = (@1 *)Tloc(b, BUNfirst(b) + first + position-1);
-// *pos=(oid) (lt-t0);
if (@5_@4(lt, &mval,@6@1)){
if (lt==t0)
@@ -351,7 +350,6 @@ CRKrestoreUnorderedZeroParallel_@2_@1(BA
*pos = *pos + 1;
}
-
return MAL_SUCCEED;
}
diff --git a/monetdb5/extras/crackers/crackers_parallelselect_ops.mx
b/monetdb5/extras/crackers/crackers_parallelselect_ops.mx
--- a/monetdb5/extras/crackers/crackers_parallelselect_ops.mx
+++ b/monetdb5/extras/crackers/crackers_parallelselect_ops.mx
@@ -134,16 +134,16 @@ CRKparalleluselectBounds_@1(int *vid, in
if (*inclusiveLow == TRUE)
{
CRKscanUnorderedZeroParallel@2_RE_@1(b, pl_new, pl_new_oid,
*low, cl1, ch1, nthreads, p_data_less, p_data_greater);
- pl_new=(int *)malloc((ch1-cl1) * sizeof(int));
- pl_new_oid=(oid *)malloc((ch1-cl1) * sizeof(oid));
+ pl_new=(int *) GDKmalloc((ch1-cl1) * sizeof(int));
+ pl_new_oid=(oid *) GDKmalloc((ch1-cl1) * sizeof(oid));
CRKreorganizeUnorderedZeroParallel@2_RE_@1(b, pl_new,
pl_new_oid, *low, cl1, ch1, nthreads, p_data_less, p_data_greater);
CRKrestoreUnorderedZeroParallel@2_RE_@1(b, pl_new, pl_new_oid,
*low, cl1, ch1, nthreads, p_data_less, p_data_greater, &vl);
}
else
{
CRKscanUnorderedZeroParallel@2_LE_@1(b, pl_new, pl_new_oid,
*low, cl1, ch1, nthreads, p_data_less, p_data_greater);
- pl_new=(int *)malloc((ch1-cl1) * sizeof(int));
- pl_new_oid=(oid *)malloc((ch1-cl1) * sizeof(oid));
+ pl_new=(int *) GDKmalloc((ch1-cl1) * sizeof(int));
+ pl_new_oid=(oid *) GDKmalloc((ch1-cl1) * sizeof(oid));
CRKreorganizeUnorderedZeroParallel@2_LE_@1(b, pl_new,
pl_new_oid, *low, cl1, ch1, nthreads, p_data_less, p_data_greater);
CRKrestoreUnorderedZeroParallel@2_LE_@1(b, pl_new, pl_new_oid,
*low, cl1, ch1, nthreads, p_data_less, p_data_greater, &vl);
}
@@ -166,16 +166,16 @@ CRKparalleluselectBounds_@1(int *vid, in
if (*inclusiveHgh == TRUE)
{
CRKscanUnorderedZeroParallel@2_LE_@1(b, pr_new, pr_new_oid,
*hgh, cl2, ch2, nthreads, p_data_less, p_data_greater);
- pr_new=(int *)malloc((ch2-cl2) * sizeof(int));
- pr_new_oid=(oid *)malloc((ch2-cl2) * sizeof(oid));
+ pr_new=(int *) GDKmalloc((ch2-cl2) * sizeof(int));
+ pr_new_oid=(oid *) GDKmalloc((ch2-cl2) * sizeof(oid));
CRKreorganizeUnorderedZeroParallel@2_LE_@1(b, pr_new,
pr_new_oid, *hgh, cl2, ch2, nthreads, p_data_less, p_data_greater);
CRKrestoreUnorderedZeroParallel@2_LE_@1(b, pr_new,
pr_new_oid, *hgh, cl2, ch2, nthreads, p_data_less, p_data_greater, &vh);
}
else
{
CRKscanUnorderedZeroParallel@2_RE_@1(b, pr_new, pr_new_oid,
*hgh, cl2, ch2, nthreads, p_data_less, p_data_greater);
- pr_new=(int *)malloc((ch2-cl2) * sizeof(int));
- pr_new_oid=(oid *)malloc((ch2-cl2) * sizeof(oid));
+ pr_new=(int *) GDKmalloc((ch2-cl2) * sizeof(int));
+ pr_new_oid=(oid *) GDKmalloc((ch2-cl2) * sizeof(oid));
CRKreorganizeUnorderedZeroParallel@2_RE_@1(b, pr_new,
pr_new_oid, *hgh, cl2, ch2, nthreads, p_data_less, p_data_greater);
CRKrestoreUnorderedZeroParallel@2_RE_@1(b, pr_new, pr_new_oid,
*hgh, cl2, ch2, nthreads, p_data_less, p_data_greater, &vh);
}
@@ -575,6 +575,13 @@ createView:
/*fprintf(ofp,"%d\n",pieces);
fclose(ofp);*/
+
+ GDKfree(pl_new);
+ GDKfree(pl_new_oid);
+ GDKfree(pr_new);
+ GDKfree(pr_new_oid);
+ GDKfree(p_data_less);
+ GDKfree(p_data_greater);
@:CreateResult()@
return MAL_SUCCEED;
@@ -886,8 +893,8 @@ CRKRangeLeftNilTree_@1(int *vid, int *bi
int *p_data_greater = NULL;
int nthreads=2;
- p_data_less=(int *)malloc(nthreads * sizeof(int));
- p_data_greater=(int *)malloc(nthreads * sizeof(int));
+ p_data_less=(int *) GDKmalloc(nthreads * sizeof(int));
+ p_data_greater=(int *) GDKmalloc(nthreads * sizeof(int));
if (*inclusiveHgh == TRUE) HBound = FALSE;
@@ -973,7 +980,12 @@ CRKRangeLeftNilTree_@1(int *vid, int *bi
}
else
vh = ch2;
-
+
+ GDKfree(pr_new);
+ GDKfree(pr_new_oid);
+ GDKfree(p_data_less);
+ GDKfree(p_data_greater);
+
@:CreateResult()@
return MAL_SUCCEED;
}
@@ -995,8 +1007,8 @@ CRKRangeRightNilTree_@1(int *vid, int *b
int *p_data_greater = NULL;
int nthreads=2;
- p_data_less=(int *)malloc(nthreads * sizeof(int));
- p_data_greater=(int *)malloc(nthreads * sizeof(int));
+ p_data_less=(int *) GDKmalloc(nthreads * sizeof(int));
+ p_data_greater=(int *) GDKmalloc(nthreads * sizeof(int));
m = existsCrackerIndex(*bid);
@@ -1081,7 +1093,12 @@ CRKRangeRightNilTree_@1(int *vid, int *b
}
else
vl = cl1;
-
+
+ GDKfree(pl_new);
+ GDKfree(pl_new_oid);
+ GDKfree(p_data_less);
+ GDKfree(p_data_greater);
+
@:CreateResult()@
return MAL_SUCCEED;
}
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
