Skip to content

Commit 69a5f40

Browse files
olsonjefferybrson
authored andcommitted
---
yaml --- r: 15983 b: refs/heads/try c: 8769409 h: refs/heads/master i: 15981: 3a6ab1d 15979: 2551abd 15975: 3a31fac 15967: 7770521 v: v3
1 parent cb3943a commit 69a5f40

File tree

3 files changed

+13
-1
lines changed

3 files changed

+13
-1
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
5-
refs/heads/try: 733881d8522ac7b3873cc16b25ce4c6d83edfdd0
5+
refs/heads/try: 8769409612be396c77184a603ea344851b5a0e76
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/rt/rust_uv.cpp

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -450,3 +450,13 @@ rust_uv_get_kernel_global_chan_ptr() {
450450
LOG(task, stdlib,"global loop val: %lu", (unsigned long int)*result);
451451
return result;
452452
}
453+
454+
extern "C" void*
455+
rust_uv_current_kernel_malloc(size_t size) {
456+
return current_kernel_malloc(size, "rust_uv_current_kernel_malloc");
457+
}
458+
459+
extern "C" void*
460+
rust_uv_current_kernel_free(void* mem) {
461+
return current_kernel_free(mem);
462+
}

branches/try/src/rt/rustrt.def.in

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,8 @@ rust_uv_set_data_for_req
143143
rust_uv_get_base_from_buf
144144
rust_uv_get_len_from_buf
145145
rust_uv_get_kernel_global_chan_ptr
146+
rust_uv_current_kernel_malloc
147+
rust_uv_current_kernel_free
146148
rust_dbg_lock_create
147149
rust_dbg_lock_destroy
148150
rust_dbg_lock_lock

0 commit comments

Comments
 (0)