From a583f145ab7db22d6e1c89c792a9cd11ef6540a6 Mon Sep 17 00:00:00 2001
From: lhausamm <loic_hausammann@hotmail.com>
Date: Mon, 28 May 2018 10:01:33 +0200
Subject: [PATCH] Remove engine from logger_init and fix testLogger
---
src/engine.c | 2 +-
src/logger.c | 2 +-
src/logger.h | 2 +-
src/logger_struct.h | 6 ++++-
tests/logger.yml | 5 ++++
tests/testLogger.c | 64 ++++++++++++++++++++++-----------------------
6 files changed, 44 insertions(+), 37 deletions(-)
create mode 100644 tests/logger.yml
diff --git a/src/engine.c b/src/engine.c
index 429727a093..03c0af95dd 100644
--- a/src/engine.c
+++ b/src/engine.c
@@ -6705,7 +6705,7 @@ void engine_init(struct engine *e, struct space *s, struct swift_params *params,
#if defined(WITH_LOGGER)
e->log = (struct logger *) malloc(sizeof(struct logger));
- logger_init(e->log, params, e);
+ logger_init(e->log, params);
#endif
/* Make the space link back to the engine. */
diff --git a/src/logger.c b/src/logger.c
index 9d592f9799..c50db8769b 100644
--- a/src/logger.c
+++ b/src/logger.c
@@ -403,7 +403,7 @@ void logger_ensure_size(
* @param params The #swift_params
* @param e The #engine
*/
-void logger_init(struct logger *log, const struct swift_params *params, const struct engine *e) {
+void logger_init(struct logger *log, const struct swift_params *params) {
/* read parameters */
log->delta_step = parser_get_param_int(params, "Logger:delta_step");
log->buffer_size = parser_get_param_float(params, "Logger:mmaped_buffer_size") * 1e9;
diff --git a/src/logger.h b/src/logger.h
index dfca21969c..4ef2a23f14 100644
--- a/src/logger.h
+++ b/src/logger.h
@@ -115,7 +115,7 @@ int logger_compute_chunk_size(unsigned int mask);
void logger_log_all(struct logger *log, const struct engine *e);
void logger_log_part(struct logger *log, const struct part *p, unsigned int mask, size_t *offset);
void logger_log_gpart(struct logger *log, const struct gpart *p, unsigned int mask, size_t *offset);
-void logger_init(struct logger *log, const struct swift_params *params, const struct engine *e);
+void logger_init(struct logger *log, const struct swift_params *params);
void logger_clean(struct logger *log);
void logger_log_timestamp(struct logger *log, integertime_t t, size_t *offset);
void logger_ensure_size(struct logger *log, size_t total_nr_parts,
diff --git a/src/logger_struct.h b/src/logger_struct.h
index 4cc401046b..b908fd7383 100644
--- a/src/logger_struct.h
+++ b/src/logger_struct.h
@@ -21,9 +21,13 @@
#ifdef WITH_LOGGER
-#define LOGGER_STRING_LENGTH 200
+#include <limits.h>
+
+/* Local Includes */
#include "dump.h"
+#define LOGGER_STRING_LENGTH 200
+
/* parameters of the logger */
struct logger_parameters {
/* size of a label in bytes */
diff --git a/tests/logger.yml b/tests/logger.yml
new file mode 100644
index 0000000000..dc7a570487
--- /dev/null
+++ b/tests/logger.yml
@@ -0,0 +1,5 @@
+# Parameters governing the logger snapshot system
+Logger:
+ delta_step: 10 # (Optional) Update the particle log every this many updates
+ mmaped_buffer_size: .01 # buffer size in GB
+ basename: indice # Common part of the filenames
diff --git a/tests/testLogger.c b/tests/testLogger.c
index abb4415068..14e49cdfd3 100644
--- a/tests/testLogger.c
+++ b/tests/testLogger.c
@@ -31,7 +31,8 @@
/* Local headers. */
#include "swift.h"
-void test_log_parts(struct dump *d) {
+void test_log_parts(struct logger *log) {
+ struct dump *d = log->dump;
/* Write several copies of a part to the dump. */
struct part p;
@@ -43,22 +44,20 @@ void test_log_parts(struct dump *d) {
size_t offset = d->count;
/* Write the full part. */
- logger_log_part(&p,
- logger_mask_x | logger_mask_v | logger_mask_a |
- logger_mask_u | logger_mask_h | logger_mask_rho |
- logger_mask_consts,
- &offset, d);
+ logger_log_part(log, &p, logger_mask_x | logger_mask_v | logger_mask_a |
+ logger_mask_u | logger_mask_h | logger_mask_rho |
+ logger_mask_consts, &offset);
printf("Wrote part at offset %#016zx.\n", offset);
/* Write only the position. */
p.x[0] = 2.0;
- logger_log_part(&p, logger_mask_x, &offset, d);
+ logger_log_part(log, &p, logger_mask_x, &offset);
printf("Wrote part at offset %#016zx.\n", offset);
/* Write the position and velocity. */
p.x[0] = 3.0;
p.v[0] = 0.3;
- logger_log_part(&p, logger_mask_x | logger_mask_v, &offset, d);
+ logger_log_part(log, &p, logger_mask_x | logger_mask_v, &offset);
printf("Wrote part at offset %#016zx.\n", offset);
/* Recover the last part from the dump. */
@@ -101,7 +100,8 @@ void test_log_parts(struct dump *d) {
}
}
-void test_log_gparts(struct dump *d) {
+void test_log_gparts(struct logger *log) {
+ struct dump *d = log->dump;
/* Write several copies of a part to the dump. */
struct gpart p;
@@ -113,21 +113,19 @@ void test_log_gparts(struct dump *d) {
size_t offset = d->count;
/* Write the full part. */
- logger_log_gpart(&p,
- logger_mask_x | logger_mask_v | logger_mask_a |
- logger_mask_h | logger_mask_consts,
- &offset, d);
+ logger_log_gpart(log, &p, logger_mask_x | logger_mask_v | logger_mask_a |
+ logger_mask_h | logger_mask_consts, &offset);
printf("Wrote gpart at offset %#016zx.\n", offset);
/* Write only the position. */
p.x[0] = 2.0;
- logger_log_gpart(&p, logger_mask_x, &offset, d);
+ logger_log_gpart(log, &p, logger_mask_x, &offset);
printf("Wrote gpart at offset %#016zx.\n", offset);
/* Write the position and velocity. */
p.x[0] = 3.0;
p.v_full[0] = 0.3;
- logger_log_gpart(&p, logger_mask_x | logger_mask_v, &offset, d);
+ logger_log_gpart(log, &p, logger_mask_x | logger_mask_v, &offset);
printf("Wrote gpart at offset %#016zx.\n", offset);
/* Recover the last part from the dump. */
@@ -170,7 +168,8 @@ void test_log_gparts(struct dump *d) {
}
}
-void test_log_timestamps(struct dump *d) {
+void test_log_timestamps(struct logger *log) {
+ struct dump *d = log->dump;
/* The timestamp to log. */
unsigned long long int t = 10;
@@ -179,13 +178,13 @@ void test_log_timestamps(struct dump *d) {
size_t offset = d->count;
/* Log three consecutive timestamps. */
- logger_log_timestamp(t, &offset, d);
+ logger_log_timestamp(log, t, &offset);
printf("Logged timestamp %020llu at offset %#016zx.\n", t, offset);
t += 10;
- logger_log_timestamp(t, &offset, d);
+ logger_log_timestamp(log, t, &offset);
printf("Logged timestamp %020llu at offset %#016zx.\n", t, offset);
t += 10;
- logger_log_timestamp(t, &offset, d);
+ logger_log_timestamp(log, t, &offset);
printf("Logged timestamp %020llu at offset %#016zx.\n", t, offset);
/* Recover the three timestamps. */
@@ -222,30 +221,29 @@ void test_log_timestamps(struct dump *d) {
int main(int argc, char *argv[]) {
- /* Some constants. */
- char filename[256];
- const int now = time(NULL);
- sprintf(filename, "/tmp/SWIFT_logger_test_%d.out", now);
-
- /* Prepare a dump. */
- struct dump d;
- dump_init(&d, filename, 1024 * 1024);
+ /* Prepare a logger. */
+ struct logger log;
+ struct swift_params params;
+ parser_read_file("logger.yml", ¶ms);
+ logger_init(&log, ¶ms);
/* Test writing/reading parts. */
- test_log_parts(&d);
+ test_log_parts(&log);
/* Test writing/reading gparts. */
- test_log_gparts(&d);
+ test_log_gparts(&log);
/* Test writing/reading timestamps. */
- test_log_timestamps(&d);
-
- /* Finalize the dump. */
- dump_close(&d);
+ test_log_timestamps(&log);
/* Be clean */
+ char filename[256];
+ sprintf(filename, "%s.dump", log.base_name);
remove(filename);
+ /* Clean the logger. */
+ logger_clean(&log);
+
/* Return a happy number. */
return 0;
}
--
GitLab