Changeset f307f12 in mainline for uspace/lib/libc/generic/loader.c

Timestamp:

2009-10-11T16:26:01Z (15 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/lib/libc/generic/loader.c (modified) (4 diffs)

uspace/lib/libc/generic/loader.c

@@ -90 +90 @@
         ipc_call_t answer;
         aid_t req = async_send_0(ldr->phone_id, LOADER_GET_TASKID, &answer);
-        int rc = ipc_data_read_start(ldr->phone_id, task_id, sizeof(task_id_t));
+        int rc = async_data_read_start(ldr->phone_id, task_id, sizeof(task_id_t));
         if (rc != EOK) {
                 async_wait_for(req, NULL);
@@ -123 +123 @@
         ipc_call_t answer;
         aid_t req = async_send_0(ldr->phone_id, LOADER_SET_PATHNAME, &answer);
-        int rc = ipc_data_write_start(ldr->phone_id, (void *) pa, pa_len);
+        int rc = async_data_write_start(ldr->phone_id, (void *) pa, pa_len);
         if (rc != EOK) {
                 async_wait_for(req, NULL);
@@ -178 +178 @@
         ipc_call_t answer;
         aid_t req = async_send_0(ldr->phone_id, LOADER_SET_ARGS, &answer);
-        ipcarg_t rc = ipc_data_write_start(ldr->phone_id, (void *) arg_buf, buffer_size);
+        ipcarg_t rc = async_data_write_start(ldr->phone_id, (void *) arg_buf, buffer_size);
         if (rc != EOK) {
                 async_wait_for(req, NULL);
@@ -232 +232 @@
         ipc_call_t answer;
         aid_t req = async_send_0(ldr->phone_id, LOADER_SET_FILES, &answer);
-        ipcarg_t rc = ipc_data_write_start(ldr->phone_id, (void *) files_buf,
+        ipcarg_t rc = async_data_write_start(ldr->phone_id, (void *) files_buf,
             count * sizeof(fdi_node_t));
         if (rc != EOK) {