event: tighten scope of object_event

Tighten up scope after the previous patch avoided using
internals.  This will also make it easier to change
internal implementation without having to chase down quite
as many impacted callers or worrying about two files getting
implementations out of sync.

* src/conf/object_event_private.h
(virObjectEventCallbackListAddID, virObjectEventQueueClear)
(virObjectEventStateLock, virObjectEventStateUnlock)
(virObjectEventTimer): Drop prototype.
(_virObjectEventCallbackList, _virObjectEventState)
(_virObjectEventCallback): Move...
* src/conf/object_event.c: ...here.
(virObjectEventCallbackListAddID, virObjectEventQueueClear)
(virObjectEventStateLock, virObjectEventStateUnlock)
(virObjectEventTimer): Mark private.

Signed-off-by: Eric Blake <eblake@redhat.com>

diff --git a/src/conf/object_event.c b/src/conf/object_event.c
index babefb51028969cd2684e4fe8e9a7dbca5abf6e8..fb0a2e295f52592f0614ab4f254c45617a7bc2b6 100644 (file)
--- a/src/conf/object_event.c
+++ b/src/conf/object_event.c
@@ -36,10 +36,42 @@
 
 #define VIR_FROM_THIS VIR_FROM_NONE
 
+struct _virObjectEventCallbackList {
+    unsigned int nextID;
+    size_t count;
+    virObjectEventCallbackPtr *callbacks;
+};
+
 struct _virObjectEventQueue {
     size_t count;
     virObjectEventPtr *events;
 };
+typedef struct _virObjectEventQueue virObjectEventQueue;
+typedef virObjectEventQueue *virObjectEventQueuePtr;
+
+struct _virObjectEventState {
+    /* The list of domain event callbacks */
+    virObjectEventCallbackListPtr callbacks;
+    /* The queue of object events */
+    virObjectEventQueuePtr queue;
+    /* Timer for flushing events queue */
+    int timer;
+    /* Flag if we're in process of dispatching */
+    bool isDispatching;
+    virMutex lock;
+};
+
+struct _virObjectEventCallback {
+    int callbackID;
+    virClassPtr klass;
+    int eventID;
+    virConnectPtr conn;
+    virObjectMetaPtr meta;
+    virConnectObjectEventGenericCallback cb;
+    void *opaque;
+    virFreeCallback freecb;
+    bool deleted;
+};
 
 static virClassPtr virObjectEventClass;
 
@@ -267,7 +299,7 @@ virObjectEventCallbackLookup(virConnectPtr conn,
  *
  * Internal function to add a callback from a virObjectEventCallbackListPtr
  */
-int
+static int
 virObjectEventCallbackListAddID(virConnectPtr conn,
                                 virObjectEventCallbackListPtr cbList,
                                 unsigned char uuid[VIR_UUID_BUFLEN],
@@ -374,7 +406,7 @@ virObjectEventCallbackListEventID(virConnectPtr conn,
  *
  * Removes all elements from the queue
  */
-void
+static void
 virObjectEventQueueClear(virObjectEventQueuePtr queue)
 {
     size_t i;
@@ -420,7 +452,7 @@ virObjectEventQueueNew(void)
  *
  * Lock event state before calling functions from object_event_private.h.
  */
-void
+static void
 virObjectEventStateLock(virObjectEventStatePtr state)
 {
     virMutexLock(&state->lock);
@@ -433,7 +465,7 @@ virObjectEventStateLock(virObjectEventStatePtr state)
  *
  * Unlock event state after calling functions from object_event_private.h.
  */
-void
+static void
 virObjectEventStateUnlock(virObjectEventStatePtr state)
 {
     virMutexUnlock(&state->lock);
@@ -475,7 +507,7 @@ static void virObjectEventStateFlush(virObjectEventStatePtr state);
  * the callback of a periodic timer on the event loop, in order to
  * flush the callback queue.
  */
-void
+static void
 virObjectEventTimer(int timer ATTRIBUTE_UNUSED, void *opaque)
 {
     virObjectEventStatePtr state = opaque;

diff --git a/src/conf/object_event_private.h b/src/conf/object_event_private.h
index 7c6ec59c757120c2e2f6ee047425912ce77c4fc6..76bd6d154ef94521e6b129bb330524057b6f101e 100644 (file)
--- a/src/conf/object_event_private.h
+++ b/src/conf/object_event_private.h
@@ -35,41 +35,9 @@ struct _virObjectMeta {
 typedef struct _virObjectMeta virObjectMeta;
 typedef virObjectMeta *virObjectMetaPtr;
 
-struct _virObjectEventCallbackList {
-    unsigned int nextID;
-    size_t count;
-    virObjectEventCallbackPtr *callbacks;
-};
 typedef struct _virObjectEventCallbackList virObjectEventCallbackList;
 typedef virObjectEventCallbackList *virObjectEventCallbackListPtr;
 
-typedef struct _virObjectEventQueue virObjectEventQueue;
-typedef virObjectEventQueue *virObjectEventQueuePtr;
-
-struct _virObjectEventState {
-    /* The list of domain event callbacks */
-    virObjectEventCallbackListPtr callbacks;
-    /* The queue of object events */
-    virObjectEventQueuePtr queue;
-    /* Timer for flushing events queue */
-    int timer;
-    /* Flag if we're in process of dispatching */
-    bool isDispatching;
-    virMutex lock;
-};
-
-struct _virObjectEventCallback {
-    int callbackID;
-    virClassPtr klass;
-    int eventID;
-    virConnectPtr conn;
-    virObjectMetaPtr meta;
-    virConnectObjectEventGenericCallback cb;
-    void *opaque;
-    virFreeCallback freecb;
-    bool deleted;
-};
-
 typedef void
 (*virObjectEventDispatchFunc)(virConnectPtr conn,
                               virObjectEventPtr event,
@@ -95,32 +63,6 @@ virObjectEventStateCallbackID(virConnectPtr conn,
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3)
     ATTRIBUTE_NONNULL(5);
 
-int
-virObjectEventCallbackListAddID(virConnectPtr conn,
-                                virObjectEventCallbackListPtr cbList,
-                                unsigned char *uuid,
-                                const char *name,
-                                int id,
-                                virClassPtr klass,
-                                int eventID,
-                                virConnectObjectEventGenericCallback callback,
-                                void *opaque,
-                                virFreeCallback freecb,
-                                int *callbackID);
-
-void
-virObjectEventQueueClear(virObjectEventQueuePtr queue);
-
-void
-virObjectEventStateLock(virObjectEventStatePtr state);
-
-void
-virObjectEventStateUnlock(virObjectEventStatePtr state);
-
-void
-virObjectEventTimer(int timer,
-                    void *opaque);
-
 void *
 virObjectEventNew(virClassPtr klass,
                   virObjectEventDispatchFunc dispatcher,