Changeset 7f389a5c


Ignore:
Timestamp:
Jul 16, 2020, 2:56:45 PM (15 months ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
arm-eh, jacob/cs343-translation, master, new-ast, new-ast-unique-expr
Children:
79306383
Parents:
0aec496
Message:

Added support for argument parsing.
Removed unnecessary headers.
Fixed magic number in splice.

Location:
benchmark/io/http
Files:
2 added
2 edited

Legend:

Unmodified
Added
Removed
  • benchmark/io/http/main.cfa

    r0aec496 r7f389a5c  
    77extern "C" {
    88        #include <sys/socket.h>
    9         #include <sys/types.h>
    109        #include <netinet/in.h>
    1110}
     
    1817#include "filecache.hfa"
    1918#include "options.hfa"
     19#include "parseargs.hfa"
    2020#include "worker.hfa"
    2121
     
    5757int main( int argc, char * argv[] ) {
    5858        int port      = 8080;
    59         int ret       = 0;
    6059        int backlog   = 10;
    6160        int nprocs    = 1;
     
    6665        //===================
    6766        // Parse args
     67        static cfa_option opt[] = {
     68                {'p', "port", "Port the server will listen on", port},
     69                {'c', "cpus", "Number of processors to use", nprocs},
     70                {'t', "threads", "Number of worker threads to use", nworkers},
     71                {'b', "accept-backlog", "Maximum number of pending accepts", backlog},
     72                {'B', "channel-size", "Maximum number of accepted connection pending", chan_size}
     73        };
     74        int opt_cnt = sizeof(opt) / sizeof(cfa_option);
     75
     76        char **left;
     77      parse_args( argc, argv, opt, opt_cnt, "[OPTIONS] [PATH]  -- cforall http server", left );
     78
    6879
    6980        //===================
     
    8091        }
    8192
     93        int ret = 0;
    8294        struct sockaddr_in address;
    8395        int addrlen = sizeof(address);
  • benchmark/io/http/worker.cfa

    r0aec496 r7f389a5c  
    77#include <string.h>
    88extern "C" {
     9        #include <fcntl.h>
    910        #include <sys/socket.h>
    1011        #include <sys/types.h>
    11         #include <linux/fcntl.h>
    12         #include <linux/stat.h>
    1312        #include <netinet/in.h>
    1413}
     
    3736        ssize_t ret;
    3837        SPLICE1: while(count > 0) {
    39                 ret = cfa_splice(ans_fd, &offset, this.pipe[1], 0p, count, 5);
     38                ret = cfa_splice(ans_fd, &offset, this.pipe[1], 0p, count, SPLICE_F_MOVE | SPLICE_F_MORE);
    4039                if( ret < 0 ) {
    4140                        if( errno != EAGAIN && errno != EWOULDBLOCK) continue SPLICE1;
     
    4746                size_t in_pipe = ret;
    4847                SPLICE2: while(in_pipe > 0) {
    49                         ret = cfa_splice(this.pipe[0], 0p, fd, 0p, in_pipe, 5);
     48                        ret = cfa_splice(this.pipe[0], 0p, fd, 0p, in_pipe, SPLICE_F_MOVE | SPLICE_F_MORE);
    5049                        if( ret < 0 ) {
    5150                                if( errno != EAGAIN && errno != EWOULDBLOCK) continue SPLICE2;
Note: See TracChangeset for help on using the changeset viewer.