aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar Jarred Sumner <709451+Jarred-Sumner@users.noreply.github.com> 2023-02-25 18:21:44 -0800
committerGravatar Jarred Sumner <709451+Jarred-Sumner@users.noreply.github.com> 2023-02-25 18:23:01 -0800
commit8ba65a4f0bbd38b5c6a677d93d1fa13d0042bb35 (patch)
treea46cd8cc292091e9c52e26d7e00dc3c737380e95 /src
parent4149b9554325106cab4a0057e192cc3c1986d503 (diff)
downloadbun-8ba65a4f0bbd38b5c6a677d93d1fa13d0042bb35.tar.gz
bun-8ba65a4f0bbd38b5c6a677d93d1fa13d0042bb35.tar.zst
bun-8ba65a4f0bbd38b5c6a677d93d1fa13d0042bb35.zip
Fixes #2194 (most likely)
Diffstat (limited to '')
-rw-r--r--src/boringssl.zig19
1 files changed, 8 insertions, 11 deletions
diff --git a/src/boringssl.zig b/src/boringssl.zig
index a6e767428..de5277a98 100644
--- a/src/boringssl.zig
+++ b/src/boringssl.zig
@@ -15,11 +15,8 @@ pub fn load() void {
boring.OpenSSL_add_all_algorithms();
if (!builtin.is_test) {
- comptime {
- @export(bun.Mimalloc.mi_malloc, .{ .name = "OPENSSL_memory_alloc", .linkage = .Strong });
- @export(bun.Mimalloc.mi_usable_size, .{ .name = "OPENSSL_memory_get_size", .linkage = .Strong });
- }
-
+ std.mem.doNotOptimizeAway(&OPENSSL_memory_alloc);
+ std.mem.doNotOptimizeAway(&OPENSSL_memory_get_size);
std.mem.doNotOptimizeAway(&OPENSSL_memory_free);
}
}
@@ -62,9 +59,9 @@ pub fn initClient() *boring.SSL {
// into the process, including pthreads locks. Failing to meet these constraints
// may result in deadlocks, crashes, or memory corruption.
-// export fn OPENSSL_memory_alloc(size: usize) ?*anyopaque {
-// return
-// }
+export fn OPENSSL_memory_alloc(size: usize) ?*anyopaque {
+ return bun.Mimalloc.mi_malloc(size);
+}
// BoringSSL always expects memory to be zero'd
export fn OPENSSL_memory_free(ptr: *anyopaque) void {
@@ -72,9 +69,9 @@ export fn OPENSSL_memory_free(ptr: *anyopaque) void {
bun.Mimalloc.mi_free(ptr);
}
-// export fn OPENSSL_memory_get_size(ptr: ?*const anyopaque) usize {
-// return bun.Mimalloc.mi_usable_size(ptr);
-// }
+export fn OPENSSL_memory_get_size(ptr: ?*const anyopaque) usize {
+ return bun.Mimalloc.mi_usable_size(ptr);
+}
test "load" {
load();
c08c03&follow=1'>implement a custom websocket clientGravatar Jarred Sumner 9-75/+1171 2022-06-22It connects! but the frames are corruptGravatar Jarred Sumner 3-31/+34 2022-06-22WebSocket is a globalGravatar Jarred Sumner 23-266/+350 2022-06-22Fix most of the errorsGravatar Jarred Sumner 6-119/+117 2022-06-22more codeGravatar Jarred Sumner 4-58/+209 2022-06-22WIP WebSocketGravatar Jarred Sumner 19-22/+3701 2022-06-20Group zsh completion options by type (#194)Gravatar Alexander Kuznetsov 1-28/+16 2022-06-17Import most of `MessageEvent` from WebKitGravatar Jarred Sumner 18-12/+1410 2022-06-15some more testsGravatar Jarred Sumner 2-10/+62 2022-06-15Update WebKitGravatar Jarred Sumner 1-0/+0 2022-06-15[web standards] Add `CloseEvent` from WebKitGravatar Jarred Sumner 9-6/+636 2022-06-15Fix lazy loading internal streamsGravatar Jarred Sumner 13-360/+424 2022-06-15direct streams mostly workjarred/directGravatar Jarred Sumner 26-1167/+1782 2022-06-15wip direct streamsGravatar Jarred Sumner 24-398/+2276 2022-06-12ArrayBufferSink works and it's good.Gravatar Jarred Sumner 26-170/+2054 2022-06-12Fix build issueGravatar Jarred Sumner 2-0/+6 2022-06-12Delete broken submoduleGravatar Jarred Sumner 1-0/+0 2022-06-10Update Dockerfile.baseGravatar Jarred Sumner 1-1/+1 2022-06-10Update WebKitGravatar Jarred Sumner 1-0/+0 2022-06-10Update event_loop.zigGravatar Jarred Sumner 1-0/+1 2022-06-10Missing errno on linuxGravatar Jarred Sumner 1-3/+1 2022-06-10Update js_parser.zigGravatar Jarred Sumner 1-21/+200 2022-06-10Update MakefileGravatar Jarred Sumner 1-4/+4 2022-06-10wip fix linux buildGravatar Jarred Sumner 1-9/+11 2022-06-10Don't show generic crash info when given invalid bunfig.tomlGravatar Jarred Sumner 1-0/+4 2022-06-10Update logger.zigGravatar Jarred Sumner 1-0/+4 2022-06-10Show tracingGravatar Jarred Sumner 1-1/+1 2022-06-10Update bunfig.zigGravatar Jarred Sumner 1-0/+1 2022-06-10Update jest.zigGravatar Jarred Sumner 1-6/+9 2022-06-09Update bun.d.tsGravatar Jarred Sumner 1-2/+5 2022-06-09Add typesGravatar Jarred Sumner 1-2/+32 2022-06-09`new Response(stream).arrayBuffer()` + 3 moreGravatar Jarred Sumner 16-39/+478 2022-06-09fix some memory leaks with stringsGravatar Jarred Sumner 4-28/+45 2022-06-09Support console.log(myBigInt)Gravatar Jarred Sumner 1-1/+6 2022-06-09Fix defaultProps with JSX optimizationGravatar Jarred Sumner 6-34/+73 2022-06-09small perf improvements to encodingGravatar Jarred Sumner 1-43/+37 2022-06-07Update event_loop.zigGravatar Jarred Sumner 1-1/+2