Changeset b23c88e in mainline for kernel/generic/src/time/clock.c

Timestamp:

2012-07-11T05:45:48Z (12 years ago)

Author:

Adam Hraska <adam.hraska+hos@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

b68ae24

Parents:

9f8745c5

Message:

preemption_disable: Replaced memory barriers with compiler barriers. Added checks if reschedule is needed once preemption is enabled.

File:

• kernel/generic/src/time/clock.c (modified) (1 diff)

kernel/generic/src/time/clock.c

@@ -212 +212 @@
                 irq_spinlock_unlock(&THREAD->lock, false);
                 
-                if ((!ticks) && (!PREEMPTION_DISABLED)) {
-                        scheduler();
+                if (ticks == 0) {
+                        if (PREEMPTION_ENABLED) {
+                                scheduler();
 #ifdef CONFIG_UDEBUG
-                        /*
-                         * Give udebug chance to stop the thread
-                         * before it begins executing userspace code.
-                         */
-                        istate_t *istate = THREAD->udebug.uspace_state;
-                        if ((istate) && (istate_from_uspace(istate)))
-                                udebug_before_thread_runs();
+                                /*
+                                * Give udebug chance to stop the thread
+                                * before it begins executing userspace code.
+                                */
+                                istate_t *istate = THREAD->udebug.uspace_state;
+                                if ((istate) && (istate_from_uspace(istate)))
+                                        udebug_before_thread_runs();
 #endif
+                        } else {
+                                THREAD->need_resched = true;
+                        }
                 }
         }