Skip to content

- Added "dropped" sources list to JSON output #298

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SeanTasker wants to merge 1 commit into
base: master
Choose a base branch
from
Open

- Added "dropped" sources list to JSON output #298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions include/odas/signal/track.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@

unsigned int nTracks;
unsigned long long * ids;
unsigned long long * dropped;
char ** tags;
float * array;
float * activity;
Expand Down
2 changes: 2 additions & 0 deletions src/module/mod_sst.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1104,11 +1104,13 @@

memset(obj->out->tracks->array, 0x00, sizeof(float) * obj->out->tracks->nTracks * 3);
memset(obj->out->tracks->ids, 0x00, sizeof(unsigned long long) * obj->out->tracks->nTracks);
memset(obj->out->tracks->dropped, 0x00, sizeof(unsigned long long) * obj->out->tracks->nTracks);
memset(obj->out->tracks->activity, 0x00, sizeof(float) * obj->out->tracks->nTracks);

for (iTrackMax = 0; iTrackMax < obj->nTracksMax; iTrackMax++) {

strcpy(obj->out->tracks->tags[iTrackMax], "");
obj->out->tracks->dropped[iTrackMax] = obj->idsRemoved[iTrackMax];

if (obj->ids[iTrackMax] != 0) {

Expand Down
10 changes: 10 additions & 0 deletions src/signal/track.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@
memset(obj->array, 0x00, sizeof(float) * 3 * nTracks);
obj->ids = (unsigned long long *) malloc(sizeof(unsigned long long) * nTracks);
memset(obj->ids, 0x00, sizeof(unsigned long long) * nTracks);
obj->dropped = (unsigned long long *) malloc(sizeof(unsigned long long) * nTracks);
memset(obj->dropped, 0x00, sizeof(unsigned long long) * nTracks);

obj->tags = (char **) malloc(sizeof(char *) * nTracks);

Expand All @@ -64,6 +66,7 @@

free((void *) obj->array);
free((void *) obj->ids);
free((void *) obj->dropped);

for (iTrack = 0; iTrack < obj->nTracks; iTrack++) {
free((void *) obj->tags[iTrack]);
Expand All @@ -87,6 +90,8 @@
memcpy(clone->array, obj->array, sizeof(float) * 3 * obj->nTracks);
clone->ids = (unsigned long long *) malloc(sizeof(unsigned long long) * obj->nTracks);
memcpy(clone->ids, obj->ids, sizeof(unsigned long long) * obj->nTracks);
clone->dropped = (unsigned long long *) malloc(sizeof(unsigned long long) * obj->nTracks);
memcpy(clone->dropped, obj->dropped, sizeof(unsigned long long) * obj->nTracks);

clone->tags = (char **) malloc(sizeof(char *) * obj->nTracks);

Expand All @@ -111,6 +116,7 @@
dest->nTracks = src->nTracks;
memcpy(dest->array, src->array, sizeof(float) * 3 * src->nTracks);
memcpy(dest->ids, src->ids, sizeof(unsigned long long) * src->nTracks);
memcpy(dest->dropped, src->dropped, sizeof(unsigned long long) * src->nTracks);

for (iTrack = 0; iTrack < src->nTracks; iTrack++) {

Expand All @@ -128,6 +134,7 @@

memset(obj->array, 0x00, sizeof(float) * 3 * obj->nTracks);
memset(obj->ids, 0x00, sizeof(unsigned long long) * obj->nTracks);
memset(obj->dropped, 0x00, sizeof(unsigned long long) * obj->nTracks);

for (iTrack = 0; iTrack < obj->nTracks; iTrack++) {

Expand All @@ -154,5 +161,8 @@
obj->activity[iTrack]);

}
for (iTrack = 0; iTrack < obj->nTracks; iTrack++) {

printf("Dropped (%04llu)\n", obj->dropped[iTrack]);
}
}
22 changes: 22 additions & 0 deletions src/sink/snk_tracks.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,6 +341,9 @@
void snk_tracks_process_format_text_json(snk_tracks_obj * obj) {

unsigned int iTrack;
int addedDroppedEntry;

addedDroppedEntry = 0;

obj->buffer[0] = 0x00;

Expand Down Expand Up @@ -369,6 +372,25 @@

}

sprintf(obj->buffer,"%s ],\n",obj->buffer);
sprintf(obj->buffer,"%s \"dropped\": [\n",obj->buffer);

for (iTrack = 0; iTrack < obj->nTracks; iTrack++)
{
if(obj->in->tracks->dropped[iTrack]!=0)
{
if(addedDroppedEntry == 1)
{
sprintf(obj->buffer,"%s,",obj->buffer);
}
sprintf(obj->buffer,"%s { \"id\": %llu }",
obj->buffer, obj->in->tracks->dropped[iTrack]);
addedDroppedEntry = 1;
}
}

sprintf(obj->buffer,"%s\n",obj->buffer);

sprintf(obj->buffer,"%s ]\n",obj->buffer);
sprintf(obj->buffer,"%s}\n",obj->buffer);

Expand Down