2 files changed, 30 insertions, 16 deletions

diff --git a/include/asm_x86.h b/include/asm_x86.h
index b5bf166..6636abb 100644
--- a/include/asm_x86.h
+++ b/include/asm_x86.h
@@ -1,4 +1,4 @@
-/* Intel ia32 assembly. 
+/* Intel ia32 assembly.
  * Don't include directly, use asm.h instead.
  *
  * Most of this code comes straight out of the Linux kernel.
@@ -16,6 +16,16 @@ static __inline__ void cpu_relax(void)
         __asm__ __volatile("pause");
 }
 
+/* please, use these only if you _really_ know what you're doing
+ * ... and remember iopl(3) first!! (include sys/io.h)
+ */
+static inline void cli(void) {
+        asm volatile("cli": : :"memory");
+}
+
+static inline void sti(void) {
+        asm volatile("sti": : :"memory");
+}
 
 #ifdef __i386__
 
@@ -26,18 +36,18 @@ typedef struct { int counter; } atomic_t;
 /**
  * atomic_read - read atomic variable
  * @v: pointer of type atomic_t
- * 
+ *
  * Atomically reads the value of @v.
- */ 
+ */
 #define atomic_read(v)          ((v)->counter)
 
 /**
  * atomic_set - set atomic variable
  * @v: pointer of type atomic_t
  * @i: required value
- * 
+ *
  * Atomically sets the value of @v to @i.
- */ 
+ */
 #define atomic_set(v,i)         (((v)->counter) = (i))
 
 static __inline__ void atomic_add(int i, atomic_t *v)
@@ -65,7 +75,7 @@ static __inline__ int atomic_add_return(int i, atomic_t *v)
                 : : "memory");
         return i + __i;
 }
- 
+
 #define atomic_inc_return(v)  (atomic_add_return(1,v))
 
 
diff --git a/pm_test/pm_task.c b/pm_test/pm_task.c
index b1158b0..71d5690 100644
--- a/pm_test/pm_task.c
+++ b/pm_test/pm_task.c
@@ -21,6 +21,8 @@
 /* architectural dependend code for pm measurement */
 #include "pm_arch.h"
 
+#include <sys/io.h>
+
 int mem_block[NUMWS][INTS_PER_WSS] __attribute__ ((aligned(CACHEALIGNMENT)));
 
 /* Setup flags, then enter loop to measure costs. */
@@ -105,6 +107,7 @@ int main(int argc, char **argv)
         saved_ctrl_page_ptr = ctrl;
 #endif
 
+        iopl(3);
         /* Enter loop that measures preemption and migration costs. */
         while (curr_job_count * task_period < SIMRUNTIME) {
 #ifdef DEBUG
@@ -117,6 +120,9 @@ int main(int argc, char **argv)
 #endif
                 if (curr_job_count != ctrl->job_count) {
 
+                        /* G-EDF with np sections while reading our samples */
+                        cli();
+
                         /* ok, this is a new job. Get info from kernel */
 
                         curr_job_count = ctrl->job_count;
@@ -126,9 +132,6 @@ int main(int argc, char **argv)
 
                         barrier();
 
-                        /* G-EDF with np sections while reading our samples */
-                        enter_np();
-
                         /* job's portion of the mem_block */
                         curr_ws = curr_job_count % NUMWS;
 
@@ -213,11 +216,17 @@ int main(int argc, char **argv)
                          * FIXME this is a very long np section, we may think
                          * about splitting it in two: C + H,H
                          */
-                        exit_np();
+                        sti();
 
                 } else if (mem_ptr && mem_ptr_end &&
                            (curr_sched_count != ctrl->sched_count ||
                             curr_cpu != ctrl->cpu)) {
+
+                        /* we are after a preemption / migration:
+                         * enter NP before reading
+                         */
+                        cli();
+
                         /* we have done at least one go in the "best case".
                          * job is the same => preempted / migrated
                          */
@@ -230,11 +239,6 @@ int main(int argc, char **argv)
 
                         barrier();
 
-                        /* we are after a preemption / migration:
-                         * enter NP before reading
-                         */
-                        enter_np();
-
                         /* Measure preemption or migration cost. */
                         mem_ptr = &mem_block[curr_ws][0];
 
@@ -256,7 +260,7 @@ int main(int argc, char **argv)
                                 data_points[data_count].access_type = 'P';
 
                         /* exit NP now */
-                        exit_np();
+                        sti();
 
                         data_points[data_count].access_time =
                                                         end_time - start_time;