14 Commits
v0.2 ... v0.3

7 changed files with 49 additions and 14 deletions

View File

@ -9,3 +9,10 @@ Change Log
- Switch to C. - Switch to C.
- Uses GNU Multiple Precision library (GMP) to hold prime numbers, allowing for 'infinite' size. - Uses GNU Multiple Precision library (GMP) to hold prime numbers, allowing for 'infinite' size.
- Add `likely()' and `unlikely()' macros to optimize. - Add `likely()' and `unlikely()' macros to optimize.
- v0.2.1: Memory Leak Fixes
- Fixed a major memory leak at the end of the program.
- Added more optimizers.
- v0.3: Optimizations
- Algorithm skips half the known primes.
- Removed `likely()' and `unlikely()' macros due to lack of information.
- Improved performance.

15
TODO.md Normal file
View File

@ -0,0 +1,15 @@
To-Do
=====
A to-do list for the project. Feel free to remove items as you solve them in your pull requests.
Next
----
To-do items to do for the next version:
- Profile code to better use `likely()` and `unlikely()` macros.
Features
--------
Features for future versions (not _Next_) of Indivisible:
- Implement multi-threaded version using OpenCL or OpenMP (whichever works).

View File

@ -2,8 +2,6 @@
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include "optimizers.h"
/** /**
* This is the number of elements by which the list expands. * This is the number of elements by which the list expands.
* WARNING: Always use doubles for this number (2^X) * WARNING: Always use doubles for this number (2^X)
@ -21,15 +19,17 @@ void initList(List *l) {
} }
void deInitList(List *l) { void deInitList(List *l) {
for(ulli i = 0; i < l->size; ++i) {
mpz_clear(l->list[i]);
}
free(l->list); free(l->list);
} }
void addToList(List *l, mpz_t n) { void addToList(List *l, mpz_t n) {
if(l->end == l->size) { if(l->end == l->size) {
l->size += BLOCK_SIZE; l->size += BLOCK_SIZE;
if(unlikely(l->size == 0)) { if(l->size == 0) {
fprintf(stderr, fprintf(stderr, "`l->size' has overflowed!\n");
"size has reached limit of `long long int' type!\n");
exit(1); exit(1);
} }
void *tmp = realloc(l->list, sizeof(mpz_t) * l->size); void *tmp = realloc(l->list, sizeof(mpz_t) * l->size);

View File

@ -2,13 +2,15 @@
#include <gmp.h> #include <gmp.h>
#include <stdbool.h> #include <stdbool.h>
#include "types.h"
/** /**
* @brief An infinitely expanding list type. * @brief An infinitely expanding list type.
*/ */
typedef struct { typedef struct {
mpz_t *list; //!< The list of elements mpz_t *list; //!< The list of elements
unsigned long long int size; //!< How many elements are in the list ulli size; //!< How many elements are in the list
unsigned long long int end; //!< The last element of the list (in use) ulli end; //!< The last element of the list (in use)
} List; } List;
/** /**

View File

@ -5,12 +5,13 @@
#include <gmp.h> #include <gmp.h>
#include "list.h" #include "list.h"
#include "types.h"
static bool run; static bool run;
void leave(); void leave();
int main(void) { int main(void) {
printf("Indivisible v0.2\n"); puts("Indivisible v0.2\n");
// Quit on ^C by setting `run = false' // Quit on ^C by setting `run = false'
run = true; run = true;
@ -34,11 +35,19 @@ int main(void) {
printf("\n"); printf("\n");
mpz_add_ui(num, num, 1); mpz_add_ui(num, num, 1);
// Variable for half `num'
mpz_t halfNum;
mpz_init(halfNum);
do { do {
// Calculate half of `num'
mpz_fdiv_q_ui(halfNum, num, 2);
// Loop through found primes // Loop through found primes
for(unsigned long long int i = 0; i < primes.size; ++i) { // Skip 2 because we're skipping even nymbers
for(ulli i = 1; mpz_cmp(primes.list[i], halfNum) >= 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) goto nextPrime; if(mpz_divisible_p(num, primes.list[i]) != 0)
goto nextPrime;
} }
// `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
@ -54,12 +63,15 @@ nextPrime:
mpz_add_ui(num, num, 2); mpz_add_ui(num, num, 2);
} while(run); } while(run);
// Clear GMP variables
mpz_clear(halfNum);
mpz_clear(num);
// Deinitialize the list // Deinitialize the list
deInitList(&primes); deInitList(&primes);
return 0; return 0;
} }
void leave() { void leave() {
printf("Exiting...\n"); puts("Exiting...\n");
run = false; run = false;
} }

View File

@ -1,3 +0,0 @@
#pragma once
#define likely(x) __builtin_expect(!!(x), 1)
#define unlikely(x) __builtin_expect(!!(x), 0)

2
src/types.h Normal file
View File

@ -0,0 +1,2 @@
#pragma once
typedef unsigned long long int ulli;