Better dealing with AQuoSA servers' parameters

diff --git a/resources/cpu_aquosa/lib/Makefile.omk b/resources/cpu_aquosa/lib/Makefile.omk
index 784632e04e9a5befc2d1254fdeecdaf13d5a2e90..834383c293c2446b905df679b5905e7a67665a82 100644 (file)
--- a/resources/cpu_aquosa/lib/Makefile.omk
+++ b/resources/cpu_aquosa/lib/Makefile.omk
@@ -1,7 +1,7 @@
 shared_LIBRARIES = frshaqcpu
 CFLAGS += -I /usr/local/aquosa/include
 frshaqcpu_SOURCES += frsh_aqcpu.c aqcpu_contract.c aqcpu_fra.c 
-include_HEADERS += aqcpu_contract.h aqcpu_res.h timespec_usec_ops.h
+include_HEADERS += aqcpu_contract.h aqcpu_res.h
 frshaqcpu_LIBS += qreslib  
 #include_HEADERS +=$(wildcard aquosa/qresmod/*.h)
 #include_HEADERS +=$(wildcard aquosa/rresmod/*.h)

diff --git a/resources/cpu_aquosa/lib/aqcpu_contract.c b/resources/cpu_aquosa/lib/aqcpu_contract.c
index 2758543ce0e6c84bcf1cb1a988e0e83edc2a5639..96db784591ad4e324de03ebf387c826906972dc2 100644 (file)
--- a/resources/cpu_aquosa/lib/aqcpu_contract.c
+++ b/resources/cpu_aquosa/lib/aqcpu_contract.c
@@ -8,15 +8,13 @@ int get_aqcpu_params(fres_vres_t *vres, aqcpu_params_t *params)
        basic = fres_contract_get_basic(vres->new);
        
        /* core contract parameters */
-       params->Q_min = 0;
+       params->Q_min = params->Q = timespec_to_usec(basic->budget);
        params->P = timespec_to_usec(basic->period);
-       /* non-core contract parameters */
-       /* right now, the same as minimum budget */
-       params->Q = timespec_to_usec(basic->budget);
 
        /* AQuoSA specific configuration */
        params->flags = 0x000;
-       /*params->flags |= QOS_F_PERSISTENT; */
+       params->flags |= QOS_F_PERSISTENT;
+
        /* if we're negotiating for the service thread create 
         * a soft server */
        /*if (contract == &service_th_contract) {
@@ -24,6 +22,7 @@ int get_aqcpu_params(fres_vres_t *vres, aqcpu_params_t *params)
        }*/
                        
        params->timeout = 0;
+
        return 0;
 }
 

diff --git a/resources/cpu_aquosa/lib/aqcpu_contract.h b/resources/cpu_aquosa/lib/aqcpu_contract.h
index f03ac7981e1c1c8f500ca2ec71920597a32c3278..7760c5d98a3d1ddeb86609c0423e57cc7b0efb27 100644 (file)
--- a/resources/cpu_aquosa/lib/aqcpu_contract.h
+++ b/resources/cpu_aquosa/lib/aqcpu_contract.h
@@ -1,6 +1,5 @@
 #ifndef AQCPU_CONTRACT_H
 #include "aquosa/qres_lib.h"
-#include "timespec_usec_ops.h"
 #include <fra_generic.h>
 
 typedef qres_params_t aqcpu_params_t;

diff --git a/resources/cpu_aquosa/lib/frsh_aqcpu.c b/resources/cpu_aquosa/lib/frsh_aqcpu.c
index 16cb1a0cb1e598a8084ee6e6aa084bac76014fe8..80def55e40420d1c874c0826f409abaa2f240a22 100644 (file)
--- a/resources/cpu_aquosa/lib/frsh_aqcpu.c
+++ b/resources/cpu_aquosa/lib/frsh_aqcpu.c
@@ -81,6 +81,7 @@
 #include <linux/unistd.h>
 #include <errno.h>
 #include <sys/types.h>
+#define _XOPEN_SOURCE 500
 #define __USE_UNIX98
 #include <pthread.h>
 #include <semaphore.h>

diff --git a/resources/cpu_aquosa/lib/timespec_usec_ops.h b/resources/cpu_aquosa/lib/timespec_usec_ops.h
deleted file mode 100644 (file)
index 57cc989..0000000
--- a/resources/cpu_aquosa/lib/timespec_usec_ops.h
+++ /dev/null
@@ -1,69 +0,0 @@
-#ifndef        __TIMESPEC_USEC_OPS_H__
-#define __TIMESPEC_USEC_OPS_H__
-
-/*
- * timespec_usec_ops.h
- *
- * ...
- */
-
-#include <time.h>
-
-#define equal_timespec(t1, t2) \
- ( ( (t1)->tv_sec == (t2)->tv_sec ) && ( (t1)->tv_nsec == (t2)->tv_nsec )  )
-
-#define increment_timespec(t) \
-do { \
- (t)->tv_nsec ++; \
- if ((t)->tv_nsec >= 1000000000UL) { \
-   (t)->tv_sec ++; \
-   (t)->tv_nsec -= 1000000000UL; \
- } \
-} while(0)
-
-#define decrement_timespec(t) \
-do { \
- if ( (t)->tv_nsec == 0) { \
-  (t)->tv_nsec = 1000000000UL; \
-  (t)->tv_sec --; \
- } \
- else \
-  (t)->tv_nsec --; \
-} while(0)
-
-#define sum_timespec(t1, t2, ts) \
-do { \
- (ts)->tv_sec  = (t1)->tv_sec  + (t2)->tv_sec; \
- (ts)->tv_nsec = (t1)->tv_nsec + (t2)->tv_nsec; \
- while ( (ts)->tv_nsec >= 1000000000UL) { \
-  (ts)->tv_sec ++; \
-  (ts)->tv_nsec -= 1000000000UL; \
- } \
-} while(0)
-
-#define sub_timespec(t1, t2, ts) \
-do { \
- if ( (t2)->tv_sec < (t1)->tv_sec || \
-  ((t2)->tv_sec == (t1)->tv_nsec && (t2)->tv_nsec < (t1)->tv_nsec) ) { \
-  (ts)->tv_sec = (t1)->tv_sec - (t2)->tv_sec; \
-  (ts)->tv_nsec = (t1)->tv_nsec - (t2)->tv_sec; \
-  while ( (ts)->tv_nsec < 0) { \
-   (ts)->tv_sec --; \
-   (ts)->tv_nsec = (ts)->tv_nsec + 1000000000UL; \
-  } \
- } else { \
-  (ts)->tv_sec = 0UL; \
-  (ts)->tv_nsec = 0UL; \
- } \
-} while(0)
-
-#define zero_timespec(t) \
-do { \
- (t)->tv_sec = 0; \
- (t)->tv_nsec = 0; \
-} while(0)
-
-#define is_zero_timespec(t) \
-( (t)->tv_sec == 0 && (t)->tv_nsec == 0 )
-
-#endif /* __TIMESPEC_USEC_OPS_H__ */