starting adaptation to fosa of frescan.. some reordering..

git-svn-id: http://www.frescor.org/private/svn/frescor/fna/trunk@1052 35b4ef3e-fd22-0410-ab77-dab3279adceb

diff --git a/doc/TODO b/doc/TODO
index b9f9847ec9cdbccf72e53a893d5706d747df541f..5f37f41b29b9c982c6c076e3345ccddfa49e1961 100644 (file)
--- a/doc/TODO
+++ b/doc/TODO
@@ -1,2 +1,4 @@
-*  make a first implementation using rtep
+*  rtep spare capacity
+*  make the unix platform working with a linux external thread
+*  finish frescan
 

diff --git a/rules.mk b/rules.mk
index 9622c90f8352bf42cb6a9b23ae5841cc840627c8..80d99b2a940bbbb3cbaad9680a15796848325d0c 100644 (file)
--- a/rules.mk
+++ b/rules.mk
@@ -7,8 +7,8 @@ none:
        @exec echo -e "\n>> Building $@: ";
        @if [ -f $< ]; \
        then \
-               $(CC) $(CFLAGS) $< $(LDFLAGS); \
-       fi; # -o $@ (fix marte mgcc)
+               $(CC) $(CFLAGS) $< $(LDFLAGS) -o $@; \
+       fi;
        @exec echo ">> End Building $@";
 
 libfna:
@@ -19,6 +19,9 @@ ifeq ($(RTEP_ENABLE),RTEP_FNA_ENABLED)
 endif
 ifeq ($(UNIX_ENABLE),UNIX_FNA_ENABLED)
                @make -C $(FNA_PATH)/src_unix libunixfna.a
+endif
+ifeq ($(FRESCAN_ENABLE),FRESCAN_FNA_ENABLED)
+               @make -C $(FNA_PATH)/src_frescan libfrescan.a
 endif
        @ar -rc libfna.a $(FNA_PATH)/src/*.o
        @mv libfna.a $(FNA_PATH)/lib/

diff --git a/src/fna_configuration.c b/src/fna_configuration.c
index 8884178ab21e60778f5161056e0c939f023b5ff2..10a12840d46c2d37109b9891e1532ca255204634 100644 (file)
--- a/src/fna_configuration.c
+++ b/src/fna_configuration.c
@@ -81,7 +81,7 @@
 
 
 fna_operations_t  *fna_operations[FNA_MAX_NETWORKS] = {
-        &rtep_fna_operations,
+        NULL, // &rtep_fna_operations,
         // &unix_fna_operations,
         // NULL, // resource_id 0
         NULL, // resource_id 1

diff --git a/src_frescan/Makefile b/src_frescan/Makefile
index f2fed0466254a242aa640793b73e69610cc630d9..eed5c0856230470ca8723786e882639633c01d28 100644 (file)
--- a/src_frescan/Makefile
+++ b/src_frescan/Makefile
@@ -1,27 +1,20 @@
-.PHONY: none frescan clean cleanall
+.PHONY: none libfrescan.a clean cleanall
 
 include ../config.mk
 include ../rules.mk
 
-CC = mgcc
-CFLAGS = -g -Wall
-LDFLAGS = -L./ -lfrescan
+LDFLAGS += -L$(FNA_PATH)/lib -lfrescan -L$(FOSA_PATH)/lib -lfosa_$(PLATFORM) -lm
 
 SRCS := $(wildcard *.c)
 OBJS := $(patsubst %.c,%.o,$(wildcard *.c))
 HDRS := $(wildcard *.h)
 
-frescan:  $(OBJS)
-       @exec echo -e "\n>> Generating libfrescan.a.. [OK]";
+libfrescan.a:  $(OBJS)
+       @exec echo -e "\n>> Building libfrescan.a:";
        ar -rc libfrescan.a *.o
+       @mv libfrescan.a $(FNA_PATH)/lib
+       @exec echo ">> end libfrescan.a  [OK]"
 
 %.o: %.c $(SRCS) $(HDRS)
        @$(CC) $(CFLAGS) -c $< # 1> /dev/null
 
-%.exe: %.c
-       @exec echo -e "\n>> Building $@: ";
-       @if [ -f $< ]; \
-       then \
-               $(CC) $(CFLAGS) $< $(LDFLAGS) -o $@; \
-       fi;
-       @exec echo ">> End Building $@";

diff --git a/src_frescan/frescan_config.h b/src_frescan/frescan_config.h
index f029763e52e5aa78597f8e7b72ebd190a0b61aaf..091f5b7d471dfbae9899e4db8be205cef8e6cc6d 100644 (file)
--- a/src_frescan/frescan_config.h
+++ b/src_frescan/frescan_config.h
@@ -24,7 +24,7 @@
 #ifndef _MARTE_FRESCAN_CONFIG_H_
 #define _MARTE_FRESCAN_CONFIG_H_
 
-#include <signal.h>      // SIGRTMIN
+#include "fosa_threads_and_signals.h" // FOSA_SIGNAL_MIN
 #include <sys/kernel.h>  // kernel_enter_critic_section
 
 #define FRESCAN_MX_REPL_OPS       100
@@ -32,9 +32,10 @@
 #define FRESCAN_BROADCAST_ADDR    0xF
 #define FRESCAN_MX_IDS            255
 #define FRESCAN_MX_PRIOS          32
-#define FRESCAN_REPL_SIGNAL_NUM   SIGRTMIN + 5 // real-time signal
+#define FRESCAN_REPL_SIGNAL_NUM   FOSA_SIGNAL_MIN + 10 // real-time signal
 #define FRESCAN_BACKGROUND_PRIO   0
 #define FRESCAN_MX_REPLY_OBJECTS  40
+#define FRESCAN_REPL_THREAD_PRIO  60
 
 #define FRESCAN_MLOCK_T            unsigned
 #define FRESCAN_CREATE_LOCK(l)

diff --git a/src_frescan/frescan_data.h b/src_frescan/frescan_data.h
index 0e78bdaec1ab5440e1b85c94b466df6c12be62d2..3d76a0d9c2b9a51197c7d30fed06f7c8176b1270 100644 (file)
--- a/src_frescan/frescan_data.h
+++ b/src_frescan/frescan_data.h
@@ -27,7 +27,7 @@
 #include <stdint.h>    // uint32_t
 #include <semaphore.h> // sem_t
 #include <time.h>      // struct timespec, timer_t
-#include <pthread.h>   // pthread_t
+#include "fosa_threads_and_signals.h"   // fosa_thread_id_t
 
 #include <misc/linux_list.h> // struct list_head
 #include <misc/freelist.h>   // freelist_t
@@ -166,7 +166,7 @@ typedef struct {
         FRESCAN_MLOCK_T lock;
         frescan_node_t local_node;
         int fd;
-        pthread_t repl_thread_id;
+        fosa_thread_id_t repl_thread_id;
         frescan_queues_t queues;
         frescan_packet_t *last_packet;
         frescan_prio_t last_packet_prio;

diff --git a/src_frescan/frescan_servers_replenishments.c b/src_frescan/frescan_servers_replenishments.c
index 383f17e9fafc948960d06f408a987654d69b9cd6..78b34f4b845c9e72cda3a82d0e15f15d284b2c33 100644 (file)
--- a/src_frescan/frescan_servers_replenishments.c
+++ b/src_frescan/frescan_servers_replenishments.c
@@ -184,8 +184,8 @@ static void *frescan_repl_thread(void *arg)
 int frescan_replenishments_init(frescan_network_t net)
 {
         int ret;
-        sigset_t set;
-        struct sigaction action;
+        fosa_signal_t signal_set[1];
+        fosa_thread_attr_t attr;
 
         ret = frescan_repl_op_init();
         if (ret != 0) {
@@ -193,35 +193,44 @@ int frescan_replenishments_init(frescan_network_t net)
                 return ret;
         }
 
-        sigemptyset(&set);
-        sigaddset(&set, FRESCAN_REPL_SIGNAL_NUM);
+        signal_set[0] = FRESCAN_REPL_SIGNAL_NUM;
+
+        ret = fosa_set_accepted_signals(signal_set, 1);
+        if (ret != 0) {
+                ERROR("could not set the repl signal\n");
+                return ret;
+        }
+
+        // create the replenishment thread
 
-        ret = pthread_sigmask(SIG_BLOCK, &set, NULL);
+        ret = fosa_thread_attr_init(&attr);
         if (ret != 0) {
-                ERROR("could not put the signal mask for replenishments\n");
+                ERROR("could not init thread attributes\n");
                 return ret;
         }
 
-        // the following is unnecesary in MaRTE OS because all signals are RT
-        action.sa_handler = SIG_DFL;
-        sigemptyset(&action.sa_mask);
-        action.sa_flags = SA_SIGINFO;
-        ret = sigaction (FRESCAN_REPL_SIGNAL_NUM, &action, NULL);
+        ret = fosa_thread_attr_set_prio(&attr, FRESCAN_REPL_THREAD_PRIO);
         if (ret != 0) {
-                ERROR("could not set action for the repl signal\n");
+                ERROR("could not set repl thread prio %d\n",
+                      FRESCAN_REPL_THREAD_PRIO);
                 return ret;
         }
 
-        // TODO: set the pthread attributes
-        ret = pthread_create(&the_networks[net].repl_thread_id,
-                              NULL,
-                              frescan_repl_thread,
-                              (void *)(uint32_t)net);
+        ret = fosa_thread_create(&the_networks[net].repl_thread_id,
+                                 &attr,
+                                 frescan_repl_thread,
+                                 (void *)(uint32_t)net);
         if (ret != 0) {
                 ERROR("could not create the replenishment thread\n");
                 return ret;
         }
 
+        ret = fosa_thread_attr_destroy(&attr);
+        if (ret != 0) {
+                ERROR("could not destroy thread attributes\n");
+                return ret;
+        }
+
         return 0;
 }
 

diff --git a/src_frescan/test_frescan_init.c b/tests/tests_frescan/test_frescan_init.c
similarity index 100%
rename from src_frescan/test_frescan_init.c
rename to tests/tests_frescan/test_frescan_init.c

diff --git a/src_frescan/test_frescan_queues.c b/tests/tests_frescan/test_frescan_queues.c
similarity index 100%
rename from src_frescan/test_frescan_queues.c
rename to tests/tests_frescan/test_frescan_queues.c

diff --git a/src_frescan/test_frescan_send_basic.c b/tests/tests_frescan/test_frescan_send_basic.c
similarity index 100%
rename from src_frescan/test_frescan_send_basic.c
rename to tests/tests_frescan/test_frescan_send_basic.c

diff --git a/src_frescan/test_frescan_servers_send_basic.c b/tests/tests_frescan/test_frescan_servers_send_basic.c
similarity index 100%
rename from src_frescan/test_frescan_servers_send_basic.c
rename to tests/tests_frescan/test_frescan_servers_send_basic.c