mirrors/bun.sh
1
0
Fork 0
mirror of https://github.com/oven-sh/bun synced 2026-02-14 12:51:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

auto uncork

Browse Source
This commit is contained in:
Jarred Sumner
2024-10-15 14:57:54 -07:00
parent ef4435d987
commit cd05556689
8 changed files with 62 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
packages/bun-uws/src/Loop.h
View File

@@ -24,6 +24,7 @@
#include "LoopData.h"
#include <libusockets.h>
#include <iostream>
#include "AsyncSocket.h"
extern "C" int bun_is_exiting();
@@ -52,6 +53,15 @@ private:
for (auto &p : loopData->preHandlers) {
p.second((Loop *) loop);
}
void *corkedSocket = loopData->getCorkedSocket();
if (corkedSocket) {
if (loopData->isCorkedSSL()) {
((uWS::AsyncSocket<true> *) corkedSocket)->uncork();
} else {
((uWS::AsyncSocket<false> *) corkedSocket)->uncork();
}
}
}
static void postCb(us_loop_t *loop) {
@@ -148,6 +158,10 @@ public:
getLazyLoop().loop = nullptr;
}
static LoopData* data(struct us_loop_t *loop) {
return (LoopData *) us_loop_ext(loop);
}
void addPostHandler(void *key, MoveOnlyFunction<void(Loop *)> &&handler) {
LoopData *loopData = (LoopData *) us_loop_ext((us_loop_t *) this);

1
packages/bun-uws/src/LoopData.h
View File

@@ -63,6 +63,7 @@ public:
}
delete [] corkBuffer;
}
void* getCorkedSocket() {
return this->corkedSocket;
}

10
src/bun.js/bindings/webcore/JSTextEncoder.cpp
View File

@@ -375,10 +375,9 @@ static inline JSC::EncodedJSValue jsTextEncoderPrototypeFunction_encodeBody(JSC:
{
auto& vm = JSC::getVM(lexicalGlobalObject);
auto throwScope = DECLARE_THROW_SCOPE(vm);
UNUSED_PARAM(throwScope);
UNUSED_PARAM(callFrame);
EnsureStillAliveScope argument0 = callFrame->argument(0);
JSC::JSString* input = argument0.value().toStringOrNull(lexicalGlobalObject);
JSC::JSString* input = argument0.value().toString(lexicalGlobalObject);
RETURN_IF_EXCEPTION(throwScope, {});
JSC::EncodedJSValue res;
String str;
if (input->is8Bit()) {
@@ -397,11 +396,6 @@ static inline JSC::EncodedJSValue jsTextEncoderPrototypeFunction_encodeBody(JSC:
res = TextEncoder__encode16(lexicalGlobalObject, str.span16().data(), str.length());
}
if (UNLIKELY(JSC::JSValue::decode(res).isObject() && JSC::JSValue::decode(res).getObject()->isErrorInstance())) {
throwScope.throwException(lexicalGlobalObject, JSC::JSValue::decode(res));
return {};
}
RELEASE_AND_RETURN(throwScope, res);
}

29
src/bun.js/event_loop.zig
View File

@@ -821,7 +821,10 @@ pub const EventLoop = struct {
defer this.debug.exit();
if (count == 1) {
this.drainMicrotasksWithGlobal(this.global, this.virtual_machine.jsc);
const vm = this.virtual_machine;
const global = this.global;
const jsc = vm.jsc;
this.drainTasks(vm, global, jsc);
}
this.entered_event_loop_count -= 1;
@@ -1479,6 +1482,19 @@ pub const EventLoop = struct {
this.virtual_machine.gc_controller.processGCTimer();
}
pub fn drainTasks(this: *EventLoop, ctx: *JSC.VirtualMachine, global: *JSC.JSGlobalObject, js_vm: *JSC.VM) void {
while (true) {
while (this.tickWithCount(ctx) > 0) : (global.handleRejectedPromises()) {
this.tickConcurrent();
} else {
this.drainMicrotasksWithGlobal(global, js_vm);
this.tickConcurrent();
if (this.tasks.count > 0) continue;
}
break;
}
}
pub fn tick(this: *EventLoop) void {
JSC.markBinding(@src());
{
@@ -1496,16 +1512,7 @@ pub const EventLoop = struct {
const global = ctx.global;
const global_vm = ctx.jsc;
while (true) {
while (this.tickWithCount(ctx) > 0) : (this.global.handleRejectedPromises()) {
this.tickConcurrent();
} else {
this.drainMicrotasksWithGlobal(global, global_vm);
this.tickConcurrent();
if (this.tasks.count > 0) continue;
}
break;
}
this.drainTasks(ctx, global, global_vm);
while (this.tickWithCount(ctx) > 0) {
this.tickConcurrent();

2
src/bun.js/javascript.zig
View File

@@ -2562,7 +2562,7 @@ pub const VirtualMachine = struct {
pub const main_file_name: string = "bun:main";
pub fn drainMicrotasks(this: *VirtualMachine) void {
this.eventLoop().drainMicrotasks();
this.eventLoop().drainTasks(this, this.global, this.jsc);
}
pub fn processFetchLog(globalThis: *JSGlobalObject, specifier: bun.String, referrer: bun.String, log: *logger.Log, ret: *ErrorableResolvedSource, err: anyerror) void {

8
src/bun.js/webcore/encoding.zig
View File

@@ -59,13 +59,14 @@ pub const TextEncoder = struct {
const uint8array = JSC.JSValue.createUninitializedUint8Array(globalThis, result.written);
bun.assert(result.written <= buf.len);
bun.assert(result.read == slice.len);
const array_buffer = uint8array.asArrayBuffer(globalThis).?;
const array_buffer = uint8array.asArrayBuffer(globalThis) orelse return .zero;
bun.assert(result.written == array_buffer.len);
@memcpy(array_buffer.byteSlice()[0..result.written], buf[0..result.written]);
return uint8array;
} else {
const bytes = strings.allocateLatin1IntoUTF8(globalThis.bunVM().allocator, []const u8, slice) catch {
return JSC.toInvalidArguments("Out of memory", .{}, globalThis);
globalThis.throwOutOfMemory();
return .zero;
};
bun.assert(bytes.len >= slice.len);
return ArrayBuffer.fromBytes(bytes, .Uint8Array).toJSUnchecked(globalThis, null);
@@ -112,7 +113,8 @@ pub const TextEncoder = struct {
@TypeOf(slice),
slice,
) catch {
return JSC.toInvalidArguments("Out of memory", .{}, globalThis);
globalThis.throwOutOfMemory();
return .zero;
};
return ArrayBuffer.fromBytes(bytes, .Uint8Array).toJSUnchecked(globalThis, null);
}

12
src/deps/libuwsockets.cpp
View File

@@ -119,6 +119,18 @@ extern "C"
}
}
extern "C" void uws_res_clear_corked_socket(us_loop_t *loop) {
uWS::LoopData *loopData = uWS::Loop::data(loop);
void *corkedSocket = loopData->getCorkedSocket();
if (corkedSocket) {
if (loopData->isCorkedSSL()) {
((uWS::AsyncSocket<true> *) corkedSocket)->uncork();
} else {
((uWS::AsyncSocket<false> *) corkedSocket)->uncork();
}
}
}
void uws_app_delete(int ssl, uws_app_t *app, const char *pattern, uws_method_handler handler, void *user_data)
{
if (ssl)

9
src/deps/uws.zig
View File

@@ -2372,6 +2372,10 @@ pub const PosixLoop = extern struct {
const log = bun.Output.scoped(.Loop, false);
pub fn uncork(this: *PosixLoop) void {
uws_res_clear_corked_socket(this);
}
pub fn iterationNumber(this: *const PosixLoop) u64 {
return this.internal_loop_data.iteration_nr;
}
@@ -4103,6 +4107,10 @@ pub const WindowsLoop = extern struct {
pre: *uv.uv_prepare_t,
check: *uv.uv_check_t,
pub fn uncork(this: *PosixLoop) void {
uws_res_clear_corked_socket(this);
}
pub fn get() *WindowsLoop {
return uws_get_loop_with_native(bun.windows.libuv.Loop.get());
}
@@ -4418,3 +4426,4 @@ pub fn onThreadExit() void {
}
extern fn uws_app_clear_routes(ssl_flag: c_int, app: *uws_app_t) void;
extern fn uws_res_clear_corked_socket(loop: *Loop) void;