Changeset f307f12 in mainline for uspace/srv/console/console.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/srv/console/console.c (modified) (5 diffs)

uspace/srv/console/console.c

@@ -429 +429 @@
         ipc_callid_t callid;
         size_t size;
-        if (!ipc_data_write_receive(&callid, &size)) {
+        if (!async_data_write_receive(&callid, &size)) {
                 ipc_answer_0(callid, EINVAL);
                 ipc_answer_0(rid, EINVAL);
@@ -442 +442 @@
         }
         
-        (void) ipc_data_write_finalize(callid, buf, size);
+        (void) async_data_write_finalize(callid, buf, size);
         
         async_serialize_start();
@@ -464 +464 @@
         ipc_callid_t callid;
         size_t size;
-        if (!ipc_data_read_receive(&callid, &size)) {
+        if (!async_data_read_receive(&callid, &size)) {
                 ipc_answer_0(callid, EINVAL);
                 ipc_answer_0(rid, EINVAL);
@@ -489 +489 @@
         
         if (pos == size) {
-                (void) ipc_data_read_finalize(callid, buf, size);
+                (void) async_data_read_finalize(callid, buf, size);
                 ipc_answer_1(rid, EOK, size);
                 free(buf);
@@ -713 +713 @@
         
         if (interbuffer) {
-                if (ipc_share_out_start(fb_info.phone, interbuffer,
+                if (async_share_out_start(fb_info.phone, interbuffer,
                     AS_AREA_READ) != EOK) {
                         as_area_destroy(interbuffer);