b=15977 analyse only consistent part of the log

[fs/lustre-release.git] / libcfs / libcfs / darwin / darwin-tracefile.c

diff --git a/libcfs/libcfs/darwin/darwin-tracefile.c b/libcfs/libcfs/darwin/darwin-tracefile.c
index e672ad5..7ab943f 100644 (file)
--- a/libcfs/libcfs/darwin/darwin-tracefile.c
+++ b/libcfs/libcfs/darwin/darwin-tracefile.c
@@ -1,8 +1,42 @@
+/* -*- 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.
+ *
+ * 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.
+ */
 
 #define DEBUG_SUBSYSTEM S_LNET
 #define LUSTRE_TRACEFILE_PRIVATE
 #include <libcfs/libcfs.h>
-#include <libcfs/kp30.h>
 #include "tracefile.h"
 
 /*
@@ -34,6 +68,7 @@ int tracefile_init_arch() {
 }
 
 void tracefile_fini_arch() {
+    fini_rwsem(&tracefile_sem);
 }
 
 void tracefile_read_lock() {
@@ -127,7 +162,7 @@ int tcd_owns_tage(struct trace_cpu_data *tcd, struct trace_page *tage)
 
 void
 set_ptldebug_header(struct ptldebug_header *header, int subsys, int mask,
-                   const int line, unsigned long stack)
+                    const int line, unsigned long stack)
 {
        struct timeval tv;
        
@@ -138,7 +173,8 @@ set_ptldebug_header(struct ptldebug_header *header, int subsys, int mask,
        do_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 = 0;
        header->ph_sec = (__u32)tv.tv_sec;
        header->ph_usec = tv.tv_usec;
        header->ph_stack = stack;
@@ -183,9 +219,3 @@ int trace_max_debug_mb(void)
 {
        return max_permit_mb;
 }
-
-void
-trace_call_on_all_cpus(void (*fn)(void *arg), void *arg)
-{
-#error "tbd"
-}