Smaller changes and improvements

Author: thomasmueller

benchmarks/hugepages.sh

@@ -0,0 +1,31 @@
+#!/bin/bash
+if ! [ $(id -u) = 0 ]; then
+   echo "The script need to be run as root." >&2
+   exit 1
+fi
+if [ -z "$1" ]
+  then
+    echo "The takes a command as a argument. E.g., try ./hugepages.sh './bulk-insert-and-query.exe 100000000 0,1000,96,98,100' "
+    exit 1
+fi
+COMMAND=$@
+echo "Running $COMMAND"
+
+
+origval=$(sudo cat /sys/kernel/mm/transparent_hugepage/enabled)
+sudo echo $origval
+set -e
+function cleanup {
+  echo "Restauring hugepages to madvise"
+  echo "madvise" > /sys/kernel/mm/transparent_hugepage/enabled
+}
+trap cleanup EXIT
+
+for mode in "always" "never" ; do
+  sudo echo "mode: " $mode
+  echo $mode > /sys/kernel/mm/transparent_hugepage/enabled
+  echo $(sudo cat /sys/kernel/mm/transparent_hugepage/enabled)
+  echo "$COMMAND"
+  $COMMAND 
+done
+echo "Done."

benchmarks/linux-perf-events.h

@@ -6,22 +6,23 @@
 #include <linux/perf_event.h> // for perf event constants
 #include <sys/ioctl.h>        // for ioctl
 #include <unistd.h>           // for syscall
-
+#include <iostream>
 #include <cerrno>  // for errno
 #include <cstring> // for memset
 #include <stdexcept>
 
 #include <vector>
 
 template <int TYPE = PERF_TYPE_HARDWARE> class LinuxEvents {
-  int fd;
+  int group;
+  bool working;
   perf_event_attr attribs;
   int num_events;
   std::vector<uint64_t> temp_result_vec;
-  std::vector<uint64_t> ids;
+  std::vector<int> fds;
 
 public:
-  LinuxEvents(std::vector<int> config_vec) : fd(0) {
+  explicit LinuxEvents(std::vector<int> config_vec) : group(-1), working(true) {
     memset(&attribs, 0, sizeof(attribs));
     attribs.type = TYPE;
     attribs.size = sizeof(attribs);
@@ -35,16 +36,16 @@ template <int TYPE = PERF_TYPE_HARDWARE> class LinuxEvents {
     const int cpu = -1; // all CPUs
     const unsigned long flags = 0;
 
-    int group = -1; // no group
     num_events = config_vec.size();
     uint32_t i = 0;
     for (auto config : config_vec) {
       attribs.config = config;
-      fd = syscall(__NR_perf_event_open, &attribs, pid, cpu, group, flags);
+      int fd = syscall(__NR_perf_event_open, &attribs, pid, cpu, group, flags);
       if (fd == -1) {
         report_error("perf_event_open");
       }
-      ioctl(fd, PERF_EVENT_IOC_ID, &ids[i++]);
+
+      fds.push_back(fd);
       if (group == -1) {
         group = fd;
       }
@@ -53,24 +54,28 @@ template <int TYPE = PERF_TYPE_HARDWARE> class LinuxEvents {
     temp_result_vec.resize(num_events * 2 + 1);
   }
 
-  ~LinuxEvents() { close(fd); }
+  ~LinuxEvents() {
+    for (auto fd : fds) {
+      close(fd);
+    }
+  }
 
   inline void start() {
-    if (ioctl(fd, PERF_EVENT_IOC_RESET, PERF_IOC_FLAG_GROUP) == -1) {
+    if (ioctl(group, PERF_EVENT_IOC_RESET, PERF_IOC_FLAG_GROUP) == -1) {
       report_error("ioctl(PERF_EVENT_IOC_RESET)");
     }
 
-    if (ioctl(fd, PERF_EVENT_IOC_ENABLE, PERF_IOC_FLAG_GROUP) == -1) {
+    if (ioctl(group, PERF_EVENT_IOC_ENABLE, PERF_IOC_FLAG_GROUP) == -1) {
       report_error("ioctl(PERF_EVENT_IOC_ENABLE)");
     }
   }
 
   inline void end(std::vector<unsigned long long> &results) {
-    if (ioctl(fd, PERF_EVENT_IOC_DISABLE, PERF_IOC_FLAG_GROUP) == -1) {
+    if (ioctl(group, PERF_EVENT_IOC_DISABLE, PERF_IOC_FLAG_GROUP) == -1) {
       report_error("ioctl(PERF_EVENT_IOC_DISABLE)");
     }
 
-    if (read(fd, &temp_result_vec[0], temp_result_vec.size() * 8) == -1) {
+    if (read(group, &temp_result_vec[0], temp_result_vec.size() * 8) == -1) {
       report_error("read");
     }
     // our actual results are in slots 1,3,5, ... of this structure
@@ -82,7 +87,9 @@ template <int TYPE = PERF_TYPE_HARDWARE> class LinuxEvents {
 
 private:
   void report_error(const std::string &context) {
-    throw std::runtime_error(context + ": " + std::string(strerror(errno)));
+    if (working)
+      std::cerr << (context + ": " + std::string(strerror(errno))) << std::endl;
+    working = false;
   }
 };
-#endif
+#endif

benchmarks/random.h

@@ -124,5 +124,3 @@ ::std::vector<T> DuplicateFreeMixIn(const T* x_begin, const T* x_end, const T* y
   if((y_probability != 0.0) && (y_probability != 1.0)) { fast_shuffle(result.data(), result.size(), &seed); }
   return result;
 }
-
-

src/bloom/bloom.h

@@ -296,7 +296,7 @@ SimpleBlockFilter<blocksize, k, HashFamily>::SimpleBlockFilter(
 
 template <size_t blocksize, int k, typename HashFamily>
 SimpleBlockFilter<blocksize, k, HashFamily>::~SimpleBlockFilter() noexcept {
-  free(data);
+  delete[] data;
   data = nullptr;
 }