vernier 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da6d8fafb453c25b5f1127a33c53401150cb91bf604a37db971c952ec490d900
-  data.tar.gz: 97cc5b3435335fe97c531122d5692a3af3264c5abeb34eafb1a1808743b017fe
+  metadata.gz: dcfae18cfffd67e1e8a52c0c9de2654e7523b674d492964dfa3447c967d981e3
+  data.tar.gz: 4ff2a81a37d19f974914a0ff3fa28937302a636721b8732f7e7b282f895db9f3
 SHA512:
-  metadata.gz: 92529d7331c8a015c900227f1d28b093322dfb386ce99213c4a22dea168d433f9e0d9ae221c3171ea7e3c91fd67753a9da668140af97f62e0edec08341cb4f63
-  data.tar.gz: bdd0baaf24abdbed97f603da42e827fa10442f4f702f15a5ee2f01e2b25eb893465d8b313bcd3dec84a402d76554aa58d28547e2bad401db2c4dbb24797a2414
+  metadata.gz: bd4e4f001047bb3f20c9c0670339747b9e29abf6e44bcd77dbb38fcf7c16f42d33eef893045ab7a899b155d9b98765950e91af79864234a2d66243490d367d49
+  data.tar.gz: 14cecc8aa1058b4e38f130bed6ec1d43e8a59a636c125862ef6c61df13f885e1d76b1a142d0fa8fab16ea6bfee2642b7cd606bb562020f800ce3518b2c7fac2c

data/ext/vernier/extconf.rb

@@ -2,7 +2,7 @@
 
 require "mkmf"
 
-$CXXFLAGS += " -std=c++17 "
+$CXXFLAGS += " -std=c++14 "
 $CXXFLAGS += " -ggdb3 -Og "
 
 create_makefile("vernier/vernier")

data/ext/vernier/vernier.cc

@@ -9,18 +9,19 @@
 #include <cassert>
 #include <atomic>
 #include <mutex>
-#include <optional>
 
 #include <sys/time.h>
 #include <signal.h>
 #ifdef __APPLE__
+/* macOS */
 #include <dispatch/dispatch.h>
 #else
+/* Linux */
 #include <semaphore.h>
+#include <sys/syscall.h> /* for SYS_gettid */
 #endif
 
 #include "vernier.hh"
-#include "stack.hh"
 
 #include "ruby/ruby.h"
 #include "ruby/debug.h"
@@ -149,6 +150,69 @@ std::ostream& operator<<(std::ostream& os, const TimeStamp& info) {
     return os;
 }
 
+struct FrameInfo {
+    static const char *label_cstr(VALUE frame) {
+        VALUE label = rb_profile_frame_full_label(frame);
+        return StringValueCStr(label);
+    }
+
+    static const char *file_cstr(VALUE frame) {
+        VALUE file = rb_profile_frame_absolute_path(frame);
+        if (NIL_P(file))
+            file = rb_profile_frame_path(frame);
+        if (NIL_P(file)) {
+            return "";
+        } else {
+            return StringValueCStr(file);
+        }
+    }
+
+    static int first_lineno_int(VALUE frame) {
+        VALUE first_lineno = rb_profile_frame_first_lineno(frame);
+        return NIL_P(first_lineno) ? 0 : FIX2INT(first_lineno);
+    }
+
+    FrameInfo(VALUE frame) :
+        label(label_cstr(frame)),
+        file(file_cstr(frame)),
+        first_lineno(first_lineno_int(frame)) { }
+
+    std::string label;
+    std::string file;
+    int first_lineno;
+};
+
+bool operator==(const FrameInfo& lhs, const FrameInfo& rhs) noexcept {
+    return
+        lhs.label == rhs.label &&
+        lhs.file == rhs.file &&
+        lhs.first_lineno == rhs.first_lineno;
+}
+
+struct Frame {
+    VALUE frame;
+    int line;
+
+    FrameInfo info() const {
+        return FrameInfo(frame);
+    }
+};
+
+bool operator==(const Frame& lhs, const Frame& rhs) noexcept {
+    return lhs.frame == rhs.frame && lhs.line == rhs.line;
+}
+
+namespace std {
+    template<>
+    struct hash<Frame>
+    {
+        std::size_t operator()(Frame const& s) const noexcept
+        {
+            return s.frame ^ s.line;
+        }
+    };
+}
+
 // A basic semaphore built on sem_wait/sem_post
 // post() is guaranteed to be async-signal-safe
 class SamplerSemaphore {
@@ -459,6 +523,8 @@ class BaseCollector {
     bool running = false;
     FrameList frame_list;
 
+    virtual ~BaseCollector() {}
+
     virtual bool start() {
         if (running) {
             return false;
@@ -666,7 +732,9 @@ class Thread {
             if (e != 0) rb_syserr_fail(e, "pthread_threadid_np");
             return thread_id;
 #else
-            return gettid();
+            // gettid() is only available as of glibc 2.30
+            pid_t tid = syscall(SYS_gettid);
+            return tid;
 #endif
         }
 
@@ -817,7 +885,7 @@ class TimeCollector : public BaseCollector {
     atomic_bool running;
     SamplerSemaphore thread_stopped;
 
-    static inline LiveSample *live_sample;
+    static LiveSample *live_sample;
 
     TimeStamp started_at;
     TimeStamp interval;
@@ -1097,6 +1165,8 @@ class TimeCollector : public BaseCollector {
     }
 };
 
+LiveSample *TimeCollector::live_sample;
+
 static void
 collector_mark(void *data) {
     BaseCollector *collector = static_cast<BaseCollector *>(data);

data/lib/vernier/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Vernier
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vernier
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - John Hawthorn
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-08-04 00:00:00.000000000 Z
+date: 2023-08-08 00:00:00.000000000 Z
 dependencies: []
 description: An experimental profiler
 email:
@@ -28,7 +28,6 @@ files:
 - examples/threaded_http_requests.rb
 - ext/vernier/extconf.rb
 - ext/vernier/ruby_type_names.h
-- ext/vernier/stack.hh
 - ext/vernier/vernier.cc
 - ext/vernier/vernier.hh
 - lib/vernier.rb

data/ext/vernier/stack.hh

@@ -1,155 +0,0 @@
-#pragma once
-
-#include "ruby/debug.h"
-
-#include <iostream>
-#include <vector>
-#include <memory>
-#include <algorithm>
-
-struct FrameInfo {
-    static const char *label_cstr(VALUE frame) {
-        VALUE label = rb_profile_frame_full_label(frame);
-        return StringValueCStr(label);
-    }
-
-    static const char *file_cstr(VALUE frame) {
-        VALUE file = rb_profile_frame_absolute_path(frame);
-        if (NIL_P(file))
-            file = rb_profile_frame_path(frame);
-        if (NIL_P(file)) {
-            return "";
-        } else {
-            return StringValueCStr(file);
-        }
-    }
-
-    static int first_lineno_int(VALUE frame) {
-        VALUE first_lineno = rb_profile_frame_first_lineno(frame);
-        return NIL_P(first_lineno) ? 0 : FIX2INT(first_lineno);
-    }
-
-    FrameInfo(VALUE frame) :
-        label(label_cstr(frame)),
-        file(file_cstr(frame)),
-        first_lineno(first_lineno_int(frame)) { }
-
-    std::string label;
-    std::string file;
-    int first_lineno;
-};
-
-bool operator==(const FrameInfo& lhs, const FrameInfo& rhs) noexcept {
-    return
-        lhs.label == rhs.label &&
-        lhs.file == rhs.file &&
-        lhs.first_lineno == rhs.first_lineno;
-}
-
-template<>
-struct std::hash<FrameInfo>
-{
-    std::size_t operator()(FrameInfo const& f) const noexcept
-    {
-        return
-            std::hash<std::string>{}(f.label) ^
-            std::hash<std::string>{}(f.file) ^
-            f.first_lineno;
-    }
-};
-
-
-struct Frame {
-    VALUE frame;
-    int line;
-
-    FrameInfo info() const {
-        return FrameInfo(frame);
-    }
-};
-
-bool operator==(const Frame& lhs, const Frame& rhs) noexcept {
-    return lhs.frame == rhs.frame && lhs.line == rhs.line;
-}
-
-template<>
-struct std::hash<Frame>
-{
-    std::size_t operator()(Frame const& s) const noexcept
-    {
-        return s.frame ^ s.line;
-    }
-};
-
-struct BaseStack {
-    virtual ~BaseStack() {};
-
-    virtual int size() const = 0;
-};
-
-struct Stack : public BaseStack {
-    std::unique_ptr<VALUE[]> frames;
-    std::unique_ptr<int[]> lines;
-    int _size = 0;
-
-    int size() const {
-        return _size;
-    }
-
-    Stack(const VALUE *_frames, const int *_lines, int size) :
-        _size(size),
-        frames(std::make_unique<VALUE[]>(size)),
-        lines(std::make_unique<int[]>(size))
-    {
-        std::copy_n(_frames, size, &frames[0]);
-        std::copy_n(_lines, size, &lines[0]);
-    }
-
-    Stack(const Stack &s) :
-        _size(s.size()),
-        frames(std::make_unique<VALUE[]>(s.size())),
-        lines(std::make_unique<int[]>(s.size()))
-    {
-        std::copy_n(&s.frames[0], s.size(), &frames[0]);
-        std::copy_n(&s.lines[0], s.size(), &lines[0]);
-    }
-
-    Frame frame(int i) const {
-        if (i >= size()) throw std::out_of_range("nope");
-        return Frame{frames[i], lines[i]};
-    }
-};
-
-bool operator==(const Stack& lhs, const Stack& rhs) noexcept {
-    return lhs.size() == rhs.size() &&
-        std::equal(&lhs.frames[0], &lhs.frames[lhs.size()], &rhs.frames[0]) &&
-        std::equal(&lhs.lines[0], &lhs.lines[lhs.size()], &rhs.lines[0]);
-}
-
-// https://xoshiro.di.unimi.it/splitmix64.c
-// https://nullprogram.com/blog/2018/07/31/
-uint64_t
-hash64(uint64_t x)
-{
-    x ^= x >> 16;
-    x *= 0x7feb352dU;
-    x ^= x >> 15;
-    x *= 0x846ca68bU;
-    x ^= x >> 16;
-    return x;
-}
-
-template<>
-struct std::hash<Stack>
-{
-    std::size_t operator()(Stack const& s) const noexcept
-    {
-        size_t hash = 0;
-        for (int i = 0; i < s.size(); i++) {
-            VALUE frame = s.frames[i];
-            hash ^= frame;
-            hash = hash64(hash);
-        }
-        return hash;
-    }
-};