From 399bd0b7f2e38cf653354a7d5811f41cf6f78e88 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Michal=20Voc=C5=AF?= Date: Thu, 2 Apr 2009 10:07:36 +0000 Subject: [PATCH] fix build --- org.glite.lb.logger/src/event_store.c | 8 +++----- org.glite.lb.logger/src/interlogd.h | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/org.glite.lb.logger/src/event_store.c b/org.glite.lb.logger/src/event_store.c index 1594997..ad1a5f2 100644 --- a/org.glite.lb.logger/src/event_store.c +++ b/org.glite.lb.logger/src/event_store.c @@ -208,8 +208,6 @@ event_store_create(char *job_id_s, const char *filename) es->event_file_name = filename ? strdup(filename) : jobid2eventfile(job_id); es->control_file_name = filename ? astrcat(filename, ".ctl") : jobid2controlfile(job_id); es->rotate_index = filename ? fname2index(filename) : 0; - es->jobid_next = es; - es->jobid_prev = es; IL_EVENT_ID_FREE(job_id); il_log(LOG_DEBUG, " creating event store for id %s, filename %s\n", job_id_s, es->event_file_name); @@ -456,16 +454,16 @@ event_store_recover_jobid(struct event_store *es) struct event_store_list *p = es->le; do { - event_store_recover(p); + event_store_recover(p->es); if(p != es->le ) { - event_store_release(p); + event_store_release(p->es); } if(pthread_rwlock_rdlock(&store_list_lock)) abort(); p = p->jobid_next; if(p != es->le) { - if(pthread_rwlock_rdlock(&p->use_lock)) + if(pthread_rwlock_rdlock(&p->es->use_lock)) abort(); } if(pthread_rwlock_unlock(&store_list_lock)) diff --git a/org.glite.lb.logger/src/interlogd.h b/org.glite.lb.logger/src/interlogd.h index d168835..e5ff035 100644 --- a/org.glite.lb.logger/src/interlogd.h +++ b/org.glite.lb.logger/src/interlogd.h @@ -126,7 +126,7 @@ struct event_store { time_t last_modified; /* time of the last file modification */ int generation; /* cleanup counter, scopes the offset */ int rotate_index; /* rotation counter */ - struct event_store_list *le /* points back to the list */ + struct event_store_list *le; /* points back to the list */ pthread_rwlock_t commit_lock; /* lock to prevent simultaneous updates to last_committed_* */ pthread_rwlock_t offset_lock; /* lock to prevent simultaneous updates offset */ pthread_rwlock_t use_lock; /* lock to prevent struct deallocation */ -- 1.8.2.3