ruby-static-tracing 0.0.16 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d539146e2e9ea21dc04efcdf30e79191e6baa8b26df3404dce11caecce1f41c5
-  data.tar.gz: a7fcc027f75a89674c33ae66b133c871d3d498de2730a512e62de1849ba81d6d
+  metadata.gz: f0f88831910e6d3f1204aa0ef915a11dc0da7602cd7e35cd1d6cf4d3f7d7628a
+  data.tar.gz: d7077a225ccfe99c6be0bdc3e85c3bdb69b75c443f2b69f1db48774271c364f7
 SHA512:
-  metadata.gz: e5c3b59f152a01cbf066828b248ab10c5ec7453b4457fdd90cc5bf776fa0fb164e48a5c284bf6922bc9deb59f66db537ad17e80547dd567879b516e2592760a8
-  data.tar.gz: 531f8f45254b8bab2171ebc40afee1395322ff64d7635094a52b25bb1e4dd6915768fbd4bc45ddc4003491cdce0659dfcb4700f398b6eb96f3d5f2069a9dd867
+  metadata.gz: ad0ea76443e3222e6638e48fb6c2db9274cb65ffabcbf85d56adc3f57c6638fc73aef8df6d18225932229523a2b476c98b62ce0c83ea988aa7729525a4c7dee9
+  data.tar.gz: 9e3287a4eaf2e4e40a7078dfd63463f5487784da13b2bf7dba3baf8340773d1e95817d979f71abd916fed6425b2117d4af915868e6c0b31b84f7b30936ed049f

data/ext/ruby-static-tracing/lib/libstapsdt/Makefile

@@ -1,6 +1,6 @@
 
 CC=gcc
-CFLAGS= -std=gnu11 $(CFLAGS_EXTRA)
+CFLAGS= -std=gnu11
 LDFLAGS=-lelf -ldl -Wl,-z,noexecstack
 VERSION=0.1.0
 

data/ext/ruby-static-tracing/lib/libstapsdt/src/errors.c

@@ -8,7 +8,7 @@
 
 const char *sdtErrors[] = {
   "failed to create Elf shared library for provider '%s'",
-  "failed to create temporary file",
+  "failed to create temporary file '%s'",
   "failed to open shared library '%s': %s",
   "failed to load symbol '%s' for shared library '%s': %s",
   "failed to close shared library '%s' for provider '%s': %s",

data/ext/ruby-static-tracing/lib/libstapsdt/src/libstapsdt.c

@@ -1,9 +1,8 @@
+#include <stdarg.h>
 #include <dlfcn.h>
 #include <err.h>
 #include <fcntl.h>
 #include <libelf.h>
-#include <limits.h>
-#include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -19,19 +18,6 @@
 #include "libstapsdt.h"
 #include "errors.h"
 
-#ifdef LIBSTAPSDT_MEMORY_BACKED_FD
-#include <linux/memfd.h>
-#include <sys/mman.h>
-#include <sys/syscall.h>
-
-#define F_SEAL_SEAL 0x0001 /* prevent further seals from being set */
-
-// Note that linux must be 3.17 or greater to support this
-static inline int memfd_create(const char *name, unsigned int flags) {
-  return syscall(__NR_memfd_create, name, flags);
-}
-#endif
-
 int createSharedLibrary(int fd, SDTProvider_t *provider) {
   DynElf *dynElf = dynElfInit(fd);
 
@@ -56,7 +42,6 @@ SDTProvider_t *providerInit(const char *name) {
   provider->probes    = NULL;
   provider->_handle   = NULL;
   provider->_filename = NULL;
-  provider->_memfd = -1;
 
   provider->name = (char *) calloc(sizeof(char), strlen(name) + 1);
   memcpy(provider->name, name, sizeof(char) * strlen(name) + 1);
@@ -95,59 +80,30 @@ SDTProbe_t *providerAddProbe(SDTProvider_t *provider, const char *name, int argC
   return &(probeList->probe);
 }
 
-static char *tempElfPath(int *fd, const char *name) {
-  char *filename = NULL;
-
-#ifdef LIBSTAPSDT_MEMORY_BACKED_FD
-  char path_buffer[PATH_MAX + 1];
-  snprintf(path_buffer, (PATH_MAX + 1), "libstapsdt:%s", name);
-
-  *fd = memfd_create(path_buffer, F_SEAL_SEAL);
-  if (*fd < 0)
-    return NULL;
-  snprintf(path_buffer, (PATH_MAX + 1), "/proc/%d/fd/%d", getpid(), *fd);
-
-  filename = calloc(sizeof(char), (strlen(path_buffer) + 1));
-  strcpy(filename, path_buffer);
-#else
-  filename = calloc(sizeof(char), strlen("/tmp/-XXXXXX.so") + strlen(name) + 1);
-
-  sprintf(filename, "/tmp/%s-XXXXXX.so", name);
-
-  if ((*fd = mkstemps(filename, 3)) < 0) {
-    free(filename);
-    return NULL;
-  }
-#endif
-  return filename;
-}
-
 int providerLoad(SDTProvider_t *provider) {
   int fd;
   void *fireProbe;
+  char *filename = calloc(sizeof(char), strlen("/tmp/-XXXXXX.so") + strlen(provider->name) + 1);
   char *error;
 
-  provider->_filename = tempElfPath(&fd, provider->name);
-#ifdef LIBSTAPSDT_MEMORY_BACKED_FD
-  provider->_memfd = fd;
-#endif
-  if (provider->_filename == NULL) {
-    sdtSetError(provider, tmpCreationError);
+  sprintf(filename, "/tmp/%s-XXXXXX.so", provider->name);
+
+  if ((fd = mkstemps(filename, 3)) < 0) {
+    sdtSetError(provider, tmpCreationError, filename);
+    free(filename);
     return -1;
   }
+  provider->_filename = filename;
 
   if(createSharedLibrary(fd, provider) != 0) {
     (void)close(fd);
     return -1;
   }
+  (void)close(fd);
 
-  if (provider->_memfd == -1)
-    (void)close(fd);
-
-  provider->_handle = dlopen(provider->_filename, RTLD_LAZY);
+  provider->_handle = dlopen(filename, RTLD_LAZY);
   if (!provider->_handle) {
-    sdtSetError(provider, sharedLibraryOpenError, provider->_filename,
-                dlerror());
+    sdtSetError(provider, sharedLibraryOpenError, filename, dlerror());
     return -1;
   }
 
@@ -156,8 +112,7 @@ int providerLoad(SDTProvider_t *provider) {
 
     // TODO (mmarchini) handle errors better when a symbol fails to load
     if ((error = dlerror()) != NULL) {
-      sdtSetError(provider, sharedLibraryOpenError, provider->_filename,
-                  node->probe.name, error);
+      sdtSetError(provider, sharedLibraryOpenError, filename, node->probe.name, error);
       return -1;
     }
 
@@ -182,12 +137,7 @@ int providerUnload(SDTProvider_t *provider) {
     node->probe._fire = NULL;
   }
 
-  if (provider->_memfd > 0) {
-    (void)close(provider->_memfd);
-    provider->_memfd = -1;
-  } else {
-    unlink(provider->_filename);
-  }
+  unlink(provider->_filename);
   free(provider->_filename);
 
   return 0;

data/ext/ruby-static-tracing/lib/libstapsdt/src/libstapsdt.h

@@ -47,7 +47,6 @@ typedef struct SDTProvider {
   // private
   void *_handle;
   char *_filename;
-  int _memfd;
 } SDTProvider_t;
 
 SDTProvider_t *providerInit(const char *name);

data/lib/ruby-static-tracing/version.rb

@@ -2,5 +2,5 @@
 
 module StaticTracing
   # The current version of this gem
-  VERSION = '0.0.16'
+  VERSION = '0.0.17'
 end

data/lib/tasks/docker.rb

@@ -10,7 +10,7 @@ namespace :docker do
   desc 'Runs the development docker image'
   task :run do
     `docker run --privileged --name ruby-static-tracing-#{Time.now.getutc.to_i} -v $(pwd):/app -d quay.io/dalehamel/ruby-static-tracing:latest /bin/sh -c "sleep infinity"`.strip
-    system("docker exec -ti #{latest_running_container_id} /app/vagrant/debugfs.sh")
+    system("docker exec -ti #{latest_running_container_id} mount -t debugfs debugfs /sys/kernel/debug")
   end
 
   desc 'Provides a shell within the development docker image'
@@ -22,11 +22,11 @@ namespace :docker do
   task :install do
     system("docker exec -ti #{latest_running_container_id} bash -c 'bundle install && bundle exec rake install'")
   end
+
   desc 'Runs integration tests within the development docker image'
   task :integration do
     system("docker exec -ti #{latest_running_container_id} bash -c 'bundle install && bundle exec rake clean && bundle exec rake build && bundle exec rake integration'")
   end
-
   desc 'Wrap running test in docker'
   task :test do
     exit system("docker exec -ti #{latest_running_container_id} \

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-static-tracing
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.17
 platform: ruby
 authors:
 - Dale Hamel
@@ -176,7 +176,6 @@ files:
 - lib/ruby-static-tracing/tracepoint.rb
 - lib/ruby-static-tracing/version.rb
 - lib/tasks/docker.rb
-- lib/tasks/vagrant.rb
 homepage: https://github.com/dalehamel/ruby-static-tracing
 licenses:
 - MIT

data/lib/tasks/vagrant.rb

@@ -1,33 +0,0 @@
-# frozen_string_literal: true
-
-namespace :vagrant do
-  desc 'Sets up a vagrant VM, needed for our development environment.'
-  task :up do
-    system('vagrant up')
-  end
-
-  desc 'Provides a shell within vagrant.'
-  task :ssh do
-    system('vagrant ssh')
-  end
-
-  desc 'Enters a shell within our development docker image, within vagrant.'
-  task :shell do
-    system("vagrant ssh -c 'cd /vagrant && bundle exec rake docker:shell'")
-  end
-
-  desc 'Runs tests within the development docker image, within vagrant'
-  task :tests do
-    system("vagrant ssh -c 'cd /vagrant && bundle exec rake docker:tests'")
-  end
-
-  desc 'Runs integration tests within the development docker image, within vagrant'
-  task :integration do
-    system("vagrant ssh -c 'cd /vagrant && bundle exec rake docker:integration'")
-  end
-
-  desc 'Cleans up the vagrant VM'
-  task :clean do
-    system('vagrant destroy')
-  end
-end