From: Jann Horn <jann@thejh.net>
Date: Sat, 29 Mar 2014 11:08:36 +0000 (+0100)
Subject: refactor, metastuff
X-Git-Url: http://git.thejh.net/?a=commitdiff_plain;h=99743142a6ff0f0c8ea2acdf8863cede4689d7eb;p=detour.git

refactor, metastuff
---

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..37c46df
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+pulser
diff --git a/common.c b/common.c
new file mode 100644
index 0000000..d45457b
--- /dev/null
+++ b/common.c
@@ -0,0 +1,52 @@
+#include <stdlib.h>
+#include <stdio.h>
+#include <jh.h>
+#include <unistd.h>
+#include <time.h>
+#include <assert.h>
+
+time_t real_seconds(void) {
+  struct timespec t;
+  int s = clock_gettime(CLOCK_REALTIME, &t);
+  assert(s==0);
+  return t.tv_sec;
+}
+
+/* Subtract the `struct timeval' values X and Y,
+   storing the result in RESULT.
+   Return 1 if the difference is negative, otherwise 0. */
+int timeval_subtract (struct timeval *result, struct timeval *x, struct timeval *y) {
+  /* Perform the carry for the later subtraction by updating y. */
+  if (x->tv_usec < y->tv_usec) {
+    int nsec = (y->tv_usec - x->tv_usec) / 1000000 + 1;
+    y->tv_usec -= 1000000 * nsec;
+    y->tv_sec += nsec;
+  }
+  if (x->tv_usec - y->tv_usec > 1000000) {
+    int nsec = (x->tv_usec - y->tv_usec) / 1000000;
+    y->tv_usec += 1000000 * nsec;
+    y->tv_sec -= nsec;
+  }
+
+  /* Compute the time remaining to wait.
+     tv_usec is certainly positive. */
+  result->tv_sec = x->tv_sec - y->tv_sec;
+  result->tv_usec = x->tv_usec - y->tv_usec;
+
+  /* Return 1 if result is negative. */
+  return x->tv_sec < y->tv_sec;
+}
+
+void sleep_until(time_t dst_sec) {
+  struct timespec dst;
+  dst.tv_sec = dst_sec;
+  dst.tv_nsec = 0;
+  while (clock_nanosleep(CLOCK_REALTIME, TIMER_ABSTIME, &dst, NULL)) /* nothing */;
+}
+
+time_t round_up(time_t t, int align) {
+  t = t - 1; /* counter bad +t for aligned things in last step */
+  t = t - t%align; /* round down to align */
+  t = t + align; /* add alignment to make it a round up */
+  return t;
+}
diff --git a/compile.sh b/compile.sh
new file mode 100755
index 0000000..d4f14df
--- /dev/null
+++ b/compile.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+gcc -Wall -o pulser pulser.c -std=gnu99 -lrt -ljh -lev
diff --git a/pulser.c b/pulser.c
index fc48c22..91fc5db 100644
--- a/pulser.c
+++ b/pulser.c
@@ -1,55 +1,4 @@
-#include <stdlib.h>
-#include <stdio.h>
-#include <jh.h>
-#include <unistd.h>
-#include <time.h>
-#include <assert.h>
-
-time_t real_seconds(void) {
-  struct timespec t;
-  int s = clock_gettime(CLOCK_REALTIME, &t);
-  assert(s==0);
-  return t.tv_sec;
-}
-
-/* Subtract the `struct timeval' values X and Y,
-   storing the result in RESULT.
-   Return 1 if the difference is negative, otherwise 0. */
-int timeval_subtract (struct timeval *result, struct timeval *x, struct timeval *y) {
-  /* Perform the carry for the later subtraction by updating y. */
-  if (x->tv_usec < y->tv_usec) {
-    int nsec = (y->tv_usec - x->tv_usec) / 1000000 + 1;
-    y->tv_usec -= 1000000 * nsec;
-    y->tv_sec += nsec;
-  }
-  if (x->tv_usec - y->tv_usec > 1000000) {
-    int nsec = (x->tv_usec - y->tv_usec) / 1000000;
-    y->tv_usec += 1000000 * nsec;
-    y->tv_sec -= nsec;
-  }
-
-  /* Compute the time remaining to wait.
-     tv_usec is certainly positive. */
-  result->tv_sec = x->tv_sec - y->tv_sec;
-  result->tv_usec = x->tv_usec - y->tv_usec;
-
-  /* Return 1 if result is negative. */
-  return x->tv_sec < y->tv_sec;
-}
-
-void sleep_until(time_t dst_sec) {
-  struct timespec dst;
-  dst.tv_sec = dst_sec;
-  dst.tv_nsec = 0;
-  while (clock_nanosleep(CLOCK_REALTIME, TIMER_ABSTIME, &dst, NULL)) /* nothing */;
-}
-
-time_t round_up(time_t t, int align) {
-  t = t - 1; /* counter bad +t for aligned things in last step */
-  t = t - t%align; /* round down to align */
-  t = t + align; /* add alignment to make it a round up */
-  return t;
-}
+#include "common.c"
 
 void handle_connection(int s) {
   dup2(s, 1);