Changeset 6c46350 in mainline

Timestamp:

2006-06-03T00:30:11Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

7f079d9

Parents:

27386e6a

Message:

Fixed some weird bugs (I wonder how this COULD even work on the other platforms).

Files:

• libc/generic/async.c (modified) (6 diffs)
• libc/generic/io/stream.c (modified) (2 diffs)
• tetris/Makefile (modified) (1 diff)

libc/generic/async.c

@@ -217 +217 @@
 /** Insert sort timeout msg into timeouts list
  *
- * Assume async_futex is held
  */
 static void insert_timeout(awaiter_t *wd)
@@ -284 +283 @@
         msg_t *msg;
         ipc_callid_t callid;
+        connection_t *conn;
         
         assert(PS_connection);
+        /* GCC 4.1.0 coughs on PS_connection-> dereference,
+         * GCC 4.1.1 happilly puts the rdhwr instruction in delay slot.
+         *           I would never expect to find so many errors in 
+         *           compiler *($&$(*&$
+         */
+        conn = PS_connection; 
 
         if (usecs < 0) /* TODO: let it get through the ipc_call once */
@@ -293 +299 @@
 
         if (usecs) {
-                gettimeofday(&PS_connection->wdata.expires, NULL);
-                tv_add(&PS_connection->wdata.expires, usecs);
+                gettimeofday(&conn->wdata.expires, NULL);
+                tv_add(&conn->wdata.expires, usecs);
         } else {
-                PS_connection->wdata.inlist = 0;
+                conn->wdata.inlist = 0;
         }
         /* If nothing in queue, wait until something appears */
-        while (list_empty(&PS_connection->msg_queue)) {
+        while (list_empty(&conn->msg_queue)) {
                 if (usecs) {
-                        PS_connection->wdata.inlist = 1;
-                        insert_timeout(&PS_connection->wdata);
+                        conn->wdata.inlist = 1;
+                        insert_timeout(&conn->wdata);
                 }
-                PS_connection->wdata.active = 0;
+                conn->wdata.active = 0;
                 psthread_schedule_next_adv(PS_TO_MANAGER);
                 /* Futex is up after getting back from async_manager 
                  * get it again */
                 futex_down(&async_futex);
-                if (usecs && PS_connection->wdata.timedout && \
-                    list_empty(&PS_connection->msg_queue)) {
+                if (usecs && conn->wdata.timedout && \
+                    list_empty(&conn->msg_queue)) {
                         /* If we timed out-> exit */
                         futex_up(&async_futex);
@@ -317 +323 @@
         }
         
-        msg = list_get_instance(PS_connection->msg_queue.next, msg_t, link);
+        msg = list_get_instance(conn->msg_queue.next, msg_t, link);
         list_remove(&msg->link);
         callid = msg->callid;
@@ -451 +457 @@
 }
 
-/** Fire all timeouts that expired */
+/** Fire all timeouts that expired 
+ *
+ */
 static void handle_expired_timeouts(void)
 {
@@ -503 +511 @@
                         gettimeofday(&tv,NULL);
                         if (tv_gteq(&tv, &waiter->expires)) {
+                                futex_up(&async_futex);
                                 handle_expired_timeouts();
                                 continue;

libc/generic/io/stream.c

@@ -52 +52 @@
 
 static int console_phone = -1;
-static stream_t streams[FDS] = {{0, 0, 0, -1}};
+static stream_t streams[FDS];
 
 static ssize_t write_stderr(void *param, const void *buf, size_t count)
@@ -117 +117 @@
         
         stream.w = write_stdout;
+        stream.phone = console_phone;
         stream.param = 0;
         return stream;

tetris/Makefile

@@ -11 +11 @@
 .PHONY: all clean depend disasm
 
-all: $(OUTPUT)
+all: $(OUTPUT) disasm
 
 -include Makefile.depend