X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm_scheduler.h;h=b1580ec89d8788372d418cab092ce3f3969c27a8;hb=5ef0e92d52b2698fd2706cd7cfc2b01526a6e319;hp=3effce551b99945f1a218870bf3302206ee3be6b;hpb=6469a843145bd6626460531b3bb382ade6540b4a;p=palacios.releases.git

diff --git a/palacios/include/palacios/vmm_scheduler.h b/palacios/include/palacios/vmm_scheduler.h
index 3effce5..b1580ec 100644
--- a/palacios/include/palacios/vmm_scheduler.h
+++ b/palacios/include/palacios/vmm_scheduler.h
@@ -1,14 +1,15 @@
 /*
  * This file is part of the Palacios Virtual Machine Monitor developed
- * by the V3VEE Project with funding from the United States National 
- * Science Foundation and the Department of Energy.  
+ * by the V3VEE Project with funding from the United States National
+ * Science Foundation and the Department of Energy.
  *
  * The V3VEE Project is a joint project between Northwestern University
- * and the University of New Mexico.  You can find out more at 
+ * and the University of New Mexico.  You can find out more at
  * http://www.v3vee.org
  *
  * Copyright (c) 2013, Oscar Mondragon <omondrag@cs.unm.edu>
- * Copyright (c) 2013, The V3VEE Project <http://www.v3vee.org> 
+ * Copyright (c) 2013, Patrick G. Bridges <bridges@cs.unm.edu>
+ * Copyright (c) 2013, The V3VEE Project <http://www.v3vee.org>
  * All rights reserved.
  *
  * Author: Oscar Mondragon <omondrag@cs.unm.edu>
@@ -27,38 +28,38 @@ struct vm_scheduler_impl {
 	int (*deinit)();
 	int (*vm_init)(struct v3_vm_info *vm);
 	int (*vm_deinit)(struct v3_vm_info *vm);
-	int (*core_init)(struct guest_info *vm);
-	int (*core_deinit)(struct guest_info *vm);
+	int (*core_init)(struct guest_info *core);
+        int (*core_stop)(struct guest_info *core);
+	int (*core_deinit)(struct guest_info *core);
 	void (*schedule)(struct guest_info *vm);
-	void (*yield)(struct guest_info *vm, int usec);
+	void (*yield)(struct guest_info *core, int usec);
 	int (*admit)(struct v3_vm_info *vm);
 	int (*remap)(struct v3_vm_info *vm);
 	int (*dvfs)(struct v3_vm_info *vm);
+         // should really have departure...
 };
 
-struct vm_sched_state {
-	struct vm_scheduler *sched;
-	void *priv_data;
-};
-
-struct vm_core_sched_state {
-	struct vm_scheduler *sched;
-	void *priv_data;
-};
-
+int v3_scheduler_register_core(struct guest_info *core);
+int v3_scheduler_stop_core(struct guest_info *core);
+int v3_scheduler_free_core(struct guest_info *core);
 void v3_schedule(struct guest_info *core);
 void v3_yield(struct guest_info *core, int usec);
 
 int v3_scheduler_register_vm(struct v3_vm_info *vm);
-int v3_scheduler_register_core(struct guest_info *vm); /* ? */
 int v3_scheduler_admit_vm(struct v3_vm_info *vm);
+int v3_scheduler_free_vm(struct v3_vm_info *vm);
 
 void v3_scheduler_remap_notify(struct v3_vm_info *vm);
 void v3_scheduler_dvfs_notify(struct v3_vm_info *vm);
 
 int V3_init_scheduling();
+int V3_deinit_scheduling();
+
 int v3_register_scheduler(struct vm_scheduler_impl *vm);
 struct vm_scheduler_impl *v3_scheduler_lookup(char *name);
+struct vm_scheduler_impl *v3_unregister_scheduler(char *name);
+
 int V3_enable_scheduler();
+int V3_disable_scheduler();
 
 #endif /* __VMM_SCHEDULER_H__ */