Changeset f307f12 in mainline for uspace/srv/loader/main.c

Timestamp:

2009-10-11T16:26:01Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

c088fd4

Parents:

c123609 (diff), ba8f8cb (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge experimental support for timeoutable fibril condition variables.
The merge includes a fix for an IPC/async framework problem caused by the fact
that timeoutable entities in the async framework (and also fibril
synchronization code) often call gettimeofday() when async_futex is held, and
the fact that gettimeofday() had a dependency on async framework.

File:

• uspace/srv/loader/main.c (modified) (8 diffs)

uspace/srv/loader/main.c

@@ -102 +102 @@
         task_id = task_get_id();
         
-        if (!ipc_data_read_receive(&callid, &len)) {
+        if (!async_data_read_receive(&callid, &len)) {
                 ipc_answer_0(callid, EINVAL);
                 ipc_answer_0(rid, EINVAL);
@@ -111 +111 @@
                 len = sizeof(task_id);
         
-        ipc_data_read_finalize(callid, &task_id, len);
+        async_data_read_finalize(callid, &task_id, len);
         ipc_answer_0(rid, EOK);
 }
@@ -127 +127 @@
         char *name_buf;
         
-        if (!ipc_data_write_receive(&callid, &len)) {
+        if (!async_data_write_receive(&callid, &len)) {
                 ipc_answer_0(callid, EINVAL);
                 ipc_answer_0(rid, EINVAL);
@@ -140 +140 @@
         }
         
-        ipc_data_write_finalize(callid, name_buf, len);
+        async_data_write_finalize(callid, name_buf, len);
         ipc_answer_0(rid, EOK);
         
@@ -164 +164 @@
         int n;
         
-        if (!ipc_data_write_receive(&callid, &buf_size)) {
+        if (!async_data_write_receive(&callid, &buf_size)) {
                 ipc_answer_0(callid, EINVAL);
                 ipc_answer_0(rid, EINVAL);
@@ -187 +187 @@
         }
         
-        ipc_data_write_finalize(callid, arg_buf, buf_size);
+        async_data_write_finalize(callid, arg_buf, buf_size);
         
         arg_buf[buf_size] = '\0';
@@ -239 +239 @@
         ipc_callid_t callid;
         size_t buf_size;
-        if (!ipc_data_write_receive(&callid, &buf_size)) {
+        if (!async_data_write_receive(&callid, &buf_size)) {
                 ipc_answer_0(callid, EINVAL);
                 ipc_answer_0(rid, EINVAL);
@@ -268 +268 @@
         }
         
-        ipc_data_write_finalize(callid, fil_buf, buf_size);
+        async_data_write_finalize(callid, fil_buf, buf_size);
         
         int count = buf_size / sizeof(fdi_node_t);