TiagoRG
/
it2s-itss-facilities
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

VCM: log number of aff vehicles

This commit is contained in:
emanuel 2023-03-22 21:00:22 +00:00
parent 57fb624719
commit 4e35d3f315
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/vcm.c
View File

@ -267,6 +267,7 @@ static void session_cleanup() {
coordination->session.requester = NULL; coordination->session.requester = NULL;
memset(coordination->session.affs, 0, sizeof(coordination->session.affs)); memset(coordination->session.affs, 0, sizeof(coordination->session.affs));
memset(coordination->session.n_affs_neighs, 0, sizeof(coordination->session.n_affs_neighs)); memset(coordination->session.n_affs_neighs, 0, sizeof(coordination->session.n_affs_neighs));
coordination->session.n_affs_neighs_reqd = 0;
coordination->session.n_affs_trjs = 0; coordination->session.n_affs_trjs = 0;
} }
@ -397,6 +398,7 @@ static int vcm_check_handle_request(VCM_t* vcm, mc_neighbour_s* neighbour) {
coordination->session.affs[i][j] = get_neighbour(*request->desiredTrajectories.list.array[i]->affectingStations.list.array[j]); coordination->session.affs[i][j] = get_neighbour(*request->desiredTrajectories.list.array[i]->affectingStations.list.array[j]);
} }
coordination->session.n_affs_neighs[i] = request->desiredTrajectories.list.array[i]->affectingStations.list.count; coordination->session.n_affs_neighs[i] = request->desiredTrajectories.list.array[i]->affectingStations.list.count;
coordination->session.n_affs_neighs_reqd = coordination->session.n_affs_neighs[i];
} }
coordination->session.n_affs_trjs = request->desiredTrajectories.list.count; coordination->session.n_affs_trjs = request->desiredTrajectories.list.count;
@ -641,8 +643,9 @@ static int vcm_check_handle_reply(VCM_t* vcm, mc_neighbour_s* neighbour) {
return 1; return 1;
} }
log_info("[vc] received VCM.reply from %d with %d accepted trajectories - session: %d | took %ld us", log_info("[vc] received VCM.reply from %d (of %d) with %d accepted trajectories - session: %d | took %ld us",
vcm->header.stationID, vcm->header.stationID,
coordination->session.n_affs_neighs_reqd,
reply->acceptedTrajectoriesIds.list.count, reply->acceptedTrajectoriesIds.list.count,
coordination->session.nonce, coordination->session.nonce,
now_us-neighbour->t_iid); now_us-neighbour->t_iid);
@ -852,6 +855,7 @@ static int intersection_detected(VCM_t* vcm, mc_neighbour_s* neighbour) {
coordination->session.ts = now; coordination->session.ts = now;
coordination->session.n_affs_trjs = 1; coordination->session.n_affs_trjs = 1;
coordination->session.n_affs_neighs[0] = n_intneigh; coordination->session.n_affs_neighs[0] = n_intneigh;
coordination->session.n_affs_neighs_reqd = n_intneigh;
memcpy(coordination->session.affs[0], intneigh, sizeof(intneigh)); memcpy(coordination->session.affs[0], intneigh, sizeof(intneigh));
tx_vcm(vcm_req); tx_vcm(vcm_req);
@ -993,6 +997,7 @@ int vcm_check(VCM_t* vcm) {
coordination->session.ts = now; coordination->session.ts = now;
memset(coordination->session.affs, 0, sizeof(coordination->session.affs)); memset(coordination->session.affs, 0, sizeof(coordination->session.affs));
memset(coordination->session.n_affs_neighs, 0, sizeof(coordination->session.n_affs_neighs)); memset(coordination->session.n_affs_neighs, 0, sizeof(coordination->session.n_affs_neighs));
coordination->session.n_affs_neighs_reqd = 0;
coordination->session.n_affs_trjs = 0; coordination->session.n_affs_trjs = 0;
} }

1
src/vcm.h
View File

@ -63,6 +63,7 @@ typedef struct coordination {
mc_neighbour_s* affs[MC_TRAJECTORIES_N_MAX][MC_AFF_STATIONS_N_MAX]; /* trjs over affected stations */ mc_neighbour_s* affs[MC_TRAJECTORIES_N_MAX][MC_AFF_STATIONS_N_MAX]; /* trjs over affected stations */
uint8_t n_affs_trjs; uint8_t n_affs_trjs;
uint8_t n_affs_neighs[MC_TRAJECTORIES_N_MAX]; uint8_t n_affs_neighs[MC_TRAJECTORIES_N_MAX];
uint8_t n_affs_neighs_reqd;
} session; } session;