Changeset f307f12 in mainline for uspace/srv/fs/tmpfs/tmpfs_ops.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/fs/tmpfs/tmpfs_ops.c (modified) (8 diffs)

uspace/srv/fs/tmpfs/tmpfs_ops.c

@@ -389 +389 @@
         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);
@@ -400 +400 @@
                 return;
         }
-        ipcarg_t retval = ipc_data_write_finalize(callid, opts, size);
+        ipcarg_t retval = async_data_write_finalize(callid, opts, size);
         if (retval != EOK) {
                 ipc_answer_0(rid, retval);
@@ -467 +467 @@
         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);
@@ -476 +476 @@
         if (nodep->type == TMPFS_FILE) {
                 bytes = max(0, min(nodep->size - pos, size));
-                (void) ipc_data_read_finalize(callid, nodep->data + pos,
+                (void) async_data_read_finalize(callid, nodep->data + pos,
                     bytes);
         } else {
@@ -503 +503 @@
                 dentryp = list_get_instance(lnk, tmpfs_dentry_t, link);
 
-                (void) ipc_data_read_finalize(callid, dentryp->name,
+                (void) async_data_read_finalize(callid, dentryp->name,
                     str_size(dentryp->name) + 1);
                 bytes = 1;
@@ -541 +541 @@
         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);
@@ -552 +552 @@
         if (pos + size <= nodep->size) {
                 /* The file size is not changing. */
-                (void) ipc_data_write_finalize(callid, nodep->data + pos, size);
+                (void) async_data_write_finalize(callid, nodep->data + pos, size);
                 ipc_answer_2(rid, EOK, size, nodep->size);
                 return;
@@ -574 +574 @@
         nodep->size += delta;
         nodep->data = newdata;
-        (void) ipc_data_write_finalize(callid, nodep->data + pos, size);
+        (void) async_data_write_finalize(callid, nodep->data + pos, size);
         ipc_answer_2(rid, EOK, size, nodep->size);
 }