X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm_time.h;h=0bbb6cccd8b4e283090e095add5b696bf0e4c592;hb=ff3728843f8471d39cf2ea3511267feb83f14678;hp=33ffa2c0fc06996505798a20324c0b4285fe5feb;hpb=0e26b3738daf436ba2d9a088ba620a3583d40de3;p=palacios.git

diff --git a/palacios/include/palacios/vmm_time.h b/palacios/include/palacios/vmm_time.h
index 33ffa2c..0bbb6cc 100644
--- a/palacios/include/palacios/vmm_time.h
+++ b/palacios/include/palacios/vmm_time.h
@@ -31,7 +31,13 @@
 
 struct guest_info;
 
-struct vm_time {
+/* Per-VM time information */
+struct v3_time {
+    uint32_t td_mult; 
+};
+
+/* Per-core time information */
+struct vm_core_time {
     uint32_t host_cpu_freq;    // in kHZ 
     uint32_t guest_cpu_freq;   // can be lower than host CPU freq!
 
@@ -44,11 +50,17 @@ struct vm_time {
     uint64_t initial_time;     // Time when VMM started. 
     uint64_t enter_time;       // Host time the guest was last entered
     uint64_t exit_time;        // Host time the the VM was exited to
+    uint64_t pause_time;       // Time at which the VM core was paused
     struct v3_msr tsc_aux;     // Auxilliary MSR for RDTSCP
 
     // Installed Timers slaved off of the guest monotonic TSC
     uint_t num_timers;
     struct list_head timers;
+
+    // Installed timeout handlers, and the time (in monotonic guest time) of hte 
+    // next timeout.
+    uint64_t next_timeout; 
+    struct list_head timeout_hooks;
 };
 
 struct v3_timer_ops {
@@ -60,9 +72,19 @@ struct v3_timer {
     void * private_data;
     struct v3_timer_ops * ops;
 
+    // Need to add accuracy/resolution fields later.
+
     struct list_head timer_link;
 };
 
+typedef void (*v3_timeout_callback_t)(struct guest_info * info, void * priv_data);
+struct v3_timeout_hook {
+    void * private_data;
+    v3_timeout_callback_t callback;
+    
+    struct list_head hook_link;
+};
+
 // Basic functions for handling passage of time in palacios
 void v3_init_time_core(struct guest_info * core);
 int v3_init_time_vm(struct v3_vm_info * vm);
@@ -75,46 +97,57 @@ int v3_start_time(struct guest_info * core);
 int v3_time_enter_vm(struct guest_info * core);
 int v3_time_exit_vm(struct guest_info * core);
 
-int v3_adjust_time(struct guest_info * core);
+int v3_pause_time(struct guest_info * core);
+int v3_resume_time(struct guest_info * core);
 int v3_offset_time(struct guest_info * core, sint64_t offset);
 
-// Basic functions for attaching timers to the passage of time
+int v3_adjust_time(struct guest_info * core);
+
+// Basic functions for attaching timers to the passage of time - these timers 
+// should eventually specify their accuracy and resolution.
 struct v3_timer * v3_add_timer(struct guest_info * info, struct v3_timer_ops * ops, void * private_data);
 int v3_remove_timer(struct guest_info * info, struct v3_timer * timer);
 void v3_update_timers(struct guest_info * info);
 
+// Functions for handling one-shot timeouts in Palacios. Note that only one
+// timeout is every currently outstanding (the soonest scheduled one!), and that
+// all hooks are called on any timeout. If a hook gets called before the desired
+// timeout time, that hook should reschedule its own timeout if desired.
+struct v3_timeout_hook * v3_add_timeout_hook(struct guest_info * info, v3_timeout_callback_t callback, void * priv_data);
+int v3_remove_timeout_hook(struct guest_info * info, struct v3_timeout_hook * hook);
+int v3_schedule_timeout(struct guest_info * info, ullong_t cycles);
+int v3_check_timeout(struct guest_info * info);
+
 // Functions to return the different notions of time in Palacios.
-static inline uint64_t v3_get_host_time(struct vm_time *t) {
+static inline uint64_t v3_get_host_time(struct vm_core_time *t) {
     uint64_t tmp;
     rdtscll(tmp);
     return tmp;
 }
 
 // Returns *monotonic* guest time.
-static inline uint64_t v3_compute_guest_time(struct vm_time *t, uint64_t ht) {
-#ifdef V3_CONFIG_TIME_HIDE_VM_COST
-    V3_ASSERT(t->exit_time);
-    return t->exit_time + t->guest_host_offset;
-#else
-    return v3_get_host_time(t) + t->guest_host_offset;
-#endif
+static inline uint64_t v3_compute_guest_time(struct vm_core_time *t, uint64_t ht) {
+    if (t->pause_time)
+    	return t->pause_time + t->guest_host_offset;
+    else
+    	return ht + t->guest_host_offset;
 }
 
-static inline uint64_t v3_get_guest_time(struct vm_time *t) {
+static inline uint64_t v3_get_guest_time(struct vm_core_time *t) {
     return v3_compute_guest_time(t, v3_get_host_time(t));
 }
 
 // Returns the TSC value seen by the guest
-static inline uint64_t v3_compute_guest_tsc(struct vm_time *t, uint64_t ht) {
+static inline uint64_t v3_compute_guest_tsc(struct vm_core_time *t, uint64_t ht) {
     return v3_compute_guest_time(t, ht) + t->tsc_guest_offset;
 }
 
-static inline uint64_t v3_get_guest_tsc(struct vm_time *t) {
+static inline uint64_t v3_get_guest_tsc(struct vm_core_time *t) {
     return v3_compute_guest_tsc(t, v3_get_host_time(t));
 }
 
 // Returns offset of guest TSC from host TSC
-static inline sint64_t v3_tsc_host_offset(struct vm_time *time_state) {
+static inline sint64_t v3_tsc_host_offset(struct vm_core_time *time_state) {
     return time_state->guest_host_offset + time_state->tsc_guest_offset;
 }