Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-1346 libcfs: cleanup waitq related primitives
[fs/lustre-release.git]
/
libcfs
/
libcfs
/
lwt.c
diff --git
a/libcfs/libcfs/lwt.c
b/libcfs/libcfs/lwt.c
index
44b2376
..
2fa7a5d
100644
(file)
--- a/
libcfs/libcfs/lwt.c
+++ b/
libcfs/libcfs/lwt.c
@@
-36,10
+36,6
@@
* Author: Eric Barton <eeb@clusterfs.com>
*/
* Author: Eric Barton <eeb@clusterfs.com>
*/
-#ifndef EXPORT_SYMTAB
-# define EXPORT_SYMTAB
-#endif
-
#define DEBUG_SUBSYSTEM S_LNET
#include <libcfs/libcfs.h>
#define DEBUG_SUBSYSTEM S_LNET
#include <libcfs/libcfs.h>
@@
-48,7
+44,7
@@
#if !KLWT_SUPPORT
int lwt_enabled;
#if !KLWT_SUPPORT
int lwt_enabled;
-lwt_cpu_t lwt_cpus[
CFS_
NR_CPUS];
+lwt_cpu_t lwt_cpus[NR_CPUS];
#endif
int lwt_pages_per_cpu;
#endif
int lwt_pages_per_cpu;
@@
-76,19
+72,19
@@
lwt_lookup_string (int *size, char *knl_ptr,
*size = strnlen (knl_ptr, maxsize - 1) + 1;
*size = strnlen (knl_ptr, maxsize - 1) + 1;
-
if (user_ptr != NULL) {
-
if (user_size < 4)
-
return (-EINVAL)
;
+ if (user_ptr != NULL) {
+ if (user_size < 4)
+
return -EINVAL
;
-
if (cfs_copy_to_user
(user_ptr, knl_ptr, *size))
-
return (-EFAULT)
;
+
if (copy_to_user
(user_ptr, knl_ptr, *size))
+
return -EFAULT
;
-
/* Did I truncate the string? */
-
if (knl_ptr[*size - 1] != 0)
-
cfs_copy_to_user
(user_ptr + *size - 4, "...", 4);
-
}
+ /* Did I truncate the string? */
+ if (knl_ptr[*size - 1] != 0)
+
copy_to_user
(user_ptr + *size - 4, "...", 4);
+ }
-
return (0)
;
+
return 0
;
}
int
}
int
@@
-101,16
+97,16
@@
lwt_control (int enable, int clear)
if (!cfs_capable(CFS_CAP_SYS_ADMIN))
return (-EPERM);
if (!cfs_capable(CFS_CAP_SYS_ADMIN))
return (-EPERM);
-
if (!enable) {
-
LWT_EVENT(0,0,0,0);
-
lwt_enabled = 0;
-
cfs_mb();
-
/* give people some time to stop adding traces */
-
cfs_
schedule_timeout(10);
-
}
+ if (!enable) {
+ LWT_EVENT(0,0,0,0);
+ lwt_enabled = 0;
+ cfs_mb();
+ /* give people some time to stop adding traces */
+ schedule_timeout(10);
+ }
-
for (i = 0; i < cfs_
num_online_cpus(); i++) {
-
p = lwt_cpus[i].lwtc_current_page;
+
for (i = 0; i <
num_online_cpus(); i++) {
+ p = lwt_cpus[i].lwtc_current_page;
if (p == NULL)
return (-ENODATA);
if (p == NULL)
return (-ENODATA);
@@
-119,7
+115,7
@@
lwt_control (int enable, int clear)
continue;
for (j = 0; j < lwt_pages_per_cpu; j++) {
continue;
for (j = 0; j < lwt_pages_per_cpu; j++) {
-
memset (p->lwtp_events, 0, CFS_PAG
E_SIZE);
+
memset(p->lwtp_events, 0, PAGE_CACH
E_SIZE);
p = cfs_list_entry (p->lwtp_list.next,
lwt_page_t, lwtp_list);
p = cfs_list_entry (p->lwtp_list.next,
lwt_page_t, lwtp_list);
@@
-136,36
+132,35
@@
lwt_control (int enable, int clear)
}
int
}
int
-lwt_snapshot
(cfs_cycles_t *now, int *ncpu, int *total_size,
-
void *user_ptr, int user_size)
+lwt_snapshot(cfs_cycles_t *now, int *ncpu, int *total_size,
+ void *user_ptr, int user_size)
{
{
-
const int events_per_page = CFS_PAG
E_SIZE / sizeof(lwt_event_t);
-
const int bytes_per_page = events_per_page * sizeof(lwt_event_t);
-
lwt_page_t
*p;
-
int i;
-
int j;
+
const int events_per_page = PAGE_CACH
E_SIZE / sizeof(lwt_event_t);
+ const int bytes_per_page = events_per_page * sizeof(lwt_event_t);
+
lwt_page_t
*p;
+ int i;
+ int j;
-
if (!cfs_capable(CFS_CAP_SYS_ADMIN))
-
return (-EPERM);
+ if (!cfs_capable(CFS_CAP_SYS_ADMIN))
+ return (-EPERM);
- *ncpu = cfs_num_online_cpus();
- *total_size = cfs_num_online_cpus() * lwt_pages_per_cpu *
- bytes_per_page;
- *now = get_cycles();
+ *ncpu = num_online_cpus();
+ *total_size = num_online_cpus() * lwt_pages_per_cpu * bytes_per_page;
+ *now = get_cycles();
-
if (user_ptr == NULL)
-
return (0);
+ if (user_ptr == NULL)
+ return (0);
-
for (i = 0; i < cfs_
num_online_cpus(); i++) {
-
p = lwt_cpus[i].lwtc_current_page;
+
for (i = 0; i <
num_online_cpus(); i++) {
+ p = lwt_cpus[i].lwtc_current_page;
if (p == NULL)
if (p == NULL)
-
return (-ENODATA)
;
+
return -ENODATA
;
-
for (j = 0; j < lwt_pages_per_cpu; j++) {
-
if (cfs_
copy_to_user(user_ptr, p->lwtp_events,
-
bytes_per_page))
-
return (-EFAULT)
;
+ for (j = 0; j < lwt_pages_per_cpu; j++) {
+
if (
copy_to_user(user_ptr, p->lwtp_events,
+ bytes_per_page))
+
return -EFAULT
;
user_ptr = ((char *)user_ptr) + bytes_per_page;
p = cfs_list_entry(p->lwtp_list.next,
user_ptr = ((char *)user_ptr) + bytes_per_page;
p = cfs_list_entry(p->lwtp_list.next,
@@
-176,26
+171,24
@@
lwt_snapshot (cfs_cycles_t *now, int *ncpu, int *total_size,
return (0);
}
return (0);
}
-int
-lwt_init ()
+int lwt_init ()
{
int i;
{
int i;
-
int j;
+ int j;
-
for (i = 0; i < cfs_
num_online_cpus(); i++)
-
if (lwt_cpus[i].lwtc_current_page != NULL)
-
return (-EALREADY);
+
for (i = 0; i <
num_online_cpus(); i++)
+ if (lwt_cpus[i].lwtc_current_page != NULL)
+ return (-EALREADY);
-
LASSERT (!lwt_enabled);
+ LASSERT (!lwt_enabled);
/* NULL pointers, zero scalars */
memset (lwt_cpus, 0, sizeof (lwt_cpus));
/* NULL pointers, zero scalars */
memset (lwt_cpus, 0, sizeof (lwt_cpus));
- lwt_pages_per_cpu =
- LWT_MEMORY / (cfs_num_online_cpus() * CFS_PAGE_SIZE);
+ lwt_pages_per_cpu = LWT_MEMORY / (num_online_cpus() * PAGE_CACHE_SIZE);
- for (i = 0; i <
cfs_
num_online_cpus(); i++)
+ for (i = 0; i < num_online_cpus(); i++)
for (j = 0; j < lwt_pages_per_cpu; j++) {
for (j = 0; j < lwt_pages_per_cpu; j++) {
- struct page *page = alloc_page
(GFP_KERNEL);
+ struct page *page = alloc_page(GFP_KERNEL);
lwt_page_t *lwtp;
if (page == NULL) {
lwt_page_t *lwtp;
if (page == NULL) {
@@
-214,7
+207,7
@@
lwt_init ()
lwtp->lwtp_page = page;
lwtp->lwtp_events = page_address(page);
lwtp->lwtp_page = page;
lwtp->lwtp_events = page_address(page);
- memset
(lwtp->lwtp_events, 0, CFS_PAG
E_SIZE);
+ memset
(lwtp->lwtp_events, 0, PAGE_CACH
E_SIZE);
if (j == 0) {
CFS_INIT_LIST_HEAD (&lwtp->lwtp_list);
if (j == 0) {
CFS_INIT_LIST_HEAD (&lwtp->lwtp_list);
@@
-233,16
+226,15
@@
lwt_init ()
return (0);
}
return (0);
}
-void
-lwt_fini ()
+void lwt_fini ()
{
{
-
int i;
+ int i;
-
lwt_control(0, 0);
+ lwt_control(0, 0);
-
for (i = 0; i < cfs_
num_online_cpus(); i++)
-
while (lwt_cpus[i].lwtc_current_page != NULL) {
-
lwt_page_t *lwtp = lwt_cpus[i].lwtc_current_page;
+
for (i = 0; i <
num_online_cpus(); i++)
+ while (lwt_cpus[i].lwtc_current_page != NULL) {
+ lwt_page_t *lwtp = lwt_cpus[i].lwtc_current_page;
if (cfs_list_empty (&lwtp->lwtp_list)) {
lwt_cpus[i].lwtc_current_page = NULL;
if (cfs_list_empty (&lwtp->lwtp_list)) {
lwt_cpus[i].lwtc_current_page = NULL;