* dumb, minor changes - need to switch machines

This commit was SVN r5592.

src/mca/ptl/portals/ptl_portals.c

@@ -40,13 +40,13 @@ mca_ptl_portals_module_t mca_ptl_portals_module = {
         0,   /* exclusivity */
         0,   /* latency */
         0,   /* bandwidth */
-        0,   /* ptl flags */
+        MCA_PTL_PUT,   /* ptl flags */
 
         mca_ptl_portals_add_procs,
         mca_ptl_portals_del_procs,
         mca_ptl_portals_finalize,
         mca_ptl_portals_send,
-        NULL,
+        mca_ptl_portals_send,
         NULL,
         mca_ptl_portals_matched,
         mca_ptl_portals_request_init,
@@ -112,6 +112,19 @@ mca_ptl_portals_add_procs(struct mca_ptl_base_module_t* ptl,
 }
 
 
+int
+mca_ptl_portals_del_procs(struct mca_ptl_base_module_t *ptl,
+			  size_t nprocs,
+			  struct ompi_proc_t **procs,
+			  struct mca_ptl_base_peer_t **peers)
+{
+    /* yeah, I have no idea what to do here */
+
+    return OMPI_SUCCESS;
+}
+
+
+
 int
 mca_ptl_portals_module_enable(struct mca_ptl_portals_module_t *ptl,
                               int enable)
@@ -139,7 +152,6 @@ mca_ptl_portals_module_enable(struct mca_ptl_portals_module_t *ptl,
         }
     }
 
-
     return OMPI_SUCCESS;
 }
 
@@ -191,5 +203,26 @@ ptl_portals_new_frag_entry(struct mca_ptl_portals_module_t *ptl)
         return OMPI_ERROR;
     }
 
+    ompi_output_verbose(50, mca_ptl_portals_component.portals_output,
+                        "new fragment added");
+
+    return OMPI_SUCCESS;
+}
+
+
+int
+mca_ptl_portals_finalize(struct mca_ptl_base_module_t *ptl_base)
+{
+    struct mca_ptl_portals_module_t *ptl =
+        (struct mca_ptl_portals_module_t *) ptl_base;
+    int ret;
+
+    ret = PtlNIFini(ptl->ni_handle);
+    if (PTL_OK != ret) {
+        ompi_output_verbose(50, mca_ptl_portals_component.portals_output,
+                            "PtlNIFini returned %d\n", ret);
+        return OMPI_ERROR;
+    }
+
     return OMPI_SUCCESS;
 }

src/mca/ptl/portals/ptl_portals.h

@@ -351,29 +351,6 @@ extern int mca_ptl_portals_send(
 );
 
 
-/**
- * PML->PTL Continue sending fragments of a large message.
- *
- * @param ptl (IN)               PTL instance
- * @param ptl_base_peer (IN)     PTL peer addressing
- * @param request (IN)           Send request
- * @param offset                 Current offset into packed/contiguous buffer.
- * @param size (IN)              Number of bytes PML is requesting PTL to deliver,
- * @param flags (IN)             Flags that should be passed to the peer via the message header.
- * @param request (OUT)          OMPI_SUCCESS if the PTL was able to queue one or more fragments
- *
- */
-
-extern int mca_ptl_portals_send_continue(
-    struct mca_ptl_base_module_t* ptl,
-    struct mca_ptl_base_peer_t* ptl_peer,
-    struct mca_pml_base_send_request_t*,
-    size_t offset,
-    size_t size,
-    int flags
-);
-
-
 extern int mca_ptl_portals_module_enable(struct mca_ptl_portals_module_t *ptl,
                                          int value);
 extern int ptl_portals_new_frag_entry(struct mca_ptl_portals_module_t *ptl);

src/mca/ptl/portals/ptl_portals_component.c

@@ -192,12 +192,12 @@ mca_ptl_portals_component_init(int *num_ptls,
     mca_ptl_base_module_t** ptls;
     *num_ptls = 0;
 
-    /* BWB - no support for progress threads */
-    if (enable_progress_threads || enable_mpi_threads) return NULL;
-
     ompi_output_verbose(100, mca_ptl_portals_component.portals_output,
                         "mca_ptl_portals_component_init()");
 
+    /* BWB - no support for progress threads */
+    if (enable_progress_threads) return NULL;
+
     /* initialize portals ptl.  note that this is in the compat code because
        it's fairly non-portable between implementations */
     if (OMPI_SUCCESS != mca_ptl_portals_init(&mca_ptl_portals_component)) {

src/mca/ptl/portals/ptl_portals_stubs.c

@@ -30,22 +30,6 @@
  * BWB - README - BWB - README - BWB - README - BWB - README - BWB */
 
 
-int
-mca_ptl_portals_finalize(struct mca_ptl_base_module_t *ptl)
-{
-    return OMPI_ERROR;
-}
-
-
-int
-mca_ptl_portals_del_procs(struct mca_ptl_base_module_t *ptl,
-			  size_t nprocs,
-			  struct ompi_proc_t **procs,
-			  struct mca_ptl_base_peer_t **peers)
-{
-    return OMPI_ERROR;
-}
-
 
 int
 mca_ptl_portals_request_init(struct mca_ptl_base_module_t *ptl,