From b9ce6027dde8b3c6fd002d38e3cee07e7711d73c Mon Sep 17 00:00:00 2001 From: Matthias Vogelgesang Date: Thu, 4 Jul 2013 16:46:30 +0200 Subject: Move timer functions into timer.{c,h} --- test/CMakeLists.txt | 13 ++++++++++++- test/ipedec.c | 37 +------------------------------------ test/timer.c | 33 +++++++++++++++++++++++++++++++++ test/timer.h | 17 +++++++++++++++++ 4 files changed, 63 insertions(+), 37 deletions(-) create mode 100644 test/timer.c create mode 100644 test/timer.h (limited to 'test') diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index aea7b7d..7539c19 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -1,9 +1,20 @@ # --- Build test executable ------------------------------------------------- +include(CheckIncludeFile) + +check_include_file("sys/time.h" HAVE_SYS_TIME_H) + +if (NOT HAVE_SYS_TIME_H) + message(FATAL_ERROR "sys/time.h not found") +endif() + include_directories( ${CMAKE_SOURCE_DIR}/src ) -add_executable(ipedec ipedec.c) +add_executable(ipedec + ipedec.c + timer.c) + target_link_libraries(ipedec ufodecode) install(TARGETS ipedec DESTINATION ${BIN_INSTALL_DIR}) diff --git a/test/ipedec.c b/test/ipedec.c index 6e48c14..52aebb0 100644 --- a/test/ipedec.c +++ b/test/ipedec.c @@ -4,9 +4,9 @@ #include #include #include -#include #include #include +#include "timer.h" static const int MAX_ROWS = 2048; @@ -103,41 +103,6 @@ print_meta_data (UfoDecoderMeta *meta) printf("\n"); } -typedef struct { - struct timeval start; - long seconds; - long useconds; -} Timer; - -static Timer * -timer_new (void) -{ - Timer *t = (Timer *) malloc (sizeof (Timer)); - t->seconds = t->useconds = 0L; - return t; -} - -static void -timer_destroy (Timer *t) -{ - free (t); -} - -static void -timer_start (Timer *t) -{ - gettimeofday(&t->start, NULL); -} - -static void -timer_stop (Timer *t) -{ - struct timeval end; - - gettimeofday(&end, NULL); - t->seconds += end.tv_sec - t->start.tv_sec; - t->useconds += end.tv_usec - t->start.tv_usec; -} static int process_file(const char *filename, Options *opts) diff --git a/test/timer.c b/test/timer.c new file mode 100644 index 0000000..43aff84 --- /dev/null +++ b/test/timer.c @@ -0,0 +1,33 @@ +#include +#include "timer.h" + + +Timer * +timer_new (void) +{ + Timer *t = (Timer *) malloc (sizeof (Timer)); + t->seconds = t->useconds = 0L; + return t; +} + +void +timer_destroy (Timer *t) +{ + free (t); +} + +void +timer_start (Timer *t) +{ + gettimeofday(&t->start, NULL); +} + +void +timer_stop (Timer *t) +{ + struct timeval end; + + gettimeofday(&end, NULL); + t->seconds += end.tv_sec - t->start.tv_sec; + t->useconds += end.tv_usec - t->start.tv_usec; +} diff --git a/test/timer.h b/test/timer.h new file mode 100644 index 0000000..272f69d --- /dev/null +++ b/test/timer.h @@ -0,0 +1,17 @@ +#ifndef TIMER_H +#define TIMER_H + +#include + +typedef struct { + struct timeval start; + long seconds; + long useconds; +} Timer; + +Timer * timer_new (void); +void timer_destroy (Timer *t); +void timer_start (Timer *t); +void timer_stop (Timer *t); + +#endif -- cgit v1.2.3