Skip to content

Simplify connection topology detection #276

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
Sympatron wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Simplify connection topology detection #276

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
37 changes: 23 additions & 14 deletions src/osdp_cp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@

#include <stdlib.h>

#include <utils/disjoint_set.h>

#include "osdp_common.h"
#include "osdp_file.h"
#include "osdp_diag.h"
Expand Down Expand Up @@ -1428,31 +1426,42 @@ static int cp_submit_command(struct osdp_pd *pd, const struct osdp_cmd *cmd)
cp_cmd_enqueue(pd, p);
return 0;
}

static int cp_detect_connection_topology(struct osdp *ctx)
{
int i, j, num_channels;
int i, j;
int num_channels = 0;
int *channel_lock = NULL;
struct osdp_pd *pd;
struct disjoint_set set;
int channels[OSDP_PD_MAX] = { 0 };

if (disjoint_set_make(&set, NUM_PD(ctx)))
return -1;

for (i = 0; i < NUM_PD(ctx); i++) {
pd = osdp_to_pd(ctx, i);
for (j = 0; j < i; j++) {

/* Check if this channel.id was seen before */
for (j = 0; j < num_channels; j++) {
if (channels[j] == pd->channel.id) {
SET_FLAG(osdp_to_pd(ctx, j), PD_FLAG_CHN_SHARED);
SET_FLAG(pd, PD_FLAG_CHN_SHARED);
disjoint_set_union(&set, i, j);
break;
}
}

if (j == num_channels) {
/* New unique channel */
channels[num_channels++] = pd->channel.id;

} else {
/* Channel already exists: mark current as shared */
SET_FLAG(pd, PD_FLAG_CHN_SHARED);

/* Also mark the first PD on same channel as shared */
for (j = 0; j < i; j++) {
if (osdp_to_pd(ctx, j)->channel.id == pd->channel.id) {
SET_FLAG(osdp_to_pd(ctx, j), PD_FLAG_CHN_SHARED);
break;
}
}
}
channels[i] = pd->channel.id;
}

num_channels = disjoint_set_num_roots(&set);
if (num_channels != NUM_PD(ctx)) {
channel_lock = calloc(1, sizeof(int) * NUM_PD(ctx));
if (channel_lock == NULL) {
Expand Down