/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
* vim:expandtab:shiftwidth=8:tabstop=8:
*
- * Copyright (C) 2001, 2002 Cluster File Systems, Inc.
- * Author: Isaac Huang <isaac@clusterfs.com>
+ * GPL HEADER START
*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 only,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License version 2 for more details (a copy is included
+ * in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License
+ * version 2 along with this program; If not, see
+ * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ * GPL HEADER END
+ */
+/*
+ * Copyright 2008 Sun Microsystems, Inc. All rights reserved
+ * Use is subject to license terms.
+ */
+/*
+ * This file is part of Lustre, http://www.lustre.org/
+ * Lustre is a trademark of Sun Microsystems, Inc.
+ *
+ * lnet/selftest/workitem.c
+ *
+ * Author: Isaac Huang <isaac@clusterfs.com>
*/
#define DEBUG_SUBSYSTEM S_LNET
-#include <libcfs/kp30.h>
-#include <libcfs/libcfs.h>
-#include <lnet/lib-lnet.h>
#include "selftest.h"
int
swi_scheduler_main (void *arg)
{
- int id = (long) arg;
+ int id = (int)(long_ptr_t) arg;
char name[16];
snprintf(name, sizeof(name), "swi_sd%03d", id);
spin_unlock(&swi_data.wi_lock);
if (nloops < SWI_RESCHED)
- wait_event_interruptible_exclusive(
+ cfs_wait_event_interruptible_exclusive(
swi_data.wi_waitq,
- !swi_sched_cansleep(&swi_data.wi_runq));
+ !swi_sched_cansleep(&swi_data.wi_runq), rc);
else
our_cond_resched();
int rc;
swi_workitem_t *wi;
- while (!list_empty(&swi_data.wi_serial_runq) &&
+ while (!list_empty(&swi_data.wi_serial_runq) &&
nloops < SWI_RESCHED) {
wi = list_entry(swi_data.wi_serial_runq.next,
swi_workitem_t, wi_list);
list_del_init(&wi->wi_list);
- LASSERT (!wi->wi_running);
- LASSERT (wi->wi_scheduled);
+ LASSERTF (!wi->wi_running && wi->wi_scheduled,
+ "wi %p running %d scheduled %d\n",
+ wi, wi->wi_running, wi->wi_scheduled);
nloops++;
wi->wi_running = 1;
spin_unlock(&swi_data.wi_lock);
if (nloops < SWI_RESCHED)
- wait_event_interruptible_exclusive(
- swi_data.wi_serial_waitq,
- !swi_sched_cansleep(&swi_data.wi_serial_runq));
+ cfs_wait_event_interruptible_exclusive(
+ swi_data.wi_serial_waitq,
+ !swi_sched_cansleep(&swi_data.wi_serial_runq), rc);
else
our_cond_resched();
q = &swi_data.wi_runq;
else
break;
-
+
wi = list_entry(q->next, swi_workitem_t, wi_list);
list_del_init(&wi->wi_list);
}
for (i = 0; i < num_online_cpus(); i++) {
- rc = swi_start_thread(swi_scheduler_main, (void *) (long) i);
+ rc = swi_start_thread(swi_scheduler_main,
+ (void *) (long_ptr_t) i);
if (rc != 0) {
CERROR ("Can't spawn workitem scheduler: %d\n", rc);
swi_shutdown();