ruby-static-tracing 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d849e0cedda5f5deaeeeffc28d29519c7eab872e1e8d92fda8368d8a39d295d
-  data.tar.gz: 84d72bc3630a1299ed7536c528a7bf12f72ac157076bf63144400690432adcd0
+  metadata.gz: 72b529791f8107bbe464af7deb35b4135fafe439307e88ff6deb019ec056d266
+  data.tar.gz: e71c574619cbce9237b959949b7eac088facbccbd52a8e1d478f4c4fc45e2470
 SHA512:
-  metadata.gz: 747545a76cd5f98365a277b96673d24d8a7d51b934273bd8d913dea2f32fd0a4064cb1b2b79ec2e9c3ab980ed4d7840a874022f107f3d9def48e0c2b1deeb82a
-  data.tar.gz: f910d359ad45e9677a98a3913a240d9080f99ed44aef1c2164fb6abaf807c06f7c9dd03cc6fd8676b3d6af30f719460139f9782373f5c35d5795cb9cc743cfe3
+  metadata.gz: 3c13797239eeb12eab9529a9bcf854c42c633ea1cb1b918413b2cea1ae1a94d96890739ed573495d585c5949d0a6ad0c6c50469423567239f583545a1f0b57b4
+  data.tar.gz: a7e0db40c3b13c34344430af47dfc1a18929f36c95aa586436175d4243b9ae4c84664fdb0b8d95eb7dcb10142dccef506a408ee43e174ada8a0298ed21cf129d

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

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module StaticTracing
-  VERSION = '0.0.11'
+  VERSION = '0.0.12'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-static-tracing
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Dale Hamel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-13 00:00:00.000000000 Z
+date: 2019-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: unmixer
@@ -113,41 +113,6 @@ files:
 - ext/ruby-static-tracing/extconf.rb
 - ext/ruby-static-tracing/include/ruby_static_tracing.h
 - ext/ruby-static-tracing/lib/deps-extconf.rb
-- ext/ruby-static-tracing/lib/libstapsdt/Makefile
-- ext/ruby-static-tracing/lib/libstapsdt/example/demo.c
-- ext/ruby-static-tracing/lib/libstapsdt/src/asm/libstapsdt-x86_64.s
-- ext/ruby-static-tracing/lib/libstapsdt/src/dynamic-symbols.c
-- ext/ruby-static-tracing/lib/libstapsdt/src/dynamic-symbols.h
-- ext/ruby-static-tracing/lib/libstapsdt/src/errors.c
-- ext/ruby-static-tracing/lib/libstapsdt/src/errors.h
-- ext/ruby-static-tracing/lib/libstapsdt/src/hash-table.c
-- ext/ruby-static-tracing/lib/libstapsdt/src/hash-table.h
-- ext/ruby-static-tracing/lib/libstapsdt/src/libstapsdt.c
-- ext/ruby-static-tracing/lib/libstapsdt/src/libstapsdt.h
-- ext/ruby-static-tracing/lib/libstapsdt/src/sdtnote.c
-- ext/ruby-static-tracing/lib/libstapsdt/src/sdtnote.h
-- ext/ruby-static-tracing/lib/libstapsdt/src/section.c
-- ext/ruby-static-tracing/lib/libstapsdt/src/section.h
-- ext/ruby-static-tracing/lib/libstapsdt/src/shared-lib.c
-- ext/ruby-static-tracing/lib/libstapsdt/src/shared-lib.h
-- ext/ruby-static-tracing/lib/libstapsdt/src/string-table.c
-- ext/ruby-static-tracing/lib/libstapsdt/src/string-table.h
-- ext/ruby-static-tracing/lib/libstapsdt/src/util.c
-- ext/ruby-static-tracing/lib/libstapsdt/src/util.h
-- ext/ruby-static-tracing/lib/libstapsdt/tests/test-errors.c
-- ext/ruby-static-tracing/lib/libstapsdt/tests/test-memory-leaks.c
-- ext/ruby-static-tracing/lib/libusdt/Makefile
-- ext/ruby-static-tracing/lib/libusdt/test_mem_usage.c
-- ext/ruby-static-tracing/lib/libusdt/test_usdt.c
-- ext/ruby-static-tracing/lib/libusdt/usdt.c
-- ext/ruby-static-tracing/lib/libusdt/usdt.h
-- ext/ruby-static-tracing/lib/libusdt/usdt_dof.c
-- ext/ruby-static-tracing/lib/libusdt/usdt_dof_file.c
-- ext/ruby-static-tracing/lib/libusdt/usdt_dof_sections.c
-- ext/ruby-static-tracing/lib/libusdt/usdt_internal.h
-- ext/ruby-static-tracing/lib/libusdt/usdt_probe.c
-- ext/ruby-static-tracing/lib/libusdt/usdt_tracepoints_i386.s
-- ext/ruby-static-tracing/lib/libusdt/usdt_tracepoints_x86_64.s
 - ext/ruby-static-tracing/lib/post-extconf.rb
 - ext/ruby-static-tracing/linux/provider.c
 - ext/ruby-static-tracing/linux/provider.h
@@ -189,8 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: USDT tracing for Ruby

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

@@ -1,76 +0,0 @@
-
-CC=gcc
-CFLAGS= -std=gnu11
-LDFLAGS=-lelf -ldl -Wl,-z,noexecstack
-VERSION=0.1.0
-
-PREFIX=/usr
-
-OBJECTS = $(patsubst src/%.c, build/lib/%.o, $(wildcard src/*.c))
-HEADERS = $(wildcard src/*.h)
-
-SOLINK = libstapsdt.so
-SONAME = libstapsdt.so.0
-
-all: out/libstapsdt.a out/$(SONAME)
-
-install:
-	mkdir -p $(DESTDIR)$(PREFIX)/lib
-	mkdir -p $(DESTDIR)$(PREFIX)/include
-	cp out/$(SONAME) $(DESTDIR)$(PREFIX)/lib/$(SONAME)
-	cp src/libstapsdt.h $(DESTDIR)$(PREFIX)/include/
-	ln -s $(DESTDIR)$(PREFIX)/lib/$(SONAME) $(DESTDIR)$(PREFIX)/lib/$(SOLINK)
-
-uninstall:
-	rm -f $(DESTDIR)$(PREFIX)/lib/$(SONAME)
-	rm -f $(DESTDIR)$(PREFIX)/lib/$(SOLINK)
-	rm -f $(DESTDIR)$(PREFIX)/include/libstapsdt.h
-
-build/lib/libstapsdt-x86_64.o: src/asm/libstapsdt-x86_64.s
-	mkdir -p build
-	$(CC) $(CFLAGS) -fPIC -c $^ -o $@
-
-build/lib/%.o: src/%.c $(HEADERS)
-	mkdir -p build/lib/
-	$(CC) $(CFLAGS) -fPIC -c $< -o $@
-
-out/libstapsdt.a: $(OBJECTS) build/lib/libstapsdt-x86_64.o
-	mkdir -p out
-	ar rcs $@ $^
-
-out/$(SONAME): $(OBJECTS) build/lib/libstapsdt-x86_64.o
-	mkdir -p out
-	$(CC) $(CFLAGS) -shared -Wl,-soname=$(SONAME) -o $@ $^ $(LDFLAGS)
-
-demo: all example/demo.c
-	$(CC) $(CFLAGS) example/demo.c out/libstapsdt.a -o demo -Isrc/ $(LDFLAGS)
-
-test: all
-	make -C ./tests/
-
-clean:
-	rm -rf build/*
-	rm -rf out/*
-	make clean -C ./tests/
-
-lint:
-	clang-tidy src/*.h src/*.c -- -Isrc/
-
-format:
-	clang-tidy src/*.h src/*.c -fix -- -Isrc/
-
-docs:
-	make -C ./docs/ html
-
-docs-server:
-	cd docs/_build/html; python3 -m http.server;
-
-deb-pkg-setup:
-	mkdir -p dist/libstapsdt-$(VERSION)/;
-	git archive HEAD | gzip > dist/libstapsdt-$(VERSION).tar.gz;
-	tar xvzf dist/libstapsdt-$(VERSION).tar.gz -C dist/libstapsdt-$(VERSION)/;
-	cd dist/libstapsdt-$(VERSION); dh_make -l -c mit -y -f ../libstapsdt-$(VERSION).tar.gz;
-	rm -rf dist/libstapsdt-$(VERSION)/debian/*.ex  dist/libstapsdt-$(VERSION)/debian/*.EX  dist/libstapsdt-$(VERSION)/debian/README.*
-
-
-.PHONY: all clear lint format build-tests docs install uninstall deb-pkg-setup

data/ext/ruby-static-tracing/lib/libstapsdt/example/demo.c

@@ -1,42 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <libstapsdt.h>
-
-int main( int argc, char *argv[] ) {
-  SDTProvider_t *provider;
-  SDTProbe_t **probes;
-  int probesCount = 0;
-  unsigned long long i=0;
-  int j=0;
-
-  if(argc < 3) {
-    printf("usage: demo PROVIDER PROBE\n");
-    return -1;
-  }
-
-  probesCount = argc - 2;
-  probes = calloc(sizeof(SDTProvider_t *), probesCount);
-
-  provider = providerInit(argv[1]);
-  for (int idx = 0; idx < (probesCount); idx++) {
-    probes[idx] = providerAddProbe(provider, argv[idx + 2], 2, uint64, int64);
-  }
-
-  if(providerLoad(provider) == -1) {
-    printf("Something went wrong: %s\n", provider->error);
-    return -1;
-  }
-
-  while(1) {
-    printf("Firing probes...\n");
-    for (int idx = 0; idx < probesCount; idx++) {
-      printf("Firing probe [%d]...\n", idx);
-      probeFire(probes[idx], i++, j--);
-    }
-    printf("Probe fired!\n");
-    sleep(3);
-  }
-
-  return 0;
-}

data/ext/ruby-static-tracing/lib/libstapsdt/src/asm/libstapsdt-x86_64.s

@@ -1,14 +0,0 @@
-.text
-
-.align 4, 0x90
-.globl _funcStart
-.globl _funcEnd
-
-_funcStart:
-  nop
-  nop
-  nop
-  nop
-  ret
-_funcEnd:
-  nop

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

@@ -1,41 +0,0 @@
-#include "dynamic-symbols.h"
-#include "string-table.h"
-#include <libelf.h>
-
-DynamicSymbolTable *dynamicSymbolTableInit(StringTable *dynamicString) {
-  DynamicSymbolTable *dynSymTab =
-      (DynamicSymbolTable *)calloc(sizeof(DynamicSymbolTable), 1);
-
-  dynSymTab->stringTable = dynamicString;
-
-  dynSymTab->bssStart.string = stringTableAdd(dynamicString, "__bss_start");
-  dynSymTab->eData.string = stringTableAdd(dynamicString, "_edata");
-  dynSymTab->end.string = stringTableAdd(dynamicString, "_end");
-
-  dynSymTab->count = 0;
-  dynSymTab->symbols = NULL;
-
-  return dynSymTab;
-}
-
-DynamicSymbol *dynamicSymbolTableAdd(DynamicSymbolTable *table,
-                                     char *symbolName) {
-  DynamicSymbolList *symbol = (DynamicSymbolList *)calloc(sizeof(DynamicSymbolList), 1);
-
-  symbol->symbol.string = stringTableAdd(table->stringTable, symbolName);
-
-  symbol->next = table->symbols;
-  table->symbols = symbol;
-  table->count += 1;
-
-  return &(symbol->symbol);
-}
-
-void dynamicSymbolTableFree(DynamicSymbolTable *table) {
-  DynamicSymbolList *node=NULL, *next=NULL;
-  for(node=table->symbols; node!=NULL; node=next) {
-    next=node->next;
-    free(node);
-  }
-  free(table);
-}

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

@@ -1,34 +0,0 @@
-#ifndef _DYNAMIC_SYMBOLS_
-#define _DYNAMIC_SYMBOLS_
-
-#include "string-table.h"
-#include <libelf.h>
-
-typedef struct {
-  StringTableNode *string;
-  Elf64_Sym *symbol;
-} DynamicSymbol;
-
-typedef struct DynamicSymbolList_ {
-  DynamicSymbol symbol;
-  struct DynamicSymbolList_ *next;
-} DynamicSymbolList;
-
-typedef struct {
-  StringTable *stringTable;
-
-  DynamicSymbol bssStart;
-  DynamicSymbol eData;
-  DynamicSymbol end;
-
-  size_t count;
-  DynamicSymbolList *symbols;
-} DynamicSymbolTable;
-
-DynamicSymbolTable *dynamicSymbolTableInit(StringTable *dynamicString);
-DynamicSymbol *dynamicSymbolTableAdd(DynamicSymbolTable *table,
-                                     char *symbolName);
-
-void dynamicSymbolTableFree(DynamicSymbolTable *table);
-
-#endif

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

@@ -1,30 +0,0 @@
-
-#include <stdarg.h>
-#define _GNU_SOURCE
-#include <stdlib.h>
-#include <stdio.h>
-
-#include "errors.h"
-
-const char *sdtErrors[] = {
-  "failed to create Elf shared library for provider '%s'",
-  "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",
-};
-
-void sdtSetError(SDTProvider_t *provider, SDTError_t error, ...) {
-  va_list argp;
-
-  if(provider->error != NULL) {
-    free(provider->error);
-    provider->error = NULL;
-    provider->errno = noError;
-  }
-
-  va_start(argp, error);
-  provider->errno = error;
-  (void)vasprintf(&provider->error, sdtErrors[error], argp);
-  va_end(argp);
-}

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

@@ -1,8 +0,0 @@
-#ifndef _ERRORS_H
-#define _ERRORS_H
-
-#include "libstapsdt.h"
-
-void sdtSetError(SDTProvider_t *provider, SDTError_t error, ...);
-
-#endif

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

@@ -1,27 +0,0 @@
-#include <stdio.h>
-#include "dynamic-symbols.h"
-
-size_t hashTableFromSymbolTable(DynamicSymbolTable *table, uint32_t **hashTable) {
-  DynamicSymbolList *current;
-  uint32_t nBuckets = table->count + 3,  // + 3, to count bss, end, and eData symbols
-           nChains = table->count + 3;
-  size_t hashTableSize = (nBuckets + nChains + 2);
-
-  uint32_t *hashTable_ = (uint32_t *)calloc(sizeof(uint32_t), hashTableSize);
-  uint32_t *buckets = &(hashTable_[2]);
-  uint32_t *chains = &(buckets[nBuckets]);
-  int idx, stringIdx=2;
-
-  hashTable_[0] = nBuckets;
-  hashTable_[1] = nChains;
-
-  for(current=table->symbols; current!=NULL; current=current->next) {
-    idx = elf_hash(current->symbol.string->str) % nBuckets;
-    chains[stringIdx] = buckets[idx];
-    buckets[idx] = stringIdx;
-    stringIdx++;
-  }
-
-  *hashTable = hashTable_;
-  return hashTableSize * sizeof(uint32_t);
-}

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

@@ -1,3 +0,0 @@
-#include "dynamic-symbols.h"
-
-size_t hashTableFromSymbolTable(DynamicSymbolTable *table, uint32_t **hashTable);

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

@@ -1,208 +0,0 @@
-#include <stdarg.h>
-#include <dlfcn.h>
-#include <err.h>
-#include <fcntl.h>
-#include <libelf.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-#include <unistd.h>
-
-#include "dynamic-symbols.h"
-#include "sdtnote.h"
-#include "section.h"
-#include "string-table.h"
-#include "shared-lib.h"
-#include "util.h"
-#include "libstapsdt.h"
-#include "errors.h"
-
-int createSharedLibrary(int fd, SDTProvider_t *provider) {
-  DynElf *dynElf = dynElfInit(fd);
-
-  for(SDTProbeList_t *node=provider->probes; node != NULL; node = node->next) {
-    dynElfAddProbe(dynElf, &(node->probe));
-  }
-
-  if(dynElfSave(dynElf) == -1) {
-    sdtSetError(provider, elfCreationError, provider->name);
-    return -1;
-  }
-
-  dynElfClose(dynElf);
-
-  return 0;
-}
-
-SDTProvider_t *providerInit(const char *name) {
-  SDTProvider_t *provider = (SDTProvider_t *) calloc(sizeof(SDTProvider_t), 1);
-  provider->error     = NULL;
-  provider->errno     = noError;
-  provider->probes    = NULL;
-  provider->_handle   = NULL;
-  provider->_filename = NULL;
-
-  provider->name = (char *) calloc(sizeof(char), strlen(name) + 1);
-  memcpy(provider->name, name, sizeof(char) * strlen(name) + 1);
-
-  return provider;
-}
-
-SDTProbe_t *providerAddProbe(SDTProvider_t *provider, const char *name, int argCount, ...) {
-  int i;
-  va_list vl;
-  ArgType_t arg;
-  va_start(vl, argCount);
-
-  SDTProbeList_t *probeList = (SDTProbeList_t *) calloc(sizeof(SDTProbeList_t), 1);
-  probeList->probe._fire = NULL;
-
-  probeList->probe.name = (char *) calloc(sizeof(char), strlen(name) + 1);
-  memcpy(probeList->probe.name, name, sizeof(char) * strlen(name) + 1);
-
-  probeList->next = provider->probes;
-  provider->probes = probeList;
-
-  probeList->probe.argCount = argCount;
-
-  for(i=0; i < argCount; i++) {
-    arg = va_arg(vl, ArgType_t);
-    probeList->probe.argFmt[i] = arg;
-  }
-
-  for(; i<MAX_ARGUMENTS; i++) {
-    probeList->probe.argFmt[i] = noarg;
-  }
-
-  probeList->probe.provider = provider;
-
-  return &(probeList->probe);
-}
-
-int providerLoad(SDTProvider_t *provider) {
-  int fd;
-  void *fireProbe;
-  char *filename = calloc(sizeof(char), strlen("/tmp/-XXXXXX.so") + strlen(provider->name) + 1);
-  char *error;
-
-  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);
-
-  provider->_handle = dlopen(filename, RTLD_LAZY);
-  if (!provider->_handle) {
-    sdtSetError(provider, sharedLibraryOpenError, filename, dlerror());
-    return -1;
-  }
-
-  for(SDTProbeList_t *node=provider->probes; node != NULL; node = node->next) {
-    fireProbe = dlsym(provider->_handle, node->probe.name);
-
-    // TODO (mmarchini) handle errors better when a symbol fails to load
-    if ((error = dlerror()) != NULL) {
-      sdtSetError(provider, sharedLibraryOpenError, filename, node->probe.name, error);
-      return -1;
-    }
-
-    node->probe._fire = fireProbe;
-  }
-
-
-  return 0;
-}
-
-int providerUnload(SDTProvider_t *provider) {
-  if(provider->_handle == NULL) {
-    return 0;
-  }
-  if(dlclose(provider->_handle) != 0) {
-    sdtSetError(provider, sharedLibraryCloseError, provider->_filename, provider->name, dlerror());
-    return -1;
-  }
-  provider->_handle = NULL;
-
-  for(SDTProbeList_t *node=provider->probes; node != NULL; node = node->next) {
-    node->probe._fire = NULL;
-  }
-
-  unlink(provider->_filename);
-  free(provider->_filename);
-
-  return 0;
-}
-
-void probeFire(SDTProbe_t *probe, ...) {
-  if(probe->_fire == NULL) {
-    return;
-  }
-  va_list vl;
-  va_start(vl, probe);
-  uint64_t arg[6] = {0};
-  for(int i=0; i < probe->argCount; i++) {
-    arg[i] = va_arg(vl, uint64_t);
-  }
-
-  switch(probe->argCount) {
-    case 0:
-      ((void (*)())probe->_fire) ();
-      return;
-    case 1:
-      ((void (*)())probe->_fire) (arg[0]);
-      return;
-    case 2:
-      ((void (*)())probe->_fire) (arg[0], arg[1]);
-      return;
-    case 3:
-      ((void (*)())probe->_fire) (arg[0], arg[1], arg[2]);
-      return;
-    case 4:
-      ((void (*)())probe->_fire) (arg[0], arg[1], arg[2], arg[3]);
-      return;
-    case 5:
-      ((void (*)())probe->_fire) (arg[0], arg[1], arg[2], arg[3], arg[4]);
-      return;
-    case 6:
-      ((void (*)())probe->_fire) (arg[0], arg[1], arg[2], arg[3], arg[4], arg[5]);
-      return;
-    default:
-      ((void (*)())probe->_fire) ();
-      return;
-  }
-}
-
-int probeIsEnabled(SDTProbe_t *probe) {
-  if(probe->_fire == NULL) {
-    return 0;
-  }
-  if(((*(char *)probe->_fire) & 0x90) == 0x90) {
-    return 0;
-  }
-  return 1;
-}
-
-void providerDestroy(SDTProvider_t *provider) {
-  SDTProbeList_t *node=NULL, *next=NULL;
-
-  for(node=provider->probes; node!=NULL; node=next) {
-    free(node->probe.name);
-    next=node->next;
-    free(node);
-  }
-  free(provider->name);
-  if(provider->error != NULL) {
-    free(provider->error);
-  }
-  free(provider);
-}