Checkpoint for the night:

- Updated copyrights
 - First pass at the uDAPL mpool component looks complete - is it really this easy?

This commit was SVN r8803.

ompi/mca/mpool/udapl/Makefile.am

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
 #                         University Research and Technology
 #                         Corporation.  All rights reserved.
 # Copyright (c) 2004-2005 The University of Tennessee and The University

ompi/mca/mpool/udapl/configure.m4

@@ -1,6 +1,6 @@
 # -*- shell-script -*-
 #
-# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
 #                         University Research and Technology
 #                         Corporation.  All rights reserved.
 # Copyright (c) 2004-2005 The University of Tennessee and The University

ompi/mca/mpool/udapl/configure.params

@@ -1,6 +1,6 @@
 # -*- shell-script -*-
 #
-# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
 #                         University Research and Technology
 #                         Corporation.  All rights reserved.
 # Copyright (c) 2004-2005 The University of Tennessee and The University

ompi/mca/mpool/udapl/mpool_udapl.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+ * Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
  *                         University Research and Technology
  *                         Corporation.  All rights reserved.
  * Copyright (c) 2004-2005 The University of Tennessee and The University
@@ -48,17 +48,27 @@ OMPI_COMP_EXPORT extern mca_mpool_udapl_component_t mca_mpool_udapl_component;
 
 
 struct mca_mpool_base_resources_t {
-    DAT_IA_HANDLE udapl_ia;
+    DAT_IA_HANDLE udapl_ia; /* interface adapter */
+    DAT_PZ_HANDLE udapl_pz; /* protection zone */
 }; 
 typedef struct mca_mpool_base_resources_t mca_mpool_base_resources_t;  
 
 struct mca_mpool_udapl_module_t {
     mca_mpool_base_module_t super;
-    DAT_IA_HANDLE udapl_ia;
+    struct mca_mpool_base_resources_t udapl_res;
 }; 
 typedef struct mca_mpool_udapl_module_t mca_mpool_udapl_module_t; 
 
 
+struct mca_mpool_udapl_registration_t {
+    mca_mpool_base_registration_t base_reg;
+    DAT_LMR_HANDLE lmr;          /* local memory region (LMR) */
+    DAT_LMR_TRIPLET lmr_triplet; /* LMR triplet - context, address, length */
+    DAT_RMR_CONTEXT rmr_context; /* remote memory region context handle */
+};
+typedef struct mca_mpool_udapl_registration_t mca_mpool_udapl_registration_t;
+OMPI_DECLSPEC OBJ_CLASS_DECLARATION(mca_mpool_udapl_registration_t);
+
 
 /* 
  *  Initializes the mpool module. 

ompi/mca/mpool/udapl/mpool_udapl_component.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+ * Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
  *                         University Research and Technology
  *                         Corporation.  All rights reserved.
  * Copyright (c) 2004-2005 The University of Tennessee and The University
@@ -64,6 +64,26 @@ mca_mpool_udapl_component_t mca_mpool_udapl_component = {
 };
 
 
+static void mca_mpool_udapl_registration_constructor(mca_mpool_udapl_registration_t *registration)
+{
+    registration->base_reg.base = NULL; 
+    registration->base_reg.bound = NULL; 
+    registration->base_reg.flags = 0;
+}
+
+static void mca_mpool_udapl_registration_destructor(mca_mpool_udapl_registration_t *registration)
+{
+    registration->base_reg.base = NULL; 
+    registration->base_reg.bound = NULL; 
+    registration->base_reg.flags = 0;
+}
+
+OBJ_CLASS_INSTANCE(mca_mpool_udapl_registration_t,
+                   mca_mpool_base_registration_t,
+                   mca_mpool_udapl_registration_constructor,
+                   mca_mpool_udapl_registration_destructor);
+
+
 
 
 /**
@@ -94,7 +114,7 @@ static mca_mpool_base_module_t* mca_mpool_udapl_init(
 
     udapl_mpool = (mca_mpool_udapl_module_t*)malloc(sizeof(mca_mpool_udapl_module_t)); 
     mca_mpool_udapl_module_init(udapl_mpool); 
-    udapl_mpool->udapl_ia = resources->udapl_ia;
+    udapl_mpool->udapl_res = *resources;
     return &udapl_mpool->super;
 }
 

ompi/mca/mpool/udapl/mpool_udapl_module.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+ * Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
  *                         University Research and Technology
  *                         Corporation.  All rights reserved.
  * Copyright (c) 2004-2005 The University of Tennessee and The University
@@ -67,9 +67,11 @@ void* mca_mpool_udapl_alloc(
 
     opal_output(0, "mpool_udapl_alloc\n");
 
+    /* TODO - align addr to dat_optimal_alignment */
     if(NULL == addr)
         return NULL;
-    if(OMPI_SUCCESS != mca_mpool_udapl_register(mpool,addr,size+align, flags, registration)) {
+    if(OMPI_SUCCESS != mca_mpool_udapl_register(mpool,
+            addr, size + align, flags, registration)) {
         free(addr);
         return NULL;
     }
@@ -87,41 +89,56 @@ int mca_mpool_udapl_register(
     uint32_t flags, 
     mca_mpool_base_registration_t** registration)
 {
-    mca_mpool_udapl_module_t * udapl_mpool = (mca_mpool_udapl_module_t*) mpool; 
+    mca_mpool_udapl_module_t* udapl_mpool; 
-    mca_mpool_base_registration_t* reg = OBJ_NEW(mca_mpool_base_registration_t);
+    mca_mpool_udapl_registration_t* reg;
+    DAT_REGION_DESCRIPTION region;
+    DAT_VLEN dat_size;
+    DAT_VADDR dat_addr;
     int rc;
 
     opal_output(0, "mpool_udapl_register\n");
 
+    udapl_mpool = (mca_mpool_udapl_module_t*)mpool;
+    reg = OBJ_NEW(mca_mpool_udapl_registration_t);
     if(NULL == reg) {
         return OMPI_ERR_OUT_OF_RESOURCE;
     }
-    reg->mpool = mpool;
+
-    reg->base = down_align_addr(addr, mca_mpool_base_page_size_log); 
+    reg->base_reg.mpool = mpool;
-    reg->flags = flags; 
+    reg->base_reg.base = down_align_addr(addr, mca_mpool_base_page_size_log); 
-    reg->bound = up_align_addr((void*) ((unsigned long) addr + size -1)
+    reg->base_reg.flags = flags; 
-                               , mca_mpool_base_page_size_log);
+    reg->base_reg.bound = up_align_addr((void*)((unsigned long) addr + size -1),
-    
+                    mca_mpool_base_page_size_log);
-#if 0
+
-    if((rc = gm_register_memory(udapl_mpool->port, reg->base, reg->bound - reg->base + 1)) != GM_SUCCESS) {
+
-        opal_output(0, "[%s:%d] error(%d) registering udapl memory\n", __FILE__, __LINE__, rc);
+    region.for_va = addr;
-        assert(0);
+    reg->lmr_triplet.virtual_address = (DAT_VADDR)addr;
+    reg->lmr_triplet.segment_length = size;
+
+    rc = dat_lmr_create(udapl_mpool->udapl_res.udapl_ia,
+            DAT_MEM_TYPE_VIRTUAL, region, reg->lmr_triplet.segment_length,
+            udapl_mpool->udapl_res.udapl_pz, DAT_MEM_PRIV_ALL_FLAG,
+            &reg->lmr, &reg->lmr_triplet.lmr_context,
+            &reg->rmr_context, &dat_size, &dat_addr);
+    if(DAT_SUCCESS != rc) {
+        /* TODO - bring in error reporting function from the BTL */
+        opal_output(0, "mpool_udapl_register failed: %d\n", rc);
         OBJ_RELEASE(reg);
-        
+
         return OMPI_ERR_OUT_OF_RESOURCE;
     }
-    mca_mpool_udapl_mem_registered += reg->bound - reg->base + 1;
-#endif
     
-    OPAL_THREAD_ADD32(&reg->ref_count,1);
+    OPAL_THREAD_ADD32(&reg->base_reg.ref_count,1);
 
     if(flags & (MCA_MPOOL_FLAGS_CACHE | MCA_MPOOL_FLAGS_PERSIST)) { 
         mpool->rcache->rcache_insert(mpool->rcache, 
                                      (mca_mpool_base_registration_t*) reg, 
                                      flags); 
     }
-    *registration = reg;
+    
-    /* opal_output(0,"registered memory from %p to %p\n", reg->base, reg->bound); */
+    *registration = &reg->base_reg;
+    opal_output(0,"registered memory from %p to %p\n",
+            reg->base_reg.base, reg->base_reg.bound);
     return OMPI_SUCCESS; 
 }
 
@@ -141,14 +158,12 @@ int mca_mpool_udapl_deregister(mca_mpool_base_module_t* mpool,
                                      reg, 
                                      reg->flags); 
     }
-#if 0
+    if((rc = mca_mpool_udapl_release(mpool, reg)) != OMPI_SUCCESS) { 
-    if((rc = mca_mpool_udapl_release(mpool, reg)) != GM_SUCCESS) { 
         opal_output(0, "[%s:%d] error(%d) deregistering udapl memory\n", __FILE__, __LINE__, rc);
         assert(0);
         return OMPI_ERR_OUT_OF_RESOURCE;
 
     }
-#endif
     return OMPI_SUCCESS;
 }
 
@@ -210,18 +225,17 @@ int mca_mpool_udapl_release(
     opal_output(0, "mpool_udapl_release\n");
 
     if(0 == OPAL_THREAD_ADD32(&reg->ref_count, -1)) {
-#if 0
+        mca_mpool_udapl_registration_t *udapl_reg =
-        int rc = gm_deregister_memory(
+                (mca_mpool_udapl_registration_t*)reg;
-                                  mpool_udapl->port,
+        int rc = dat_lmr_free(udapl_reg->lmr);
-                                  reg->base,
+        
-                                  reg->bound - reg->base + 1);
+        if(DAT_SUCCESS != rc) {
-        if(GM_SUCCESS != rc) { 
+            /* TODO - use error reporting function from the BTL */
             opal_output(0, "[%s:%d] error(%d) deregistering udapl memory\n", __FILE__, __LINE__, rc); 
-            return OMPI_ERROR; 
+            return OMPI_ERROR;
         }
-#endif
+
         /* opal_output(0,"deregistering udapl memory\n"); */
-        mca_mpool_udapl_mem_registered -= reg->bound - reg->base + 1;
         OBJ_RELEASE(reg);
     }
     else {