see subject
regards
-steve
Index: exec/Makefile
===================================================================
--- exec/Makefile (revision 1755)
+++ exec/Makefile (working copy)
@@ -59,9 +59,9 @@
# main executive objects
MAIN_SRC = main.c print.c mempool.c util.c sync.c service.c ipc.c timer.c \
- totemconfig.c mainconfig.c
+ totemconfig.c mainconfig.c schedwrk.c
MAIN_OBJS = main.o print.o mempool.o util.o sync.o service.o ipc.o timer.o \
- totemconfig.o mainconfig.o ../lcr/lcr_ifact.o
+ totemconfig.o mainconfig.o ../lcr/lcr_ifact.o schedwrk.o
OTHER_OBJS = objdb.o
ifeq (${BUILD_DYNAMIC}, 1)
@@ -238,6 +238,9 @@
confdb.o: confdb.c
$(CC) $(CFLAGS) -c -o $@ $(*F).c
+schedwrk.o: schedwrk.c
+ $(CC) $(CFLAGS) -c -o $@ $(*F).c
+
# -fPIC rules required for lib totem
aispoll.o: aispoll.c
$(CC) $(CFLAGS) $(CPPFLAGS) -fPIC -c -o $@ $(*F).c
Index: exec/schedwrk.c
===================================================================
--- exec/schedwrk.c (revision 0)
+++ exec/schedwrk.c (revision 0)
@@ -0,0 +1,133 @@
+/*
+ * Copyright (c) 2009 Red Hat, Inc.
+ *
+ * All rights reserved.
+ *
+ * Author: Steven Dake ([email protected])
+ *
+ * This software licensed under BSD license, the text of which follows:
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * - Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * - Neither the name of the MontaVista Software, Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from this
+ * software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "totempg.h"
+#include "../include/hdb.h"
+
+static void (*serialize_lock) (void);
+static void (*serialize_unlock) (void);
+
+typedef unsigned int hdb_handle_t;
+
+static struct hdb_handle_database schedwrk_instance_database = {
+ .handle_count = 0,
+ .handles = 0,
+ .iterator = 0,
+ .mutex = PTHREAD_MUTEX_INITIALIZER
+};
+
+struct schedwrk_instance {
+ int (*schedwrk_fn) (void *);
+ void *context;
+ void *callback_handle;
+};
+
+static int schedwrk_do (enum totem_callback_token_type type, void *context)
+{
+ hdb_handle_t *handle = (hdb_handle_t *)context;
+ struct schedwrk_instance *instance;
+ int res;
+
+ res = hdb_handle_get (&schedwrk_instance_database, *handle,
+ (void *)&instance);
+ if (res != 0) {
+ goto error_exit;
+ }
+
+ serialize_lock ();
+ res = instance->schedwrk_fn (instance->context);
+ serialize_unlock ();
+
+ if (res == -1) {
+ hdb_handle_destroy (&schedwrk_instance_database, *handle);
+ }
+ hdb_handle_put (&schedwrk_instance_database, *handle);
+ return (res);
+
+error_exit:
+ return (-1);
+}
+
+void schedwrk_init (
+ void (*serialize_lock_fn) (void),
+ void (*serialize_unlock_fn) (void))
+{
+ serialize_lock = serialize_lock_fn;
+ serialize_unlock = serialize_unlock_fn;
+}
+
+int schedwrk_create (
+ hdb_handle_t *handle,
+ int (schedwrk_fn) (void *),
+ void *context)
+{
+ struct schedwrk_instance *instance;
+ int res;
+
+ res = hdb_handle_create (&schedwrk_instance_database,
+ sizeof (struct schedwrk_instance), handle);
+ if (res != 0) {
+ goto error_exit;
+ }
+ res = hdb_handle_get (&schedwrk_instance_database, *handle,
+ (void *)&instance);
+ if (res != 0) {
+ goto error_destroy;
+ }
+
+ totempg_callback_token_create (
+ &instance->callback_handle,
+ TOTEM_CALLBACK_TOKEN_SENT,
+ 1,
+ schedwrk_do,
+ handle);
+
+ instance->schedwrk_fn = schedwrk_fn;
+ instance->context = context;
+
+ hdb_handle_put (&schedwrk_instance_database, *handle);
+
+ return (0);
+
+error_destroy:
+ hdb_handle_destroy (&schedwrk_instance_database, *handle);
+
+error_exit:
+ return (-1);
+}
+
+void schedwrk_destroy (hdb_handle_t handle)
+{
+ hdb_handle_destroy (&schedwrk_instance_database, handle);
+}
Index: exec/schedwrk.h
===================================================================
--- exec/schedwrk.h (revision 0)
+++ exec/schedwrk.h (revision 0)
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2009 Red Hat, Inc.
+ *
+ * All rights reserved.
+ *
+ * Author: Steven Dake ([email protected])
+ *
+ * This software licensed under BSD license, the text of which follows:
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * - Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * - Neither the name of the MontaVista Software, Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from this
+ * software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#ifndef SCHEDWRK_H_DEFINED
+#define SCHEDWRK_H_DEFINED
+
+void schedwrk_init (
+ void (*serialize_lock_fn) (void),
+ void (*serialize_unlock_fn) (void));
+
+int schedwrk_create (
+ unsigned int *handle,
+ int (schedwrk_fn) (void *),
+ void *context);
+
+void schedwrk_destroy (unsigned int handle);
+
+#endif /* SCHEDWRK_H_DEFINED */
Index: exec/ckpt.c
===================================================================
--- exec/ckpt.c (revision 1755)
+++ exec/ckpt.c (working copy)
@@ -63,6 +63,7 @@
#include "main.h"
#include "ipc.h"
#include "totempg.h"
+#include "schedwrk.h"
#include "print.h"
#define GLOBALID_CHECKPOINT_NAME "global_checkpoint_name_do_not_use_in_an_application"
@@ -395,7 +396,7 @@
static unsigned int my_token_callback_active = 0;
-static void * my_token_callback_handle;
+static unsigned int callback_expiry_handle;
struct checkpoint_cleanup {
struct list_head list;
@@ -1495,7 +1496,7 @@
}
-int callback_expiry (enum totem_callback_token_type type, void *data)
+int callback_expiry (void *data)
{
struct checkpoint *checkpoint = (struct checkpoint *)data;
struct req_exec_ckpt_checkpointunlink req_exec_ckpt_checkpointunlink;
@@ -1553,12 +1554,11 @@
list_add (&checkpoint->expiry_list, &my_checkpoint_expiry_list_head);
if (my_token_callback_active == 0) {
- totempg_callback_token_create (
- &my_token_callback_handle,
- TOTEM_CALLBACK_TOKEN_SENT,
- 1,
+ schedwrk_create (
+ &callback_expiry_handle,
callback_expiry,
NULL);
+
my_token_callback_active = 1;
}
}
Index: exec/main.c
===================================================================
--- exec/main.c (revision 1755)
+++ exec/main.c (working copy)
@@ -629,6 +629,10 @@
aisexec_mempool_init ();
+ schedwrk_init (
+ serialize_mutex_lock,
+ serialize_mutex_unlock);
+
openais_ipc_init (gid_valid,
serialize_mutex_lock,
serialize_mutex_unlock);
Index: Makefile.inc
===================================================================
--- Makefile.inc (revision 1755)
+++ Makefile.inc (working copy)
@@ -76,7 +76,7 @@
CFLAGS += -O3 -Wall
# -Wstrict-aliasing=2 TODO sameday fix all of these
ifndef OPENAIS_PROFILE
- CFLAGS += -fomit-frame-pointer
+ CFLAGS += -fomit-frame-pointer -DDEBUG
endif
LDFLAGS +=
endif
_______________________________________________
Openais mailing list
[email protected]
https://lists.linux-foundation.org/mailman/listinfo/openais
