Finish renaming of modules to components.
authorAnselm Busse <anselm.busse@tu-berlin.de>
Tue, 16 Feb 2016 19:50:29 +0000 (20:50 +0100)
committerAnselm Busse <anselm.busse@tu-berlin.de>
Tue, 16 Feb 2016 19:50:29 +0000 (20:50 +0100)
framework/components/affinities.c [moved from framework/modules/affinities.c with 98% similarity]
framework/components/fcfs.c [moved from framework/modules/fcfs.c with 100% similarity]
framework/components/include/topics/affinity.h [moved from framework/modules/include/topics/affinity.h with 100% similarity]
framework/components/load_balance.c [moved from framework/modules/load_balance.c with 98% similarity]
framework/components/round_robin.c [moved from framework/modules/round_robin.c with 100% similarity]
framework/components/template.c [moved from framework/modules/template.c with 100% similarity]
framework/components/tick_divider.c [moved from framework/modules/tick_divider.c with 100% similarity]
framework/os/linux/Makefile
framework/os/linux/linux_sched.c

similarity index 98%
rename from framework/modules/affinities.c
rename to framework/components/affinities.c
index 36177cc..24618e6 100644 (file)
@@ -3,7 +3,7 @@
 
 #include <fw.h>
 
-#include <topics/affinity.h>
+#include "../components/include/topics/affinity.h"
 
 #define AF_COMPONENT_UUID      0x0D
 #define AF_COMPONENT_NAME      "CPU Affinity Component"
similarity index 98%
rename from framework/modules/load_balance.c
rename to framework/components/load_balance.c
index 8040da8..0129d4a 100644 (file)
@@ -1,7 +1,7 @@
 #include <fw.h>
 
-#include <topics/affinity.h>
 #include <topics/cpu_status.h>
+#include "../components/include/topics/affinity.h"
 
 #define LB_MODULE_UUID 0x02
 #define LB_MODULE_NAME "Load Balancer"
index 4508fc1..f6604a6 100644 (file)
@@ -1,3 +1,8 @@
+KBUILD_CFLAGS += -DFW_OS_LINUX
+KBUILD_CFLAGS += -Ikernel/sched/modsched/framework/include \
+                                -Ikernel/sched/modsched/framework/include/generated \
+                                -Ikernel/sched/modsched/framework/components/include
+
 obj-y += linux_sched.o os.o os_kdb.o os_sched.o os_syscall.o
 obj-y += ../../lib/fw_comm.o \
                 ../../lib/fw_components.o \
@@ -19,14 +24,14 @@ obj-$(CONFIG_TOPO_LB_RR_FCFS)       += ../../generated/topo_lb_rr_fcfs.o
 obj-$(CONFIG_TOPO_LB_RR_QUAD)  += ../../generated/topo_lb_rr_quad.o
 obj-$(CONFIG_TOPO_LB_RR_MULTI) += ../../generated/topo_lb_rr_multi.o
 
-obj-$(CONFIG_MOD_TEMPLATE)                     += ../../modules/template.o
-obj-$(CONFIG_MOD_ROUND_ROBIN)          += ../../modules/round_robin.o
-obj-$(CONFIG_MOD_FCFS)                                 += ../../modules/fcfs.o
-obj-$(CONFIG_MOD_LOAD_BALANCING)       += ../../modules/load_balance.o
-obj-$(CONFIG_MOD_AFFINITIES)           += ../../modules/affinities.o
+obj-$(CONFIG_MOD_TEMPLATE)                     += ../../components/template.o
+obj-$(CONFIG_MOD_ROUND_ROBIN)          += ../../components/round_robin.o
+obj-$(CONFIG_MOD_FCFS)                                 += ../../components/fcfs.o
+obj-$(CONFIG_MOD_LOAD_BALANCING)       += ../../components/load_balance.o
+obj-$(CONFIG_MOD_AFFINITIES)           += ../../components/affinities.o
 
-$(obj)/os.o: $(obj)/../../lib $(obj)/../../modules $(obj)/../../generated
+$(obj)/os.o: $(obj)/../../lib $(obj)/../../components $(obj)/../../generated
 
-$(obj)/../../lib $(obj)/../../modules $(obj)/../../generated:
+$(obj)/../../lib $(obj)/../../components $(obj)/../../generated:
        $(Q)mkdir -p $@
 
index 5b78c39..8b1d163 100644 (file)
 #include <fw_sched.h>
 #include <fw_helper.h>
 #include <topics/admit.h>
-#include <topics/affinity.h>
 #include <topics/block.h>
 #include <topics/release.h>
 #include <topics/relinquish.h>
 #include <topics/unblock.h>
+#include <topics/affinity.h>
 
 unsigned int smp_started;