X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=libcfs%2Flibcfs%2Fwinnt%2Fwinnt-tracefile.c;h=5c50f984129c0112d395c28425734439354400dd;hb=6fd5e00ff03d41b427eec5d70efaef4bbdd8d59c;hp=4197d32f7694b270217d222eb372b2c6ed72f6a7;hpb=70e80ade90af09300396706b8910e196a7928520;p=fs%2Flustre-release.git diff --git a/libcfs/libcfs/winnt/winnt-tracefile.c b/libcfs/libcfs/winnt/winnt-tracefile.c index 4197d32..5c50f98 100644 --- a/libcfs/libcfs/winnt/winnt-tracefile.c +++ b/libcfs/libcfs/winnt/winnt-tracefile.c @@ -16,8 +16,8 @@ * 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 [sun.com URL with a - * copy of GPLv2]. + * 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 @@ -26,7 +26,7 @@ * GPL HEADER END */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved + * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. */ /* @@ -40,201 +40,184 @@ #include #include "tracefile.h" -#ifndef get_cpu -#define get_cpu() smp_processor_id() -#define put_cpu() do { } while (0) -#endif +/* percents to share the total debug memory for each type */ +static unsigned int pages_factor[CFS_TCD_TYPE_MAX] = { + 90, /* 90% pages for CFS_TCD_TYPE_PASSIVE */ + 10 /* 10% pages for CFS_TCD_TYPE_DISPATCH */ +}; -#define TCD_TYPE_MAX 1 +char *cfs_trace_console_buffers[CFS_NR_CPUS][CFS_TCD_TYPE_MAX]; -event_t tracefile_event; +cfs_rw_semaphore_t cfs_tracefile_sem; -void tracefile_init_arch() +int cfs_tracefile_init_arch() { int i; int j; - struct trace_cpu_data *tcd; - - cfs_init_event(&tracefile_event, TRUE, TRUE); - - /* initialize trace_data */ - memset(trace_data, 0, sizeof(trace_data)); - for (i = 0; i < TCD_TYPE_MAX; i++) { - trace_data[i]=cfs_alloc(sizeof(struct trace_data_union)*NR_CPUS, 0); - if (trace_data[i] == NULL) - goto out; - } - - /* arch related info initialized */ - tcd_for_each(tcd, i, j) { - tcd->tcd_pages_factor = 100; /* Only one type */ - tcd->tcd_cpu = j; - tcd->tcd_type = i; - } - - memset(trace_console_buffers, 0, sizeof(trace_console_buffers)); - - for (i = 0; i < NR_CPUS; i++) { - for (j = 0; j < 1; j++) { - trace_console_buffers[i][j] = - cfs_alloc(TRACE_CONSOLE_BUFFER_SIZE, - CFS_ALLOC_ZERO); - - if (trace_console_buffers[i][j] == NULL) - goto out; + struct cfs_trace_cpu_data *tcd; + + cfs_init_rwsem(&cfs_tracefile_sem); + + /* initialize trace_data */ + memset(cfs_trace_data, 0, sizeof(cfs_trace_data)); + for (i = 0; i < CFS_TCD_TYPE_MAX; i++) { + cfs_trace_data[i] = + cfs_alloc(sizeof(union cfs_trace_data_union) * \ + CFS_NR_CPUS, GFP_KERNEL); + if (cfs_trace_data[i] == NULL) + goto out; + } + + /* arch related info initialized */ + cfs_tcd_for_each(tcd, i, j) { + tcd->tcd_pages_factor = (USHORT) pages_factor[i]; + tcd->tcd_type = (USHORT) i; + tcd->tcd_cpu = (USHORT)j; + } + + for (i = 0; i < cfs_num_possible_cpus(); i++) + for (j = 0; j < CFS_TCD_TYPE_MAX; j++) { + cfs_trace_console_buffers[i][j] = + cfs_alloc(CFS_TRACE_CONSOLE_BUFFER_SIZE, + GFP_KERNEL); + + if (cfs_trace_console_buffers[i][j] == NULL) + goto out; } - } return 0; out: - tracefile_fini_arch(); - KsPrint((0, "lnet: No enough memory\n")); + cfs_tracefile_fini_arch(); + printk(CFS_KERN_ERR "lnet: Not enough memory\n"); return -ENOMEM; + } -void tracefile_fini_arch() +void cfs_tracefile_fini_arch() { int i; int j; - for (i = 0; i < NR_CPUS; i++) { - for (j = 0; j < 2; j++) { - if (trace_console_buffers[i][j] != NULL) { - cfs_free(trace_console_buffers[i][j]); - trace_console_buffers[i][j] = NULL; + for (i = 0; i < cfs_num_possible_cpus(); i++) { + for (j = 0; j < CFS_TCD_TYPE_MAX; j++) { + if (cfs_trace_console_buffers[i][j] != NULL) { + cfs_free(cfs_trace_console_buffers[i][j]); + cfs_trace_console_buffers[i][j] = NULL; } - } - } + } + } - for (i = 0; trace_data[i] != NULL; i++) { - cfs_free(trace_data[i]); - trace_data[i] = NULL; - } -} + for (i = 0; cfs_trace_data[i] != NULL; i++) { + cfs_free(cfs_trace_data[i]); + cfs_trace_data[i] = NULL; + } -void tracefile_read_lock() -{ - cfs_wait_event(&tracefile_event, 0); + cfs_fini_rwsem(&cfs_tracefile_sem); } -void tracefile_read_unlock() +void cfs_tracefile_read_lock() { - cfs_wake_event(&tracefile_event); + cfs_down_read(&cfs_tracefile_sem); } -void tracefile_write_lock() +void cfs_tracefile_read_unlock() { - cfs_wait_event(&tracefile_event, 0); + cfs_up_read(&cfs_tracefile_sem); } -void tracefile_write_unlock() +void cfs_tracefile_write_lock() { - cfs_wake_event(&tracefile_event); + cfs_down_write(&cfs_tracefile_sem); } -char * -trace_get_console_buffer(void) +void cfs_tracefile_write_unlock() { -#pragma message ("is there possible problem with pre-emption ?") - int cpu = (int) KeGetCurrentProcessorNumber(); - return trace_console_buffers[cpu][0]; + cfs_up_write(&cfs_tracefile_sem); } -void -trace_put_console_buffer(char *buffer) +cfs_trace_buf_type_t cfs_trace_buf_idx_get() { + if (KeGetCurrentIrql() >= DISPATCH_LEVEL) + return CFS_TCD_TYPE_DISPATCH; + else + return CFS_TCD_TYPE_PASSIVE; } -struct trace_cpu_data * -trace_get_tcd(void) -{ -#pragma message("todo: return NULL if in interrupt context") - - int cpu = (int) KeGetCurrentProcessorNumber(); - return &(*trace_data[0])[cpu].tcd; -} - -void -trace_put_tcd (struct trace_cpu_data *tcd, unsigned long flags) +int cfs_trace_lock_tcd(struct cfs_trace_cpu_data *tcd) { + __LASSERT(tcd->tcd_type < CFS_TCD_TYPE_MAX); + return 1; } -int -trace_lock_tcd(struct trace_cpu_data *tcd) +void cfs_trace_unlock_tcd(struct cfs_trace_cpu_data *tcd) { - __LASSERT(tcd->tcd_type < TCD_TYPE_MAX); - return 1; + __LASSERT(tcd->tcd_type < CFS_TCD_TYPE_MAX); } -void -trace_unlock_tcd(struct trace_cpu_data *tcd) +int cfs_tcd_owns_tage(struct cfs_trace_cpu_data *tcd, + struct cfs_trace_page *tage) { - __LASSERT(tcd->tcd_type < TCD_TYPE_MAX); + /* + * XXX nikita: do NOT call portals_debug_msg() (CDEBUG/ENTRY/EXIT) + * from here: this will lead to infinite recursion. + */ + return tcd->tcd_cpu == tage->cpu; } void -set_ptldebug_header(struct ptldebug_header *header, int subsys, int mask, - const int line, unsigned long stack) +cfs_set_ptldebug_header(struct ptldebug_header *header, int subsys, int mask, + const int line, unsigned long stack) { struct timeval tv; - do_gettimeofday(&tv); + cfs_gettimeofday(&tv); header->ph_subsys = subsys; header->ph_mask = mask; - header->ph_cpu_id = smp_processor_id(); + header->ph_cpu_id = cfs_smp_processor_id(); + header->ph_type = cfs_trace_buf_idx_get(); header->ph_sec = (__u32)tv.tv_sec; header->ph_usec = tv.tv_usec; header->ph_stack = stack; - header->ph_pid = current->pid; + header->ph_pid = (__u32)(ULONG_PTR)current->pid; header->ph_line_num = line; header->ph_extern_pid = 0; return; } -void print_to_console(struct ptldebug_header *hdr, int mask, const char *buf, - int len, const char *file, const char *fn) +void cfs_print_to_console(struct ptldebug_header *hdr, int mask, + const char *buf, int len, const char *file, + const char *fn) { - char *prefix = NULL, *ptype = NULL; + char *prefix = "Lustre", *ptype = NULL; if ((mask & D_EMERG) != 0) { prefix = "LustreError"; - ptype = KERN_EMERG; + ptype = CFS_KERN_EMERG; } else if ((mask & D_ERROR) != 0) { prefix = "LustreError"; - ptype = KERN_ERR; + ptype = CFS_KERN_ERR; } else if ((mask & D_WARNING) != 0) { prefix = "Lustre"; - ptype = KERN_WARNING; - } else if ((mask & libcfs_printk) != 0 || (mask & D_CONSOLE)) { + ptype = CFS_KERN_WARNING; + } else if ((mask & (D_CONSOLE | libcfs_printk)) != 0) { prefix = "Lustre"; - ptype = KERN_INFO; + ptype = CFS_KERN_INFO; } if ((mask & D_CONSOLE) != 0) { - printk("%s%s: %s", ptype, prefix, buf); + printk("%s%s: %.*s", ptype, prefix, len, buf); } else { - printk("%s%s: %d:%d:(%s:%d:%s()) %s", ptype, prefix, hdr->ph_pid, - hdr->ph_extern_pid, file, hdr->ph_line_num, fn, buf); + printk("%s%s: %d:%d:(%s:%d:%s()) %.*s", ptype, prefix, hdr->ph_pid, + hdr->ph_extern_pid, file, hdr->ph_line_num, fn, len, buf); } return; } -int tcd_owns_tage(struct trace_cpu_data *tcd, struct trace_page *tage) +int cfs_trace_max_debug_mb(void) { - return 1; -} - -int trace_max_debug_mb(void) -{ - int total_mb = (num_physpages >> (20 - CFS_PAGE_SHIFT)); + int total_mb = (cfs_num_physpages >> (20 - CFS_PAGE_SHIFT)); return MAX(512, (total_mb * 80)/100); } - -void -trace_call_on_all_cpus(void (*fn)(void *arg), void *arg) -{ -#error "tbd" -}