aboutsummaryrefslogtreecommitdiff
path: root/src/invalid
diff options
context:
space:
mode:
authorJ08nY2017-10-14 13:51:47 +0200
committerJ08nY2017-10-14 13:51:47 +0200
commit4dece41c236a7e92ab04205e8b6e076a2514a528 (patch)
tree81d01f854049a588cdd510deda3fc08a8f2e08c0 /src/invalid
parent80514f24dae8352f39f9a9e49c0d9afbd8edd432 (diff)
downloadecgen-4dece41c236a7e92ab04205e8b6e076a2514a528.tar.gz
ecgen-4dece41c236a7e92ab04205e8b6e076a2514a528.tar.zst
ecgen-4dece41c236a7e92ab04205e8b6e076a2514a528.zip
Format and update README.
Diffstat (limited to 'src/invalid')
-rw-r--r--src/invalid/invalid.c14
-rw-r--r--src/invalid/invalid_thread.c11
-rw-r--r--src/invalid/invalid_thread.h2
3 files changed, 13 insertions, 14 deletions
diff --git a/src/invalid/invalid.c b/src/invalid/invalid.c
index e908aa4..4533020 100644
--- a/src/invalid/invalid.c
+++ b/src/invalid/invalid.c
@@ -92,8 +92,8 @@ static size_t invalid_primes(GEN order, pari_ulong **primes) {
}
static size_t invalid_curves_single(const curve_t *curve, pari_ulong *primes,
- size_t nprimes, curve_t **curves,
- exhaustive_t *setup) {
+ size_t nprimes, curve_t **curves,
+ exhaustive_t *setup) {
arg_t *invalid_argss[OFFSET_END] = {NULL};
exhaustive_t invalid_setup = {.generators = setup->generators,
.validators = setup->validators,
@@ -129,7 +129,8 @@ static size_t invalid_curves_single(const curve_t *curve, pari_ulong *primes,
if (total > 0) {
if (!exhaustive_gen_retry(invalid, setup, OFFSET_GENERATORS,
OFFSET_POINTS, 1)) {
- curve_unroll(invalid, avma, btop); // necessary to free the ellinit
+ curve_unroll(invalid, avma,
+ btop); // necessary to free the ellinit
avma = btop;
continue;
}
@@ -156,8 +157,7 @@ static size_t invalid_curves_single(const curve_t *curve, pari_ulong *primes,
* generate prime order points, this is expensive (order needs to be
* factorised, so only do it if we want the curve)
*/
- exhaustive_gen(invalid, &invalid_setup, OFFSET_POINTS,
- OFFSET_END);
+ exhaustive_gen(invalid, &invalid_setup, OFFSET_POINTS, OFFSET_END);
size_t count = 0;
for (size_t i = nprimes; i-- > 0;) {
@@ -209,8 +209,8 @@ static size_t invalid_curves_single(const curve_t *curve, pari_ulong *primes,
}
static size_t invalid_curves_threaded(const curve_t *curve, pari_ulong *primes,
- size_t nprimes, curve_t **curves,
- exhaustive_t *setup) {
+ size_t nprimes, curve_t **curves,
+ exhaustive_t *setup) {
pthread_t pthreads[cfg->threads];
thread_t threads[cfg->threads];
struct pari_thread pari_threads[cfg->threads];
diff --git a/src/invalid/invalid_thread.c b/src/invalid/invalid_thread.c
index 8967d31..255c61f 100644
--- a/src/invalid/invalid_thread.c
+++ b/src/invalid/invalid_thread.c
@@ -23,8 +23,7 @@ void *invalid_thread(void *arg) {
while (*thread->generated < thread->nprimes) {
pari_sp btop = avma;
- exhaustive_gen(invalid, thread->setup, OFFSET_B,
- OFFSET_GENERATORS);
+ exhaustive_gen(invalid, thread->setup, OFFSET_B, OFFSET_GENERATORS);
size_t ndivides = 0;
for (size_t i = thread->nprimes; i-- > 0;) {
if (dvdis(invalid->order, thread->primes[i])) {
@@ -34,8 +33,8 @@ void *invalid_thread(void *arg) {
}
if (ndivides > 0 &&
- exhaustive_gen_retry(invalid, &invalid_setup,
- OFFSET_GENERATORS, OFFSET_POINTS, 1)) {
+ exhaustive_gen_retry(invalid, &invalid_setup, OFFSET_GENERATORS,
+ OFFSET_POINTS, 1)) {
pthread_mutex_lock(thread->mutex_state);
size_t nfree = 0;
// can be up to ndivides, but also lower...
@@ -54,8 +53,8 @@ void *invalid_thread(void *arg) {
if (nfree > 0) {
arg_t prime_divisors = {primes, nprimes};
invalid_argss[OFFSET_POINTS] = &prime_divisors;
- exhaustive_gen(invalid, &invalid_setup,
- OFFSET_POINTS, OFFSET_END);
+ exhaustive_gen(invalid, &invalid_setup, OFFSET_POINTS,
+ OFFSET_END);
pthread_mutex_lock(thread->mutex_state);
size_t count = 0;
diff --git a/src/invalid/invalid_thread.h b/src/invalid/invalid_thread.h
index e93bbda..d05c29a 100644
--- a/src/invalid/invalid_thread.h
+++ b/src/invalid/invalid_thread.h
@@ -8,8 +8,8 @@
#ifndef ECGEN_INVALID_THREAD_H
#define ECGEN_INVALID_THREAD_H
-#include <exhaustive/exhaustive.h>
#include <pthread.h>
+#include "exhaustive/exhaustive.h"
#include "misc/types.h"
typedef enum { STATE_FREE, STATE_GENERATING, STATE_GENERATED } state_e;