Skip to content
This repository has been archived by the owner on Oct 31, 2018. It is now read-only.

Removing linked list requirements #7

Merged
merged 2 commits into from Feb 18, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
Expand Up @@ -2,7 +2,7 @@
CHECK = check

EXE = event_messaged
EXE_OBJS = $(EXE).o message.o event_messaged_sdbus.o list.o
EXE_OBJS = $(EXE).o message.o event_messaged_sdbus.o

OBJS_CHECK = test.o message.o

Expand Down
78 changes: 45 additions & 33 deletions event_messaged.C
Expand Up @@ -6,53 +6,65 @@ const char *path_to_messages = "/var/lib/obmc/events";

using namespace std;

void message_refresh_events(event_manager *em)
{
em->next_log_refresh();
return;
}
uint16_t message_next_event(event_manager *em)
{
return em->next_log();
}

uint16_t message_create_new_log_event(event_manager *em, event_record_t *rec) {
return em->create(rec);
uint16_t message_create_new_log_event(event_manager *em, event_record_t *rec)
{
return em->create(rec);
}
int message_load_log(event_manager *em,uint16_t logid, event_record_t **rec) {
return em->open(logid, rec);
int message_load_log(event_manager *em,uint16_t logid, event_record_t **rec)
{
return em->open(logid, rec);
}
void message_free_log(event_manager *em, event_record_t *rec) {
return em->close(rec);
void message_free_log(event_manager *em, event_record_t *rec)
{
return em->close(rec);
}
int message_delete_log(event_manager *em, uint16_t logid) {
return em->remove(logid);
int message_delete_log(event_manager *em, uint16_t logid)
{
return em->remove(logid);
}

int load_existing_events(event_manager *em) {

uint16_t id;
int load_existing_events(event_manager *em)
{
uint16_t id;

while ( (id = em->next_log()) != 0) {
send_log_to_dbus(em, id);
}
while ( (id = em->next_log()) != 0) {
send_log_to_dbus(em, id);
}

return 0;
return 0;
}

int main(int argc, char *argv[]) {

int rc = 0;
event_manager em(path_to_messages);

int main(int argc, char *argv[])
{
int rc = 0;
event_manager em(path_to_messages);

rc = build_bus(&em);
if (rc < 0) {
fprintf(stderr, "Event Messager failed to connect to dbus rc=%d", rc);
goto finish;
}
rc = build_bus(&em);
if (rc < 0) {
fprintf(stderr, "Event Messager failed to connect to dbus rc=%d", rc);
goto finish;
}

rc = load_existing_events(&em);
if (rc < 0) {
fprintf(stderr, "Event Messager failed add previous logs to dbus rc=%d", rc);
goto finish;
}
rc = load_existing_events(&em);
if (rc < 0) {
fprintf(stderr, "Event Messager failed add previous logs to dbus rc=%d", rc);
goto finish;
}

rc = start_event_monitor();
rc = start_event_monitor();

finish:
cleanup_event_monitor();
cleanup_event_monitor();

return rc;
return rc;
}