Add debug logging with time, refactor allocation

2 files changed, 9 insertions, 11 deletions

diff --git a/src/cm/cm.c b/src/cm/cm.c
index 43ae515..f91cddf 100644
--- a/src/cm/cm.c
+++ b/src/cm/cm.c
@@ -2,14 +2,16 @@
  * ecgen, tool for generating Elliptic curve domain parameters
  * Copyright (C) 2017 J08nY
  */
-/**
- * @file cm.c
- */
 #include "cm.h"
 #include "exhaustive/anomalous.h"
+#include "io/output.h"
 #include "p1363.h"
 
 int cm_do(config_t *cfg) {
+	debug_log_start("Starting Complex Multiplication method");
+
+	fprintf(stderr, "This is *NOT IMPLEMENTED* currently.\n");
+
 	GEN D = stoi(71);
 	form_t **forms;
 	size_t nforms = p1363_forms(D, &forms);
@@ -18,5 +20,6 @@ int cm_do(config_t *cfg) {
 	}
 
 	p1363_free(&forms, nforms);
+	debug_log_start("Finished Complex Multiplication method");
 	return 0;
 }
diff --git a/src/cm/p1363.c b/src/cm/p1363.c
index 24d28cb..d9fe943 100644
--- a/src/cm/p1363.c
+++ b/src/cm/p1363.c
@@ -2,11 +2,8 @@
  * ecgen, tool for generating Elliptic curve domain parameters
  * Copyright (C) 2017 J08nY
  */
-/**
- * @file p1363.c
- */
 #include "p1363.h"
-#include <pari/paripriv.h>
+#include "util/memory.h"
 
 GEN p1363_group(GEN D) {
 	pari_sp ltop = avma;
@@ -57,12 +54,10 @@ long p1363_num(GEN group) { return glength(group); }
 size_t p1363_forms(GEN D, form_t ***forms) {
 	GEN group = p1363_group(D);
 	size_t nforms = (size_t)p1363_num(group);
-	*forms = pari_malloc(nforms * sizeof(form_t *));
-	memset(*forms, 0, nforms * sizeof(form_t *));
+	*forms = try_calloc(nforms * sizeof(form_t *));
 
 	for (size_t i = 0; i < nforms; ++i) {
-		(*forms)[i] = pari_malloc(sizeof(form_t));
-		memset((*forms)[i], 0, sizeof(form_t));
+		(*forms)[i] = try_calloc(sizeof(form_t));
 		(*forms)[i]->A = gel(gel(group, i + 1), 1);
 		(*forms)[i]->B = gel(gel(group, i + 1), 2);
 		(*forms)[i]->C = gel(gel(group, i + 1), 3);