Skip to content

Fixed tests #2

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

Merged
yangosoft merged 1 commit into from
Jan 11, 2025
Merged

Fixed tests #2

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
22 changes: 10 additions & 12 deletions src/coordinator.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,10 +372,6 @@ impl Coordinator {
Some(current_id - 1)
}

pub fn get_num_participants(&self) -> u64 {
unsafe { (*self.directory).last_participant_id }
}

pub fn get_participant_id_by_event_id(&self, event_id: u64) -> Option<u64> {
if event_id > MAX_EVENTS as u64 {
return None;
Expand All @@ -393,8 +389,8 @@ use std::ffi::CString;

#[test]
fn test_shared_memory_write_read() {
let mut coordinator = Coordinator::new("test_shared_memory_coordinator");
let mut coordinator2 = Coordinator::open_existing("test_shared_memory_coordinator");
let mut coordinator = Coordinator::new("test_shared_memory_write_read");
let mut coordinator2 = Coordinator::open_existing("test_shared_memory_write_read");

let ret = coordinator.add_participant("test_participant");
assert!(ret.is_ok());
Expand All @@ -420,18 +416,20 @@ fn test_shared_memory_write_read() {

#[test]
fn test_events() {
let mut coordinator = Coordinator::new("test_shared_memory_coordinator");
let mut coordinator2 = Coordinator::open_existing("test_shared_memory_coordinator");

let ret = coordinator.add_event("test_event");
let mut coordinator = Coordinator::new("test_events");
let mut coordinator2 = Coordinator::open_existing("test_events");
let mut participant_id = coordinator
.add_participant("test_shared_memory_participant")
.unwrap();
let ret = coordinator.add_event(participant_id, "test_event");
assert!(ret.is_ok());
let num_events = coordinator2.get_number_of_events();
assert_eq!(num_events, 1);
let ret = coordinator2.add_event("test_event");
let ret = coordinator2.add_event(participant_id, "test_event");
assert!(ret.is_ok());
let num_events = coordinator2.get_number_of_events();
assert_eq!(num_events, 1);
let ret = coordinator2.add_event("test_event");
let ret = coordinator2.add_event(participant_id, "test_event");
assert!(ret.is_ok());
let num_events = coordinator2.get_number_of_events();
assert_eq!(num_events, 1);
Expand Down
4 changes: 2 additions & 2 deletions src/subscriber.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ impl<'a> Subscriber<'a> {
loop {
debug!("Waiting on new participant...");
//Check which was the last event
let last_participant_id = self.coordinator.get_num_participants();
let last_participant_id = self.coordinator.get_number_of_participants();
debug!(
"Last participant id before waiting: {:?}",
last_participant_id
Expand All @@ -218,7 +218,7 @@ impl<'a> Subscriber<'a> {
continue;
}

let current_participant_id = self.coordinator.get_num_participants();
let current_participant_id = self.coordinator.get_number_of_participants();
debug!(
"New participant event received. Checking last participant id: {:?}",
current_participant_id
Expand Down
Loading