corosync 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ebdf0a21a91d835cd04ebbdccba82d69b791636
-  data.tar.gz: bfbc00cbe277b8bdf5fb7fc8f7e7f7286accd97b
+  metadata.gz: ec6cba2dc8f6d3d85accfe0821274b1bc3268e2a
+  data.tar.gz: 05257c44ede07405190a84caaf509be8216095d6
 SHA512:
-  metadata.gz: 09db7ddafba097fde8bd040d98e667cb6f8b291020804d5c503334432c883c0792360547b66b9caa48204ee2e85131d96dafcbe8390cd12ce984245ea522d15b
-  data.tar.gz: 65a2cc445d24f1c7f3ac033cc485ba2457ba5e3460c237c30b30e06a3f17dc61f684990c18eaa65cd174360addc5e9456a9089efe0841a7abcd612988966881c
+  metadata.gz: 16c7e8a4d0ac77525d5ba950d9f04b025d0424c07b39ba613ec70843f5ce80acf2eab56bc1762923fc5b0a22ad29710314553e8841322890338118755c12eebf
+  data.tar.gz: e818f76f4e96fa0bf648a62767c3ca7208646b36d319d4ae81c58d578a4a62a6c5fac6a08a22ed573e2994ba635c812a4b944f9b9749f75dd0382258a697bffe

data/.gitignore

@@ -1 +1,2 @@
 .yardoc
+*.gem

data/README.md

@@ -23,6 +23,7 @@ Currently the only supported service is CPG. It is fully functional, though it m
 
 ### CPG
 
+    require 'corosync/cpg'
     cpg = Corosync::CPG.new('mygroup')
     cpg.on_message do |message, membership|
       puts "Received #{message}"

data/lib/corosync/cpg/member.rb

@@ -20,7 +20,7 @@ class Corosync::CPG::Member
 			member = args.first
 
 			member = Corosync::CpgAddress.new(member) if member.is_a?(FFI::Pointer)
-			if member.is_a?(Corosync::CpgAddress) then
+			if member.is_a?(Corosync::CpgAddress) or member.is_a?(Corosync::CpgIterationDescriptionT) then
 				@nodeid = member[:nodeid]
 				@pid = member[:pid]
 			else

data/lib/corosync/cpg.rb

@@ -12,7 +12,7 @@ require 'corosync/cpg/member'
 # This is all done through callbacks. You define a block of code to execute, and whenever a message is received, it is passed to that block.  
 # After registering the callbacks, you call {#dispatch} to check for any pending messages, upon which the appropriate callbacks will be executed.
 #
-# The simplest usage of this library is to call `Corosync::CPG.new('groupname')`. This will connect to CPG and join the specified group. Note though that upon joining a group, the library automatically calls {#dispatch} once on it's own. This is so that it can get the initial confchg message and obtain a group membership list. As such you will not have been able to establish a callback yet. The solution to this is to create the CPG object without joining, register your callbacks, and then call {#join}.
+# The simplest usage of this library is to call `Corosync::CPG.new('groupname')`. This will connect to CPG and join the specified group.
 #
 # == Threading notice
 # With MRI Ruby 1.9.3 and older, you cannot call {#dispatch} from within a thread. Attempting to do so will result in a segfault.  
@@ -22,6 +22,7 @@ require 'corosync/cpg/member'
 # ----
 #
 # @example
+#   require 'corosync/cpg'
 #   cpg = Corosync::CPG.new('mygroup')
 #   cpg.on_message do |message, member|
 #     puts "Received #{message}"
@@ -38,10 +39,6 @@ class Corosync::CPG
 	# @return [IO]
 	attr_reader :fd
 
-	# Members currently in the group.
-	# @return [Corosync::CPG::MemberList]
-	attr_reader :members
-
 	# Name of the currently joined group
 	# @return [String]
 	attr_reader :group
@@ -66,7 +63,6 @@ class Corosync::CPG
 		@group = nil
 		@fd = nil
 		@handle = nil
-		@members = Corosync::CPG::MemberList.new
 
 		join group if group
 	end
@@ -103,14 +99,12 @@ class Corosync::CPG
 		@fd = nil
 		@model = nil
 		@handle = nil
-		@members = Corosync::CPG::MemberList.new
 
 		true
 	end
 	alias_method :close, :finalize
 
 	# Join the specified closed process group.  
-	# Note that the library will automatically make a call to {#dispatch} upon join. This is so that it can obtain a group membership list. If you wish to receive the initial join message, you must register the callback with {#on_confchg} before calling {#join}.
 	# @param name [String] Name of the group. Maximum length of 128 characters.
 	# @return [void]
 	def join(name)
@@ -124,8 +118,6 @@ class Corosync::CPG
 			raise StandardError, "Received #{cs_error.to_s.upcase} attempting to join group"
 		end
 
-		dispatch
-
 		@group = name
 
 		self
@@ -146,7 +138,6 @@ class Corosync::CPG
 		end
 
 		@group = nil
-		@members = Corosync::CPG::MemberList.new
 	end
 
 	# Checks for a single pending events and triggers the appropriate callback if found.
@@ -199,8 +190,6 @@ class Corosync::CPG
 			member_list << (member_list_p + i * Corosync::CpgAddress.size)
 		end
 
-		@members = member_list.dup.freeze
-
 		return if !@callback_confchg # no point in continuing otherwise
 
 		left_list = Corosync::CPG::MemberList.new
@@ -247,6 +236,40 @@ class Corosync::CPG
 		nodeid_p.read_uint
 	end
 
+	# Gets a list of members currently in the group
+	# @return [Corosync::CPG::MemberList]
+	def members
+		members = Corosync::CPG::MemberList.new
+
+		cpg_name = Corosync::CpgName.new
+		cpg_name[:value] = @group
+		cpg_name[:length] = @group.size
+
+		iteration_handle_ptr = FFI::MemoryPointer.new(Corosync.find_type(:cpg_iteration_handle_t))
+		cs_error = Corosync.cpg_iteration_initialize(@handle, Corosync::CPG_ITERATION_ONE_GROUP, cpg_name, iteration_handle_ptr)
+		if cs_error != :ok then
+			raise StandardError, "Received #{cs_error.to_s.upcase} attempting to initialize member iteration"
+		end
+		iteration_handle = iteration_handle_ptr.read_uint64
+
+		begin
+			iteration_description = Corosync::CpgIterationDescriptionT.new
+			while (cs_error = Corosync.cpg_iteration_next(iteration_handle, iteration_description.pointer)) == :ok do
+				members << Corosync::CPG::Member.new(iteration_description)
+			end
+			if cs_error != :err_no_sections then
+				raise StandardError, "Received #{cs_error.to_s.upcase} attempting to iterate group members"
+			end
+		ensure
+			cs_error = Corosync.cpg_iteration_finalize(iteration_handle)
+			if cs_error != :ok then
+				raise StandardError, "Received #{cs_error.to_s.upcase} attempting to finalize member iteration"
+			end
+		end
+
+		members
+	end
+
 	# Returns the {Corosync::CPG::Member member} object describing ourself.
 	# @return [Corosync::CPG::Member]
 	def member

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Corosync
-	GEM_VERSION = '0.0.2'
+	GEM_VERSION = '0.0.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: corosync
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Patrick Hemmer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-05 00:00:00.000000000 Z
+date: 2013-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi