-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
* GPL HEADER START
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
/*
* Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
+ *
+ * Copyright (c) 2011, 2012, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
#ifndef __KERNEL__
+#include <string.h>
#include <libcfs/libcfs.h>
/*
(void)link;
/* well, wait for something to happen */
- cfs_call_wait_handler(0);
+ call_wait_handler(0);
}
int64_t cfs_waitq_timedwait(struct cfs_waitlink *link, cfs_task_state_t state,
{
LASSERT(link != NULL);
(void)link;
- cfs_call_wait_handler(timeout);
+ call_wait_handler(timeout);
return 0;
}
(void)f(arg);
return NULL;
}
-int cfs_create_thread(cfs_thread_t func, void *arg)
+
+int cfs_create_thread(cfs_thread_t func, void *arg, unsigned long flags)
{
pthread_t tid;
pthread_attr_t tattr;
return getgid();
}
+#ifndef HAVE_STRLCPY /* not in glibc for RHEL 5.x, remove when obsolete */
+size_t strlcpy(char *tgt, const char *src, size_t tgt_len)
+{
+ int src_len = strlen(src);
+
+ strncpy(tgt, src, tgt_len - 1);
+ tgt[tgt_len - 1] = '\0';
+
+ return src_len + 1;
+}
+#endif
+
+#ifndef HAVE_STRLCAT /* not in glibc for RHEL 5.x, remove when obsolete */
+size_t strlcat(char *tgt, const char *src, size_t size)
+{
+ size_t tgt_len = strlen(tgt);
+
+ if (size > tgt_len) {
+ strncat(tgt, src, size - tgt_len - 1);
+ tgt[size - 1] = '\0';
+ }
+
+ return tgt_len + strlen(src);
+}
+#endif
+
+/* Read the environment variable of current process specified by @key. */
+int cfs_get_environ(const char *key, char *value, int *val_len)
+{
+ char *entry;
+ int len;
+
+ entry = getenv(key);
+ if (entry == NULL)
+ return -ENOENT;
+
+ len = strlcpy(value, entry, *val_len);
+ if (len >= *val_len)
+ return -EOVERFLOW;
+
+ return 0;
+}
+
void cfs_enter_debugger(void)
{
/*
cfs_sigset_t cfs_block_allsigs(void)
{
- cfs_sigset_t all;
- cfs_sigset_t old;
- int rc;
+ cfs_sigset_t all;
+ cfs_sigset_t old;
+ int rc;
- sigfillset(&all);
- rc = sigprocmask(SIG_SETMASK, &all, &old);
- LASSERT(rc == 0);
+ sigfillset(&all);
+ rc = sigprocmask(SIG_BLOCK, &all, &old);
+ LASSERT(rc == 0);
- return old;
+ return old;
}
-cfs_sigset_t cfs_block_sigs(cfs_sigset_t blocks)
+cfs_sigset_t cfs_block_sigs(unsigned long sigs)
{
- cfs_sigset_t old;
- int rc;
+ cfs_sigset_t old;
+ cfs_sigset_t blocks = { { sigs } }; /* kludge */
+ int rc;
- rc = sigprocmask(SIG_SETMASK, &blocks, &old);
- LASSERT (rc == 0);
+ rc = sigprocmask(SIG_BLOCK, &blocks, &old);
+ LASSERT (rc == 0);
- return old;
+ return old;
}
/* Block all signals except for the @sigs. It's only used in
/* __linux__ */
#endif
-void lbug_with_loc(const char *file, const char *func, const int line)
+void lbug_with_loc(struct libcfs_debug_msg_data *msgdata)
{
/* No libcfs_catastrophe in userspace! */
- libcfs_debug_msg(NULL, 0, D_EMERG, file, func, line, "LBUG\n");
+ libcfs_debug_msg(msgdata, "LBUG\n");
abort();
}