From ebfe508205a08eb72c66779520e3c059e4b655a1 Mon Sep 17 00:00:00 2001 From: David Kaufmann Date: Mon, 31 Oct 2011 13:41:57 +0100 Subject: [PATCH] small changes --- openmp/merge/sort.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/openmp/merge/sort.c b/openmp/merge/sort.c index 76434eb..63231ae 100644 --- a/openmp/merge/sort.c +++ b/openmp/merge/sort.c @@ -41,8 +41,8 @@ void merge(int ti, int * a, int n, int * b, int m, int * c) { if (n<0) { n=0;} sum = n + m; //printf ("%i modifying %i (%i+%i) (c[%i]/0x%08x -> c[%i]/0x%08x)\n", ti, sum, n, m, 0, (unsigned int) &c, sum-1, ((unsigned int) &c)+sum); - i = 0; - while (i < sum) { + for (i = 0; i < sum; i++) { + // n+m == 0 if (*a < 0 && *b < 0) { printf ("%i Calculation failed somehow...\n", ti); return; @@ -64,7 +64,6 @@ void merge(int ti, int * a, int n, int * b, int m, int * c) { } } } - i++; } return; } @@ -89,6 +88,7 @@ int main ( int argc, char ** argv) { } } + //printf ("Maximal number of threads: %i\n", omp_get_max_threads()); printf ("----------------------------------\n"); c = (int *) malloc((LISTSIZE * 2 + 1) * (sizeof (int))); @@ -98,7 +98,7 @@ int main ( int argc, char ** argv) { printlist("0 Sorted List B:", b); a_len = n/p; -#pragma omp parallel for shared(a,b,c,n,p,a_len) private(i,b_len_begin,b_len_end,b_len) + #pragma omp parallel for shared(a,b,c,n,p,a_len) private(i,b_len_begin,b_len_end,b_len) for (i = 0; i < p; i++) { b_len_begin = rank(a[i*a_len], b); b_len_end = rank(a[(i+1)*a_len], b); -- 2.43.0