added more tests

examples/example.c

@@ -70,6 +70,7 @@ int main(int argc, char** argv) {
         na_tag_t  tag = 0;
         na_size_t actual_size = 0;
 
+        sleep(1);
         ret = mona_msg_recv_unexpected(
                 mona, buf, msg_len, plugin_data,
                 &source_addr, &tag, &actual_size);

src/mona.c

@@ -467,7 +467,6 @@ static int mona_callback(const struct na_cb_info *info)
             *(req->size) = size;
         }
     }
-
     ABT_eventual_set(req->eventual, &na_ret, sizeof(na_ret));
     return NA_SUCCESS;
 }

src/mona.pc.in

@@ -7,6 +7,6 @@ Name: mona
 Description: Mochi Messaging over NA
 Version: @MONA_VERSION@
 
-Requires: mercury
+Requires: mercury argobots
 Libs: -L${libdir} @PRIVATE_LIBS@
 Cflags: -I${includedir}

tests/CMakeLists.txt

@@ -4,5 +4,19 @@ target_include_directories (test-init PUBLIC
     ${CMAKE_CURRENT_SOURCE_DIR}/../include)
 target_link_libraries (test-init mona)
 
+add_executable (test-send-recv-unexpected test-send-recv-unexpected.c munit/munit.c)
+target_include_directories (test-send-recv-unexpected PUBLIC 
+    ${CMAKE_CURRENT_SOURCE_DIR}/munit
+    ${CMAKE_CURRENT_SOURCE_DIR}/../include)
+target_link_libraries (test-send-recv-unexpected mona)
+
+add_executable (test-send-recv-expected test-send-recv-expected.c munit/munit.c)
+target_include_directories (test-send-recv-expected PUBLIC 
+    ${CMAKE_CURRENT_SOURCE_DIR}/munit
+    ${CMAKE_CURRENT_SOURCE_DIR}/../include)
+target_link_libraries (test-send-recv-expected mona)
+
 
 add_test (NAME TestInit COMMAND ./test-init)
+add_test (NAME TestSendRecvUnexpected COMMAND mpirun -np 2 ./test-send-recv-unexpected)
+add_test (NAME TestSendRecvExpected COMMAND mpirun -np 2 ./test-send-recv-expected)

tests/test-init.c

@@ -24,7 +24,7 @@ static MunitResult test_init_finalize(const MunitParameter params[], void* data)
     (void)data;
 
     mona_instance_t mona = mona_init("na+sm", NA_TRUE, NULL);
-    munit_assert_ptr(mona, !=, NULL);
+    munit_assert_not_null(mona);
 
     mona_finalize(mona);
     return MUNIT_OK;

tests/test-send-recv-expected.c

+#include <mpi.h>
+#include "munit/munit.h"
+#include "mona.h"
+
+#define MIN(a,b) ((a) < (b) ? (a) : (b))
+
+typedef struct {
+    mona_instance_t mona;
+    int rank;
+    na_addr_t self_addr;
+    na_addr_t other_addr;
+} test_context;
+
+static void* test_context_setup(const MunitParameter params[], void* user_data)
+{
+    (void)params;
+    (void)user_data;
+
+    int ret;
+
+    MPI_Init(NULL, NULL);
+    ABT_init(0, NULL);
+    mona_instance_t mona = mona_init("ofi+tcp", NA_TRUE, NULL);
+
+    test_context* context = (test_context*)calloc(1, sizeof(*context));
+    context->mona = mona;
+    MPI_Comm_rank(MPI_COMM_WORLD, &(context->rank));
+
+    ret = mona_addr_self(mona, &(context->self_addr));
+    munit_assert_int(ret, ==, NA_SUCCESS);
+
+    char self_addr_str[128];
+    na_size_t self_addr_size = 128;
+    ret = mona_addr_to_string(mona, self_addr_str, &self_addr_size, context->self_addr);
+    munit_assert_int(ret, ==, NA_SUCCESS);
+
+    char other_addr_str[128];
+
+    MPI_Sendrecv(self_addr_str, 128, MPI_BYTE, (context->rank + 1) % 2, 0,
+                 other_addr_str, 128, MPI_BYTE, (context->rank + 1) % 2, 0,
+                 MPI_COMM_WORLD, MPI_STATUS_IGNORE);
+
+    ret = mona_addr_lookup(mona, other_addr_str, &(context->other_addr));
+    munit_assert_int(ret, ==, NA_SUCCESS);
+
+    return context;
+}
+
+static void test_context_tear_down(void* fixture)
+{
+    MPI_Barrier(MPI_COMM_WORLD);
+
+    test_context* context = (test_context*)fixture;
+    mona_addr_free(context->mona, context->self_addr);
+    mona_addr_free(context->mona, context->other_addr);
+    mona_finalize(context->mona);
+    free(context);
+
+    ABT_finalize();
+    MPI_Finalize();
+}
+
+static MunitResult test_send_recv_expected(const MunitParameter params[], void* data)
+{
+    (void)params;
+    test_context* context = (test_context*)data;
+    na_return_t ret;
+    mona_instance_t mona = context->mona;
+    void* plugin_data = NULL;
+    size_t msg_len = MIN(mona_msg_get_max_expected_size(mona),
+                         2*mona_msg_get_max_unexpected_size(mona));
+    char* buf = (char*)mona_msg_buf_alloc(mona, msg_len, &plugin_data);
+
+    if(context->rank == 0) { // sender
+
+        int i;
+        for(i = mona_msg_get_expected_header_size(mona); i < (int)msg_len; i++) {
+            buf[i] = i % 32;
+        }
+        ret = mona_msg_init_expected(mona, buf, msg_len);
+        munit_assert_int(ret, ==, NA_SUCCESS);
+
+        MPI_Barrier(MPI_COMM_WORLD);
+
+        ret = mona_msg_send_expected(
+                mona, buf, msg_len, plugin_data, context->other_addr, 0, 34);
+        munit_assert_int(ret, ==, NA_SUCCESS);
+
+    } else { // receiver
+
+        mona_request_t req;
+        na_op_id_t op = mona_op_create(mona);
+
+        ret = mona_msg_irecv_expected(
+                mona, buf, msg_len, plugin_data,
+                context->other_addr, 0, 34, &op, &req);
+        munit_assert_int(ret, ==, NA_SUCCESS);
+
+        MPI_Barrier(MPI_COMM_WORLD);
+
+        ret = mona_wait(req);
+        munit_assert_int(ret, ==, NA_SUCCESS);
+
+        int i;
+        for(i = mona_msg_get_expected_header_size(mona); i < (int)msg_len; i++) {
+            munit_assert_int(buf[i], ==, i % 32);
+        }
+
+        ret = mona_op_destroy(mona, op);
+        munit_assert_int(ret, ==, NA_SUCCESS);
+
+    }
+    
+    ret = mona_msg_buf_free(mona, buf, plugin_data);
+    munit_assert_int(ret, ==, NA_SUCCESS);
+
+    return MUNIT_OK;
+}
+
+static MunitTest test_suite_tests[] = {
+    { (char*) "/expected", test_send_recv_expected, test_context_setup, test_context_tear_down, MUNIT_TEST_OPTION_NONE, NULL },
+    { NULL, NULL, NULL, NULL, MUNIT_TEST_OPTION_NONE, NULL }
+};
+
+static const MunitSuite test_suite = { 
+    (char*) "/mona/send-recv", test_suite_tests, NULL, 1, MUNIT_SUITE_OPTION_NONE
+};
+
+int main(int argc, char* argv[MUNIT_ARRAY_PARAM(argc + 1)]) {
+    return munit_suite_main(&test_suite, (void*) "mona", argc, argv);
+}
+

tests/test-send-recv-unexpected.c

+#include <mpi.h>
+#include "munit/munit.h"
+#include "mona.h"
+
+typedef struct {
+    mona_instance_t mona;
+    int rank;
+    na_addr_t self_addr;
+    na_addr_t other_addr;
+} test_context;
+
+static void* test_context_setup(const MunitParameter params[], void* user_data)
+{
+    (void)params;
+    (void)user_data;
+
+    int ret;
+
+    MPI_Init(NULL, NULL);
+    ABT_init(0, NULL);
+    mona_instance_t mona = mona_init("na+sm", NA_TRUE, NULL);
+
+    test_context* context = (test_context*)calloc(1, sizeof(*context));
+    context->mona = mona;
+    MPI_Comm_rank(MPI_COMM_WORLD, &(context->rank));
+
+    ret = mona_addr_self(mona, &(context->self_addr));
+    munit_assert_int(ret, ==, NA_SUCCESS);
+
+    char self_addr_str[128];
+    na_size_t self_addr_size = 128;
+    ret = mona_addr_to_string(mona, self_addr_str, &self_addr_size, context->self_addr);
+    munit_assert_int(ret, ==, NA_SUCCESS);
+
+    char other_addr_str[128];
+
+    MPI_Sendrecv(self_addr_str, 128, MPI_BYTE, (context->rank + 1) % 2, 0,
+                 other_addr_str, 128, MPI_BYTE, (context->rank + 1) % 2, 0,
+                 MPI_COMM_WORLD, MPI_STATUS_IGNORE);
+
+    ret = mona_addr_lookup(mona, other_addr_str, &(context->other_addr));
+    munit_assert_int(ret, ==, NA_SUCCESS);
+
+    return context;
+}
+
+static void test_context_tear_down(void* fixture)
+{
+    MPI_Barrier(MPI_COMM_WORLD);
+
+    test_context* context = (test_context*)fixture;
+    mona_addr_free(context->mona, context->self_addr);
+    mona_addr_free(context->mona, context->other_addr);
+    mona_finalize(context->mona);
+    free(context);
+
+    ABT_finalize();
+    MPI_Finalize();
+}
+
+static MunitResult test_send_recv_unexpected(const MunitParameter params[], void* data)
+{
+    (void)params;
+    test_context* context = (test_context*)data;
+    na_return_t ret;
+    mona_instance_t mona = context->mona;
+    void* plugin_data = NULL;
+    size_t msg_len = mona_msg_get_max_unexpected_size(mona);
+    char* buf = (char*)mona_msg_buf_alloc(mona, msg_len, &plugin_data);
+
+    if(context->rank == 0) { // sender
+        int i;
+        for(i = mona_msg_get_unexpected_header_size(mona); i < (int)msg_len; i++) {
+            buf[i] = i % 32;
+        }
+        ret = mona_msg_init_unexpected(mona, buf, msg_len);
+        munit_assert_int(ret, ==, NA_SUCCESS);
+
+        ret = mona_msg_send_unexpected(
+                mona, buf, msg_len, plugin_data, context->other_addr, 0, 1234);
+        munit_assert_int(ret, ==, NA_SUCCESS);
+    } else { // receiver
+        na_tag_t  tag         = 0;
+        na_size_t actual_size = 0;
+        na_addr_t source_addr = NA_ADDR_NULL;
+
+        ret = mona_msg_recv_unexpected(
+                mona, buf, msg_len, plugin_data,
+                &source_addr, &tag, &actual_size);
+        munit_assert_int(ret, ==, NA_SUCCESS);
+        int i;
+        for(i = mona_msg_get_unexpected_header_size(mona); i < (int)msg_len; i++) {
+            munit_assert_int(buf[i], ==, i % 32);
+        }
+
+        ret = mona_addr_free(mona, source_addr);
+        munit_assert_int(ret, ==, NA_SUCCESS);
+    }
+    
+    ret = mona_msg_buf_free(mona, buf, plugin_data);
+    munit_assert_int(ret, ==, NA_SUCCESS);
+
+    return MUNIT_OK;
+}
+
+static MunitTest test_suite_tests[] = {
+    { (char*) "/unexpected", test_send_recv_unexpected, test_context_setup, test_context_tear_down, MUNIT_TEST_OPTION_NONE, NULL },
+    { NULL, NULL, NULL, NULL, MUNIT_TEST_OPTION_NONE, NULL }
+};
+
+static const MunitSuite test_suite = { 
+    (char*) "/mona/send-recv", test_suite_tests, NULL, 1, MUNIT_SUITE_OPTION_NONE
+};
+
+int main(int argc, char* argv[MUNIT_ARRAY_PARAM(argc + 1)]) {
+    return munit_suite_main(&test_suite, (void*) "mona", argc, argv);
+}
+