Unverified Commit 77fe6f36 authored by Eisenhauer, Greg's avatar Eisenhauer, Greg Committed by GitHub
Browse files

Merge pull request #1062 from eisenhauer/ATLUpstream 

Atl upstream
parents 23f6464c 1ab17943

examples/heatTransfer/heat_sst_bp_rdma.xml

+2 −2
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
    <io name="writer">

        <engine type="SST">

            <parameter key="MarshalMethod" value="BP"/>

            <parameter key="DataTransport" value="rdma" />

            <!--parameter key="DataTransport" value="rdma" -->

        </engine>

    </io>
@@ -25,7 +25,7 @@ 
    <io name="readerInput">

        <engine type="SST">

            <parameter key="MarshalMethod" value="BP"/>

            <parameter key="DataTransport" value="rdma" />

            <!--parameter key="DataTransport" value="rdma" -->

        </engine>

    </io>

examples/heatTransfer/heat_sst_ffs_rdma.xml

+2 −2
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
    <io name="writer">

        <engine type="SST">

            <parameter key="MarshalMethod" value="FFS"/>

            <parameter key="DataTransport" value="rdma"/>

            <!--parameter key="DataTransport" value="rdma"-->

        </engine>

    </io>
@@ -25,7 +25,7 @@ 
    <io name="readerInput">

        <engine type="SST">

            <parameter key="MarshalMethod" value="FFS"/>

            <parameter key="DataTransport" value="rdma"/>

            <!--parameter key="DataTransport" value="rdma"-->

        </engine>

    </io>

thirdparty/atl/atl/attr.c

+10 −10
Original line number Diff line number Diff line
@@ -116,15 +116,15 @@ extern int 
add_pattr(attr_list list, atom_t attr_id, attr_value_type val_type, 

	  attr_union value);



static void

deallocate_global_atom_server()

{

    if (global_as) {

        atom_server tmp = global_as;

        global_as = NULL;

        free_atom_server(tmp);

    }

}

/* static void */

/* deallocate_global_atom_server() */

/* { */

/*     if (global_as) { */

/*         atom_server tmp = global_as; */

/*         global_as = NULL; */

/*         free_atom_server(tmp); */

/*     } */

/* } */



static

void
@@ -138,7 +138,7 @@ atom_server *asp; 


    if ((asp == &global_as) && first) {

        first = 0;

        atexit(deallocate_global_atom_server);

//      atexit(deallocate_global_atom_server);

    }

}