ssg.c 15.7 KB
Newer Older
1 2 3 4 5 6
/*
 * Copyright (c) 2016 UChicago Argonne, LLC
 *
 * See COPYRIGHT in top-level directory.
 */

7
#include "ssg-config.h"
Shane Snyder's avatar
Shane Snyder committed
8

Jonathan Jenkins's avatar
Jonathan Jenkins committed
9 10 11 12
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <unistd.h>
13
#include <errno.h>
Jonathan Jenkins's avatar
Jonathan Jenkins committed
14 15
#include <stdlib.h>
#include <string.h>
Jonathan Jenkins's avatar
Jonathan Jenkins committed
16
#include <assert.h>
Jonathan Jenkins's avatar
Jonathan Jenkins committed
17

Shane Snyder's avatar
Shane Snyder committed
18
#include <mercury.h>
19
#include <abt.h>
Shane Snyder's avatar
Shane Snyder committed
20
#include <margo.h>
21

22
#include "ssg.h"
23
#include "ssg-internal.h"
24 25 26 27
#if USE_SWIM_FD
#include "swim-fd/swim-fd.h"
#endif

28 29 30
/* SSG helper routine prototypes */
static hg_return_t ssg_group_lookup(
    ssg_group_t * g, const char * const addr_strs[]);
31 32 33
static void ssg_generate_group_id(
    const char * name, const char * leader_addr_str,
    ssg_group_id_t *group_id);
34 35
static const char ** ssg_setup_addr_str_list(
    char * buf, int num_addrs);
36

37
/* XXX: is this right? can this be a global? */
38
margo_instance_id ssg_mid = MARGO_INSTANCE_NULL;
Jonathan Jenkins's avatar
Jonathan Jenkins committed
39

40 41 42
/* XXX: fix this */
ssg_group_t *the_group = NULL;

43 44 45 46
DECLARE_MARGO_RPC_HANDLER(ssg_attach_recv_ult)

static hg_id_t ssg_attach_rpc_id;

47 48 49
/***************************************************
 *** SSG runtime intialization/shutdown routines ***
 ***************************************************/
50

51 52
int ssg_init(
    margo_instance_id mid)
Jonathan Jenkins's avatar
Jonathan Jenkins committed
53
{
54 55 56 57 58 59
    hg_class_t *hg_cls = margo_get_class(mid);

    /* register HG RPCs for SSG */
    ssg_attach_rpc_id = MERCURY_REGISTER(hg_cls, "ssg_attach", void, void,
        ssg_attach_recv_ult_handler);

60
    ssg_mid = mid;
Jonathan Jenkins's avatar
Jonathan Jenkins committed
61

62 63
    return SSG_SUCCESS;
}
Jonathan Jenkins's avatar
Jonathan Jenkins committed
64

65
int ssg_finalize()
66
{
67
    return SSG_SUCCESS;
68
}
Jonathan Jenkins's avatar
Jonathan Jenkins committed
69

70 71 72
/*************************************
 *** SSG group management routines ***
 *************************************/
Jonathan Jenkins's avatar
Jonathan Jenkins committed
73

74
int ssg_group_create(
75 76
    const char * group_name,
    const char * const group_addr_strs[],
77 78
    int group_size,
    ssg_group_id_t * group_id)
79
{
80
    hg_class_t *hgcl = NULL;
Shane Snyder's avatar
Shane Snyder committed
81
    hg_addr_t self_addr = HG_ADDR_NULL;
82
    char *self_addr_str = NULL;
Shane Snyder's avatar
Shane Snyder committed
83
    hg_size_t self_addr_size = 0;
84 85 86
    const char *self_addr_substr = NULL;
    const char *addr_substr = NULL;
    int i;
87
    hg_return_t hret;
88
    ssg_group_t *g = NULL;
89
    int sret = SSG_ERROR;
90

91 92
    hgcl = margo_get_class(ssg_mid);
    if (!hgcl) goto fini;
Jonathan Jenkins's avatar
Jonathan Jenkins committed
93

94
    /* get my address */
95 96 97 98 99 100 101 102 103
    hret = HG_Addr_self(hgcl, &self_addr);
    if (hret != HG_SUCCESS) goto fini;
    hret = HG_Addr_to_string(hgcl, NULL, &self_addr_size, self_addr);
    if (hret != HG_SUCCESS) goto fini;
    self_addr_str = malloc(self_addr_size);
    if (self_addr_str == NULL) goto fini;
    hret = HG_Addr_to_string(hgcl, self_addr_str, &self_addr_size, self_addr);
    if (hret != HG_SUCCESS) goto fini;

104 105 106 107
    /* strstr is used here b/c there may be inconsistencies in whether the class
     * is included in the address or not (it should not be in HG_Addr_to_string,
     * but it's possible that it is in the list of group address strings)
     */
108
    self_addr_substr = strstr(self_addr_str, "://");
Shane Snyder's avatar
Shane Snyder committed
109 110 111 112
    if (self_addr_substr == NULL)
        self_addr_substr = self_addr_str;
    else
        self_addr_substr += 3;
Shane Snyder's avatar
Shane Snyder committed
113

114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129
    /* allocate an SSG group data structure and initialize some of it */
    g = malloc(sizeof(*g));
    if (!g) goto fini;
    memset(g, 0, sizeof(*g));
    g->name = strdup(group_name);
    if (!g->name) goto fini;
    g->self_rank = -1;
    g->view.group_size = group_size;
    g->view.member_states = malloc(group_size * sizeof(*g->view.member_states));
    if (!g->view.member_states) goto fini;
    memset(g->view.member_states, 0, group_size * sizeof(*g->view.member_states));

    /* resolve my rank within the group */
    for (i = 0; i < group_size; i++)
    {
        addr_substr = strstr(group_addr_strs[i], "://");
Shane Snyder's avatar
Shane Snyder committed
130 131 132 133
        if (addr_substr == NULL)
            addr_substr = group_addr_strs[i];
        else
            addr_substr += 3;
134 135 136 137 138 139 140 141 142 143 144 145 146 147
        if (strcmp(self_addr_substr, addr_substr) == 0)
        {
            /* this is my address -- my rank is the offset in the address array */
            g->self_rank = i;
            g->view.member_states[i].addr = self_addr;
        }
        else
        {
            /* initialize group member addresses to NULL before looking them up */
            g->view.member_states[i].addr = HG_ADDR_NULL;
        }
        g->view.member_states[i].is_member = 1;
    }
    /* if unable to resolve my rank within the group, error out */
148
    if (g->self_rank == -1)
149 150 151 152 153 154 155 156 157 158 159 160 161 162
    {
        fprintf(stderr, "Error: SSG unable to resolve rank in group %s\n",
            group_name);
        goto fini;
    }

    /* lookup hg addresses information for all group members */
    hret = ssg_group_lookup(g, group_addr_strs);
    if (hret != HG_SUCCESS)
    {
        fprintf(stderr, "Error: SSG unable to complete lookup for group %s\n",
            group_name);
        goto fini;
    }
Shane Snyder's avatar
Shane Snyder committed
163
    SSG_DEBUG(g, "group lookup successful (size=%d)\n", group_size);
164 165

#if USE_SWIM_FD
166 167 168 169 170 171
    int swim_active = 1;
#ifdef SWIM_FORCE_FAIL
    if (g->self_rank == 1)
        swim_active = 0;
#endif

172
    /* initialize swim failure detector */
173 174
    // TODO: we should probably barrier or sync somehow to avoid rpc failures
    // due to timing skew of different ranks initializing swim
175
    g->fd_ctx = (void *)swim_init(g, swim_active);
176
    if (g->fd_ctx == NULL) goto fini;
177 178
#endif

179
    /* TODO: add reference to this group to SSG runtime state */
180
    the_group = g;
181

182 183 184 185 186 187
    /* generate a unique ID for this group that can be used by other
     * processes to join or attach to the group
     */    
    ssg_generate_group_id(group_name, group_addr_strs[0], group_id);

    sret = SSG_SUCCESS;
188
    /* don't free these pointers on success */
189
    self_addr = HG_ADDR_NULL;
190 191
    g = NULL;
fini:
Shane Snyder's avatar
Shane Snyder committed
192 193
    if (hgcl && self_addr != HG_ADDR_NULL) HG_Addr_free(hgcl, self_addr);
    free(self_addr_str);
194 195 196 197 198 199 200
    if (g)
    {
        free(g->name);
        free(g->view.member_states);
        free(g);
    }

201
    return sret;
202 203
}

204
int ssg_group_create_config(
205
    const char * group_name,
206 207
    const char * file_name,
    ssg_group_id_t * group_id)
208 209 210 211 212 213 214 215 216 217
{
    int fd;
    struct stat st;
    char *rd_buf = NULL;
    ssize_t rd_buf_sz;
    char *tok;
    void *addr_buf = NULL;
    int addr_buf_len = 0, num_addrs = 0;
    int ret;
    const char **addr_strs = NULL;
218
    int sret = SSG_ERROR;
219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253

    /* open config file for reading */
    fd = open(file_name, O_RDONLY);
    if (fd == -1)
    {
        fprintf(stderr, "Error: SSG unable to open config file %s for group %s\n",
            file_name, group_name);
        goto fini;
    }

    /* get file size and allocate a buffer to store it */
    ret = fstat(fd, &st);
    if (ret == -1)
    {
        fprintf(stderr, "Error: SSG unable to stat config file %s for group %s\n",
            file_name, group_name);
        goto fini;
    }
    rd_buf = malloc(st.st_size+1);
    if (rd_buf == NULL) goto fini;

    /* load it all in one fell swoop */
    rd_buf_sz = read(fd, rd_buf, st.st_size);
    if (rd_buf_sz != st.st_size)
    {
        fprintf(stderr, "Error: SSG unable to read config file %s for group %s\n",
            file_name, group_name);
        goto fini;
    }
    rd_buf[rd_buf_sz]='\0';

    /* strtok the result - each space-delimited address is assumed to be
     * a unique mercury address
     */
    tok = strtok(rd_buf, "\r\n\t ");
Jonathan Jenkins's avatar
Jonathan Jenkins committed
254 255
    if (tok == NULL) goto fini;

256 257
    /* build up the address buffer */
    addr_buf = malloc(rd_buf_sz);
258
    if (addr_buf == NULL) goto fini;
259 260
    do
    {
Jonathan Jenkins's avatar
Jonathan Jenkins committed
261
        int tok_sz = strlen(tok);
262 263
        memcpy((char*)addr_buf + addr_buf_len, tok, tok_sz+1);
        addr_buf_len += tok_sz+1;
Jonathan Jenkins's avatar
Jonathan Jenkins committed
264 265 266
        num_addrs++;
        tok = strtok(NULL, "\r\n\t ");
    } while (tok != NULL);
267 268 269 270 271 272 273
    if (addr_buf_len != rd_buf_sz)
    {
        /* adjust buffer size if our initial guess was wrong */
        void *tmp = realloc(addr_buf, addr_buf_len);
        if (tmp == NULL) goto fini;
        addr_buf = tmp;
    }
Jonathan Jenkins's avatar
Jonathan Jenkins committed
274

275 276 277
    /* set up address string array for group members */
    addr_strs = ssg_setup_addr_str_list(addr_buf, num_addrs);
    if (!addr_strs) goto fini;
278

279
    /* invoke the generic group create routine using our list of addrs */
280
    sret = ssg_group_create(group_name, addr_strs, num_addrs, group_id);
Jonathan Jenkins's avatar
Jonathan Jenkins committed
281 282

fini:
283
    /* cleanup before returning */
Jonathan Jenkins's avatar
Jonathan Jenkins committed
284
    if (fd != -1) close(fd);
285
    free(rd_buf);
286
    free(addr_buf);
287 288
    free(addr_strs);

289
    return sret;
Jonathan Jenkins's avatar
Jonathan Jenkins committed
290 291 292
}

#ifdef HAVE_MPI
293
int ssg_group_create_mpi(
294
    const char * group_name,
295 296
    MPI_Comm comm,
    ssg_group_id_t * group_id)
Jonathan Jenkins's avatar
Jonathan Jenkins committed
297
{
298
    hg_class_t *hgcl = NULL;
Jonathan Jenkins's avatar
Jonathan Jenkins committed
299
    hg_addr_t self_addr = HG_ADDR_NULL;
300
    char *self_addr_str = NULL;
Jonathan Jenkins's avatar
Jonathan Jenkins committed
301
    hg_size_t self_addr_size = 0;
302 303 304 305 306 307
    int self_addr_size_int = 0; /* for mpi-friendly conversion */
    char *addr_buf = NULL;
    int *sizes = NULL;
    int *sizes_psum = NULL;
    int comm_size = 0, comm_rank = 0;
    const char **addr_strs = NULL;
308
    hg_return_t hret;
309
    int sret = SSG_ERROR;
310

311 312
    hgcl = margo_get_class(ssg_mid);
    if (!hgcl) goto fini;
Jonathan Jenkins's avatar
Jonathan Jenkins committed
313

314
    /* get my address */
Jonathan Jenkins's avatar
Jonathan Jenkins committed
315 316 317
    hret = HG_Addr_self(hgcl, &self_addr);
    if (hret != HG_SUCCESS) goto fini;
    hret = HG_Addr_to_string(hgcl, NULL, &self_addr_size, self_addr);
Shane Snyder's avatar
Shane Snyder committed
318
    if (hret != HG_SUCCESS) goto fini;
Jonathan Jenkins's avatar
Jonathan Jenkins committed
319 320
    self_addr_str = malloc(self_addr_size);
    if (self_addr_str == NULL) goto fini;
Jonathan Jenkins's avatar
Jonathan Jenkins committed
321 322
    hret = HG_Addr_to_string(hgcl, self_addr_str, &self_addr_size, self_addr);
    if (hret != HG_SUCCESS) goto fini;
323
    self_addr_size_int = (int)self_addr_size; /* null char included in call */
Jonathan Jenkins's avatar
Jonathan Jenkins committed
324

325
    /* gather the buffer sizes */
Jonathan Jenkins's avatar
Jonathan Jenkins committed
326 327 328 329 330 331 332
    MPI_Comm_size(comm, &comm_size);
    MPI_Comm_rank(comm, &comm_rank);
    sizes = malloc(comm_size * sizeof(*sizes));
    if (sizes == NULL) goto fini;
    sizes[comm_rank] = self_addr_size_int;
    MPI_Allgather(MPI_IN_PLACE, 0, MPI_BYTE, sizes, 1, MPI_INT, comm);

333 334 335
    /* compute a exclusive prefix sum of the data sizes, including the
     * total at the end
     */
Jonathan Jenkins's avatar
Jonathan Jenkins committed
336 337 338 339 340 341
    sizes_psum = malloc((comm_size+1) * sizeof(*sizes_psum));
    if (sizes_psum == NULL) goto fini;
    sizes_psum[0] = 0;
    for (int i = 1; i < comm_size+1; i++)
        sizes_psum[i] = sizes_psum[i-1] + sizes[i-1];

342
    /* allgather the addresses */
343 344
    addr_buf = malloc(sizes_psum[comm_size]);
    if (addr_buf == NULL) goto fini;
Jonathan Jenkins's avatar
Jonathan Jenkins committed
345
    MPI_Allgatherv(self_addr_str, self_addr_size_int, MPI_BYTE,
346
            addr_buf, sizes, sizes_psum, MPI_BYTE, comm);
Jonathan Jenkins's avatar
Jonathan Jenkins committed
347

348 349 350 351 352
    /* set up address string array for group members */
    addr_strs = ssg_setup_addr_str_list(addr_buf, comm_size);
    if (!addr_strs) goto fini;

    /* invoke the generic group create routine using our list of addrs */
353
    sret = ssg_group_create(group_name, addr_strs, comm_size, group_id);
Shane Snyder's avatar
Shane Snyder committed
354 355

fini:
356
    /* cleanup before returning */
Shane Snyder's avatar
Shane Snyder committed
357 358
    free(sizes);
    free(sizes_psum);
359
    free(addr_buf);
360 361
    if (hgcl && self_addr != HG_ADDR_NULL) HG_Addr_free(hgcl, self_addr);
    free(self_addr_str);
362 363
    free(addr_strs);

364
    return sret;
Shane Snyder's avatar
Shane Snyder committed
365 366 367
}
#endif

368 369
int ssg_group_destroy(
    ssg_group_id_t group_id)
Shane Snyder's avatar
Shane Snyder committed
370
{
371 372 373 374
    int i;
    ssg_group_t *g = the_group;
    assert(g);

375
#if USE_SWIM_FD
376 377
    swim_context_t *swim_ctx = (swim_context_t *)g->fd_ctx;
    assert(swim_ctx);
378 379
    if(swim_ctx)
        swim_finalize(swim_ctx);
380
#endif
381

382 383
    for (i = 0; i < g->view.group_size; i++)
    {
384 385
        if (g->view.member_states[i].addr != HG_ADDR_NULL)
            HG_Addr_free(margo_get_class(ssg_mid), g->view.member_states[i].addr);
386
    }
387 388 389
    free(g->view.member_states);
    free(g);

390
    return SSG_SUCCESS;
Jonathan Jenkins's avatar
Jonathan Jenkins committed
391 392
}

393 394 395
int ssg_group_attach(
    ssg_group_id_t group_id)
{
396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421
    hg_class_t *hgcl = NULL;
    hg_addr_t srvr_addr = HG_ADDR_NULL;
    hg_handle_t handle = HG_HANDLE_NULL;
    hg_return_t hret;

    hgcl = margo_get_class(ssg_mid);
    if (!hgcl) goto fini;

    /* lookup the address of the given group's leader server */
    hret = margo_addr_lookup(ssg_mid, group_id.addr_str, &srvr_addr);
    if (hret != HG_SUCCESS) goto fini;

    hret = HG_Create(margo_get_context(ssg_mid), srvr_addr, ssg_attach_rpc_id,
        &handle);
    if (hret != HG_SUCCESS) goto fini;

    /* XXX: send a request to the leader addr to attach to the group */
    hret = margo_forward(ssg_mid, handle, NULL);
    if (hret != HG_SUCCESS) goto fini;

    /* XXX: store the obtained view locally to refer to */

    /* TODO: hold on to leader addr so we don't have to look it up again? */
fini:
    if (hgcl && srvr_addr != HG_ADDR_NULL) HG_Addr_free(hgcl, srvr_addr);
    if (handle != HG_HANDLE_NULL) HG_Destroy(handle);
422 423 424 425 426 427 428 429 430 431 432

    return SSG_SUCCESS;
}

int ssg_group_detach(
    ssg_group_id_t group_id)
{

    return SSG_SUCCESS;
}

Shane Snyder's avatar
Shane Snyder committed
433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454
#if 0
/*** SSG group membership view access routines */

int ssg_get_group_rank(const ssg_t s)
{
    return s->view.self_rank;
}

int ssg_get_group_size(const ssg_t s)
{
    return s->view.group_size;
}

hg_addr_t ssg_get_addr(const ssg_t s, int rank)
{
    if (rank >= 0 && rank < s->view.group_size)
        return s->view.member_states[rank].addr;
    else
        return HG_ADDR_NULL;
}
#endif

455 456 457 458 459
/***************************
 *** SSG helper routines ***
 ***************************/

static void ssg_lookup_ult(void * arg);
460 461
struct lookup_ult_args
{
462
    ssg_group_t *g;
463
    int rank;
464
    const char *addr_str;
465 466 467
    hg_return_t out;
};

468 469
static hg_return_t ssg_group_lookup(
    ssg_group_t * g, const char * const addr_strs[])
Jonathan Jenkins's avatar
Jonathan Jenkins committed
470
{
471 472
    ABT_thread *ults;
    struct lookup_ult_args *args;
473
    int i, r;
474
    int aret;
475
    hg_return_t hret = HG_SUCCESS;
Jonathan Jenkins's avatar
Jonathan Jenkins committed
476

477
    if (g == NULL) return HG_INVALID_PARAM;
Jonathan Jenkins's avatar
Jonathan Jenkins committed
478

479 480
    /* initialize ULTs */
    ults = malloc(g->view.group_size * sizeof(*ults));
481
    if (ults == NULL) return HG_NOMEM_ERROR;
482
    args = malloc(g->view.group_size * sizeof(*args));
483 484
    if (args == NULL)
    {
485 486 487
        free(ults);
        return HG_NOMEM_ERROR;
    }
488
    for (i = 0; i < g->view.group_size; i++)
489 490
        ults[i] = ABT_THREAD_NULL;

491 492
    for (i = 1; i < g->view.group_size; i++)
    {
493 494
        r = (g->self_rank + i) % g->view.group_size;
        args[r].g = g;
Jonathan Jenkins's avatar
Jonathan Jenkins committed
495
        args[r].rank = r;
496
        args[r].addr_str = addr_strs[r];
497
        aret = ABT_thread_create(*margo_get_handler_pool(ssg_mid), &ssg_lookup_ult,
Jonathan Jenkins's avatar
Jonathan Jenkins committed
498
                &args[r], ABT_THREAD_ATTR_NULL, &ults[r]);
499 500
        if (aret != ABT_SUCCESS) {
            hret = HG_OTHER_ERROR;
501
            goto fini;
502
        }
Jonathan Jenkins's avatar
Jonathan Jenkins committed
503
    }
504

505
    /* wait on all */
506 507
    for (i = 1; i < g->view.group_size; i++)
    {
508
        r = (g->self_rank + i) % g->view.group_size;
509
        aret = ABT_thread_join(ults[r]);
Jonathan Jenkins's avatar
Jonathan Jenkins committed
510 511
        ABT_thread_free(&ults[r]);
        ults[r] = ABT_THREAD_NULL; // in case of cascading failure from join
512 513
        if (aret != ABT_SUCCESS)
        {
514
            hret = HG_OTHER_ERROR;
Jonathan Jenkins's avatar
Jonathan Jenkins committed
515
            break;
516
        }
517 518
        else if (args[r].out != HG_SUCCESS)
        {
Shane Snyder's avatar
Shane Snyder committed
519
            fprintf(stderr, "Error: SSG unable to lookup HG address for rank %d"
520
                "(err=%d)\n", r, args[r].out);
Jonathan Jenkins's avatar
Jonathan Jenkins committed
521 522
            hret = args[r].out;
            break;
523 524 525
        }
    }

526
fini:
527
    /* cleanup */
528 529 530 531
    for (i = 0; i < g->view.group_size; i++)
    {
        if (ults[i] != ABT_THREAD_NULL)
        {
532 533
            ABT_thread_cancel(ults[i]);
            ABT_thread_free(ults[i]);
534 535
        }
    }
536 537
    free(ults);
    free(args);
538 539

    return hret;
Jonathan Jenkins's avatar
Jonathan Jenkins committed
540
}
Jonathan Jenkins's avatar
Jonathan Jenkins committed
541

542 543
static void ssg_lookup_ult(
    void * arg)
Jonathan Jenkins's avatar
Jonathan Jenkins committed
544
{
545 546
    struct lookup_ult_args *l = arg;
    ssg_group_t *g = l->g;
547

548 549 550 551
    l->out = margo_addr_lookup(ssg_mid, l->addr_str,
        &g->view.member_states[l->rank].addr);
    return;
}
552

553 554 555 556 557 558 559
static void ssg_attach_recv_ult(hg_handle_t handle)
{
    HG_Destroy(handle);
    return;
}
DEFINE_MARGO_RPC_HANDLER(ssg_attach_recv_ult)

560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575
static void ssg_generate_group_id(
    const char * name, const char * leader_addr_str,
    ssg_group_id_t *group_id)
{
    uint32_t upper, lower;

    /* hash the group name to obtain an 64-bit unique ID */
    ssg_hashlittle2(name, strlen(name), &lower, &upper);

    group_id->magic_nr = SSG_MAGIC_NR;
    group_id->name_hash = lower + (((uint64_t)upper)<<32);
    strcpy(group_id->addr_str, leader_addr_str);

    return;
}

576 577 578 579 580 581 582
static const char ** ssg_setup_addr_str_list(
    char * buf, int num_addrs)
{
    const char **ret = malloc(num_addrs * sizeof(*ret));
    if (ret == NULL) return NULL;

    ret[0] = buf;
583 584
    for (int i = 1; i < num_addrs; i++)
    {
585 586
        const char * a = ret[i-1];
        ret[i] = a + strlen(a) + 1;
Jonathan Jenkins's avatar
Jonathan Jenkins committed
587
    }
588
    return ret;
Jonathan Jenkins's avatar
Jonathan Jenkins committed
589
}