LU-2675 cleanup: remove unused mkdirdeep.c and lltrace.h

[fs/lustre-release.git] / libcfs / include / libcfs / libcfs_prim.h

diff --git a/libcfs/include/libcfs/libcfs_prim.h b/libcfs/include/libcfs/libcfs_prim.h
index c9b5c39..4a6588e 100644 (file)
--- a/libcfs/include/libcfs/libcfs_prim.h
+++ b/libcfs/include/libcfs/libcfs_prim.h
@@ -1,6 +1,4 @@
-/* -*- 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.
@@ -16,8 +14,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 +24,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.
  */
 /*
@@ -42,12 +40,20 @@
 #ifndef __LIBCFS_PRIM_H__
 #define __LIBCFS_PRIM_H__
 
+#ifndef CFS_EXPORT_SYMBOL
+# define CFS_EXPORT_SYMBOL(s)
+#endif
+
 /*
  * Schedule
  */
-void cfs_schedule_timeout(cfs_task_state_t state, int64_t timeout);
+void cfs_schedule_timeout_and_set_state(cfs_task_state_t state,
+                                        int64_t timeout);
+void cfs_schedule_timeout(int64_t timeout);
 void cfs_schedule(void);
 void cfs_pause(cfs_duration_t ticks);
+int  cfs_need_resched(void);
+void cfs_cond_resched(void);
 
 /*
  * Wait Queues
@@ -55,8 +61,10 @@ void cfs_pause(cfs_duration_t ticks);
 void cfs_waitq_init(cfs_waitq_t *waitq);
 void cfs_waitlink_init(cfs_waitlink_t *link);
 void cfs_waitq_add(cfs_waitq_t *waitq, cfs_waitlink_t *link);
-void cfs_waitq_add_exclusive(cfs_waitq_t *waitq, 
+void cfs_waitq_add_exclusive(cfs_waitq_t *waitq,
                              cfs_waitlink_t *link);
+void cfs_waitq_add_exclusive_head(cfs_waitq_t *waitq,
+                                  cfs_waitlink_t *link);
 void cfs_waitq_del(cfs_waitq_t *waitq, cfs_waitlink_t *link);
 int  cfs_waitq_active(cfs_waitq_t *waitq);
 void cfs_waitq_signal(cfs_waitq_t *waitq);
@@ -69,7 +77,7 @@ int64_t cfs_waitq_timedwait(cfs_waitlink_t *link, cfs_task_state_t state,
 /*
  * Timer
  */
-typedef  void (cfs_timer_func_t)(unsigned long);
+typedef  void (cfs_timer_func_t)(ulong_ptr_t);
 
 void cfs_init_timer(cfs_timer_t *t);
 void cfs_timer_init(cfs_timer_t *t, cfs_timer_func_t *func, void *arg);
@@ -78,4 +86,35 @@ void cfs_timer_arm(cfs_timer_t *t, cfs_time_t deadline);
 void cfs_timer_disarm(cfs_timer_t *t);
 int  cfs_timer_is_armed(cfs_timer_t *t);
 cfs_time_t cfs_timer_deadline(cfs_timer_t *t);
+
+/*
+ * Memory
+ */
+#ifndef cfs_memory_pressure_get
+#define cfs_memory_pressure_get() (0)
+#endif
+#ifndef cfs_memory_pressure_set
+#define cfs_memory_pressure_set() do {} while (0)
+#endif
+#ifndef cfs_memory_pressure_clr
+#define cfs_memory_pressure_clr() do {} while (0)
+#endif
+
+static inline int cfs_memory_pressure_get_and_set(void)
+{
+        int old = cfs_memory_pressure_get();
+
+        if (!old)
+                cfs_memory_pressure_set();
+        return old;
+}
+
+static inline void cfs_memory_pressure_restore(int old)
+{
+        if (old)
+                cfs_memory_pressure_set();
+        else
+                cfs_memory_pressure_clr();
+        return;
+}
 #endif