Changeset 54f89d5 for example/io/simple/server.cfa

Timestamp:

Dec 4, 2020, 11:39:23 AM (3 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

Children:

3c6480b7

Parents:

ab0257b9 (diff), a32cbac2 (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 branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• example/io/simple/server.cfa (modified) (8 diffs)

example/io/simple/server.cfa

@@ -13 +13 @@
 #include <time.hfa>
 #include <thread.hfa>
+#include <concurrency/iofwd.hfa>
 
 //----------
@@ -21 +22 @@
 }
 
-void message( Printer & mutex, char * msg, size_t len ) {
-        fprintf(stderr, "'%.*s'", len, msg);
+void message( Printer & mutex, char * _msg, size_t len ) {
+        fprintf(stderr, "'%.*s'", len, _msg);
 }
 
@@ -29 +30 @@
 }
 
-void error( Printer & mutex, const char * msg, int error) {
-        fprintf(stderr, "%s - %s\n", msg, strerror(error));
+void error( Printer & mutex, const char * _msg, int error) {
+        fprintf(stderr, "%s - %s\n", _msg, strerror(error));
 }
 
@@ -49 +50 @@
         }
 }
-
-//----------
-extern ssize_t cfa_recvmsg(int sockfd, struct msghdr *msg, int flags);
-extern int cfa_accept4(int sockfd, struct sockaddr *addr, socklen_t *addrlen, int flags);
-extern int cfa_close(int fd);
 
 //----------
@@ -88 +84 @@
         struct sockaddr_in cli_addr;
         __socklen_t clilen = sizeof(cli_addr);
-        int newsock = cfa_accept4(sock, (struct sockaddr *) &cli_addr, &clilen, 0);
+        int newsock = cfa_accept4(sock, (struct sockaddr *) &cli_addr, &clilen, 0, 0, -1`s, 0p, 0p);
         if (newsock < 0) {
                 error( printer, "accept", -newsock);
@@ -97 +93 @@
 
         while(1) {
-                int res = cfa_recvmsg(newsock, &msg, 0);
+                int res = cfa_recvmsg(newsock, &msg, 0, 0, -1`s, 0p, 0p);
                 if(res == 0) break;
                 if(res < 0) {
@@ -107 +103 @@
         }
 
-        ret = cfa_close(newsock);
+        ret = cfa_close(newsock, 0, -1`s, 0p, 0p);
       if(ret < 0) {
             error( printer, "close new", -ret);
@@ -113 +109 @@
       }
 
-        ret = cfa_close(sock);
+        ret = cfa_close(sock, 0, -1`s, 0p, 0p);
       if(ret < 0) {
             error( printer, "close old", -ret);