missing files

diff --git a/src/curl/curl.c b/src/curl/curl.c
index a0a0279950608936aa3b41384aa4f680c9503c98..0d9342b6077056961923af9c2916591dec3c3be9 100644 (file)
--- a/src/curl/curl.c
+++ b/src/curl/curl.c
@@ -30,6 +30,10 @@
 #include <jansson.h>
 #include "gnunet_curl_lib.h"
 
+#if ENABLE_BENCHMARK
+#include "../util/benchmark.h"
+#endif
+
 
 /**
  * Log error related to CURL operations.

diff --git a/src/util/benchmark.c b/src/util/benchmark.c
new file mode 100644 (file)
index 0000000..4a0c9b7
--- /dev/null
+++ b/src/util/benchmark.c
@@ -0,0 +1,144 @@
+/*
+     This file is part of GNUnet.
+     Copyright (C) 2018 GNUnet e.V.
+
+     GNUnet is free software: you can redistribute it and/or modify it
+     under the terms of the GNU Affero General Public License as published
+     by the Free Software Foundation, either version 3 of the License,
+     or (at your option) any later version.
+
+     GNUnet is distributed in the hope that it will be useful, but
+     WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     Affero General Public License for more details.
+    
+     You should have received a copy of the GNU Affero General Public License
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/**
+ * @file util/benchmark.c
+ * @brief benchmarking for various operations
+ * @author Florian Dold <flo@dold.me>
+ */
+
+#include "platform.h"
+#include "gnunet_util_lib.h"
+#include "benchmark.h"
+#include <pthread.h>
+#include <sys/syscall.h>
+
+/**
+ * Thread-local storage key for the benchmark data.
+ */
+static pthread_key_t key;
+
+/**
+ * One-time initialization marker for key.
+ */
+static pthread_once_t key_once = PTHREAD_ONCE_INIT;
+
+
+/**
+ * Write benchmark data to a file.
+ *
+ * @param bd the benchmark data
+ */
+static void
+write_benchmark_data (struct BenchmarkData *bd)
+{
+  struct GNUNET_DISK_FileHandle *fh;
+  pid_t pid = getpid ();
+  pid_t tid = syscall (SYS_gettid);
+  char *s;
+
+  GNUNET_asprintf (&s, "gnunet-benchmark-%llu-%llu.txt",
+                   (unsigned long long) pid,
+                   (unsigned long long) tid);
+
+  fh = GNUNET_DISK_file_open (s,
+                              (GNUNET_DISK_OPEN_WRITE |
+                               GNUNET_DISK_OPEN_TRUNCATE |
+                               GNUNET_DISK_OPEN_CREATE),
+                              (GNUNET_DISK_PERM_USER_READ |
+                               GNUNET_DISK_PERM_USER_WRITE));
+  GNUNET_assert (NULL != fh);
+  GNUNET_free (s);
+
+  GNUNET_asprintf (&s, "eddsa_sign_count %llu",
+                   (unsigned long long) bd->eddsa_sign_count);
+  GNUNET_assert (GNUNET_SYSERR != GNUNET_DISK_file_write_blocking (fh, s, strlen (s)));
+  GNUNET_free (s);
+
+  GNUNET_assert (GNUNET_OK == GNUNET_DISK_file_close (fh));
+}
+
+
+/**
+ * Called when the main thread exits and benchmark data for it was created.
+ */
+static void
+main_thread_destructor ()
+{
+  struct BenchmarkData *bd;
+
+  bd = pthread_getspecific (key);
+  if (NULL != bd)
+    write_benchmark_data (bd);
+}
+
+
+/**
+ * Called when a thread exits and benchmark data for it was created.
+ *
+ * @param cls closure
+ */
+static void
+thread_destructor (void *cls)
+{
+  struct BenchmarkData *bd = cls;
+
+  // main thread will be handled by atexit
+  if (getpid () == (pid_t) syscall (SYS_gettid))
+    return;
+  
+  GNUNET_assert (NULL != bd);
+
+}
+
+
+/**
+ * Initialize the thread-local variable key for benchmark data.
+ */
+static void
+make_key()
+{
+  (void) pthread_key_create (&key, &thread_destructor);
+}
+
+
+/**
+ * Acquire the benchmark data for the current thread, allocate if necessary.
+ * Installs handler to collect the benchmark data on thread termination.
+ *
+ * @return benchmark data for the current thread
+ */
+struct BenchmarkData *
+get_benchmark_data (void)
+{
+  struct BenchmarkData *bd;
+
+  (void) pthread_once (&key_once, &make_key);
+
+  if (NULL == (bd = pthread_getspecific (key)))
+  {
+    bd = GNUNET_new (struct BenchmarkData);
+    (void) pthread_setspecific (key, bd);
+    if (getpid () == (pid_t) syscall (SYS_gettid))
+    {
+      // We're the main thread!
+      atexit (main_thread_destructor);
+    }
+  }
+  return bd;
+}

diff --git a/src/util/benchmark.h b/src/util/benchmark.h
new file mode 100644 (file)
index 0000000..eec9c9c
--- /dev/null
+++ b/src/util/benchmark.h
@@ -0,0 +1,55 @@
+/*
+     This file is part of GNUnet.
+     Copyright (C) 2018 GNUnet e.V.
+
+     GNUnet is free software: you can redistribute it and/or modify it
+     under the terms of the GNU Affero General Public License as published
+     by the Free Software Foundation, either version 3 of the License,
+     or (at your option) any later version.
+
+     GNUnet is distributed in the hope that it will be useful, but
+     WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     Affero General Public License for more details.
+    
+     You should have received a copy of the GNU Affero General Public License
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/**
+ * @file util/benchmark.h
+ * @brief benchmarking for various operations
+ * @author Florian Dold <flo@dold.me>
+ */
+
+#ifndef BENCHMARK_H_
+#define BENCHMARK_H_
+
+#include "gnunet_time_lib.h"
+
+/**
+ * Thread-local struct for benchmarking data.
+ */
+struct BenchmarkData {
+  /**
+   * Number of eddsa_sign operations.
+   */
+  uint64_t eddsa_sign_count;
+
+  /**
+   * Time spent in eddsa_sign.
+   */
+  struct GNUNET_TIME_Relative eddsa_sign_time;
+};
+
+
+/**
+ * Acquire the benchmark data for the current thread, allocate if necessary.
+ * Installs handler to collect the benchmark data on thread termination.
+ *
+ * @return benchmark data for the current thread
+ */
+struct BenchmarkData *
+get_benchmark_data (void);
+
+#endif  /* BENCHMARK_H_ */

diff --git a/src/util/crypto_ecc.c b/src/util/crypto_ecc.c
index ed20fa2c891e41b80e98f639f9a462224d58866b..ca2aa40ad511da8a120aad3458d3596c2fd50445 100644 (file)
--- a/src/util/crypto_ecc.c
+++ b/src/util/crypto_ecc.c
@@ -877,7 +877,6 @@ GNUNET_CRYPTO_eddsa_sign (const struct GNUNET_CRYPTO_EddsaPrivateKey *priv,
 #if ENABLE_BENCHMARK
   struct BenchmarkData *bd = get_benchmark_data ();
   bd->eddsa_sign_count++;
-  printf("crypto eddsa sign\n");
 #endif
 
   priv_sexp = decode_private_eddsa_key (priv);