[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r27129 - gnunet/src/testbed
From: |
gnunet |
Subject: |
[GNUnet-SVN] r27129 - gnunet/src/testbed |
Date: |
Tue, 14 May 2013 17:34:12 +0200 |
Author: harsha
Date: 2013-05-14 17:34:12 +0200 (Tue, 14 May 2013)
New Revision: 27129
Modified:
gnunet/src/testbed/testbed_api_hosts.c
Log:
- sort hosts returned from loadleveler
Modified: gnunet/src/testbed/testbed_api_hosts.c
===================================================================
--- gnunet/src/testbed/testbed_api_hosts.c 2013-05-14 14:31:01 UTC (rev
27128)
+++ gnunet/src/testbed/testbed_api_hosts.c 2013-05-14 15:34:12 UTC (rev
27129)
@@ -589,9 +589,7 @@
char *buf;
char *hostname;
char **hostnames;
- char **hostaddrs;
- const char *hostip;
- struct GNUNET_TESTBED_Host **host_list;
+ struct GNUNET_TESTBED_Host **host_list;
ssize_t rsize;
uint64_t size;
uint64_t offset;
@@ -603,7 +601,6 @@
} pstep;
unsigned int host;
unsigned int nhosts;
- unsigned int nhostaddrs;
if (NULL == (hostfile = getenv ("MP_SAVEHOSTFILE")))
{
@@ -634,9 +631,7 @@
pstep = SCAN;
hostname = NULL;
hostnames = NULL;
- hostaddrs = NULL;
nhosts = 0;
- nhostaddrs = 0;
while (offset < size)
{
switch (pstep)
@@ -692,31 +687,17 @@
GNUNET_free_non_null (buf);
if (NULL == hostnames)
return 0;
- for (host = 0; host < nhosts; host++)
- {
- hostip = simple_resolve (hostnames[host]);
- if (NULL == hostip)
- {
- nhosts = 0;
- goto cleanup;
- }
- GNUNET_array_append (hostaddrs, nhostaddrs, GNUNET_strdup (hostip));
- }
- GNUNET_assert (nhostaddrs == nhosts);
if (NULL == hosts)
goto cleanup;
- host_list = GNUNET_malloc (sizeof (struct GNUNET_TESTBED_Host *) *
nhostaddrs);
+ host_list = GNUNET_malloc (sizeof (struct GNUNET_TESTBED_Host *) * nhosts);
for (host = 0; host < nhosts; host++)
- host_list[host] = GNUNET_TESTBED_host_create (hostaddrs[host], NULL, cfg,
0);
+ host_list[host] = GNUNET_TESTBED_host_create (hostnames[host], NULL, cfg,
0);
*hosts = host_list;
cleanup:
for (host = 0; host < nhosts; host++)
GNUNET_free (hostnames[host]);
GNUNET_free(hostnames);
- for (host = 0; (NULL != hostaddrs) && (host < nhostaddrs); host++)
- GNUNET_free (hostaddrs[host]);
- GNUNET_free (hostaddrs);
return nhosts;
#endif
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r27129 - gnunet/src/testbed,
gnunet <=