fluencelabs/wasmer
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasmer synced 2025-06-20 04:06:30 +00:00
Code Issues Projects Releases Wiki Activity

fix warnings; rm dbg statements

Browse Source
This commit is contained in:
Mark McCaskey
2019-07-01 12:57:33 -07:00
parent d825fe9eb2
commit 6afc2e4fd9
3 changed files with 10 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
lib/emscripten/src/env/unix/mod.rs vendored
View File

@ -195,7 +195,7 @@ pub fn _getaddrinfo(
}); });
let hints = hints_ptr.deref(memory).map(|hints_memory| { let hints = hints_ptr.deref(memory).map(|hints_memory| {
let hints_guest = dbg!(hints_memory.get()); let hints_guest = hints_memory.get();
unsafe { unsafe {
let mut hints_native: addrinfo = std::mem::uninitialized(); let mut hints_native: addrinfo = std::mem::uninitialized();
hints_native.ai_flags = hints_guest.ai_flags; hints_native.ai_flags = hints_guest.ai_flags;
@ -231,7 +231,7 @@ pub fn _getaddrinfo(
&mut out_ptr as *mut *mut addrinfo, &mut out_ptr as *mut *mut addrinfo,
) )
}; };
if dbg!(result) != 0 { if result != 0 {
return result; return result;
} }
@ -245,7 +245,6 @@ pub fn _getaddrinfo(
let current_guest_node_ptr: WasmPtr<EmAddrInfo> = let current_guest_node_ptr: WasmPtr<EmAddrInfo> =
call_malloc_with_cast(ctx, std::mem::size_of::<EmAddrInfo>() as _); call_malloc_with_cast(ctx, std::mem::size_of::<EmAddrInfo>() as _);
if head_of_list.is_none() { if head_of_list.is_none() {
dbg!("Setting head of list");
head_of_list = Some(current_guest_node_ptr); head_of_list = Some(current_guest_node_ptr);
} }
@ -253,7 +252,6 @@ pub fn _getaddrinfo(
if let Some(prev_guest) = previous_guest_node { if let Some(prev_guest) = previous_guest_node {
let mut pg = prev_guest.deref_mut(ctx.memory(0)).unwrap().get_mut(); let mut pg = prev_guest.deref_mut(ctx.memory(0)).unwrap().get_mut();
pg.ai_next = current_guest_node_ptr; pg.ai_next = current_guest_node_ptr;
dbg!("list connected");
} }
// update values // update values
@ -274,15 +272,13 @@ pub fn _getaddrinfo(
guest_sockaddr_ptr guest_sockaddr_ptr
}; };
dbg!("Socketaddr allocated");
// allocate canon name on guest and copy data over // allocate canon name on guest and copy data over
let guest_canonname_ptr = { let guest_canonname_ptr = {
let str_ptr = (*current_host_node).ai_canonname; let str_ptr = (*current_host_node).ai_canonname;
if !str_ptr.is_null() { if !str_ptr.is_null() {
let canonname_cstr = dbg!(std::ffi::CStr::from_ptr(str_ptr)); let canonname_cstr = std::ffi::CStr::from_ptr(str_ptr);
let canonname_bytes = canonname_cstr.to_bytes_with_nul(); let canonname_bytes = canonname_cstr.to_bytes_with_nul();
let str_size = dbg!(canonname_bytes.len()); let str_size = canonname_bytes.len();
let guest_canonname: WasmPtr<c_char, Array> = let guest_canonname: WasmPtr<c_char, Array> =
call_malloc_with_cast(ctx, str_size as _); call_malloc_with_cast(ctx, str_size as _);
@ -299,13 +295,10 @@ pub fn _getaddrinfo(
} }
}; };
dbg!("canonname allocated");
let mut current_guest_node = current_guest_node_ptr let mut current_guest_node = current_guest_node_ptr
.deref_mut(ctx.memory(0)) .deref_mut(ctx.memory(0))
.unwrap() .unwrap()
.get_mut(); .get_mut();
// TODO order these
current_guest_node.ai_flags = (*current_host_node).ai_flags; current_guest_node.ai_flags = (*current_host_node).ai_flags;
current_guest_node.ai_family = (*current_host_node).ai_family; current_guest_node.ai_family = (*current_host_node).ai_family;
current_guest_node.ai_socktype = (*current_host_node).ai_socktype; current_guest_node.ai_socktype = (*current_host_node).ai_socktype;
@ -315,23 +308,15 @@ pub fn _getaddrinfo(
current_guest_node.ai_canonname = guest_canonname_ptr; current_guest_node.ai_canonname = guest_canonname_ptr;
current_guest_node.ai_next = WasmPtr::new(0); current_guest_node.ai_next = WasmPtr::new(0);
dbg!("Guest node updated");
previous_guest_node = Some(current_guest_node_ptr); previous_guest_node = Some(current_guest_node_ptr);
current_host_node = (*current_host_node).ai_next; current_host_node = (*current_host_node).ai_next;
dbg!("End of loop bookkeeping finished");
} }
dbg!("freeing memory");
// this frees all connected nodes on the linked list // this frees all connected nodes on the linked list
freeaddrinfo(out_ptr); freeaddrinfo(out_ptr);
head_of_list.unwrap_or(WasmPtr::new(0)) head_of_list.unwrap_or(WasmPtr::new(0))
}; };
res_val_ptr res_val_ptr.deref(ctx.memory(0)).unwrap().set(head_of_list);
.deref(ctx.memory(0))
.unwrap()
.set(dbg!(head_of_list));
0 0
} }

10
lib/emscripten/src/env/windows/mod.rs vendored
View File

@ -138,11 +138,11 @@ pub fn _gai_strerror(_ctx: &mut Ctx, _ecode: i32) -> i32 {
} }
pub fn _getaddrinfo( pub fn _getaddrinfo(
ctx: &mut Ctx, _ctx: &mut Ctx,
node_ptr: WasmPtr<c_char>, _node_ptr: WasmPtr<c_char>,
service_str_ptr: WasmPtr<c_char>, _service_str_ptr: WasmPtr<c_char>,
hints_ptr: WasmPtr<EmAddrInfo>, _hints_ptr: WasmPtr<EmAddrInfo>,
res_val_ptr: WasmPtr<WasmPtr<EmAddrInfo>>, _res_val_ptr: WasmPtr<WasmPtr<EmAddrInfo>>,
) -> i32 { ) -> i32 {
debug!("emscripten::_getaddrinfo -- stub"); debug!("emscripten::_getaddrinfo -- stub");
-1 -1

8
lib/emscripten/src/syscalls/unix.rs
View File

@ -632,14 +632,6 @@ pub fn ___syscall102(ctx: &mut Ctx, _which: c_int, mut varargs: VarArgs) -> c_in
let address_len: u32 = socket_varargs.get(ctx); let address_len: u32 = socket_varargs.get(ctx);
let buf_addr = emscripten_memory_pointer!(ctx.memory(0), buf) as _; let buf_addr = emscripten_memory_pointer!(ctx.memory(0), buf) as _;
let address = emscripten_memory_pointer!(ctx.memory(0), address) as *mut sockaddr; let address = emscripten_memory_pointer!(ctx.memory(0), address) as *mut sockaddr;
dbg!(address);
unsafe {
dbg!(*(address as *mut u8));
dbg!(*(address as *mut u8).add(1));
for i in 0..14 {
dbg!(*(address as *mut u8).add(1 + i));
}
}
let address_len_addr = let address_len_addr =
emscripten_memory_pointer!(ctx.memory(0), address_len) as *mut socklen_t; emscripten_memory_pointer!(ctx.memory(0), address_len) as *mut socklen_t;
unsafe { unsafe {