@@ -29,25 +29,20 @@ G_BEGIN_DECLS -#define IRIS_ARBITER(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST ((obj), \ - IRIS_TYPE_ARBITER, IrisArbiter)) - -#define IRIS_IS_ARBITER(obj) \ - (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \ - IRIS_TYPE_ARBITER)) +#define IRIS_ARBITER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), IRIS_TYPE_ARBITER, IrisArbiter)) +#define IRIS_IS_ARBITER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), IRIS_TYPE_ARBITER)) typedef struct _IrisArbiter IrisArbiter; -GType iris_arbiter_get_type (void) G_GNUC_CONST; -IrisReceiver* iris_arbiter_receive (IrisScheduler *scheduler, - IrisPort *port, - IrisMessageHandler handler, - gpointer user_data, - GDestroyNotify notify); -IrisArbiter* iris_arbiter_coordinate (IrisReceiver *exclusive, - IrisReceiver *concurrent, - IrisReceiver *teardown); +GType iris_arbiter_get_type (void) G_GNUC_CONST; +IrisReceiver* iris_arbiter_receive (IrisScheduler *scheduler, + IrisPort *port, + IrisMessageHandler handler, + gpointer user_data, + GDestroyNotify notify); +IrisArbiter* iris_arbiter_coordinate (IrisReceiver *exclusive, + IrisReceiver *concurrent, + IrisReceiver *teardown); G_END_DECLS iris/iris-arbiter.h @@ -27,31 +27,13 @@ G_BEGIN_DECLS -#define IRIS_TYPE_GMAINSCHEDULER (iris_gmainscheduler_get_type ()) - -#define IRIS_GMAINSCHEDULER(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST ((obj), \ - IRIS_TYPE_GMAINSCHEDULER, IrisGMainScheduler)) - -#define IRIS_GMAINSCHEDULER_CONST(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST ((obj), \ - IRIS_TYPE_GMAINSCHEDULER, IrisGMainScheduler const)) - -#define IRIS_GMAINSCHEDULER_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST ((klass), \ - IRIS_TYPE_GMAINSCHEDULER, IrisGMainSchedulerClass)) - -#define IRIS_IS_GMAINSCHEDULER(obj) \ - (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \ - IRIS_TYPE_GMAINSCHEDULER)) - -#define IRIS_IS_GMAINSCHEDULER_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_TYPE ((klass), \ - IRIS_TYPE_GMAINSCHEDULER)) - -#define IRIS_GMAINSCHEDULER_GET_CLASS(obj) \ - (G_TYPE_INSTANCE_GET_CLASS ((obj), \ - IRIS_TYPE_GMAINSCHEDULER, IrisGMainSchedulerClass)) +#define IRIS_TYPE_GMAINSCHEDULER (iris_gmainscheduler_get_type ()) +#define IRIS_GMAINSCHEDULER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), IRIS_TYPE_GMAINSCHEDULER, IrisGMainScheduler)) +#define IRIS_GMAINSCHEDULER_CONST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), IRIS_TYPE_GMAINSCHEDULER, IrisGMainScheduler const)) +#define IRIS_GMAINSCHEDULER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), IRIS_TYPE_GMAINSCHEDULER, IrisGMainSchedulerClass)) +#define IRIS_IS_GMAINSCHEDULER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), IRIS_TYPE_GMAINSCHEDULER)) +#define IRIS_IS_GMAINSCHEDULER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), IRIS_TYPE_GMAINSCHEDULER)) +#define IRIS_GMAINSCHEDULER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), IRIS_TYPE_GMAINSCHEDULER, IrisGMainSchedulerClass)) typedef struct _IrisGMainScheduler IrisGMainScheduler; typedef struct _IrisGMainSchedulerClass IrisGMainSchedulerClass; @@ -70,9 +52,9 @@ struct _IrisGMainSchedulerClass IrisSchedulerClass parent_class; }; -GType iris_gmainscheduler_get_type (void) G_GNUC_CONST; -IrisScheduler* iris_gmainscheduler_new (GMainContext *context);; -GMainContext* iris_gmainscheduler_get_context (IrisGMainScheduler *gmain_scheduler); +GType iris_gmainscheduler_get_type (void) G_GNUC_CONST; +IrisScheduler* iris_gmainscheduler_new (GMainContext *context);; +GMainContext* iris_gmainscheduler_get_context (IrisGMainScheduler *gmain_scheduler); G_END_DECLS iris/iris-gmainscheduler.h @@ -27,31 +27,13 @@ G_BEGIN_DECLS -#define IRIS_TYPE_LFSCHEDULER (iris_lfscheduler_get_type ()) - -#define IRIS_LFSCHEDULER(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST ((obj), \ - IRIS_TYPE_LFSCHEDULER, IrisLFScheduler)) - -#define IRIS_LFSCHEDULER_CONST(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST ((obj), \ - IRIS_TYPE_LFSCHEDULER, IrisLFScheduler const)) - -#define IRIS_LFSCHEDULER_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST ((klass), \ - IRIS_TYPE_LFSCHEDULER, IrisLFSchedulerClass)) - -#define IRIS_IS_LFSCHEDULER(obj) \ - (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \ - IRIS_TYPE_LFSCHEDULER)) - -#define IRIS_IS_LFSCHEDULER_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_TYPE ((klass), \ - IRIS_TYPE_LFSCHEDULER)) - -#define IRIS_LFSCHEDULER_GET_CLASS(obj) \ - (G_TYPE_INSTANCE_GET_CLASS ((obj), \ - IRIS_TYPE_LFSCHEDULER, IrisLFSchedulerClass)) +#define IRIS_TYPE_LFSCHEDULER (iris_lfscheduler_get_type ()) +#define IRIS_LFSCHEDULER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), IRIS_TYPE_LFSCHEDULER, IrisLFScheduler)) +#define IRIS_LFSCHEDULER_CONST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), IRIS_TYPE_LFSCHEDULER, IrisLFScheduler const)) +#define IRIS_LFSCHEDULER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), IRIS_TYPE_LFSCHEDULER, IrisLFSchedulerClass)) +#define IRIS_IS_LFSCHEDULER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), IRIS_TYPE_LFSCHEDULER)) +#define IRIS_IS_LFSCHEDULER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), IRIS_TYPE_LFSCHEDULER)) +#define IRIS_LFSCHEDULER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), IRIS_TYPE_LFSCHEDULER, IrisLFSchedulerClass)) typedef struct _IrisLFScheduler IrisLFScheduler; typedef struct _IrisLFSchedulerClass IrisLFSchedulerClass; @@ -70,10 +52,10 @@ struct _IrisLFSchedulerClass IrisSchedulerClass parent_class; }; -GType iris_lfscheduler_get_type (void) G_GNUC_CONST; -IrisScheduler* iris_lfscheduler_new (void); -IrisScheduler* iris_lfscheduler_new_full (guint min_threads, - guint max_threads); +GType iris_lfscheduler_get_type (void) G_GNUC_CONST; +IrisScheduler* iris_lfscheduler_new (void); +IrisScheduler* iris_lfscheduler_new_full (guint min_threads, + guint max_threads); G_END_DECLS iris/iris-lfscheduler.h @@ -28,6 +28,7 @@ G_BEGIN_DECLS #define IRIS_TYPE_MESSAGE (iris_message_get_type()) typedef struct _IrisMessage IrisMessage; + typedef void (*IrisMessageHandler) (IrisMessage *message, gpointer data); struct _IrisMessage iris/iris-message.h @@ -28,31 +28,13 @@ G_BEGIN_DECLS -#define IRIS_TYPE_PORT (iris_port_get_type ()) - -#define IRIS_PORT(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST ((obj), \ - IRIS_TYPE_PORT, IrisPort)) - -#define IRIS_PORT_CONST(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST ((obj), \ - IRIS_TYPE_PORT, IrisPort const)) - -#define IRIS_PORT_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST ((klass), \ - IRIS_TYPE_PORT, IrisPortClass)) - -#define IRIS_IS_PORT(obj) \ - (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \ - IRIS_TYPE_PORT)) - -#define IRIS_IS_PORT_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_TYPE ((klass), \ - IRIS_TYPE_PORT)) - -#define IRIS_PORT_GET_CLASS(obj) \ - (G_TYPE_INSTANCE_GET_CLASS ((obj), \ - IRIS_TYPE_PORT, IrisPortClass)) +#define IRIS_TYPE_PORT (iris_port_get_type ()) +#define IRIS_PORT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), IRIS_TYPE_PORT, IrisPort)) +#define IRIS_PORT_CONST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), IRIS_TYPE_PORT, IrisPort const)) +#define IRIS_PORT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), IRIS_TYPE_PORT, IrisPortClass)) +#define IRIS_IS_PORT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), IRIS_TYPE_PORT)) +#define IRIS_IS_PORT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), IRIS_TYPE_PORT)) +#define IRIS_PORT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), IRIS_TYPE_PORT, IrisPortClass)) typedef struct _IrisPort IrisPort; typedef struct _IrisPortClass IrisPortClass; iris/iris-port.h @@ -28,10 +28,10 @@ G_BEGIN_DECLS #define IRIS_TYPE_QUEUE (iris_queue_get_type ()) #define IRIS_QUEUE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), IRIS_TYPE_QUEUE, IrisQueue)) #define IRIS_QUEUE_CONST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), IRIS_TYPE_QUEUE, IrisQueue const)) -#define IRIS_QUEUE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), IRIS_TYPE_QUEUE, IrisQueueClass)) +#define IRIS_QUEUE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), IRIS_TYPE_QUEUE, IrisQueueClass)) #define IRIS_IS_QUEUE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), IRIS_TYPE_QUEUE)) -#define IRIS_IS_QUEUE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), IRIS_TYPE_QUEUE)) -#define IRIS_QUEUE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), IRIS_TYPE_QUEUE, IrisQueueClass)) +#define IRIS_IS_QUEUE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), IRIS_TYPE_QUEUE)) +#define IRIS_QUEUE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), IRIS_TYPE_QUEUE, IrisQueueClass)) typedef struct _IrisQueue IrisQueue; typedef struct _IrisQueueClass IrisQueueClass; iris/iris-queue.h @@ -27,23 +27,14 @@ G_BEGIN_DECLS -#define IRIS_TYPE_RECEIVER (iris_receiver_get_type ()) +#define IRIS_TYPE_RECEIVER (iris_receiver_get_type ()) +#define IRIS_RECEIVER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), IRIS_TYPE_RECEIVER, IrisReceiver)) +#define IRIS_RECEIVER_CONST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), IRIS_TYPE_RECEIVER, IrisReceiver const)) +#define IRIS_IS_RECEIVER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), IRIS_TYPE_RECEIVER)) -#define IRIS_RECEIVER(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST ((obj), \ - IRIS_TYPE_RECEIVER, IrisReceiver)) - -#define IRIS_RECEIVER_CONST(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST ((obj), \ - IRIS_TYPE_RECEIVER, IrisReceiver const)) - -#define IRIS_IS_RECEIVER(obj) \ - (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \ - IRIS_TYPE_RECEIVER)) - -typedef struct _IrisReceiver IrisReceiver; -typedef struct _IrisReceiverClass IrisReceiverClass; -typedef struct _IrisReceiverPrivate IrisReceiverPrivate; +typedef struct _IrisReceiver IrisReceiver; +typedef struct _IrisReceiverClass IrisReceiverClass; +typedef struct _IrisReceiverPrivate IrisReceiverPrivate; struct _IrisReceiver { @@ -53,10 +44,10 @@ struct _IrisReceiver IrisReceiverPrivate *priv; }; -GType iris_receiver_get_type (void) G_GNUC_CONST; -IrisScheduler* iris_receiver_get_scheduler (IrisReceiver *receiver); -void iris_receiver_set_scheduler (IrisReceiver *receiver, - IrisScheduler *scheduler); +GType iris_receiver_get_type (void) G_GNUC_CONST; +IrisScheduler* iris_receiver_get_scheduler (IrisReceiver *receiver); +void iris_receiver_set_scheduler (IrisReceiver *receiver, + IrisScheduler *scheduler); G_END_DECLS iris/iris-receiver.h @@ -29,31 +29,13 @@ G_BEGIN_DECLS -#define IRIS_TYPE_TASK (iris_task_get_type ()) - -#define IRIS_TASK(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST ((obj), \ - IRIS_TYPE_TASK, IrisTask)) - -#define IRIS_TASK_CONST(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST ((obj), \ - IRIS_TYPE_TASK, IrisTask const)) - -#define IRIS_TASK_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST ((klass), \ - IRIS_TYPE_TASK, IrisTaskClass)) - -#define IRIS_IS_TASK(obj) \ - (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \ - IRIS_TYPE_TASK)) - -#define IRIS_IS_TASK_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_TYPE ((klass), \ - IRIS_TYPE_TASK)) - -#define IRIS_TASK_GET_CLASS(obj) \ - (G_TYPE_INSTANCE_GET_CLASS ((obj), \ - IRIS_TYPE_TASK, IrisTaskClass)) +#define IRIS_TYPE_TASK (iris_task_get_type ()) +#define IRIS_TASK(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), IRIS_TYPE_TASK, IrisTask)) +#define IRIS_TASK_CONST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), IRIS_TYPE_TASK, IrisTask const)) +#define IRIS_TASK_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), IRIS_TYPE_TASK, IrisTaskClass)) +#define IRIS_IS_TASK(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), IRIS_TYPE_TASK)) +#define IRIS_IS_TASK_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), IRIS_TYPE_TASK)) +#define IRIS_TASK_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), IRIS_TYPE_TASK, IrisTaskClass)) /** * IRIS_TASK_THROW_NEW: iris/iris-task.h @@ -29,14 +29,14 @@ G_BEGIN_DECLS #define IRIS_TYPE_WSQUEUE (iris_wsqueue_get_type ()) #define IRIS_WSQUEUE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), IRIS_TYPE_WSQUEUE, IrisWSQueue)) #define IRIS_WSQUEUE_CONST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), IRIS_TYPE_WSQUEUE, IrisWSQueue const)) -#define IRIS_WSQUEUE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), IRIS_TYPE_WSQUEUE, IrisWSQueueClass)) +#define IRIS_WSQUEUE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), IRIS_TYPE_WSQUEUE, IrisWSQueueClass)) #define IRIS_IS_WSQUEUE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), IRIS_TYPE_WSQUEUE)) -#define IRIS_IS_WSQUEUE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), IRIS_TYPE_WSQUEUE)) -#define IRIS_WSQUEUE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), IRIS_TYPE_WSQUEUE, IrisWSQueueClass)) +#define IRIS_IS_WSQUEUE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), IRIS_TYPE_WSQUEUE)) +#define IRIS_WSQUEUE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), IRIS_TYPE_WSQUEUE, IrisWSQueueClass)) -typedef struct _IrisWSQueue IrisWSQueue; -typedef struct _IrisWSQueueClass IrisWSQueueClass; -typedef struct _IrisWSQueuePrivate IrisWSQueuePrivate; +typedef struct _IrisWSQueue IrisWSQueue; +typedef struct _IrisWSQueueClass IrisWSQueueClass; +typedef struct _IrisWSQueuePrivate IrisWSQueuePrivate; struct _IrisWSQueue { iris/iris-wsqueue.h @@ -27,35 +27,17 @@ G_BEGIN_DECLS -#define IRIS_TYPE_WSSCHEDULER (iris_wsscheduler_get_type ()) - -#define IRIS_WSSCHEDULER(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST ((obj), \ - IRIS_TYPE_WSSCHEDULER, IrisWSScheduler)) - -#define IRIS_WSSCHEDULER_CONST(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST ((obj), \ - IRIS_TYPE_WSSCHEDULER, IrisWSScheduler const)) - -#define IRIS_WSSCHEDULER_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST ((klass), \ - IRIS_TYPE_WSSCHEDULER, IrisWSSchedulerClass)) - -#define IRIS_IS_WSSCHEDULER(obj) \ - (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \ - IRIS_TYPE_WSSCHEDULER)) - -#define IRIS_IS_WSSCHEDULER_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_TYPE ((klass), \ - IRIS_TYPE_WSSCHEDULER)) - -#define IRIS_WSSCHEDULER_GET_CLASS(obj) \ - (G_TYPE_INSTANCE_GET_CLASS ((obj), \ - IRIS_TYPE_WSSCHEDULER, IrisWSSchedulerClass)) - -typedef struct _IrisWSScheduler IrisWSScheduler; -typedef struct _IrisWSSchedulerClass IrisWSSchedulerClass; -typedef struct _IrisWSSchedulerPrivate IrisWSSchedulerPrivate; +#define IRIS_TYPE_WSSCHEDULER (iris_wsscheduler_get_type ()) +#define IRIS_WSSCHEDULER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), IRIS_TYPE_WSSCHEDULER, IrisWSScheduler)) +#define IRIS_WSSCHEDULER_CONST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), IRIS_TYPE_WSSCHEDULER, IrisWSScheduler const)) +#define IRIS_WSSCHEDULER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), IRIS_TYPE_WSSCHEDULER, IrisWSSchedulerClass)) +#define IRIS_IS_WSSCHEDULER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), IRIS_TYPE_WSSCHEDULER)) +#define IRIS_IS_WSSCHEDULER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), IRIS_TYPE_WSSCHEDULER)) +#define IRIS_WSSCHEDULER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), IRIS_TYPE_WSSCHEDULER, IrisWSSchedulerClass)) + +typedef struct _IrisWSScheduler IrisWSScheduler; +typedef struct _IrisWSSchedulerClass IrisWSSchedulerClass; +typedef struct _IrisWSSchedulerPrivate IrisWSSchedulerPrivate; struct _IrisWSScheduler { @@ -70,10 +52,10 @@ struct _IrisWSSchedulerClass IrisSchedulerClass parent_class; }; -GType iris_wsscheduler_get_type (void) G_GNUC_CONST; -IrisScheduler* iris_wsscheduler_new (void); -IrisScheduler* iris_wsscheduler_new_full (guint min_threads, - guint max_threads); +GType iris_wsscheduler_get_type (void) G_GNUC_CONST; +IrisScheduler* iris_wsscheduler_new (void); +IrisScheduler* iris_wsscheduler_new_full (guint min_threads, + guint max_threads); G_END_DECLS iris/iris-wsscheduler.h 8c99d88ac8761057c908df3fa8e26089192d9c31 Christian Hergert chris@dronelabs.com http://github.com/chergert/iris/commit/11c7c80f76747c19e2c467d7a933305b684f3ede 11c7c80f76747c19e2c467d7a933305b684f3ede 2009-09-23T21:45:50-07:00 2009-09-23T21:45:50-07:00 Header cleanup for public api. 0b9a1fb8041fd37bfd6590b2bf2fa93fb7aee6f4 Christian Hergert chris@dronelabs.com