aboutsummaryrefslogtreecommitdiff
path: root/packages/bun-uws
diff options
context:
space:
mode:
authorGravatar Dylan Conway <dylan.conway567@gmail.com> 2023-10-10 15:28:08 -0700
committerGravatar Dylan Conway <dylan.conway567@gmail.com> 2023-10-10 15:28:08 -0700
commitee2e34866e3bc0d12ba5cb1d5041524776472d71 (patch)
tree3f71bf8153545396ba38294f8577e77ce0b12439 /packages/bun-uws
parente6d97f2581959d77a5b486faefbfdf094abedf9b (diff)
parent6301778a589254e2c3c0d95f768fce303f528b03 (diff)
downloadbun-ee2e34866e3bc0d12ba5cb1d5041524776472d71.tar.gz
bun-ee2e34866e3bc0d12ba5cb1d5041524776472d71.tar.zst
bun-ee2e34866e3bc0d12ba5cb1d5041524776472d71.zip
Merge branch 'main' into dylan/github-api-option
Diffstat (limited to 'packages/bun-uws')
-rw-r--r--packages/bun-uws/capi/examples/Broadcast.c4
-rw-r--r--packages/bun-uws/capi/examples/HelloWorldAsync.c4
-rw-r--r--packages/bun-uws/capi/examples/UpgradeAsync.c4
-rw-r--r--packages/bun-uws/examples/UpgradeAsync.cpp2
-rw-r--r--packages/bun-uws/src/Loop.h2
5 files changed, 8 insertions, 8 deletions
diff --git a/packages/bun-uws/capi/examples/Broadcast.c b/packages/bun-uws/capi/examples/Broadcast.c
index dc6787349..ef1b09101 100644
--- a/packages/bun-uws/capi/examples/Broadcast.c
+++ b/packages/bun-uws/capi/examples/Broadcast.c
@@ -14,7 +14,7 @@ void uws_timer_close(struct us_timer_t *timer)
struct timer_handler_data *data;
memcpy(&data, us_timer_ext(t), sizeof(struct timer_handler_data *));
free(data);
- us_timer_close(t);
+ us_timer_close(t, 0);
}
//Timer create helper
struct us_timer_t *uws_create_timer(int ms, int repeat_ms, void (*handler)(void *data), void *data)
@@ -47,7 +47,7 @@ struct us_timer_t *uws_create_timer(int ms, int repeat_ms, void (*handler)(void
if (!data->repeat)
{
free(data);
- us_timer_close(t);
+ us_timer_close(t, 0);
}
},
ms, repeat_ms);
diff --git a/packages/bun-uws/capi/examples/HelloWorldAsync.c b/packages/bun-uws/capi/examples/HelloWorldAsync.c
index b8549b07e..e22dd44c1 100644
--- a/packages/bun-uws/capi/examples/HelloWorldAsync.c
+++ b/packages/bun-uws/capi/examples/HelloWorldAsync.c
@@ -19,7 +19,7 @@ void uws_timer_close(struct us_timer_t *timer)
struct timer_handler_data *data;
memcpy(&data, us_timer_ext(t), sizeof(struct timer_handler_data *));
free(data);
- us_timer_close(t);
+ us_timer_close(t, 0);
}
//Timer create helper
struct us_timer_t *uws_create_timer(int ms, int repeat_ms, void (*handler)(void *data), void *data)
@@ -52,7 +52,7 @@ struct us_timer_t *uws_create_timer(int ms, int repeat_ms, void (*handler)(void
if (!data->repeat)
{
free(data);
- us_timer_close(t);
+ us_timer_close(t, 0);
}
},
ms, repeat_ms);
diff --git a/packages/bun-uws/capi/examples/UpgradeAsync.c b/packages/bun-uws/capi/examples/UpgradeAsync.c
index 3dacd8c8e..8c6e73542 100644
--- a/packages/bun-uws/capi/examples/UpgradeAsync.c
+++ b/packages/bun-uws/capi/examples/UpgradeAsync.c
@@ -62,7 +62,7 @@ void uws_timer_close(struct us_timer_t *timer)
struct timer_handler_data *data;
memcpy(&data, us_timer_ext(t), sizeof(struct timer_handler_data *));
free(data);
- us_timer_close(t);
+ us_timer_close(t, 0);
}
//Timer create helper
struct us_timer_t *uws_create_timer(int ms, int repeat_ms, void (*handler)(void *data), void *data)
@@ -95,7 +95,7 @@ struct us_timer_t *uws_create_timer(int ms, int repeat_ms, void (*handler)(void
if (!data->repeat)
{
free(data);
- us_timer_close(t);
+ us_timer_close(t, 0);
}
},
ms, repeat_ms);
diff --git a/packages/bun-uws/examples/UpgradeAsync.cpp b/packages/bun-uws/examples/UpgradeAsync.cpp
index 0c5301be4..045605831 100644
--- a/packages/bun-uws/examples/UpgradeAsync.cpp
+++ b/packages/bun-uws/examples/UpgradeAsync.cpp
@@ -90,7 +90,7 @@ int main() {
delete upgradeData;
- us_timer_close(t);
+ us_timer_close(t, 0);
}, 5000, 0);
},
diff --git a/packages/bun-uws/src/Loop.h b/packages/bun-uws/src/Loop.h
index d3ca45b58..7311dd976 100644
--- a/packages/bun-uws/src/Loop.h
+++ b/packages/bun-uws/src/Loop.h
@@ -126,7 +126,7 @@ public:
LoopData *loopData = (LoopData *) us_loop_ext((us_loop_t *) this);
/* Stop and free dateTimer first */
- us_timer_close(loopData->dateTimer);
+ us_timer_close(loopData->dateTimer, 1);
loopData->~LoopData();
/* uSockets will track whether this loop is owned by us or a borrowed alien loop */