Compiles with GCC
[akaros.git] / kern / include / smp.h
index 975693b..36be0bb 100644 (file)
@@ -1,30 +1,34 @@
+/*
+ * Copyright (c) 2009 The Regents of the University of California
+ * Barret Rhoden <brho@cs.berkeley.edu>
+ * See LICENSE for details.
+ */
+
 #ifndef ROS_INC_SMP_H
 #define ROS_INC_SMP_H
 
 /* SMP related functions */
 
 #include <arch/smp.h>
-#include <arch/types.h>
+#include <ros/common.h>
 #include <trap.h>
 #include <atomic.h>
+#include <process.h>
 #include <workqueue.h>
-
-#ifdef __BOCHS__
-#define SMP_CALL_FUNCTION_TIMEOUT    0x00ffffff
-#define SMP_BOOT_TIMEOUT             0x0000ffff
-#else
-#define SMP_CALL_FUNCTION_TIMEOUT    0x7ffffff0
-#define SMP_BOOT_TIMEOUT             0x002fffff
+#include <env.h>
+
+// will want this padded out to cacheline alignment
+struct per_cpu_info {
+       spinlock_t lock;
+       bool preempt_pending;
+       struct workqueue TP(void*) workqueue;
+#ifdef __i386__
+       spinlock_t amsg_lock;
+       unsigned amsg_current;
+       active_message_t active_msgs[NUM_ACTIVE_MESSAGES];
 #endif
-
-typedef struct per_cpu_info {
-       uint32_t lock;
-       // Once we have a real kmalloc, we can make this dynamic.  Want a queue.
-       work_t delayed_work;
-       // will want it padded out to an even cacheline
-} per_cpu_info_t;
-
-extern per_cpu_info_t per_cpu_info[MAX_NUM_CPUS];
+};
+extern struct per_cpu_info per_cpu_info[MAX_NUM_CPUS];
 extern volatile uint8_t num_cpus;
 
 /* SMP bootup functions */
@@ -32,11 +36,11 @@ void smp_boot(void);
 void smp_idle(void);
 
 /* SMP utility functions */
-int smp_call_function_self(isr_t handler, void* data,
+int smp_call_function_self(poly_isr_t handler, TV(t) data,
                            handler_wrapper_t** wait_wrapper);
-int smp_call_function_all(isr_t handler, void* data,
+int smp_call_function_all(poly_isr_t handler, TV(t) data,
                           handler_wrapper_t** wait_wrapper);
-int smp_call_function_single(uint8_t dest, isr_t handler, void* data,
+int smp_call_function_single(uint32_t dest, poly_isr_t handler, TV(t) data,
                              handler_wrapper_t** wait_wrapper);
 int smp_call_wait(handler_wrapper_t*SAFE wrapper);