Small fixes to get frsh distributed test working again.

diff --git a/fwp/Makefile.omk b/fwp/Makefile.omk
index 353cd064ff7b878fd45494d5fba890dc334d9c3d..38ccbc6b889670ebdd4934ea5f931e53e8151dba 100644 (file)
--- a/fwp/Makefile.omk
+++ b/fwp/Makefile.omk
@@ -1,6 +1,4 @@
 default_CONFIG = CONFIG_FWP=y
 
-ifeq ($(CONFIG_FWP),y)
-SUBDIRS = lib tests
+SUBDIRS = lib
 CFLAGS+= -Wall -Wextra -D_REENTRANT
-endif

diff --git a/fwp/lib/Makefile.omk b/fwp/lib/Makefile.omk
index f4a57aad157c12ae0346ee0e6265f22d8417a0b6..5b631034412edf2dbde685d14d3a3e6a289f6fc4 100644 (file)
--- a/fwp/lib/Makefile.omk
+++ b/fwp/lib/Makefile.omk
@@ -1,7 +1,7 @@
 #lib_LIBRARIES = fwp
 shared_LIBRARIES = fwp
 CFLAGS += -D_FWP_INTERNALS_
-SUBDIRS = core  
+SUBDIRS = core 
 #LDFLAGS = -lpthread  -lrt
 fwp_SOURCES = core/fwp_utils.c core/fwp_vres.c core/fwp_msgb.c core/fwp_msgq.c\
              core/fwp_endpoint.c

diff --git a/fwp/lib/core/Makefile.omk b/fwp/lib/core/Makefile.omk
index 6ac7f3812c15c97e0e36caafaf1ef5ccf640ee8d..4b73972b93ef2ed6288fec82cd267dd09bc75c3b 100644 (file)
--- a/fwp/lib/core/Makefile.omk
+++ b/fwp/lib/core/Makefile.omk
@@ -1,6 +1,6 @@
 #lib_LIBRARIES = fwp
 CFLAGS += -Wall -D_REENTRANT -g -D_FWP_INTERNALS_
-SUBDIRS=tests 
+SUBDIRS= tests 
 #LDFLAGS = -lpthread  -lrt
 #fwp_SOURCES = fwp_utils.c fwp_vres.c fwp_msgb.c fwp_msgq.c\
              fwp_endpoint.c

diff --git a/fwp/lib/core/fwp_endpoint.c b/fwp/lib/core/fwp_endpoint.c
index 866e71cb9990bc052365f9b1887e26e64c454493..6c31d29a9c8d366743015bb7605dbaaef841697f 100644 (file)
--- a/fwp/lib/core/fwp_endpoint.c
+++ b/fwp/lib/core/fwp_endpoint.c
@@ -202,6 +202,8 @@ int fwp_send_endpoint_create(unsigned int node,
        if (fwp_vres_create(&fwp_vres_params_default, &fwp_epoint->vresd)) {
                goto err;
        }
+       
+       fwp_send_endpoint_bind(fwp_epoint, fwp_epoint->vresd);
 #endif
        
        *epointd = fwp_epoint;
@@ -315,7 +317,9 @@ int fwp_receive_endpoint_create(unsigned int port,
        
        getsockname(fwp_epoint->sockd, (struct sockaddr*)&fwp_epoint->peer.addr, 
                        &fwp_epoint->peer.addrlen);
-       
+
+       addr = (struct sockaddr_in*) fwp_epoint->peer.addr;
+       FWP_DEBUG("Recv port= %d\n",ntohs(addr->sin_port));     
        *epointd = fwp_epoint;  
        return 0;
 err:
@@ -336,17 +340,12 @@ int fwp_send_endpoint_bind(fwp_endpoint_d_t epointd, fwp_vres_d_t vresd)
        int rv;
        fwp_endpoint_t *fwp_epoint = epointd;
        
-#ifndef FWP_CONTNEGT
-       FWP_DEBUG("Empty bind\n");
-       rv = fwp_vres_bind(fwp_epoint->vresd, fwp_epoint->sockd);
-#else  
        fwp_epoint->vresd = vresd;      
        rv = fwp_vres_bind(vresd, fwp_epoint->sockd);
        /* if send endpoint is already bound 
        if (epoint->type == FWP_EPOINT_BOUND) {  
                fwp_send_endpoint_unbind(epoint);
        }*/
-#endif 
        return rv;
 }
 

diff --git a/fwp/lib/core/fwp_vres.c b/fwp/lib/core/fwp_vres.c
index 8a8c4d4231646e4e2e26fdd2c45fdd7f441bfd1d..02d29980e56c8c9997e5c49213b3b2f649fa9d45 100644 (file)
--- a/fwp/lib/core/fwp_vres.c
+++ b/fwp/lib/core/fwp_vres.c
@@ -386,6 +386,7 @@ static void* fwp_vres_tx_thread(void *_vres)
                                 */
                                curr_budget++;
                        }
+                       
                        fwp_msgb_free(msgb);
                }
 
@@ -442,7 +443,6 @@ int fwp_vres_bind(fwp_vres_d_t vresd, int sockd)
        /*if (rv)
                goto err;*/
        fwp_vres_set_flag(vres, FWP_VF_BOUND);
-       FWP_DEBUG("Bind is ok\n");
 err:
        pthread_mutex_unlock(&fwp_vres_table.lock);
        return rv;

diff --git a/fwp/lib/fwp_fna.c b/fwp/lib/fwp_fna.c
index 2389bc3b3864ce53fa1172f5fff21a19839c91bb..8ac470e5b9b584ed157e99b9f33233ca1decdc1c 100644 (file)
--- a/fwp/lib/fwp_fna.c
+++ b/fwp/lib/fwp_fna.c
@@ -40,8 +40,8 @@ int fwp_fna_receive_endpoint_created(fna_endpoint_data_t  *endpoint)
                return rv;
        
        endpoint->protocol_info.body = fwp_epoint;
-       fwp_endpoint_get_params(fwp_epoint, &node, &port, attr);
-       endpoint->stream_id = port;
+//     fwp_endpoint_get_params(fwp_epoint, &node, &port, attr);
+//     endpoint->stream_id = port;
 
        return 0;
 }
@@ -49,8 +49,11 @@ int fwp_fna_receive_endpoint_created(fna_endpoint_data_t  *endpoint)
 int fwp_fna_send_endpoint_bind(fna_endpoint_data_t *endpoint, fna_vres_id_t vres)
 {
 #warning fwp_fna_send_endpoint_bind is empty
+#ifdef FWP_CONTNEGT
+
 /*     return fwp_send_endpoint_bind(endpoint->protocol_info.body, 
                                        (fwp_endpoint_t*) vres);*/
+#endif
        return 0;
 }
 

diff --git a/fwp/mngr/fwpsched.c b/fwp/mngr/fwpsched.c
index 8297ef478eb84bbd67e1fafc802515efcf0a225a..cd2ae9d85358235fdacf1eadb82ef63a55dc285c 100644 (file)
--- a/fwp/mngr/fwpsched.c
+++ b/fwp/mngr/fwpsched.c
@@ -7,7 +7,7 @@
 UL_LOG_CUST(ulogd_frs_dummy);
 ul_log_domain_t ulogd_frs_dummy = {UL_LOGL_MSG, "frs_dummy"};
 
-int create_vres(fres_vres_t *vres, void *priv)
+static int create_vres(fres_vres_t *vres, void *priv)
 {
        int *my_data = priv;
        fres_block_basic *basic;
@@ -17,13 +17,14 @@ int create_vres(fres_vres_t *vres, void *priv)
 
        fres_contract_id_to_string(id, &vres->contract->id, sizeof(id));
        basic = fres_contract_get_basic(vres->contract);
-       printf("Creating VRes #%d (id=%s, period=%ld ms, budget=%ld ms)\n",
+       printf("Creating FWP VRes #%d (id=%s, period=%ld ms, budget=%ld ms)\n",
               *my_data, id,
               fosa_rel_time_to_msec(basic->period),
               fosa_rel_time_to_msec(basic->budget));
        return 0;
 }
-int cancel_vres(fres_vres_t *vres, void *priv)
+
+static int cancel_vres(fres_vres_t *vres, void *priv)
 {
        int *my_data = priv;
        fres_block_basic *basic;