Changeset 1da7397 for libcfa/src/concurrency/clib/cfathread.cfa

Timestamp:

Mar 27, 2021, 6:04:14 PM (5 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum, stuck-waitfor-destruct

Children:

fec3e9a

Parents:

2644610 (diff), f8a7fed (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:

fix conflict

File:

• libcfa/src/concurrency/clib/cfathread.cfa (modified) (4 diffs)

libcfa/src/concurrency/clib/cfathread.cfa

@@ -58 +58 @@
         this.themain = themain;
         this.arg = arg;
-        ((thread&)this){"C-thread", cl};
+        (this.self){"C-thread", cl};
         __thrd_start(this, main);
 }
@@ -102 +102 @@
         this.init = init;
         this.arg = arg;
-        ((thread&)this){"Processir Init"};
+        (this.self){"Processir Init"};
 
         // Don't use __thrd_start! just prep the context manually
@@ -312 +312 @@
 
         ssize_t cfathread_write(int fildes, const void *buf, size_t nbyte) {
-                return cfa_write(fildes, buf, nbyte, CFA_IO_LAZY);
+                // Use send rather then write for socket since it's faster
+                return cfa_send(fildes, buf, nbyte, 0, CFA_IO_LAZY);
         }
 
@@ -335 +336 @@
 
         ssize_t cfathread_read(int fildes, void *buf, size_t nbyte) {
-                return cfa_read(fildes, buf, nbyte, CFA_IO_LAZY);
-        }
-
-}
+                // Use recv rather then read for socket since it's faster
+                return cfa_recv(fildes, buf, nbyte, 0, CFA_IO_LAZY);
+        }
+
+}