Thread: [Openhpi-svn] SF.net SVN: openhpi:[7234] openhpi/trunk (Page 4)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 7234
          http://openhpi.svn.sourceforge.net/openhpi/?rev=7234&view=rev
Author:   avpak
Date:     2010-12-26 15:13:00 +0000 (Sun, 26 Dec 2010)

Log Message:
-----------
Feature request #3129975

Modified Paths:
--------------
    openhpi/trunk/openhpid/event.c
    openhpi/trunk/openhpid/ohpi.c
    openhpi/trunk/plugins/simulator/sim_init.c
    openhpi/trunk/plugins/slave/handler.cpp

Modified: openhpi/trunk/openhpid/event.c
===================================================================

--- openhpi/trunk/openhpid/event.c	2010-12-25 13:14:54 UTC (rev 7233)
+++ openhpi/trunk/openhpid/event.c	2010-12-26 15:13:00 UTC (rev 7234)
@@ -274,6 +274,7 @@
                 break;
             case SAHPI_RESE_RESOURCE_REMOVED:
                 remove = TRUE;
+                process = ( exists != 0 ) ? TRUE : FALSE;
                 break;
             default:
                 // unknown resource event
@@ -283,7 +284,9 @@
         }
 
         if ( remove ) {
-            oh_remove_resource(rpt, e->resource.ResourceId);
+            if ( exists ) {
+                oh_remove_resource(rpt, e->resource.ResourceId);
+            }
         } else {
             hidp = g_new0(unsigned int, 1);
             *hidp = e->hid;

Modified: openhpi/trunk/openhpid/ohpi.c
===================================================================
--- openhpi/trunk/openhpid/ohpi.c	2010-12-25 13:14:54 UTC (rev 7233)
+++ openhpi/trunk/openhpid/ohpi.c	2010-12-26 15:13:00 UTC (rev 7234)
@@ -129,6 +129,44 @@
 
         if (error == SA_OK)
            if (oh_destroy_handler(id)) error = SA_ERR_HPI_ERROR;
+
+        if (error == SA_OK) {
+            // Remove all handler remaing resources from the Domain RPT
+            SaHpiRptEntryT *rpte;
+            SaHpiResourceIdT rid;
+            GSList *events = 0;
+
+            rid = SAHPI_FIRST_ENTRY;
+            while ((rpte = oh_get_resource_next(&(d->rpt), rid)) != 0) {
+                const void * data;
+                data = oh_get_resource_data(&(d->rpt), rpte->ResourceId);
+                if (data) {
+                    const unsigned int hid = *(const unsigned int*)(data);
+                    if (hid == id) {
+                        struct oh_event * e = g_new0(struct oh_event, 1);
+                        e->hid = id;
+                        e->resource = *rpte;
+                        e->rdrs = 0;
+                        e->rdrs_to_remove = 0;
+                        e->event.Source = rpte->ResourceId;
+                        e->event.EventType = SAHPI_ET_RESOURCE;
+                        oh_gettimeofday(&e->event.Timestamp);
+                        e->event.Severity = SAHPI_MAJOR;
+                        e->event.EventDataUnion.ResourceEvent.ResourceEventType
+                            = SAHPI_RESE_RESOURCE_REMOVED;
+                        events = g_slist_prepend(events, e);
+                    }
+                }
+                rid = rpte->ResourceId;
+            }
+
+            GSList *iter = events;
+            while (iter) {
+                oh_evt_queue_push(oh_process_q, iter->data);
+                iter = g_slist_next(iter);
+            }
+            g_slist_free(events);
+        }
    
         oh_release_domain(d); /* Unlock domain */
         return error;

Modified: openhpi/trunk/plugins/simulator/sim_init.c
===================================================================
--- openhpi/trunk/plugins/simulator/sim_init.c	2010-12-25 13:14:54 UTC (rev 7233)
+++ openhpi/trunk/plugins/simulator/sim_init.c	2010-12-26 15:13:00 UTC (rev 7234)
@@ -204,26 +204,33 @@
 {
     struct oh_handler_state *state = hnd;
 
-    SaHpiEntryIdT id;
-    SaHpiRptEntryT * rpte;
+    SaHpiEntryIdT rid;
+    SaHpiRptEntryT *rpte;
+    GSList *events = 0;
 
-    id = SAHPI_FIRST_ENTRY;
-    while ((rpte = oh_get_resource_next(state->rptcache, id)) != 0) {
-        struct oh_event * e = (struct oh_event *)g_malloc0(sizeof(struct oh_event));
-
+    rid = SAHPI_FIRST_ENTRY;
+    while ((rpte = oh_get_resource_next(state->rptcache, rid)) != 0) {
+        struct oh_event *e = g_new0(struct oh_event, 1);
         e->hid = state->hid;
         e->resource = *rpte;
         e->rdrs = 0;
+        e->rdrs_to_remove = 0;
         e->event.Source = rpte->ResourceId;
         e->event.EventType = SAHPI_ET_RESOURCE;
         oh_gettimeofday(&e->event.Timestamp);
         e->event.Severity = SAHPI_MAJOR;
         e->event.EventDataUnion.ResourceEvent.ResourceEventType = SAHPI_RESE_RESOURCE_REMOVED;
+        events = g_slist_prepend(events, e);
 
-        oh_evt_queue_push(state->eventq, e );
+        rid = rpte->ResourceId;
+    }
 
-        id = rpte->EntryId;
+    GSList *iter = events;
+    while (iter) {
+        oh_evt_queue_push(state->eventq, iter->data );
+        iter = g_slist_next(iter);
     }
+    g_slist_free(events);
 
     oh_el_close(state->elcache);
     oh_flush_rpt(state->rptcache);

Modified: openhpi/trunk/plugins/slave/handler.cpp
===================================================================
--- openhpi/trunk/plugins/slave/handler.cpp	2010-12-25 13:14:54 UTC (rev 7233)
+++ openhpi/trunk/plugins/slave/handler.cpp	2010-12-26 15:13:00 UTC (rev 7234)
@@ -278,7 +278,7 @@
         e->resource.ResourceCapabilities = 0;
         SaHpiEventT& he = e->event;
         he.EventType = SAHPI_ET_RESOURCE;
-        he.Severity = SAHPI_MAJOR; // TODO
+        he.Severity = SAHPI_MAJOR;
         SaHpiResourceEventT& re = he.EventDataUnion.ResourceEvent;
         re.ResourceEventType = SAHPI_RESE_RESOURCE_REMOVED;
    


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




Thread: [Openhpi-svn] SF.net SVN: openhpi:[7234] openhpi/trunk (Page 4)

openhpi-svn