Changeset 97748ee

Timestamp:

Jan 13, 2021, 1:38:51 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

a00bc5b

Parents:

7270432

Message:

Worker now supports /ping uri which just answers empty reponse.

File:

• benchmark/io/http/worker.cfa (modified) (2 diffs)

benchmark/io/http/worker.cfa

@@ -65 +65 @@
                         // If this wasn't a request retrun 400
                         if( code != OK200 ) {
-                                if( options.log ) printf("=== Invalid Request : %d ===\n", code_val(code));
+                                printf("=== Invalid Request : %d ===\n", code_val(code));
                                 answer_error(fd, code);
                                 continue REQUEST;
@@ -77 +77 @@
                                 // Send the header
                                 answer_plain(fd, text, sizeof(text));
+
+                                if( options.log ) printf("=== Answer sent ===\n");
+                                continue REQUEST;
                         }
-                        else {
-                                if( options.log ) printf("=== Request for file %.*s ===\n", (int)name_size, file);
 
-                                // Get the fd from the file cache
-                                int ans_fd;
-                                size_t count;
-                                [ans_fd, count] = get_file( file, name_size );
-
-                                // If we can't find the file, return 404
-                                if( ans_fd < 0 ) {
-                                        if( options.log ) printf("=== File Not Found ===\n");
-                                        answer_error(fd, E404);
-                                        continue REQUEST;
-                                }
+                        if(0 == strncmp(file, "ping", min(name_size, sizeof("ping") ))) {
+                                if( options.log ) printf("=== Request for /ping ===\n");
 
                                 // Send the header
-                                answer_header(fd, count);
+                                answer_empty(fd);
 
-                                // Send the desired file
-                                sendfile( this.pipe, fd, ans_fd, count);
+                                if( options.log ) printf("=== Answer sent ===\n");
+                                continue REQUEST;
                         }
+
+                        if( options.log ) printf("=== Request for file %.*s ===\n", (int)name_size, file);
+
+                        // Get the fd from the file cache
+                        int ans_fd;
+                        size_t count;
+                        [ans_fd, count] = get_file( file, name_size );
+
+                        // If we can't find the file, return 404
+                        if( ans_fd < 0 ) {
+                                printf("=== File Not Found ===\n");
+                                answer_error(fd, E404);
+                                continue REQUEST;
+                        }
+
+                        // Send the header
+                        answer_header(fd, count);
+
+                        // Send the desired file
+                        sendfile( this.pipe, fd, ans_fd, count);
 
                         if( options.log ) printf("=== Answer sent ===\n");