Almost completely parallelized.

This commit is contained in:
Nicolás A. Ortega 2017-01-31 19:39:35 +01:00
parent a6ecea514f
commit 76936644cd
No known key found for this signature in database
GPG Key ID: 614272579C2070D1

View File

@ -4,6 +4,7 @@
#include <stdbool.h> #include <stdbool.h>
#include <unistd.h> #include <unistd.h>
#include <gmp.h> #include <gmp.h>
#include <omp.h>
#include <sys/stat.h> #include <sys/stat.h>
@ -103,10 +104,6 @@ int main(int argc, char *argv[]) {
mpz_t num; mpz_t num;
mpz_init(num); mpz_init(num);
// Variable for half `num'
mpz_t numRoot;
mpz_init(numRoot);
if(efile == NULL) puts("Use Ctrl+C to exit."); if(efile == NULL) puts("Use Ctrl+C to exit.");
if(newFile) { if(newFile) {
@ -166,35 +163,63 @@ int main(int argc, char *argv[]) {
goto releaseMemory; goto releaseMemory;
} }
#pragma omp parallel shared(run, num)
{
// Variable for sqrt of `privNum'
mpz_t numRoot;
mpz_init(numRoot);
mpz_t privNum;
mpz_init(privNum);
mpz_add_ui(privNum, num, omp_get_thread_num() * 2);
/*mpz_out_str(stdout, base, privNum);*/
/*printf("-\n");*/
#pragma omp barrier
do { do {
// Calculate the sqrt(num) // Calculate the sqrt(num)
mpz_sqrt(numRoot, num); mpz_sqrt(numRoot, privNum);
// Make sure a number larger than numRoot exists
while(mpz_cmp(primes.list[primes.end], numRoot) <= 0) {
if(!run)
goto leaveLoop;
}
/** /**
* Loop through primes we've found until we get to half of the number * Loop through primes we've found until we get to the sqrt of the
* we're analyzing. Also, skip `2' since we're not testing even * number we're analyzing. Also, skip `2' since we're not testing even
* numbers. * numbers.
*/ */
for(size_t i = 1; mpz_cmp(primes.list[i], numRoot) <= 0; ++i) { for(size_t i = 1; mpz_cmp(primes.list[i], numRoot) <= 0; ++i) {
// If `num' is divisible by a prime then go to the next number // If `num' is divisible by a prime then go to the next number
if(mpz_divisible_p(num, primes.list[i]) != 0) if(mpz_divisible_p(privNum, primes.list[i]) != 0)
goto nextNum; goto nextNum;
} }
// `num' is a prime so we add it to the list and print it // `num' is a prime so we add it to the list and print it
if(addToList(&primes, num) == 1) { #pragma omp critical
{
if(addToList(&primes, privNum) == 1) {
fprintf(stderr, "Failed to allocate more memory for list.\n"); fprintf(stderr, "Failed to allocate more memory for list.\n");
goto releaseMemory; exitCode = 1;
run = false;
} }
if(!f_quiet) { if(!f_quiet) {
if(mpz_out_str(stdout, base, num) == 0) if(mpz_out_str(stdout, base, privNum) == 0)
fprintf(stderr, "Could not print to `stdout'!\n"); fprintf(stderr, "Could not print to `stdout'!\n");
printf("\n"); printf("\n");
} }
}
nextNum: nextNum:
// Add 2 (skip even numbers since they're all divisible by 2) mpz_add_ui(privNum, privNum, omp_get_num_threads() * 2);
mpz_add_ui(num, num, 2);
} while(run); } while(run);
leaveLoop:
mpz_clear(privNum);
mpz_clear(numRoot);
#pragma omp barrier
}
printf("Found %zu primes.\n", primes.end); printf("Found %zu primes.\n", primes.end);
@ -218,7 +243,6 @@ nextNum:
releaseMemory: releaseMemory:
puts("Clearing memory..."); puts("Clearing memory...");
// Clear GMP variables // Clear GMP variables
mpz_clear(numRoot);
mpz_clear(num); mpz_clear(num);
// Deinitialize the list // Deinitialize the list
deInitList(&primes); deInitList(&primes);