P-State control on Linux - User Utility and Library

[palacios.git] / linux_usr / Makefile

diff --git a/linux_usr/Makefile b/linux_usr/Makefile
index f586bb7..e57a444 100644 (file)
--- a/linux_usr/Makefile
+++ b/linux_usr/Makefile
@@ -11,7 +11,7 @@ STATIC = 0
 # Executables that implement core functionality
 #
 BASE_EXECS =   v3_mem \
-                v3_mem_free \
+                v3_mem_reset \
                v3_create \
                 v3_create_bind \
                v3_free  \
@@ -20,6 +20,7 @@ BASE_EXECS =  v3_mem \
                v3_pause  \
                v3_continue \
                v3_core_move \
+                v3_mem_move \
                v3_load \
                v3_save \
                v3_cons \
@@ -30,7 +31,10 @@ BASE_EXECS =         v3_mem \
                v3_debug \
                v3_send \
                v3_receive \
-               v3_pci
+               v3_pci \
+               v3_guest_mem_access \
+               v3_guest_mem_track \
+                v3_dvfs
 
 
 #
@@ -40,7 +44,6 @@ EXAMPLE_EXECS = v3_user_host_dev_example \
                v3_os_debug \
                v3_user_keyed_stream_example \
                v3_user_keyed_stream_file \
-               v3_guest_mem_example
 
 #
 # Currently experimental things
@@ -65,7 +68,7 @@ COPIED_EXECS = v3_x0vncserver v3_x0gui
 #
 # Libraries that we need to build
 #
-LIBS = libv3_user_host_dev.a libv3_user_keyed_stream.a libv3_ctrl.a libv3_guest_mem.a libv3_fb.a
+LIBS = libv3_user_host_dev.a libv3_user_keyed_stream.a libv3_ctrl.a libv3_guest_mem.a libv3_fb.a libv3_user_dvfs.a
 
 BUILD_EXECS = $(BASE_EXECS) $(EXAMPLE_EXECS) $(EXPERIMENTAL_EXECS) 
 BUILD_LIBS = $(LIBS)
@@ -77,7 +80,7 @@ ifeq ($(STATIC),1)
   CFLAGS += -static 
 endif
 
-CFLAGS += -I../linux_module
+CFLAGS += -I../linux_module -I../palacios/include/
 
 CC = gcc -g
 AR = ar
@@ -163,15 +166,31 @@ v3_user_keyed_stream_file : v3_user_keyed_stream_file.c libv3_user_keyed_stream.
        $(CC) $(CFLAGS) $< -I../linux_module -L. -lv3_user_keyed_stream -o $@
 
 
-# guest memory access by mmap and example
+# guest memory access by mmap 
+# guest memory reference tracking via mem_track interface
+# examples
 #
 libv3_guest_mem.a : v3_guest_mem.c v3_guest_mem.h v3_ctrl.h
        $(CC) $(CFLAGS) -c v3_guest_mem.c 
        $(AR) ruv libv3_guest_mem.a v3_guest_mem.o
        rm -f v3_guest_mem.o
 
-v3_guest_mem_example : v3_guest_mem_example.c libv3_guest_mem.a
-       $(CC) $(CFLAGS) $< -L. -lv3_guest_mem -o $@
+v3_guest_mem_access : v3_guest_mem_access.c libv3_guest_mem.a libv3_ctrl.a
+       $(CC) $(CFLAGS) $< -L. -lv3_guest_mem -lv3_ctrl -o $@
+
+v3_guest_mem_track : v3_guest_mem_track.c libv3_guest_mem.a libv3_ctrl.a
+       $(CC) $(CFLAGS) $< -L. -lv3_guest_mem -lv3_ctrl -o $@
+
+#
+# User DVFS control includse a library and a caller
+#
+libv3_user_dvfs.a : v3_user_dvfs.c v3_user_dvfs.h v3_ctrl.h
+       $(CC) $(CFLAGS) -I../linux_module -c v3_user_dvfs.c 
+       $(AR) ruv libv3_user_dvfs.a v3_user_dvfs.o
+       rm -f v3_user_dvfs.o
+
+v3_dvfs : v3_dvfs.c libv3_user_dvfs.a libv3_ctrl.a
+       $(CC) $(CFLAGS) $< -I../linux_module -L. -lv3_user_dvfs -lv3_ctrl -o $@
 
 
 #
@@ -194,7 +213,7 @@ v3_x0vncserver :
        else \
                echo "In order to use v3_vncclient/server you must have" ; \
                echo "previously built or received palacios/linux_usr/x0vncserver" ; \
-               echo "To learn more about this, look in palacios/linux_usr/vnc"; \
+               echo "To learn more about this, look in palacios/linux_usr/vnc"; \
        fi;
 
 #