Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[pull] master from ithewei:master #54

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 16, 2025
Merged

[pull] master from ithewei:master #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions event/hevent.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,7 @@ static void fill_io_type(hio_t* io) {
}

static void hio_socket_init(hio_t* io) {
if ((io->io_type & HIO_TYPE_SOCK_DGRAM) || (io->io_type & HIO_TYPE_SOCK_RAW)) {
// NOTE: sendto multiple peeraddr cannot use io->write_queue
blocking(io->fd);
} else {
nonblocking(io->fd);
}
nonblocking(io->fd);
// fill io->localaddr io->peeraddr
if (io->localaddr == NULL) {
HV_ALLOC(io->localaddr, sizeof(sockaddr_u));
Expand Down
30 changes: 21 additions & 9 deletions event/nio.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,11 @@ static void nio_write(hio_t* io) {
char* base = pbuf->base;
char* buf = base + pbuf->offset;
int len = pbuf->len - pbuf->offset;
nwrite = __nio_write(io, buf, len, NULL);
struct sockaddr* addr = NULL;
if (io->io_type & (HIO_TYPE_SOCK_DGRAM | HIO_TYPE_SOCK_RAW)) {
addr = (struct sockaddr*)base;
}
nwrite = __nio_write(io, buf, len, addr);
// printd("write retval=%d\n", nwrite);
if (nwrite < 0) {
err = socket_errno();
Expand Down Expand Up @@ -526,26 +530,34 @@ static int hio_write4 (hio_t* io, const void* buf, size_t len, struct sockaddr*
hio_add(io, hio_handle_events, HV_WRITE);
}
if (nwrite < len) {
if (io->write_bufsize + len - nwrite > io->max_write_bufsize) {
size_t unwritten_len = len - nwrite;
if (io->write_bufsize + unwritten_len > io->max_write_bufsize) {
hloge("write bufsize > %u, close it!", io->max_write_bufsize);
io->error = ERR_OVER_LIMIT;
goto write_error;
}
size_t addrlen = 0;
if ((io->io_type & (HIO_TYPE_SOCK_DGRAM | HIO_TYPE_SOCK_RAW)) && addr) {
addrlen = SOCKADDR_LEN(addr);
}
offset_buf_t remain;
remain.len = len - nwrite;
remain.offset = 0;
remain.offset = addrlen;
remain.len = addrlen + unwritten_len;
// NOTE: free in nio_write
HV_ALLOC(remain.base, remain.len);
memcpy(remain.base, ((char*)buf) + nwrite, remain.len);
if (addr && addrlen > 0) {
memcpy(remain.base, addr, addrlen);
}
memcpy(remain.base + remain.offset, ((char*)buf) + nwrite, unwritten_len);
if (io->write_queue.maxsize == 0) {
write_queue_init(&io->write_queue, 4);
}
write_queue_push_back(&io->write_queue, &remain);
io->write_bufsize += remain.len;
io->write_bufsize += unwritten_len;
if (io->write_bufsize > WRITE_BUFSIZE_HIGH_WATER) {
hlogw("write len=%u enqueue %u, bufsize=%u over high water %u",
(unsigned int)len,
(unsigned int)(remain.len - remain.offset),
(unsigned int)unwritten_len,
(unsigned int)io->write_bufsize,
(unsigned int)WRITE_BUFSIZE_HIGH_WATER);
}
Expand All @@ -571,11 +583,11 @@ static int hio_write4 (hio_t* io, const void* buf, size_t len, struct sockaddr*
}

int hio_write (hio_t* io, const void* buf, size_t len) {
return hio_write4(io, buf, len, NULL);
return hio_write4(io, buf, len, io->peeraddr);
}

int hio_sendto (hio_t* io, const void* buf, size_t len, struct sockaddr* addr) {
return hio_write4(io, buf, len, addr);
return hio_write4(io, buf, len, addr ? addr : io->peeraddr);
}

int hio_close (hio_t* io) {
Expand Down
4 changes: 2 additions & 2 deletions event/overlapio.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,11 +380,11 @@ static int hio_write4 (hio_t* io, const void* buf, size_t len, struct sockaddr*
}

int hio_write (hio_t* io, const void* buf, size_t len) {
return hio_write4(io, buf, len, NULL);
return hio_write4(io, buf, len, io->peeraddr);
}

int hio_sendto (hio_t* io, const void* buf, size_t len, struct sockaddr* addr) {
return hio_write4(io, buf, len, addr);
return hio_write4(io, buf, len, addr ? addr : io->peeraddr);
}

int hio_close (hio_t* io) {
Expand Down
Loading