factotum/nats.zig
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

thunks: also aligncast userdata

Browse Source 
This is probably the sort of thing that I wouldn't actually think of
having explicit test coverage for if I hadn't accidentally ran across
it while fiddling. I will compensate for this easily by not actually
writing tests at all.
This commit is contained in:
torque 2023-08-24 20:11:27 -07:00
parent 2e06f44aa8
commit 0dac8402cf
Signed by: torque
SSH Key Fingerprint: SHA256:nCrXefBNo6EbjNSQhv0nXmEg/VuNq3sMF5b8zETw3Tk
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/connection.zig
View File

@ -893,7 +893,7 @@ pub fn makeConnectionCallbackThunk(
return struct { return struct {
fn thunk(conn: ?*nats_c.natsConnection, userdata: ?*anyopaque) callconv(.C) void { fn thunk(conn: ?*nats_c.natsConnection, userdata: ?*anyopaque) callconv(.C) void {
const connection: *Connection = if (conn) |c| @ptrCast(c) else unreachable; const connection: *Connection = if (conn) |c| @ptrCast(c) else unreachable;
const data: *T = if (userdata) |u| @ptrCast(u) else unreachable; const data: *T = if (userdata) |u| @alignCast(@ptrCast(u)) else unreachable;
callback(connection, data); callback(connection, data);
} }
}.thunk; }.thunk;
@ -916,7 +916,7 @@ pub fn makeReconnectDelayCallbackThunk(
userdata: ?*anyopaque, userdata: ?*anyopaque,
) callconv(.C) i64 { ) callconv(.C) i64 {
const connection: *Connection = if (conn) |c| @ptrCast(c) else unreachable; const connection: *Connection = if (conn) |c| @ptrCast(c) else unreachable;
const data: *T = if (userdata) |u| @ptrCast(u) else unreachable; const data: *T = if (userdata) |u| @alignCast(@ptrCast(u)) else unreachable;
return callback(connection, attempts, data); return callback(connection, attempts, data);
} }
}.thunk; }.thunk;
@ -946,7 +946,7 @@ pub fn makeErrorHandlerCallbackThunk(
) callconv(.C) void { ) callconv(.C) void {
const connection: *Connection = if (conn) |c| @ptrCast(c) else unreachable; const connection: *Connection = if (conn) |c| @ptrCast(c) else unreachable;
const subscription: *Subscription = if (sub) |s| @ptrCast(s) else unreachable; const subscription: *Subscription = if (sub) |s| @ptrCast(s) else unreachable;
const data: *T = if (userdata) |u| @ptrCast(u) else unreachable; const data: *T = if (userdata) |u| @alignCast(@ptrCast(u)) else unreachable;
callback(connection, subscription, Status.fromInt(status), data); callback(connection, subscription, Status.fromInt(status), data);
} }
@ -1005,7 +1005,7 @@ pub fn makeEventLoopAddRemoveCallbackThunk(
userdata: ?*anyopaque, userdata: ?*anyopaque,
) callconv(.C) nats_c.natsStatus { ) callconv(.C) nats_c.natsStatus {
const connection: *Connection = if (conn) |c| @ptrCast(c) else unreachable; const connection: *Connection = if (conn) |c| @ptrCast(c) else unreachable;
const data: *T = if (userdata) |u| @ptrCast(u) else unreachable; const data: *T = if (userdata) |u| @alignCast(@ptrCast(u)) else unreachable;
callback(connection, attempts, data) catch |err| callback(connection, attempts, data) catch |err|
return Status.fromError(err).toInt(); return Status.fromError(err).toInt();
@ -1028,7 +1028,7 @@ pub fn makeEventLoopDetachCallbackThunk(
fn thunk( fn thunk(
userdata: ?*anyopaque, userdata: ?*anyopaque,
) callconv(.C) nats_c.natsStatus { ) callconv(.C) nats_c.natsStatus {
const data: *T = if (userdata) |u| @ptrCast(u) else unreachable; const data: *T = if (userdata) |u| @alignCast(@ptrCast(u)) else unreachable;
callback(data) catch |err| return Status.fromError(err).toInt(); callback(data) catch |err| return Status.fromError(err).toInt();
return nats_c.NATS_OK; return nats_c.NATS_OK;
} }
@ -1058,7 +1058,7 @@ pub fn makeJwtHandlerCallbackThunk(
err_out: *?[*:0]u8, err_out: *?[*:0]u8,
userdata: ?*anyopaque, userdata: ?*anyopaque,
) callconv(.C) nats_c.natsStatus { ) callconv(.C) nats_c.natsStatus {
const data: *T = if (userdata) |u| @ptrCast(u) else unreachable; const data: *T = if (userdata) |u| @alignCast(@ptrCast(u)) else unreachable;
switch (callback(data)) { switch (callback(data)) {
.jwt => |jwt| { .jwt => |jwt| {
@ -1099,7 +1099,7 @@ pub fn makeSignatureHandlerCallbackThunk(
nonce: [*:0]const u8, nonce: [*:0]const u8,
userdata: ?*anyopaque, userdata: ?*anyopaque,
) callconv(.C) nats_c.natsStatus { ) callconv(.C) nats_c.natsStatus {
const data: *T = if (userdata) |u| @ptrCast(u) else unreachable; const data: *T = if (userdata) |u| @alignCast(@ptrCast(u)) else unreachable;
switch (callback(std.mem.sliceTo(nonce, 0), data)) { switch (callback(std.mem.sliceTo(nonce, 0), data)) {
.signature => |sig| { .signature => |sig| {

2
src/subscription.zig
View File

@ -197,7 +197,7 @@ pub fn makeSubscriptionCallbackThunk(
const connection: *Connection = if (conn) |c| @ptrCast(c) else unreachable; const connection: *Connection = if (conn) |c| @ptrCast(c) else unreachable;
const subscription: *Subscription = if (sub) |s| @ptrCast(s) else unreachable; const subscription: *Subscription = if (sub) |s| @ptrCast(s) else unreachable;
const data: *T = if (userdata) |u| @ptrCast(u) else unreachable; const data: *T = if (userdata) |u| @alignCast(@ptrCast(u)) else unreachable;
callback(data, connection, subscription, message); callback(data, connection, subscription, message);
} }

2
src/thunk.zig
View File

@ -16,7 +16,7 @@ pub fn makeSimpleCallbackThunk(
) *const SimpleCallback { ) *const SimpleCallback {
return struct { return struct {
fn thunk(userdata: ?*anyopaque) callconv(.C) void { fn thunk(userdata: ?*anyopaque) callconv(.C) void {
const data: *T = if (userdata) |u| @ptrCast(u) else unreachable; const data: *T = if (userdata) |u| @alignCast(@ptrCast(u)) else unreachable;
callback(data); callback(data);
} }
}.thunk; }.thunk;