cmpi-bindings 0.9.0 → 0.9.5

data/ext/cmpi-bindings/string_array.h

@@ -110,15 +110,15 @@ static void string_array_print(char** array)
 {
     char** p;
 
-    printf("string_array\n");
-    printf("{\n");
+    fprintf(stderr, "string_array\n");
+    fprintf(stderr, "{\n");
 
     for (p = array; *p; p++)
     {
-        printf("    {%s}\n", *p);
+        fprintf(stderr, "    {%s}\n", *p);
     }
 
-    printf("}\n");
+    fprintf(stderr, "}\n");
 }
 #endif
 

data/ext/src/cmpi_provider.c

@@ -1054,7 +1054,7 @@ authorizeFilter(
 
     TARGET_THREAD_BEGIN_BLOCK; 
     _ctx = SWIG_NewPointerObj((void*) ctx, SWIGTYPE_p__CMPIContext, 0);
-    _filter = SWIG_NewPointerObj((void*) filter, SWIGTYPE_p__CMPISelectExp, 0);
+    _filter = SWIG_NewPointerObj((void*)wrap_select_filter(filter, NULL), SWIGTYPE_p__CMPISelectExp, 0);
     _classPath = SWIG_NewPointerObj((void*) classPath, SWIGTYPE_p__CMPIObjectPath, 0);
     _className = string2target(className); 
     _owner = string2target(owner); 
@@ -1090,12 +1090,12 @@ activateFilter(
     Target_Type _classPath;
     Target_Type _firstActivation;
     Target_Type _className;
-   
+
     _SBLIM_TRACE(1,("activateFilter() called, ctx %p, filter %p, className %s, classPath %p, firstActivation %d", ctx, filter, className, classPath, firstActivation));
 
     TARGET_THREAD_BEGIN_BLOCK; 
     _ctx = SWIG_NewPointerObj((void*) ctx, SWIGTYPE_p__CMPIContext, 0);
-    _filter = SWIG_NewPointerObj((void*) filter, SWIGTYPE_p__CMPISelectExp, 0);
+    _filter = SWIG_NewPointerObj((void*)wrap_select_filter(filter, NULL), SWIGTYPE_p__CMPISelectExp, 0);
     _classPath = SWIG_NewPointerObj((void*) classPath, SWIGTYPE_p__CMPIObjectPath, 0);
     _firstActivation = Target_Bool(firstActivation); 
     _className = string2target(className); 
@@ -1136,7 +1136,7 @@ deActivateFilter(
 
     TARGET_THREAD_BEGIN_BLOCK; 
     _ctx = SWIG_NewPointerObj((void*) ctx, SWIGTYPE_p__CMPIContext, 0);
-    _filter = SWIG_NewPointerObj((void*) filter, SWIGTYPE_p__CMPISelectExp, 0);
+    _filter = SWIG_NewPointerObj((void*)wrap_select_filter(filter, NULL), SWIGTYPE_p__CMPISelectExp, 0);
     _classPath = SWIG_NewPointerObj((void*) classPath, SWIGTYPE_p__CMPIObjectPath, 0);
     _lastActivation = Target_Bool(lastActivation); 
     _className = string2target(className); 
@@ -1180,7 +1180,7 @@ mustPoll(
     TARGET_THREAD_BEGIN_BLOCK; 
     _ctx = SWIG_NewPointerObj((void*) ctx, SWIGTYPE_p__CMPIContext, 0);
     //Target_Type _rslt = SWIG_NewPointerObj((void*) rslt, SWIGTYPE_p__CMPIResult, 0);
-    _filter = SWIG_NewPointerObj((void*) filter, SWIGTYPE_p__CMPISelectExp, 0);
+    _filter = SWIG_NewPointerObj((void*)wrap_select_filter(filter, NULL), SWIGTYPE_p__CMPISelectExp, 0);
     _classPath = SWIG_NewPointerObj((void*) classPath, SWIGTYPE_p__CMPIObjectPath, 0);
     _className = string2target(className); 
 
@@ -1305,11 +1305,11 @@ static int
 createInit(ProviderMIHandle* miHdl, CMPIStatus* st)
 {
     const char *trace_level = getenv("CMPI_BINDINGS_TRACE_LEVEL");
-    _SBLIM_TRACE(0,("\n>>>>> createInit() called, broker %p, miname= %s (ctx=%p), status %p, trace_level %s\n", miHdl->broker, miHdl->miName, miHdl->context, st, trace_level?trace_level:"(null)"));
+    _SBLIM_TRACE(1,(">>>>> createInit() called, broker %p, miname= %s (ctx=%p), status %p, trace_level %s", miHdl->broker, miHdl->miName, miHdl->context, st, trace_level?trace_level:"(null)"));
 
     if (trace_level) {
       cmpi_bindings_trace_level = *trace_level - '0';
-      _SBLIM_TRACE(0,("tracing at level %d\n", cmpi_bindings_trace_level));
+      _SBLIM_TRACE(0,("tracing at level %d", cmpi_bindings_trace_level));
     }
     return TargetInitialize(miHdl, st);
 }
@@ -1321,7 +1321,7 @@ CMPI##ptype##MI* _Generic_Create_##ptype##MI(const CMPIBroker* broker, \
 { \
     CMPI##ptype##MI *mi; \
     ProviderMIHandle *hdl; \
-    _SBLIM_TRACE(1, ("\n>>>>> in FACTORY: CMPI"#ptype"MI* _Generic_Create_"#ptype"MI... miname=%s", miname)); \
+    _SBLIM_TRACE(1, (">>>>> in FACTORY: CMPI"#ptype"MI* _Generic_Create_"#ptype"MI... miname=%s", miname)); \
     hdl = (ProviderMIHandle*)malloc(sizeof(ProviderMIHandle)); \
     if (hdl) { \
         hdl->implementation = Target_Null; \
@@ -1340,7 +1340,7 @@ CMPI##ptype##MI* _Generic_Create_##ptype##MI(const CMPIBroker* broker, \
         mi->ft = &ptype##MIFT__; \
     } \
     ++_MI_COUNT; \
-    _SBLIM_TRACE(1, ("\n>>>>>_MI_COUNT %d:  returning mi=0x%08x  hdl=0x%08x, hdl->implementation=%p   mi->ft=0x%08x\n", _MI_COUNT, mi, mi->hdl, hdl->implementation, mi->ft)); \
+    _SBLIM_TRACE(1, (">>>>> CMPI"#ptype"MI(%s) _MI_COUNT %d: returning mi=%p : miHdl=%p, hdl->implementation=%p, mi->ft=%p", miname, _MI_COUNT, mi, mi->hdl, hdl->implementation, mi->ft)); \
     return mi; \
 }
 

data/ext/src/target_ruby.c

@@ -176,6 +176,11 @@ get_exc_trace(const CMPIBroker* broker)
   CMPIString *result;
 
   if (NIL_P(exception)) {
+    _SBLIM_TRACE(1,("<%d> Ruby: get_exc_trace: no exception", getpid()));
+    return NULL;
+  }
+  if (NIL_P(trace)) {
+    _SBLIM_TRACE(1,("<%d> Ruby: get_exc_trace: no trace ($@ is nil)", getpid()));
     return NULL;
   }
   backtrace = rb_funcall(trace, rb_intern("join"), 1, rb_str_new("\n\t", 2));
@@ -496,13 +501,13 @@ TargetCleanup(ProviderMIHandle * hdl)
   if (--_MI_COUNT > 0) 
   {
     pthread_mutex_unlock(&_CMPI_INIT_MUTEX);
-    _SBLIM_TRACE(1,("_MI_COUNT > 0: %d", _MI_COUNT));
+    _SBLIM_TRACE(0,("_MI_COUNT > 0: %d", _MI_COUNT));
     return;
   }
 
   if (_TARGET_INIT)  // if Ruby is initialized and _MI_COUNT == 0, call ruby_finalize
   {
-    _SBLIM_TRACE(1,("Calling ruby_finalize()"));
+    _SBLIM_TRACE(0,("Calling ruby_finalize(), unloading Ruby"));
     ruby_finalize();
     _TARGET_INIT = 0; // false
   }

data/lib/cmpi.rb

@@ -105,7 +105,14 @@ module Cmpi
   def self.charsptr
     ((16+10)<<8)
   end
-  
+  def self.embedded_object
+    ((1)<<14)
+  end
+  def self.embedded_instance
+    ((1)<<15)
+  end
+
+
   unless defined? CMPI_ARRAY
     CMPI_ARRAY = ((1)<<13)
   end
@@ -178,6 +185,12 @@ module Cmpi
   def self.charsptrA
     CMPI_ARRAY | self.charsptrA
   end
+  def self.embedded_objectA
+    CMPI_ARRAY | self.embedded_object
+  end
+  def self.embedded_instanceA
+    CMPI_ARRAY | self.embedded_instance
+  end
 
   #
   # Convert CIM DateTime string representation (see DSP0004, 2.2.1)
@@ -263,7 +276,7 @@ module Cmpi
     def self.method_missing name, *args
       v = self.map[name.to_s]
       return v if v
-      STDERR.puts "#{self.class}.#{name} ?"
+      STDERR.puts "#{self}.#{name} ?"
       nil
     end
   end
@@ -322,10 +335,16 @@ module Cmpi
 	v = args[0]
 	n = s.chop
 	# -> http://blog.sidu.in/2008/02/loading-classes-from-strings-in-ruby.html
-	@typemap ||= Cmpi.const_get(self.objectpath.classname).typemap
-	t = @typemap[n] if @typemap
-#	STDERR.printf "Instance.#{n} = #{v}[#{v.class}]:#{t}" % [n, v, v.class, t]
-     	STDERR.printf "Instance.%s = %s[%s]:%04x\n" % [n, v, v.class, t]
+        unless @typemap
+          begin
+            @typemap = Cmpi.const_get(self.objectpath.classname).typemap
+          rescue NoMethodError
+            raise "Cmpi::#{self.objectpath.classname}.typemap not defined"
+          end
+        end
+	t = @typemap[n]
+        raise "Property '#{n}' of Cmpi::#{self.objectpath.classname}.typemap not defined" unless t
+#        STDERR.printf "Instance.%s = %s[%s]:%04x\n" % [n, v, v.class, t]
         self[n,v] = t
       else
 #	STDERR.puts "CMPIInstance.#{name} -> #{self[s].inspect}"
@@ -348,9 +367,16 @@ module Cmpi
 	v = args[0]
 	n = s.chop
 	# -> http://blog.sidu.in/2008/02/loading-classes-from-strings-in-ruby.html
-	@typemap ||= Cmpi.const_get(classname).typemap rescue nil
-	t = @typemap[n] if @typemap
-#	STDERR.puts "ObjectPath.#{n} = #{v}:#{t}"
+        unless @typemap
+          begin
+            @typemap = Cmpi.const_get(self.classname).typemap
+          rescue NameError
+            raise "Cmpi::#{self.classname}.typemap not defined"
+          end
+        end
+	t = @typemap[n]
+        raise "Property '#{n}' of Cmpi::#{self.classname}.typemap not defined" unless t
+#        STDERR.printf "ObjectPath.%s = %s[%s]:%04x\n" % [n, v, v.class, t]
         self[n,v] = t
       else
 #	STDERR.puts "CMPIObjectPath.#{name} -> #{self[s].inspect}"

metadata

@@ -1,62 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: cmpi-bindings
 version: !ruby/object:Gem::Version
-  version: 0.9.0
-  prerelease: 
+  version: 0.9.5
 platform: ruby
 authors:
 - Klaus Kämpf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-14 00:00:00.000000000 Z
+date: 2013-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0.5'
 description: The cmpi-bindings gem provides a Ruby API to write CIM providers
@@ -76,28 +69,26 @@ files:
 - ext/cmpi-bindings/extconf.rb
 homepage: http://www.github.com/kkaempf/cmpi-bindings
 licenses: []
-post_install_message: ! "  ____\n/@    ~-.\n/ __ .- | remember to have fun! \n //
-  //  @  \n\n"
+metadata: {}
+post_install_message: "  ____\n/@    ~-.\n/ __ .- | remember to have fun! \n // //
+  \ @  \n\n"
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Write CIM providers in Ruby
 test_files: []
-has_rdoc: