smparkes-eventmachine 0.12.10 → 0.12.10.1

data/eventmachine.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{smparkes-eventmachine}
-  s.version = "0.12.10"
+  s.version = "0.12.10.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Francis Cianfrocca"]

data/ext/em.cpp

@@ -2133,6 +2133,7 @@ EventMachine_t::UnwatchFile
 
 void EventMachine_t::UnwatchFile (int wd)
 {
+// fprintf(stderr, "unwatch wd %d\n", wd);
 	Bindable_t *b = Files[wd];
 	assert(b);
 	Files.erase(wd);
@@ -2152,6 +2153,7 @@ void EventMachine_t::UnwatchFile (int wd)
 
 void EventMachine_t::UnwatchFile (const unsigned long sig)
 {
+// fprintf(stderr, "unwatch sig %lu\n", sig);
 	for(map<int, Bindable_t*>::iterator i=Files.begin(); i != Files.end(); i++)
 	{
 		if (i->second->GetBinding() == sig) {
@@ -2170,26 +2172,25 @@ EventMachine_t::_ReadInotify_Events
 void EventMachine_t::_ReadInotifyEvents()
 {
 	#ifdef HAVE_INOTIFY
-        union {
-            struct inotify_event event;
-            char buffer[256];
-        };
+        char buffer[1024];
 
 	assert(EventCallback);
 
-	while (read(inotify->GetSocket(), buffer, sizeof(buffer) ) > 0) {
-            // fprintf(stderr,"%08x %08x\n",event.mask, event.mask & (IN_MODIFY | IN_CREATE | IN_DELETE | IN_MOVE));
-                // assert(event.len == 0);
-                if (event.mask & (IN_MODIFY | IN_CREATE | IN_DELETE | IN_MOVE)){
-                    // fprintf(stderr,"%08x\n",event.mask);
-			(*EventCallback)(Files [event.wd]->GetBinding(), EM_CONNECTION_READ, "modified", 8);
+        int returned;
+	while ((returned = read(inotify->GetSocket(), buffer, sizeof(buffer) )) > 0) {
+                int current = 0;
+                while(current< returned){
+                        struct inotify_event* event = (struct inotify_event*)(buffer+current);
+                        if (event->mask & (IN_MODIFY | IN_CREATE | IN_DELETE | IN_MOVE))
+                                (*EventCallback)(Files [event->wd]->GetBinding(), EM_CONNECTION_READ, "modified", 8);
+                        if (event->mask & IN_MOVE_SELF)
+        			(*EventCallback)(Files [event->wd]->GetBinding(), EM_CONNECTION_READ, "moved", 5);
+        		if (event->mask & IN_DELETE_SELF) {
+                		(*EventCallback)(Files [event->wd]->GetBinding(), EM_CONNECTION_READ, "deleted", 7);
+                        	UnwatchFile ((int)event->wd);
+                        }
+                        current += sizeof(struct inotify_event) + event->len;
                 }
-		if (event.mask & IN_MOVE_SELF)
-			(*EventCallback)(Files [event.wd]->GetBinding(), EM_CONNECTION_READ, "moved", 5);
-		if (event.mask & IN_DELETE_SELF) {
-			(*EventCallback)(Files [event.wd]->GetBinding(), EM_CONNECTION_READ, "deleted", 7);
-			UnwatchFile ((int)event.wd);
-		}
 	}
 	#endif
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: smparkes-eventmachine
 version: !ruby/object:Gem::Version 
-  version: 0.12.10
+  version: 0.12.10.1
 platform: ruby
 authors: 
 - Francis Cianfrocca