pcp_easy 0.3.0 → 0.4.0

data/lib/pcp_easy/pmapi/pm_atom_value.rb

@@ -0,0 +1,49 @@
+require 'ffi'
+
+module PCPEasy
+  class PMAPI
+    class PmAtomValue < FFI::Union
+      layout :l, :int32,
+             :ul, :uint32,
+             :ll, :int64,
+             :ull, :uint64,
+             :f, :float,
+             :d, :double,
+             :cp, :pointer,
+             :vbp, :pointer
+
+      def l
+        self[:l]
+      end
+
+      def ul
+        self[:ul]
+      end
+
+      def ll
+        self[:ll]
+      end
+
+      def ull
+        self[:ull]
+      end
+
+      def f
+        self[:f]
+      end
+
+      def d
+        self[:d]
+      end
+
+      def cp
+        self[:cp]
+      end
+
+      def vbp
+        self[:vbp]
+      end
+
+    end
+  end
+end

data/lib/pcp_easy/pmapi/pm_desc.rb

@@ -0,0 +1,49 @@
+require 'ffi'
+require 'pcp_easy/pmapi/pm_units'
+
+module PCPEasy
+  class PMAPI
+    class PmDesc < FFI::Struct
+      layout :pmid, :uint,
+             :type, :int,
+             :indom, :uint,
+             :sem, :int,
+             :units, :uint32
+
+      def inspect
+        "<#{self.class.to_s}:#{object_id} pmid=#{pmid} type=#{type} indom=#{indom} sem=#{sem} units=#{units.inspect}>"
+      end
+
+      def pmid
+        self[:pmid]
+      end
+
+      def type
+        self[:type]
+      end
+
+      def indom
+        self[:indom]
+      end
+
+      def sem
+        self[:sem]
+      end
+
+      def units
+        @units ||= PmUnits.new(self[:units])
+      end
+
+      def ==(other)
+        self.class == other.class && \
+        pmid == other.pmid && \
+        type == other.type && \
+        indom == other.indom && \
+        sem == other.sem && \
+        units == other.units
+
+      end
+
+    end
+  end
+end

data/lib/pcp_easy/pmapi/pm_result.rb

@@ -0,0 +1,36 @@
+require 'ffi'
+
+require 'pcp_easy/pmapi/timeval'
+require 'pcp_easy/pmapi/pm_value_set'
+
+module PCPEasy
+  class PMAPI
+    class PmResult < FFI::Struct
+      layout :timestamp, Timeval,
+             :numpmid, :int,
+             :vset, :pointer
+             # pointer to start of PmValueSet
+
+      def vset
+        numpmid.times.collect do |n|
+          PmValueSet.new((start_of_vset + FFI::Pointer.size * n).get_pointer(0))
+        end
+      end
+
+      def numpmid
+        self[:numpmid]
+      end
+
+      def timestamp
+        self[:timestamp]
+      end
+
+      private
+
+      def start_of_vset
+        pointer + (self.size - FFI::Pointer.size)
+      end
+
+    end
+  end
+end

data/lib/pcp_easy/pmapi/pm_units.rb

@@ -0,0 +1,62 @@
+module PCPEasy
+  class PMAPI
+    class PmUnits
+
+      # Decodes a 32bit integer into the correct fields of pmUnits.
+      # This implementation assumes little-endian encoding
+
+      def initialize(pm_units)
+        @pm_units = pm_units
+      end
+
+      def dim_space
+        signed_4_bit(@pm_units >> 28)
+      end
+
+      def dim_time
+        signed_4_bit(@pm_units >> 24)
+      end
+
+      def dim_count
+        signed_4_bit(@pm_units >> 20)
+      end
+
+      def scale_space
+        unsigned_4_bit(@pm_units >> 16)
+      end
+
+      def scale_time
+        unsigned_4_bit(@pm_units >> 12)
+      end
+
+      def scale_count
+        signed_4_bit(@pm_units >> 8)
+      end
+
+      def inspect
+        "<#{self.class.to_s}:#{object_id} @pm_units=#{@pm_units} {#{dim_space},#{dim_time},#{dim_count},#{scale_space},#{scale_time},#{scale_count}}>"
+      end
+
+      def ==(other)
+        self.class == other.class && \
+        dim_space == other.dim_space && \
+        dim_time == other.dim_time && \
+        dim_count == other.dim_count && \
+        scale_space == other.scale_space && \
+        scale_time == other.scale_time && \
+        scale_count == other.scale_count
+      end
+
+      private
+
+      def signed_4_bit(lowest_4_bits)
+        lowest_4_bits & 0x8 == 0 ? lowest_4_bits & 0xf : -((~lowest_4_bits & 0xf) + 1)
+      end
+
+      def unsigned_4_bit(lowest_4_bits)
+        lowest_4_bits & 0xf
+      end
+
+    end
+  end
+end

data/lib/pcp_easy/pmapi/pm_value.rb

@@ -0,0 +1,34 @@
+require 'ffi'
+
+module PCPEasy
+  class PMAPI
+
+    class PmValueU < FFI::Union
+      layout :pval, :pointer,
+             :lval, :int
+
+      def pval
+        self[:pval]
+      end
+
+      def lval
+        self[:lval]
+      end
+    end
+
+    class PmValue < FFI::Struct
+      layout :inst, :int,
+             :value, PmValueU
+      def inst
+        self[:inst]
+      end
+
+      def value
+        self[:value]
+      end
+
+    end
+
+
+  end
+end

data/lib/pcp_easy/pmapi/pm_value_set.rb

@@ -0,0 +1,38 @@
+require 'ffi'
+require 'pcp_easy/pmapi/pm_value'
+
+module PCPEasy
+  class PMAPI
+    class PmValueSet < FFI::Struct
+
+      layout :pmid, :uint,
+             :numval, :int,
+             :valfmt, :int,
+             :vlist, PmValue
+             # Can have one or more PmValue
+
+      def vlist
+        @vlist ||= numval.times.collect {|n| PmValue.new(start_of_vlist + PmValue.size * n)}
+      end
+
+      def numval
+        self[:numval]
+      end
+
+      def pmid
+        self[:pmid]
+      end
+
+      def valfmt
+        self[:valfmt]
+      end
+
+      private
+
+      def start_of_vlist
+        pointer + (self.size - PmValue.size)
+      end
+
+    end
+  end
+end

data/lib/pcp_easy/pmapi/timeval.rb

@@ -0,0 +1,16 @@
+require 'ffi'
+
+module PCPEasy
+  class PMAPI
+    class Timeval < FFI::Struct
+      layout :tv_sec, :long,
+             :tv_usec, :long
+
+      def ==(other)
+        self.class == other.class && \
+        self[:tv_sec] == other[:tv_sec] && \
+        self[:tv_usec] == other[:tv_usec]
+      end
+    end
+  end
+end

metadata

@@ -1,23 +1,23 @@
 --- !ruby/object:Gem::Specification
 name: pcp_easy
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Ryan Doyle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-07 00:00:00.000000000 Z
+date: 2016-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rake-compiler
+  name: ffi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -52,23 +52,39 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email: 
 executables: []
-extensions:
-- ext/pcp_easy/extconf.rb
+extensions: []
 extra_rdoc_files: []
 files:
-- ext/pcp_easy/agent.c
-- ext/pcp_easy/agent.h
-- ext/pcp_easy/exceptions.c
-- ext/pcp_easy/exceptions.h
-- ext/pcp_easy/extconf.rb
-- ext/pcp_easy/metric.c
-- ext/pcp_easy/metric.h
-- ext/pcp_easy/metric_value.c
-- ext/pcp_easy/metric_value.h
-- ext/pcp_easy/pcp_easy.c
+- lib/pcp_easy.rb
+- lib/pcp_easy/agent.rb
+- lib/pcp_easy/error.rb
+- lib/pcp_easy/metric.rb
+- lib/pcp_easy/metric/value.rb
+- lib/pcp_easy/pmapi.rb
+- lib/pcp_easy/pmapi/pm_atom_value.rb
+- lib/pcp_easy/pmapi/pm_desc.rb
+- lib/pcp_easy/pmapi/pm_result.rb
+- lib/pcp_easy/pmapi/pm_units.rb
+- lib/pcp_easy/pmapi/pm_value.rb
+- lib/pcp_easy/pmapi/pm_value_set.rb
+- lib/pcp_easy/pmapi/timeval.rb
 homepage: 
 licenses: []
 metadata: {}
@@ -88,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Simple query interface for Performance Co-Pilot

data/ext/pcp_easy/agent.c

@@ -1,117 +0,0 @@
-/*
- * Copyright (C) 2016 Ryan Doyle
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#include <ruby.h>
-#include <pcp/pmapi.h>
-
-#include "exceptions.h"
-#include "metric.h"
-
-VALUE pcpeasy_agent_class = Qnil;
-
-
-typedef struct {
-    int pm_context;
-} PcpEasyAgent;
-
-static void deallocate(void *untyped_pcpeasy_agent) {
-    PcpEasyAgent *pcpqz_agent = (PcpEasyAgent*)untyped_pcpeasy_agent;
-    pmDestroyContext(pcpqz_agent->pm_context);
-    xfree(pcpqz_agent);
-}
-
-static VALUE allocate(VALUE self) {
-    PcpEasyAgent *pcpeasy_agent;
-    return Data_Make_Struct(self, PcpEasyAgent, 0, deallocate, pcpeasy_agent);
-};
-
-static VALUE initialize(VALUE self, VALUE hostname_rb) {
-    PcpEasyAgent *pcpeasy_agent;
-    const char *hostname;
-    int pm_context;
-
-    Data_Get_Struct(self, PcpEasyAgent, pcpeasy_agent);
-    hostname = StringValueCStr(hostname_rb);
-
-    if((pm_context = pmNewContext(PM_CONTEXT_HOST, hostname)) < 0) {
-        pcpeasy_raise_from_pmapi_error(pm_context);
-    }
-
-    rb_iv_set(self, "@host", hostname_rb);
-
-    /* Store away with this instance */
-    pcpeasy_agent->pm_context = pm_context;
-
-    return self;
-}
-
-static VALUE decode_pm_result(pmResult *pm_result, char *metric_name) {
-    /* No values (or somehow more than 1) */
-    if (pm_result->numpmid != 1) {
-        return Qnil;
-    }
-
-    return pcpeasy_metric_new(metric_name, pm_result->vset[0]);
-}
-
-static VALUE metric(VALUE self, VALUE metric_string_rb) {
-    /* Get our context */
-    PcpEasyAgent *pcpeasy_agent;
-    Data_Get_Struct(self, PcpEasyAgent, pcpeasy_agent);
-    pmUseContext(pcpeasy_agent->pm_context);
-
-    /* Get the pmID */
-    int error;
-    pmID pmid;
-    pmID *pmid_list = ALLOC(pmID);
-    char **metric_list = ALLOC(char*);
-    char *metric_name = StringValueCStr(metric_string_rb);
-    metric_list[0] = metric_name;
-    if((error = pmLookupName(1, metric_list, pmid_list)) < 0) {
-        xfree(pmid_list);
-        xfree(metric_list);
-        pcpeasy_raise_from_pmapi_error(error);
-    }
-    pmid = pmid_list[0];
-    xfree(pmid_list);
-    xfree(metric_list);
-
-
-    /* Do the fetch */
-    pmResult *pm_result;
-    VALUE result;
-    if((error = pmFetch(1, &pmid, &pm_result))) {
-        pcpeasy_raise_from_pmapi_error(error);
-    }
-
-    /* Decode the result */
-    result = decode_pm_result(pm_result, metric_name);
-    pmFreeResult(pm_result);
-
-    return result;
-}
-
-
-void pcpeasy_agent_init(VALUE rb_cPCPEasy) {
-    pcpeasy_agent_class = rb_define_class_under(rb_cPCPEasy, "Agent", rb_cObject);
-
-    rb_define_alloc_func(pcpeasy_agent_class, allocate);
-    rb_define_method(pcpeasy_agent_class, "initialize", initialize, 1);
-    rb_define_method(pcpeasy_agent_class, "metric", metric, 1);
-    rb_define_attr(pcpeasy_agent_class, "host", 1, 0);
-}