diff --git a/tests/check_declaration_seal.c b/tests/check_declaration_seal.c
index 38cab7997f9ecc5437df53657df368ba99751da2..a7266c6c0da0f5a1aa04251d248fb7e5c0b75212 100644
--- a/tests/check_declaration_seal.c
+++ b/tests/check_declaration_seal.c
@@ -61,7 +61,7 @@ CHEAT_TEST(cdo_declaration_seal_works,
mstro_cdo cdo=NULL;
enum mstro_cdo_attr_value_type type;
const void* val;
- uint64_t size;
+ int64_t size;
size = 16000;
cheat_assert(MSTRO_OK
== mstro_cdo_declare(
@@ -102,7 +102,7 @@ CHEAT_TEST(cdo_declaration_seal_works,
cheat_assert(MSTRO_OK
== mstro_cdo_attribute_set(
cdo, ".maestro.core.cdo.scope.local-size",
- &size, true));
+ &size, true));
cheat_assert(MSTRO_OK == mstro_cdo_declaration_seal(cdo));
diff --git a/tests/check_pool_mamba.c b/tests/check_pool_mamba.c
index 76e959ecdfbc74d303c35739f44049e9d247ba1d..b7f9ec4c0e1ea630cd83fdc8cbe685fa334be572 100644
--- a/tests/check_pool_mamba.c
+++ b/tests/check_pool_mamba.c
@@ -1,6 +1,6 @@
/* -*- mode:c -*- */
/** @file
- ** @brief simple mamba use through maestro check
+ ** @brief simple mamba use through maestro check
**/
/*
@@ -50,16 +50,16 @@ CHEAT_TEST(cdo_local_pool_mamba_works,
char name[] = "Test CDO name üÜöÖäÄ";
mstro_cdo cdo=NULL;
cheat_assert(MSTRO_OK == mstro_cdo_declare(name, MSTRO_ATTR_DEFAULT, &cdo));
- uint64_t size = 4096;
+ int64_t size = 4096;
enum mstro_cdo_attr_value_type type;
float* buf;
void *rec;
buf = malloc(sizeof(float)*size);
fprintf(stderr, "buf: %p\n", buf);
rec = NULL;
-
+
// TODO declare/set a Mamba array
- mmbArray* ma_ptr = NULL;
+ mmbArray* ma_ptr = NULL;
// TODO associate (cdo, mmb_array_ptr)
cheat_assert(MSTRO_OK
== mstro_cdo_attribute_set(
@@ -67,14 +67,14 @@ CHEAT_TEST(cdo_local_pool_mamba_works,
cheat_assert(MSTRO_OK
== mstro_cdo_attribute_set(
cdo, ".maestro.core.cdo.scope.local-size", &size, true));
-
+
mmbArray *mamba_ptr=NULL;
/* mamba array not automatically available */
mstro_status s1 = mstro_cdo_attribute_get(
cdo, ".maestro.core.cdo.mamba-array", &type, (const void**)&mamba_ptr);
-
+
fprintf(stderr,"Mamba array fetch stat 1: %d, val %p\n", s1, mamba_ptr);
-
+
cheat_assert(MSTRO_OK==s1);
cheat_assert(mamba_ptr==NULL);
@@ -82,10 +82,10 @@ CHEAT_TEST(cdo_local_pool_mamba_works,
mmbArray *tmp=NULL;
cheat_assert(MSTRO_OK==mstro_cdo_access_mamba_array(cdo,&tmp));
cheat_assert(tmp==NULL);
-
+
/* now seal */
cheat_assert(MSTRO_OK == mstro_cdo_declaration_seal(cdo));
-
+
cheat_assert(MSTRO_OK
== mstro_cdo_access_ptr(
@@ -93,7 +93,7 @@ CHEAT_TEST(cdo_local_pool_mamba_works,
fprintf(stderr, "rec: %p\n", (float*)rec);
cheat_assert(rec==buf);
- /* afterwards we can also get mamba array as an attribute */
+ /* afterwards we can also get mamba array as an attribute */
cheat_assert(MSTRO_OK
== mstro_cdo_attribute_get(
cdo, ".maestro.core.cdo.mamba-array", &type, (const void**)&mamba_ptr));
@@ -114,6 +114,3 @@ CHEAT_TEST(cdo_local_pool_mamba_works,
cheat_assert(MSTRO_OK == mstro_finalize());
free(buf);
)
-
-
-
diff --git a/tests/check_transport_mio.c b/tests/check_transport_mio.c
index f2eb2e065639efb06aea6d09bab708bfe5d6d08f..fd7116c8034e742b92be20b87a7f03cf0919879d 100644
--- a/tests/check_transport_mio.c
+++ b/tests/check_transport_mio.c
@@ -58,26 +58,26 @@ CHEAT_DECLARE (
{
unsigned char x;
int i;
-
- for (i=0,x=0;i<size; i++)
- x ^= ((unsigned char*)rawptr)[i];
-
+
+ for (i=0,x=0;i<size; i++)
+ x ^= ((unsigned char*)rawptr)[i];
+
fprintf(stderr, "Checksum for cdo \"%s\":\t%d\n", name, x);
return x;
}
)
-
+
/* this tests MIO transport by using this single thread as both Producer and Consumer */
CHEAT_TEST(transport_mio_works,
size_t data_count = 1031;
- size_t bytes = data_count*sizeof(double);
+ int64_t bytes = data_count*sizeof(double);
size_t pad = 0;
double src_data[data_count];
for(size_t i=0; i<data_count; i++) {
src_data[i]=random();
}
unsigned char sender_checksum = transport_checksum("pioneer departure", src_data, data_count);
-
+
cheat_assert(MSTRO_OK == mstro_init("Tests","TRANSPORT",0));
char name[] = "transport_pioneer";
char filename_dst[] = "./CDOs/__CDO_mio_transport_pioneer";
@@ -85,7 +85,7 @@ CHEAT_DECLARE (
mstro_cdo cdo_dst=NULL;
int s = mkdir("./CDOs", S_IRWXU);
cheat_assert(s==0 || errno==EEXIST);
-
+
cheat_assert(MSTRO_OK == mstro_cdo_declare(name, MSTRO_ATTR_DEFAULT, &cdo_src));
cheat_assert(MSTRO_OK == mstro_cdo_attribute_set(cdo_src,
MSTRO_ATTR_CORE_CDO_RAW_PTR,
@@ -110,13 +110,13 @@ CHEAT_DECLARE (
NULL,
(const void**)&tval));
cheat_assert(*tval==bytes);
-
+
cheat_assert(MSTRO_OK == mstro_cdo_declare(name, MSTRO_ATTR_DEFAULT, &cdo_dst));
-
+
/* Particular case where the offerer is also the src, so let us execute
* the src transport before offering, otherwise the raw-ptr won't be
* accessible anymore */
-
+
/* Have a ticket issued for src */
Mstro__Pool__UUID id = MSTRO__POOL__UUID__INIT;
size_t i;
@@ -147,10 +147,10 @@ CHEAT_DECLARE (
ticket.ticket_case = MSTRO__POOL__TRANSFER_TICKET__TICKET_MIO;
Mstro__Pool__TransferTicketMIO mio = MSTRO__POOL__TRANSFER_TICKET_MIO__INIT;
ticket.mio = &mio;
- struct mstro_cdo_id* semid;
+ struct mstro_cdo_id* semid;
semid = malloc(sizeof(struct mio_obj_id));
cheat_assert(semid != NULL);
- struct mstro_cdo_id* objid;
+ struct mstro_cdo_id* objid;
objid = malloc(sizeof(struct mio_obj_id));
cheat_assert (objid != NULL);
char* semname = NULL;
@@ -170,53 +170,50 @@ CHEAT_DECLARE (
*/
cheat_assert(sizeof(struct mstro_cdo_id) == 2*sizeof(uint64_t));
cheat_assert(sizeof(struct mstro_cdo_id) == sizeof(struct mio_obj_id));
-
+
ticket.mio->semid.len = sizeof(struct mstro_cdo_id);
ticket.mio->semid.data = (uint8_t*)semid;
ticket.mio->objid.len = sizeof(struct mstro_cdo_id);
objid->qw[0] = ticket.cdoid->qw0;
objid->qw[1] = ticket.cdoid->qw1;
ticket.mio->objid.data = (uint8_t*)objid;
-
+
ticket.mio->keep_obj = 0;
/* No clean issuing, have to duplicate code above from maestro/ofi.c*/
// cheat_assert(MSTRO_OK == mstro_transport_ticket_issue(cdo_src, &ticket));
-
- cheat_assert(MSTRO_OK == mstro_transport_mio_src_execute(cdo_src, &ticket));
-
+
+ cheat_assert(MSTRO_OK == mstro_transport_mio_src_execute(cdo_src, &ticket));
+
cheat_assert(MSTRO_OK == mstro_cdo_offer(cdo_src));
/* ticket is supposed to be sent to dst (4-step protocol), so here let
* us just pretend it was, and use ticket directly for dst transport
* execute, while it is being implemented */
-
+
cheat_assert(MSTRO_OK == mstro_cdo_declaration_seal(cdo_dst));
- cheat_assert(MSTRO_OK == mstro_transport_mio_dst_execute(cdo_dst, &ticket));
+ cheat_assert(MSTRO_OK == mstro_transport_mio_dst_execute(cdo_dst, &ticket));
cheat_assert(MSTRO_OK == mstro_cdo_require(cdo_dst));
cheat_assert(MSTRO_OK == mstro_cdo_demand(cdo_dst));
-
-
+
+
double* data;
size_t len;
enum mstro_cdo_attr_value_type type;
const void* val;
-
+
cheat_assert(MSTRO_OK == mstro_cdo_access_ptr(cdo_dst, (void**)&data, NULL));
- cheat_assert(MSTRO_OK == mstro_cdo_attribute_get(cdo_dst, "scope.local-size", &type, &val));
+ cheat_assert(MSTRO_OK == mstro_cdo_attribute_get(cdo_dst, "scope.local-size", &type, &val));
len = *(size_t*)val;
len /= sizeof(double);
cheat_assert(len > 0 && data != NULL);
unsigned char receiver_checksum = transport_checksum("pioneer arrival", data, len);
cheat_assert(sender_checksum == receiver_checksum);
-
+
cheat_assert(MSTRO_OK == mstro_cdo_dispose(cdo_dst));
cheat_assert(MSTRO_OK == mstro_cdo_withdraw(cdo_src));
cheat_assert(MSTRO_OK == mstro_cdo_dispose(cdo_src));
cheat_assert(MSTRO_OK == mstro_finalize());
-
- )
-
-
+ )