Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 22:15:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

Use usize rather than u64 in MemoryReport.

Browse source 
I should have used usize in the first place.
This commit is contained in:
Nicholas Nethercote 2015-03-26 19:15:59 -07:00 • committed by Ms2ger
parent c1cc31b9d6
commit 66902d2c90
4 changed files with 43 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

32
support/rust-task_info/src/task_basic_info.rs
View file

@ -10,32 +10,30 @@
//! Interface to the measurements in the task_basic_info struct, gathered by
//! invoking `task_info()` with the `TASK_BASIC_INFO` flavor.
use libc::{c_int,uint64_t};
use libc::{c_int, size_t};
/// Obtains task_basic_info::virtual_size.
pub fn virtual_size() -> Option<u64> {
let mut virtual_size: u64 = 0;
let mut rv;
unsafe {
rv = TaskBasicInfoVirtualSize(&mut virtual_size);
}
if rv == 0 { Some(virtual_size) } else { None }
pub fn virtual_size() -> Option<usize> {
let mut virtual_size: size_t = 0;
let rv = unsafe {
TaskBasicInfoVirtualSize(&mut virtual_size)
};
if rv == 0 { Some(virtual_size as usize) } else { None }
}
/// Obtains task_basic_info::resident_size.
pub fn resident_size() -> Option<u64> {
let mut resident_size: u64 = 0;
let mut rv;
unsafe {
rv = TaskBasicInfoResidentSize(&mut resident_size);
}
if rv == 0 { Some(resident_size) } else { None }
pub fn resident_size() -> Option<usize> {
let mut resident_size: size_t = 0;
let rv = unsafe {
TaskBasicInfoResidentSize(&mut resident_size)
};
if rv == 0 { Some(resident_size as usize) } else { None }
}
#[link(name = "task_info", kind = "static")]
extern {
fn TaskBasicInfoVirtualSize(virtual_size: *mut uint64_t) -> c_int;
fn TaskBasicInfoResidentSize(resident_size: *mut uint64_t) -> c_int;
fn TaskBasicInfoVirtualSize(virtual_size: *mut size_t) -> c_int;
fn TaskBasicInfoResidentSize(resident_size: *mut size_t) -> c_int;
}
#[cfg(test)]

4
support/rust-task_info/src/task_info.c
View file

@ -20,7 +20,7 @@ TaskBasicInfo(struct task_basic_info* info)
}
int
TaskBasicInfoVirtualSize(int64_t *virtualSize)
TaskBasicInfoVirtualSize(size_t* virtualSize)
{
struct task_basic_info ti;
int rv = TaskBasicInfo(&ti);
@ -29,7 +29,7 @@ TaskBasicInfoVirtualSize(int64_t *virtualSize)
}
int
TaskBasicInfoResidentSize(int64_t *residentSize)
TaskBasicInfoResidentSize(size_t* residentSize)
{
struct task_basic_info ti;
int rv = TaskBasicInfo(&ti);