Changeset 741fd16 in mainline

Timestamp:

2008-11-21T22:14:24Z (16 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

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

Children:

32e6c9c

Parents:

384c488

Message:

Stoppability sections must be much smaller (design error). Also fix deadlock in udebug_stop(). Fix pause functionality in tracer.

Files:

• kernel/generic/src/ipc/sysipc.c (modified) (3 diffs)
• kernel/generic/src/synch/futex.c (modified) (2 diffs)
• kernel/generic/src/syscall/syscall.c (modified) (2 diffs)
• kernel/generic/src/udebug/udebug_ops.c (modified) (2 diffs)
• uspace/app/trace/trace.c (modified) (4 diffs)

kernel/generic/src/ipc/sysipc.c

@@ -456 +456 @@
 
         if (!(res = request_preprocess(&call, phone))) {
+#ifdef CONFIG_UDEBUG
+                udebug_stoppable_begin();
+#endif
                 rc = ipc_call_sync(phone, &call);
+#ifdef CONFIG_UDEBUG
+                udebug_stoppable_end();
+#endif
                 if (rc != EOK)
                         return rc;
                 process_answer(&call);
+
         } else {
                 IPC_SET_RETVAL(call.data, res);
@@ -496 +503 @@
 
         if (!(res = request_preprocess(&call, phone))) {
+#ifdef CONFIG_UDEBUG
+                udebug_stoppable_begin();
+#endif
                 rc = ipc_call_sync(phone, &call);
+#ifdef CONFIG_UDEBUG
+                udebug_stoppable_end();
+#endif
                 if (rc != EOK)
                         return rc;
@@ -799 +812 @@
         call_t *call;
 
-restart:        
+restart:
+
+#ifdef CONFIG_UDEBUG
+        udebug_stoppable_begin();
+#endif  
         call = ipc_wait_for_call(&TASK->answerbox, usec,
             flags | SYNCH_FLAGS_INTERRUPTIBLE);
+
+#ifdef CONFIG_UDEBUG
+        udebug_stoppable_end();
+#endif
         if (!call)
                 return 0;

kernel/generic/src/synch/futex.c

@@ -116 +116 @@
         pte_t *t;
         ipl_t ipl;
+        int rc;
         
         ipl = interrupts_disable();
@@ -135 +136 @@
 
         futex = futex_find(paddr);
-        
-        return (unative_t) waitq_sleep_timeout(&futex->wq, usec, flags |
+
+#ifdef CONFIG_UDEBUG
+        udebug_stoppable_begin();
+#endif
+        rc = waitq_sleep_timeout(&futex->wq, usec, flags |
             SYNCH_FLAGS_INTERRUPTIBLE);
+
+#ifdef CONFIG_UDEBUG
+        udebug_stoppable_end();
+#endif
+        return (unative_t) rc;
 }
 

kernel/generic/src/syscall/syscall.c

@@ -106 +106 @@
         udebug_syscall_event(a1, a2, a3, a4, a5, a6, id, 0, false);
 #endif
-
         if (id < SYSCALL_END) { 
-#ifdef CONFIG_UDEBUG
-                udebug_stoppable_begin();
-#endif
                 rc = syscall_table[id](a1, a2, a3, a4, a5, a6);
         } else {
@@ -123 +119 @@
 #ifdef CONFIG_UDEBUG
         udebug_syscall_event(a1, a2, a3, a4, a5, a6, id, rc, true);
-        udebug_stoppable_end();
-#endif
-        
+#endif  
         return rc;
 }

kernel/generic/src/udebug/udebug_ops.c

@@ -318 +318 @@
 
         LOG("udebug_stop()\n");
-        mutex_lock(&TASK->udebug.lock);
 
         /*
@@ -355 +354 @@
         _thread_op_end(t);
 
+        mutex_lock(&TASK->udebug.lock);
         ipc_answer(&TASK->answerbox, call);
         mutex_unlock(&TASK->udebug.lock);

uspace/app/trace/trace.c

@@ -450 +450 @@
         while (!abort_trace) {
 
+                if (paused) {
+                        printf("Waiting for resume\n");
+                        while (paused) {
+                                usleep(1000000);
+                                fibril_yield();
+                                printf(".");
+                        }
+                        printf("Resumed\n");
+                }
+
                 /* Run thread until an event occurs */
                 rc = udebug_go(phoneid, thread_hash,
@@ -470 +480 @@
                         case UDEBUG_EVENT_STOP:
                                 printf("Stop event\n");
-                                printf("Waiting for resume\n");
-                                while (paused) {
-                                        usleep(1000000);
-                                        fibril_yield();
-                                        printf(".");
-                                }
-                                printf("Resumed\n");
                                 break;
                         case UDEBUG_EVENT_THREAD_B:
@@ -581 +584 @@
                 if (c == 'q') break;
                 if (c == 'p') {
+                        printf("Pause...\n");
                         paused = 1;
                         rc = udebug_stop(phoneid, thash);
@@ -587 +591 @@
                 if (c == 'r') {
                         paused = 0;
+                        printf("Resume...\n");
                 }
         }