p/ponymap
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Group the output properly

Browse Source 
Somehow I must have forgotten about transports at some point.
This commit is contained in:
Přemysl Eric Janouch 2014-09-21 03:06:17 +02:00
parent d18224cc65
commit aeb1012997
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ponymap.c
View File

@ -1299,11 +1299,12 @@ target_dump_json (struct target *self, struct target_dump_data *data)
json_object_set_new (o, "services", services); json_object_set_new (o, "services", services);
struct service *last_service = NULL; struct service *last_service = NULL;
struct transport *last_transport = NULL;
json_t *service, *ports; json_t *service, *ports;
for (size_t i = 0; i < data->results_len; i++) for (size_t i = 0; i < data->results_len; i++)
{ {
struct unit *u = data->results[i]; struct unit *u = data->results[i];
if (u->service != last_service) if (u->service != last_service || u->transport != last_transport)
{ {
service = json_object (); service = json_object ();
ports = json_array (); ports = json_array ();
@ -1316,6 +1317,7 @@ target_dump_json (struct target *self, struct target_dump_data *data)
json_object_set_new (service, "ports", ports); json_object_set_new (service, "ports", ports);
last_service = u->service; last_service = u->service;
last_transport = u->transport;
} }
json_t *port = json_object (); json_t *port = json_object ();
@ -1346,11 +1348,12 @@ target_dump_terminal (struct target *self, struct target_dump_data *data)
root->bold = true; root->bold = true;
struct service *last_service = NULL; struct service *last_service = NULL;
struct transport *last_transport = NULL;
struct node *service, **s_tail = &root->children, *port, **p_tail; struct node *service, **s_tail = &root->children, *port, **p_tail;
for (size_t i = 0; i < data->results_len; i++) for (size_t i = 0; i < data->results_len; i++)
{ {
struct unit *u = data->results[i]; struct unit *u = data->results[i];
if (u->service != last_service) if (u->service != last_service || u->transport != last_transport)
{ {
*s_tail = service = node_new (xstrdup_printf ("%s (%s)", *s_tail = service = node_new (xstrdup_printf ("%s (%s)",
u->service->name, u->transport->name)); u->service->name, u->transport->name));
@ -1358,6 +1361,7 @@ target_dump_terminal (struct target *self, struct target_dump_data *data)
p_tail = &service->children; p_tail = &service->children;
last_service = u->service; last_service = u->service;
last_transport = u->transport;
} }
port = *p_tail = node_new (xstrdup_printf ("port %" PRIu16, u->port)); port = *p_tail = node_new (xstrdup_printf ("port %" PRIu16, u->port));
@ -1379,10 +1383,12 @@ target_dump_terminal (struct target *self, struct target_dump_data *data)
} }
static int static int
unit_cmp_by_service (const void *ax, const void *bx) unit_cmp_by_group (const void *ax, const void *bx)
{ {
const struct unit **a = (void *) ax, **b = (void *) bx; const struct unit **ay = (void *) ax, **by = (void *) bx;
return strcmp ((*a)->service->name, (*b)->service->name); const struct unit *a = *ay, *b = *by;
int x = strcmp (a->service->name, b->service->name);
return x ? x : strcmp (a->transport->name, b->transport->name);
} }
static void static void
@ -1403,7 +1409,7 @@ target_dump_results (struct target *self)
sorted[--len] = iter; sorted[--len] = iter;
// Sort them by service name so that they can be grouped // Sort them by service name so that they can be grouped
qsort (sorted, N_ELEMENTS (sorted), sizeof *sorted, unit_cmp_by_service); qsort (sorted, N_ELEMENTS (sorted), sizeof *sorted, unit_cmp_by_group);
if (ctx->json_results) if (ctx->json_results)
target_dump_json (self, &data); target_dump_json (self, &data);