Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use new RPC mechanism #53

Merged
merged 4 commits into from
Jul 12, 2017
Merged

Use new RPC mechanism #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
169e2e3
ocp-indent everything
jonludlam Jul 12, 2017
d187988
Remove trailing whitespace
jonludlam Jul 12, 2017
42dfd43
Use new RPC mechanism
jonludlam Jun 22, 2017
2977555
Add some explanations of the new mechanism
jonludlam Jul 12, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 31 additions & 31 deletions lib/memory.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,13 @@ let pages_per_mib = bytes_per_mib /// bytes_per_page

(** Returns true if (and only if) the specified argument is a power of 2. *)
let is_power_of_2 n =
(n > 0) && (n land (0 - n) = n)
(n > 0) && (n land (0 - n) = n)

let round_down_to_multiple_of x y =
(x /// y) *** y
(x /// y) *** y

let round_up_to_multiple_of x y =
((x +++ y --- 1L) /// y) *** y
((x +++ y --- 1L) /// y) *** y

(* === Memory rounding functions ============================================ *)

Expand All @@ -60,10 +60,10 @@ let round_pages_up_to_nearest_mib v = round_up v pages_per_mib
(* === Division functions =================================================== *)

let divide_rounding_down numerator denominator =
numerator /// denominator
numerator /// denominator

let divide_rounding_up numerator denominator =
(numerator +++ denominator --- 1L) /// denominator
(numerator +++ denominator --- 1L) /// denominator

(* === Memory unit conversion functions ===================================== *)

Expand Down Expand Up @@ -117,49 +117,49 @@ let mib_of_pages_used value = divide_rounding_up value pages_per_mib
(* === Domain memory breakdown: HVM guests ================================== *)

module type MEMORY_MODEL_DATA = sig
val extra_internal_mib : int64
val extra_external_mib : int64
val extra_internal_mib : int64
val extra_external_mib : int64
end

module HVM_memory_model_data : MEMORY_MODEL_DATA = struct
let extra_internal_mib = 1L
let extra_external_mib = 1L
let extra_internal_mib = 1L
let extra_external_mib = 1L
end

module Linux_memory_model_data : MEMORY_MODEL_DATA = struct
let extra_internal_mib = 0L
let extra_external_mib = 1L
let extra_internal_mib = 0L
let extra_external_mib = 1L
end

module Memory_model (D : MEMORY_MODEL_DATA) = struct

let build_max_mib static_max_mib video_mib = static_max_mib --- (Int64.of_int video_mib)
let build_max_mib static_max_mib video_mib = static_max_mib --- (Int64.of_int video_mib)

let build_start_mib target_mib video_mib = target_mib --- (Int64.of_int video_mib)
let build_start_mib target_mib video_mib = target_mib --- (Int64.of_int video_mib)

let xen_max_offset_mib = D.extra_internal_mib
let xen_max_offset_mib = D.extra_internal_mib

let xen_max_mib target_mib = target_mib +++ xen_max_offset_mib
let xen_max_mib target_mib = target_mib +++ xen_max_offset_mib

let shadow_mib static_max_mib vcpu_count multiplier =
let vcpu_pages = 256L *** (Int64.of_int vcpu_count) in
let p2m_map_pages = static_max_mib in
let shadow_resident_pages = static_max_mib in
let total_mib = mib_of_pages_used
(vcpu_pages +++ p2m_map_pages +++ shadow_resident_pages) in
let total_mib_multiplied =
Int64.of_float ((Int64.to_float total_mib) *. multiplier) in
max 1L total_mib_multiplied
let shadow_mib static_max_mib vcpu_count multiplier =
let vcpu_pages = 256L *** (Int64.of_int vcpu_count) in
let p2m_map_pages = static_max_mib in
let shadow_resident_pages = static_max_mib in
let total_mib = mib_of_pages_used
(vcpu_pages +++ p2m_map_pages +++ shadow_resident_pages) in
let total_mib_multiplied =
Int64.of_float ((Int64.to_float total_mib) *. multiplier) in
max 1L total_mib_multiplied

let overhead_mib static_max_mib vcpu_count multiplier =
D.extra_internal_mib +++
D.extra_external_mib +++
(shadow_mib static_max_mib vcpu_count multiplier)
let overhead_mib static_max_mib vcpu_count multiplier =
D.extra_internal_mib +++
D.extra_external_mib +++
(shadow_mib static_max_mib vcpu_count multiplier)

let footprint_mib target_mib static_max_mib vcpu_count multiplier =
target_mib +++ (overhead_mib static_max_mib vcpu_count multiplier)
let footprint_mib target_mib static_max_mib vcpu_count multiplier =
target_mib +++ (overhead_mib static_max_mib vcpu_count multiplier)

let shadow_multiplier_default = 1.0
let shadow_multiplier_default = 1.0

end

Expand Down
Loading