crosstyan/iofthetiger
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sample_web_server: fix CTRL-C and high cpu usage issue

Browse Source 
fix #4
This commit is contained in:
Tao Guo
2024-11-14 14:21:35 -08:00
parent 435674a6f6
commit 5adc39806a
1 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/sample_web_server.zig
View File

@ -76,7 +76,7 @@ pub fn main() !void {
io.accept(*Acceptor, &acceptor, acceptCallback, &acceptor_completion, listener); io.accept(*Acceptor, &acceptor, acceptCallback, &acceptor_completion, listener);
// Wait while accepting. // Wait while accepting.
while (acceptor.accepting) try io.tick(); while (acceptor.accepting and running.load(.monotonic)) try io.run_for_ns(1 * std.time.ns_per_ms);
// Reset accepting flag. // Reset accepting flag.
acceptor.accepting = true; acceptor.accepting = true;
@ -111,7 +111,8 @@ fn logError(queue_mutex: *Thread.Mutex, queue: *Queue) void {
const Client = struct { const Client = struct {
allocator: mem.Allocator, allocator: mem.Allocator,
completion: IO.Completion, send_completion: IO.Completion,
recv_completion: IO.Completion,
io: *IO, io: *IO,
recv_buf: [Config.recv_buf_len]u8, recv_buf: [Config.recv_buf_len]u8,
socket: posix.socket_t, socket: posix.socket_t,
@ -143,7 +144,8 @@ fn handleClient(queue_mutex: *Thread.Mutex, queue: *Queue) !void {
var client_ptr = try allocator.create(Client); var client_ptr = try allocator.create(Client);
client_ptr.allocator = allocator; client_ptr.allocator = allocator;
client_ptr.io = &io; client_ptr.io = &io;
client_ptr.completion = undefined; client_ptr.send_completion = undefined;
client_ptr.recv_completion = undefined;
client_ptr.recv_buf = undefined; client_ptr.recv_buf = undefined;
client_ptr.socket = socket; client_ptr.socket = socket;
client_ptr.thread_id = thread_id; client_ptr.thread_id = thread_id;
@ -153,13 +155,13 @@ fn handleClient(queue_mutex: *Thread.Mutex, queue: *Queue) !void {
*Client, *Client,
client_ptr, client_ptr,
recvCallback, recvCallback,
&client_ptr.completion, &client_ptr.recv_completion,
socket, socket,
&client_ptr.recv_buf, &client_ptr.recv_buf,
); );
} }
try io.tick(); try io.run_for_ns(1 * std.time.ns_per_ms);
} }
} }
@ -187,6 +189,16 @@ fn recvCallback(
return; return;
} }
// Try to receive from client again (keep-alive).
client_ptr.io.recv(
*Client,
client_ptr,
recvCallback,
completion,
client_ptr.socket,
&client_ptr.recv_buf,
);
const response = const response =
\\HTTP/1.1 200 OK \\HTTP/1.1 200 OK
\\Connection: Keep-Alive \\Connection: Keep-Alive
@ -203,7 +215,7 @@ fn recvCallback(
*Client, *Client,
client_ptr, client_ptr,
sendCallback, sendCallback,
completion, &client_ptr.send_completion,
client_ptr.socket, client_ptr.socket,
response, response,
); );
@ -214,18 +226,9 @@ fn sendCallback(
completion: *IO.Completion, completion: *IO.Completion,
result: IO.SendError!usize, result: IO.SendError!usize,
) void { ) void {
_ = completion; // autofix
const sent = result catch @panic("sendCallback"); const sent = result catch @panic("sendCallback");
log.debug("{}: Sent {} to {}", .{ client_ptr.thread_id, sent, client_ptr.socket }); log.debug("{}: Sent {} to {}", .{ client_ptr.thread_id, sent, client_ptr.socket });
// Try to receive from client again (keep-alive).
client_ptr.io.recv(
*Client,
client_ptr,
recvCallback,
completion,
client_ptr.socket,
&client_ptr.recv_buf,
);
} }
fn closeCallback( fn closeCallback(