Commit dca29fa5 authored by yoogx's avatar yoogx

* Follow-up in integration of the monitoring API

        For issue #5
parent 0c3c96e0
......@@ -5,10 +5,10 @@
#include <request.h>
#include <state.hh>
#include <trace.hh>
#include <configuration.hh>
#include <deployment.h>
// Parameter i in the template parameters list
// Parameter i in the template parameters list
// gives the number of ports for thread i.
// >>> TO GENERATE
using ports_type = taste::ports_table< PORT_TYPE_CONTENT >;
......
......@@ -199,6 +199,28 @@ check-linuxtaste:
echo "It should point to the directory where the distro was built" && exit 2 ; \
fi
################################################################################
# TASTE-RUNTIME-MONITORING
ifeq ($(MONITORING),true)
MONITORING_OBJS = trace_manager.o remote_configuration.o
PO_HI_CPPOBJS += $(MONITORING_OBJS)
INCLUDE += -I$(RUNTIME_PATH)/src \
-I$(RUNTIME_PATH)/src/monitoring \
-I$(RUNTIME_PATH)/include \
-I$(RUNTIME_PATH)/include/monitoring \
-I$(RUNTIME_PATH)/src/monitoring/cheddar_scheduling
CPPFLAGS += -std=c++1y -g
LDFLAGS += -lstdc++
endif
hyperperiod-cheddar:
python get_cheddar_schedule.py
python parser_cheddar_et.py
################################################################################
# General compilation rules
......@@ -210,6 +232,7 @@ endif
ifdef SCADE_DIR
(cd $(SCADE_DIR) && for v in `ls *.c`; do $(CC) -c $$v; done)
endif
for f in $(PO_HI_OBJS); do \
c_file="`basename $$f .o`.c"; \
c_file_dirname="`dirname $$f`"; \
......@@ -221,6 +244,17 @@ endif
fi ; \
done
for f in $(PO_HI_CPPOBJS); do \
c_file="`basename $$f .o`.cc"; \
c_file_dirname="`dirname $$f`"; \
if [ -n "$$c_file_dirname" ]; then \
if [ ! -d $$c_file_dirname ]; then mkdir -p $$c_file_dirname ; fi ; \
$(CPP) $(INCLUDE) $(CPPFLAGS) -c -o $$f '$(RUNTIME_PATH)/src/'$$c_file_dirname'/'$$c_file || exit 1 ; \
else \
$(CPP) $(INCLUDE) $(CPPFLAGS) -c -o $$f '$(RUNTIME_PATH)/src/'$$c_file || exit 1 ; \
fi ; \
done
compile-node: $(BINARY)
ifeq ($(TARGET), $(filter $(TARGET), leon3-scoc3 leon.rtems leon.rtems_posix))
......@@ -331,6 +365,9 @@ endif
%.o: %.cpp
$(CPP) $(INCLUDE) $(CPPFLAGS) -c -o $@ $<
%.o: %.cc
$(CPP) $(INCLUDE) $(CPPFLAGS) -c -o $@ $<
%.o: %.c
$(CC) $(INCLUDE) $(CFLAGS) -c -o $@ $<
......
################################################################################
# Use of Cheddar with python and C++ compilation rules
AUTOMAKE_OPTIONS = no-dependencies
SUBDIRS=
clean:
rm *.o *~ *.cxx cheddar_schedule.py *.so
CPP_FILES = $(srcdir)/cheddar_schedule.cc $(srcdir)/cheddar_schedule.hh \
$(srcdir)/cheddar_types.hh $(srcdir)/hyperperriod_config.hh
csrc = ${shell $(CYGPATH_U) '$(OCARINA_RUNTIME)/polyorb-hi-c/src'}
install-data-local:
$(INSTALL) -d $(DESTDIR)$(csrc)
for f in $(CPP_FILES); do $(INSTALL) -m 444 $$f $(DESTDIR)$(csrc) ; done
uninstall-local:
rm -rf $(DESTDIR)$(csrc)
EXTRA_DIST = $(CPP_FILES) $(PYTHON_FILES)
CLEANFILES = *~
hyperperiod-cheddar:
python get_cheddar_schedule.py
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment