Changeset 92538ab for benchmark/io/http/protocol.hfa

Timestamp:

Apr 10, 2022, 2:53:18 PM (4 years ago)

Author:

JiadaL <j82liang@…>

Branches:

ADT, ast-experimental, enum, master, pthread-emulation, qualifiedEnum

Children:

d8e2a09

Parents:

4559b34 (diff), 6256891 (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:

Resolve conflict

File:

• benchmark/io/http/protocol.hfa (modified) (2 diffs)

benchmark/io/http/protocol.hfa

@@ -1 +1 @@
 #pragma once
+
+struct sendfile_stats_t;
 
 enum HttpCode {
@@ -18 +20 @@
 int answer_plaintext( int fd );
 int answer_empty( int fd );
-int answer_sendfile( int pipe[2], int fd, int ans_fd, size_t count );
+int answer_sendfile( int pipe[2], int fd, int ans_fd, size_t count, struct sendfile_stats_t & );
 
 [HttpCode code, bool closed, * const char file, size_t len] http_read(int fd, []char buffer, size_t len);