New and improved recipe, now with 120% less bugs

include/lo2s/config.hpp

@@ -58,7 +58,7 @@ struct Config
     std::vector<std::string> x86_adapt_knobs;
 #endif
     bool use_sensors;
-    int cgroup_fd = -1;
+  Fd cgroup_fd = Fd::invalid();
     // OTF2
     std::string trace_path;
     // perf

include/lo2s/perf/bio/reader.hpp

@@ -126,8 +126,8 @@ class Reader : public PullReader
 
         attr.sample_period = 1;
         attr.sample_type = PERF_SAMPLE_RAW | PERF_SAMPLE_TIME;
-        fd_ = perf_event_open(&attr, cpu_.as_scope(), -1, 0);
-        if (fd_ < 0)
+        fd_ = perf_event_open(&attr, cpu_.as_scope());
+        if (!fd_.is_valid())
         {
             Log::error() << "perf_event_open for raw tracepoint failed.";
             throw_errno();
@@ -137,40 +137,19 @@ class Reader : public PullReader
 
         try
         {
-            if (fcntl(fd_, F_SETFL, O_NONBLOCK))
-            {
-                throw_errno();
-            }
-
-            init_mmap(fd_);
+            init_mmap(fd_.as_int());
             Log::debug() << "perf_tracepoint_reader mmap initialized";
-
-            auto ret = ioctl(fd_, PERF_EVENT_IOC_ENABLE);
-            Log::debug() << "perf_tracepoint_reader ioctl(fd, PERF_EVENT_IOC_ENABLE) = " << ret;
-            if (ret == -1)
-            {
-                throw_errno();
-            }
         }
         catch (...)
         {
             Log::error() << "Couldn't initialize block:rq_insert reading";
-            close(fd_);
             throw;
         }
     }
 
-    ~Reader()
-    {
-        if (fd_ != -1)
-        {
-            close(fd_);
-        }
-    }
-
     void stop()
     {
-        auto ret = ioctl(fd_, PERF_EVENT_IOC_DISABLE);
+        auto ret = ioctl(fd_.as_int(), PERF_EVENT_IOC_DISABLE);
         Log::debug() << "perf_tracepoint_reader ioctl(fd, PERF_EVENT_IOC_DISABLE) = " << ret;
         if (ret == -1)
         {
@@ -185,7 +164,7 @@ class Reader : public PullReader
 
     int fd() const
     {
-        return fd_;
+      return fd_.as_int();
     }
 
     Reader& operator=(const Reader&) = delete;
@@ -211,7 +190,7 @@ class Reader : public PullReader
 
 private:
     Cpu cpu_;
-    int fd_ = -1;
+  Fd fd_ = Fd::invalid();
 };
 } // namespace bio
 } // namespace perf

include/lo2s/perf/counter/group/reader.hpp

@@ -58,21 +58,9 @@ class Reader : public EventReader<T>
         struct GroupReadFormat v;
     };
 
-    ~Reader()
-    {
-        for (int fd : counter_fds_)
-        {
-            if (fd != -1)
-            {
-                ::close(fd);
-            }
-        }
-        ::close(group_leader_fd_);
-    }
-
 protected:
-    int group_leader_fd_;
-    std::vector<int> counter_fds_;
+  Fd group_leader_fd_ = Fd::invalid();
+    std::vector<Fd> counter_fds_;
     CounterCollection counter_collection_;
     GroupCounterBuffer counter_buffer_;
 };

include/lo2s/perf/counter/userspace/reader.hpp

@@ -54,7 +54,7 @@ class Reader
     }
 
 protected:
-    std::vector<int> counter_fds_;
+    std::vector<Fd> counter_fds_;
     CounterCollection counter_collection_;
     UserspaceCounterBuffer counter_buffer_;
     int timer_fd_;

include/lo2s/perf/event_reader.hpp

@@ -39,11 +39,11 @@
 
 extern "C"
 {
+  #include <fcntl.h>
+#include <sys/ioctl.h>
 #include <linux/perf_event.h>
 #include <sys/mman.h>
-}
-
-/* perf sample has 16 bits size limit */
+} /* perf sample has 16 bits size limit */
 #define PERF_SAMPLE_MAX_SIZE (1 << 16)
 
 namespace lo2s
@@ -76,8 +76,7 @@ class EventReader
         RecordMmap2Type& operator=(RecordMmap2Type&&) = delete;
 
         struct perf_event_header header;
-        uint32_t pid;
-        uint32_t tid;
+        uint32_t pid; uint32_t tid;
         uint64_t addr;
         uint64_t len;
         uint64_t pgoff;
@@ -156,8 +155,15 @@ class EventReader
     }
 
 protected:
-    void init_mmap(int fd)
+  void init_mmap(int fd, bool enable_on_exec = false)
     {
+
+            // asynchronous delivery
+            // if (fcntl(fd, F_SETFL, O_ASYNC | O_NONBLOCK))
+            if (fcntl(fd_, F_SETFL, O_NONBLOCK))
+            {
+                throw_errno();
+            }
         fd_ = fd;
 
         mmap_pages_ = config().mmap_pages;
@@ -173,6 +179,17 @@ class EventReader
                             "perf_event_mlock_kb";
             throw_errno();
         }
+
+
+            if (!enable_on_exec)
+            {
+                auto ret = ioctl(fd_, PERF_EVENT_IOC_ENABLE);
+                Log::debug() << "ioctl(fd, PERF_EVENT_IOC_ENABLE) = " << ret;
+                if (ret == -1)
+                {
+                    throw_errno();
+                }
+            }
     }
 
 public:

include/lo2s/perf/sample/reader.hpp

@@ -37,13 +37,9 @@
 
 extern "C"
 {
-#include <fcntl.h>
 #include <unistd.h>
 
 #include <linux/perf_event.h>
-
-#include <sys/ioctl.h>
-#include <sys/mman.h>
 }
 
 namespace lo2s
@@ -143,7 +139,7 @@ class Reader : public EventReader<T>
          * and the value of it is greater than the initial value */
         do
         {
-            fd_ = perf_event_open(&perf_attr, scope, -1, 0, config().cgroup_fd);
+          fd_ = perf_event_open(&perf_attr, scope, Fd::invalid(), 0, config().cgroup_fd);
 
             if (errno == EACCES && !perf_attr.exclude_kernel && perf_event_paranoid() > 1)
             {
@@ -159,9 +155,9 @@ class Reader : public EventReader<T>
                 break;
             else
                 perf_attr.precise_ip--;
-        } while (fd_ <= 0);
+        } while (!fd_.is_valid());
 
-        if (fd_ < 0)
+        if (!fd_.is_valid())
         {
             Log::error() << "perf_event_open for sampling failed";
             if (perf_attr.use_clockid)
@@ -172,34 +168,8 @@ class Reader : public EventReader<T>
         }
         Log::debug() << "Using precise_ip level: " << perf_attr.precise_ip;
 
-        // Exception safe, so much wow!
-        try
-        {
-            // asynchronous delivery
-            // if (fcntl(fd, F_SETFL, O_ASYNC | O_NONBLOCK))
-            if (fcntl(fd_, F_SETFL, O_NONBLOCK))
-            {
-                throw_errno();
-            }
-
-            init_mmap(fd_);
+          init_mmap(fd_.as_int(), enable_on_exec);
             Log::debug() << "mmap initialized";
-
-            if (!enable_on_exec)
-            {
-                auto ret = ioctl(fd_, PERF_EVENT_IOC_ENABLE);
-                Log::debug() << "ioctl(fd, PERF_EVENT_IOC_ENABLE) = " << ret;
-                if (ret == -1)
-                {
-                    throw_errno();
-                }
-            }
-        }
-        catch (...)
-        {
-            close();
-            throw;
-        }
     }
 
     Reader(const Reader&) = delete;
@@ -220,24 +190,13 @@ class Reader : public EventReader<T>
                            "extend to prevent the kernel from doing that"
                            " or you can increase your sampling period.";
         }
-        close();
-    }
-
-public:
-    void close()
-    {
-        if (fd_ != -1)
-        {
-            ::close(fd_);
-            fd_ = -1;
-        }
     }
 
 protected:
     bool has_cct_;
 
 private:
-    int fd_ = -1;
+  Fd fd_ = Fd::invalid();
 };
 } // namespace sample
 } // namespace perf