qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Anthony Liguori <aliguori@us.ibm.com>
To: qemu-devel@nongnu.org
Cc: Adam Litke <aglitke@linux.vnet.ibm.com>,
	Anthony Liguori <aliguori@us.ibm.com>,
	Markus Armbruster <armbru@redhat.com>,
	Luiz Capitulino <lcapitulino@redhat.com>
Subject: [Qemu-devel] [PATCH 11/22] qapi: add signal support to core QMP server
Date: Sun,  6 Mar 2011 19:22:53 -0600	[thread overview]
Message-ID: <1299460984-15849-12-git-send-email-aliguori@us.ibm.com> (raw)
In-Reply-To: <1299460984-15849-1-git-send-email-aliguori@us.ibm.com>

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

diff --git a/qmp-core.c b/qmp-core.c
index 78aef3a..3a6242c 100644
--- a/qmp-core.c
+++ b/qmp-core.c
@@ -28,6 +28,22 @@ typedef struct QmpCommand
     QTAILQ_ENTRY(QmpCommand) node;
 } QmpCommand;
 
+typedef struct DefaultQmpConnection
+{
+    QmpSignal *obj;
+    int handle;
+    QTAILQ_ENTRY(DefaultQmpConnection) node;
+} DefaultQmpConnection;
+
+struct QmpState
+{
+    int (*add_connection)(QmpState *s, QmpConnection *conn);
+    void (*del_connection)(QmpState *s, int global_handle, Error **errp);
+    void (*event)(QmpState *s, QObject *data);
+
+    QTAILQ_HEAD(, DefaultQmpConnection) default_connections;
+};
+
 static QTAILQ_HEAD(, QmpCommand) qmp_commands =
     QTAILQ_HEAD_INITIALIZER(qmp_commands);
 
@@ -75,3 +91,90 @@ char *qobject_as_string(QObject *obj)
         return NULL;
     }
 }
+
+void qmp_state_add_connection(QmpState *sess, const char *event_name, QmpSignal *obj, int handle, QmpConnection *conn)
+{
+    conn->state = sess;
+    conn->event_name = event_name;
+    conn->signal = obj;
+    conn->handle = handle;
+    conn->global_handle = sess->add_connection(sess, conn);
+}
+
+void qmp_state_del_connection(QmpState *sess, int global_handle, Error **errp)
+{
+    sess->del_connection(sess, global_handle, errp);
+}
+
+void qmp_state_event(QmpConnection *conn, QObject *data)
+{
+    QDict *event = qdict_new();
+    qemu_timeval tv;
+    QObject *ts;
+
+    qemu_gettimeofday(&tv);
+
+    ts = qobject_from_jsonf("{ 'seconds': %" PRId64 ", "
+                            "'microseconds': %" PRId64 " }",
+                            (int64_t)tv.tv_sec, (int64_t)tv.tv_usec);
+    qdict_put_obj(event, "timestamp", ts);
+
+    qdict_put(event, "event", qstring_from_str(conn->event_name));
+    if (data) {
+        qobject_incref(data);
+        qdict_put_obj(event, "data", data);
+    }
+
+    qdict_put(event, "tag", qint_from_int(conn->global_handle));
+
+    conn->state->event(conn->state, QOBJECT(event));
+    QDECREF(event);
+}
+
+QmpSignal *qmp_signal_init(void)
+{
+    QmpSignal *obj = qemu_mallocz(sizeof(*obj));
+    obj->max_handle = 0;
+    obj->ref = 1;
+    QTAILQ_INIT(&obj->slots);
+    return obj;
+}
+
+void qmp_signal_ref(QmpSignal *obj)
+{
+    obj->ref++;
+}
+
+void qmp_signal_unref(QmpSignal *obj)
+{
+    if (--obj->ref) {
+        qemu_free(obj);
+    }
+}
+
+int qmp_signal_connect(QmpSignal *obj, void *func, void *opaque)
+{
+    int handle = ++obj->max_handle;
+    QmpSlot *slot = qemu_mallocz(sizeof(*slot));
+
+    slot->handle = handle;
+    slot->func = func;
+    slot->opaque = opaque;
+
+    QTAILQ_INSERT_TAIL(&obj->slots, slot, node);
+
+    return handle;
+}
+
+void qmp_signal_disconnect(QmpSignal *obj, int handle)
+{
+    QmpSlot *slot;
+
+    QTAILQ_FOREACH(slot, &obj->slots, node) {
+        if (slot->handle == handle) {
+            QTAILQ_REMOVE(&obj->slots, slot, node);
+            qemu_free(slot);
+            break;
+        }
+    }
+}
diff --git a/qmp-core.h b/qmp-core.h
index e3235ec..5ce02f7 100644
--- a/qmp-core.h
+++ b/qmp-core.h
@@ -21,10 +21,65 @@ typedef struct QmpState QmpState;
 typedef void (QmpCommandFunc)(const QDict *, QObject **, Error **);
 typedef void (QmpStatefulCommandFunc)(QmpState *qmp__sess, const QDict *, QObject **, Error **);
 
+typedef struct QmpSlot
+{
+    int handle;
+    void *func;
+    void *opaque;
+    QTAILQ_ENTRY(QmpSlot) node;
+} QmpSlot;
+
+struct QmpSignal
+{
+    int max_handle;
+    int ref;
+    QTAILQ_HEAD(, QmpSlot) slots;
+};
+
+typedef struct QmpConnection
+{
+    QmpState *state;
+    const char *event_name;
+    QmpSignal *signal;
+    int handle;
+    int global_handle;
+    QTAILQ_ENTRY(QmpConnection) node;
+} QmpConnection;
+
 void qmp_register_command(const char *name, QmpCommandFunc *fn);
 void qmp_register_stateful_command(const char *name, QmpStatefulCommandFunc *fn);
 void qmp_init_chardev(CharDriverState *chr);
 
 char *qobject_as_string(QObject *obj);
 
+QmpSignal *qmp_signal_init(void);
+void qmp_signal_ref(QmpSignal *obj);
+void qmp_signal_unref(QmpSignal *obj);
+int qmp_signal_connect(QmpSignal *obj, void *func, void *opaque);
+void qmp_signal_disconnect(QmpSignal *obj, int handle);
+
+void qmp_state_add_connection(QmpState *sess, const char *name, QmpSignal *obj, int handle, QmpConnection *conn);
+void qmp_state_del_connection(QmpState *sess, int global_handle, Error **errp);
+void qmp_state_event(QmpConnection *conn, QObject *data);
+
+#define signal_init(obj) do {          \
+    (obj)->signal = qmp_signal_init(); \
+} while (0)
+
+#define signal_unref(obj) qmp_signal_unref((obj)->signal)
+
+#define signal_connect(obj, fn, opaque) \
+    qmp_signal_connect((obj)->signal, (obj)->func = fn, opaque)
+
+#define signal_disconnect(obj, handle) \
+    qmp_signal_disconnect((obj)->signal, handle)
+
+#define signal_notify(obj, ...) do {                         \
+    QmpSlot *qmp__slot;                                      \
+    QTAILQ_FOREACH(qmp__slot, &(obj)->signal->slots, node) { \
+        (obj)->func = qmp__slot->func;                       \
+        (obj)->func(qmp__slot->opaque, ## __VA_ARGS__);      \
+    }                                                        \
+} while(0)
+
 #endif
-- 
1.7.0.4

  parent reply	other threads:[~2011-03-07  1:23 UTC|newest]

Thread overview: 106+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-03-07  1:22 [Qemu-devel] [PATCH 00/22] QAPI Round 1 Anthony Liguori
2011-03-07  1:22 ` [Qemu-devel] [PATCH 01/22] Add hard build dependency on glib Anthony Liguori
2011-03-07 10:59   ` Daniel P. Berrange
2011-03-07 13:55     ` Anthony Liguori
2011-03-07  1:22 ` [Qemu-devel] [PATCH 02/22] qerror: expose a function to format an error Anthony Liguori
2011-03-07 11:14   ` Stefan Hajnoczi
2011-03-07 13:38     ` Anthony Liguori
2011-03-07  1:22 ` [Qemu-devel] [PATCH 03/22] qapi: add Error object Anthony Liguori
2011-03-07 11:06   ` Daniel P. Berrange
2011-03-07 13:59     ` Anthony Liguori
2011-03-07 14:24     ` Anthony Liguori
2011-03-07 11:38   ` Stefan Hajnoczi
2011-03-07 13:36     ` Anthony Liguori
2011-03-07 13:55       ` Stefan Hajnoczi
2011-03-07  1:22 ` [Qemu-devel] [PATCH 04/22] qerror: split out the reporting bits of QError Anthony Liguori
2011-03-07  1:22 ` [Qemu-devel] [PATCH 05/22] qerror: add new error message for invalid enum values Anthony Liguori
2011-03-07  1:22 ` [Qemu-devel] [PATCH 06/22] qapi: add JSON parsing error message Anthony Liguori
2011-03-07  1:22 ` [Qemu-devel] [PATCH 07/22] json: propagate error from parser Anthony Liguori
2011-03-07  1:22 ` [Qemu-devel] [PATCH 08/22] qapi: add code generator for qmp-types Anthony Liguori
2011-03-07  1:57   ` Anthony Liguori
2011-03-07  1:22 ` [Qemu-devel] [PATCH 09/22] qapi: add code generator for type marshallers Anthony Liguori
2011-03-07  1:22 ` [Qemu-devel] [PATCH 10/22] qapi: add core QMP server support Anthony Liguori
2011-03-07 13:09   ` Stefan Hajnoczi
2011-03-07 13:39     ` Anthony Liguori
2011-03-07 13:46       ` Daniel P. Berrange
2011-03-07 13:54         ` Anthony Liguori
2011-03-07  1:22 ` Anthony Liguori [this message]
2011-03-07 13:21   ` [Qemu-devel] [PATCH 11/22] qapi: add signal support to core QMP server Stefan Hajnoczi
2011-03-07 13:53     ` Anthony Liguori
2011-03-07 14:36       ` Stefan Hajnoczi
2011-03-07 14:41         ` Anthony Liguori
2011-03-07  1:22 ` [Qemu-devel] [PATCH 12/22] qapi: add QAPI module type Anthony Liguori
2011-03-07  1:22 ` [Qemu-devel] [PATCH 13/22] qapi: add code generators for QMP command marshaling Anthony Liguori
2011-03-07 13:27   ` Stefan Hajnoczi
2011-03-07 13:44     ` Anthony Liguori
2011-03-07 14:38       ` Stefan Hajnoczi
2011-03-07  1:22 ` [Qemu-devel] [PATCH 14/22] qapi: add query-version QMP command Anthony Liguori
2011-03-07 13:35   ` Stefan Hajnoczi
2011-03-07 13:41     ` Anthony Liguori
2011-03-09 13:28       ` Avi Kivity
2011-03-09 13:44         ` Anthony Liguori
2011-03-09 13:51           ` Avi Kivity
2011-03-09 14:13             ` Anthony Liguori
2011-03-09 13:36   ` Avi Kivity
2011-03-09 14:11     ` Anthony Liguori
2011-03-09 14:37       ` Avi Kivity
2011-03-09 14:47         ` Anthony Liguori
2011-03-10 12:41           ` Avi Kivity
2011-03-10 12:46             ` Avi Kivity
2011-03-10 13:52             ` Anthony Liguori
2011-03-07  1:22 ` [Qemu-devel] [PATCH 15/22] qapi: add new QMP server that uses CharDriverState Anthony Liguori
2011-03-07 13:52   ` Stefan Hajnoczi
2011-03-07 14:02     ` Anthony Liguori
2011-03-07  1:22 ` [Qemu-devel] [PATCH 16/22] vl: add a new -qmp2 option to expose experimental QMP server Anthony Liguori
2011-03-07  1:22 ` [Qemu-devel] [PATCH 17/22] qapi: add QMP quit command Anthony Liguori
2011-03-07  1:23 ` [Qemu-devel] [PATCH 18/22] qapi: add QMP qmp_capabilities command Anthony Liguori
2011-03-07  1:23 ` [Qemu-devel] [PATCH 19/22] qapi: add QMP put-event command Anthony Liguori
2011-03-09 13:31   ` Avi Kivity
2011-03-09 13:48     ` Anthony Liguori
2011-03-09 13:58       ` Avi Kivity
2011-03-09 14:26         ` Anthony Liguori
2011-03-10 12:39           ` Avi Kivity
2011-03-10 14:12             ` Anthony Liguori
2011-03-10 14:24               ` Avi Kivity
2011-03-10 15:30                 ` Avi Kivity
2011-03-10 15:41                   ` Anthony Liguori
2011-03-10 15:49                     ` Avi Kivity
2011-03-10 16:42                       ` Anthony Liguori
2011-03-12 20:37                         ` Avi Kivity
2011-03-10 15:33                 ` Anthony Liguori
2011-03-10 15:45                   ` Avi Kivity
2011-03-10 16:04                     ` Anthony Liguori
2011-03-12 20:42                       ` Avi Kivity
2011-03-12 23:30                         ` Anthony Liguori
2011-03-07  1:23 ` [Qemu-devel] [PATCH 20/22] qapi: add code generator for libqmp Anthony Liguori
2011-03-07  1:23 ` [Qemu-devel] [PATCH 21/22] qapi: add test-libqmp Anthony Liguori
2011-03-07  1:23 ` [Qemu-devel] [PATCH 22/22] qapi: generate HTML report for test-libqmp Anthony Liguori
2011-03-07  2:11   ` Anthony Liguori
2011-03-07  1:26 ` [Qemu-devel] [PATCH] qapi: qmp-types.c and qmp-types.h Anthony Liguori
2011-03-07  1:27 ` [Qemu-devel] [PATCH] qapi: qmp-marshal-types.c and qmp-marshal-types.h Anthony Liguori
2011-03-07  1:28 ` [Qemu-devel] [PATCH] qapi: add qmp-marshal.c and qmp.h Anthony Liguori
2011-03-07  1:29 ` [Qemu-devel] [PATCH] qapi: add libqmp.c and libqmp.h Anthony Liguori
2011-03-07 15:08 ` [Qemu-devel] [PATCH 00/22] QAPI Round 1 Stefan Hajnoczi
2011-03-07 15:59   ` Anthony Liguori
2011-03-08 11:12     ` Avi Kivity
2011-03-08 13:35       ` Anthony Liguori
2011-03-08 13:45         ` Avi Kivity
2011-03-08 13:54           ` Anthony Liguori
2011-03-08 14:00             ` Avi Kivity
2011-03-08 14:10               ` Anthony Liguori
2011-03-08 14:17                 ` Avi Kivity
2011-03-08 14:20                   ` Anthony Liguori
2011-03-08 14:38                   ` Anthony Liguori
2011-03-08 14:52                     ` Avi Kivity
2011-03-08 15:03                       ` Anthony Liguori
2011-03-08 17:44                         ` Avi Kivity
2011-03-08 19:19                           ` Anthony Liguori
2011-03-09  8:51                             ` Avi Kivity
2011-03-09 13:12                               ` Anthony Liguori
2011-03-09 13:14                                 ` Avi Kivity
2011-03-09 13:51                                   ` Anthony Liguori
2011-03-09 13:55                                     ` Avi Kivity
2011-03-09 14:15                                       ` Anthony Liguori
2011-03-09 13:51                                   ` Michael Roth
2011-03-07 20:59   ` Anthony Liguori
2011-03-07 22:00     ` Stefan Hajnoczi

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1299460984-15849-12-git-send-email-aliguori@us.ibm.com \
    --to=aliguori@us.ibm.com \
    --cc=aglitke@linux.vnet.ibm.com \
    --cc=armbru@redhat.com \
    --cc=lcapitulino@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).