mirror/opentracker
1
0
Fork 0
mirror of git://erdgeist.org/opentracker synced 2025-03-31 18:42:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Better track current iobatch

Browse Source
This commit is contained in:
Dirk Engling 2024-04-13 02:54:08 +02:00
parent 1a70d9f9ef
commit 3a6d99dd46
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
opentracker.c
View File

@ -238,8 +238,8 @@ static void handle_write( const int64 sock ) {
/* In a chunked transfer after all batches accumulated have been sent, wait for the next one */ /* In a chunked transfer after all batches accumulated have been sent, wait for the next one */
if( chunked ) { if( chunked ) {
//fprintf( stderr, "handle_write is STRUCT_HTTP_FLAG_CHUNKED_IN_TRANSFER => dont want write on sock %lld\n", sock); fprintf( stderr, "handle_write is STRUCT_HTTP_FLAG_CHUNKED_IN_TRANSFER => dont want write on sock %lld\n", sock);
//io_dontwantwrite( sock ); io_dontwantwrite( sock );
} else { } else {
fprintf( stderr, "handle_write is STRUCT_HTTP_FLAG_CHUNKED_IN_TRANSFER => handle dead on sock %lld\n", sock); fprintf( stderr, "handle_write is STRUCT_HTTP_FLAG_CHUNKED_IN_TRANSFER => handle dead on sock %lld\n", sock);
handle_dead( sock ); handle_dead( sock );

16
ot_http.c
View File

@ -123,6 +123,7 @@ ssize_t http_issue_error( const int64 sock, struct ot_workstruct *ws, int code )
ssize_t http_sendiovecdata( const int64 sock, struct ot_workstruct *ws, int iovec_entries, struct iovec *iovector, int is_partial ) { ssize_t http_sendiovecdata( const int64 sock, struct ot_workstruct *ws, int iovec_entries, struct iovec *iovector, int is_partial ) {
struct http_data *cookie = io_getcookie( sock ); struct http_data *cookie = io_getcookie( sock );
io_batch *current;
char *header; char *header;
const char *encoding = ""; const char *encoding = "";
int i; int i;
@ -169,15 +170,19 @@ fprintf(stderr, "http_sendiovecdata sending %d iovec entries found cookie->batch
if (!cookie->batch ) { if (!cookie->batch ) {
cookie->batch = malloc( sizeof(io_batch) ); cookie->batch = malloc( sizeof(io_batch) );
if (!cookie->batch) {
free(header);
iovec_free( &iovec_entries, &iovector );
HTTPERROR_500;
}
memset( cookie->batch, 0, sizeof(io_batch) ); memset( cookie->batch, 0, sizeof(io_batch) );
cookie->batches = 1; cookie->batches = 1;
} }
iob_addbuf_free( cookie->batch, header, header_size ); current = cookie->batch + cookie->batches - 1;
iob_addbuf_free( current, header, header_size );
/* Split huge iovectors into separate io_batches */ /* Split huge iovectors into separate io_batches */
for( i=0; i<iovec_entries; ++i ) { for( i=0; i<iovec_entries; ++i ) {
io_batch *current = cookie->batch + cookie->batches - 1;
/* If the current batch's limit is reached, try to reallocate a new batch to work on */ /* If the current batch's limit is reached, try to reallocate a new batch to work on */
if( current->bytesleft > OT_BATCH_LIMIT ) { if( current->bytesleft > OT_BATCH_LIMIT ) {
fprintf(stderr, "http_sendiovecdata found batch above limit: %zd\n", current->bytesleft); fprintf(stderr, "http_sendiovecdata found batch above limit: %zd\n", current->bytesleft);
@ -193,12 +198,13 @@ fprintf(stderr, "http_sendiovecdata calling iob_addbuf_free with %zd\n", iovecto
} }
free( iovector ); free( iovector );
if ( cookie->flag & STRUCT_HTTP_FLAG_CHUNKED_IN_TRANSFER ) if ( cookie->flag & STRUCT_HTTP_FLAG_CHUNKED_IN_TRANSFER )
iob_addbuf(cookie->batch + cookie->batches - 1, "\r\n", 2); iob_addbuf(current, "\r\n", 2);
} }
if ((cookie->flag & STRUCT_HTTP_FLAG_CHUNKED_IN_TRANSFER) && cookie->batch && !is_partial) { if ((cookie->flag & STRUCT_HTTP_FLAG_CHUNKED_IN_TRANSFER) && cookie->batch && !is_partial) {
fprintf(stderr, "http_sendiovecdata adds a terminating 0 size buffer to batch\n"); fprintf(stderr, "http_sendiovecdata adds a terminating 0 size buffer to batch\n");
iob_addbuf(cookie->batch + cookie->batches - 1, "0\r\n\r\n", 5); current = cookie->batch + cookie->batches - 1;
iob_addbuf(current, "0\r\n\r\n", 5);
cookie->flag &= ~STRUCT_HTTP_FLAG_CHUNKED_IN_TRANSFER; cookie->flag &= ~STRUCT_HTTP_FLAG_CHUNKED_IN_TRANSFER;
} }