/*
Bacula® - The Network Backup Solution
- Copyright (C) 2000-2007 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2008 Free Software Foundation Europe e.V.
The main author of Bacula is Kern Sibbald, with contributions from
many others, a complete list can be found in the file AUTHORS.
const int dbglvl = 3400;
+/*
+ * Setting a NULL in tsd doesn't clear the tsd but instead tells
+ * pthreads not to call the tsd destructor. Consequently, we
+ * define this *invalid* jcr address and stuff it in the tsd
+ * when the jcr is no longer valid.
+ */
+#define INVALID_JCR ((JCR *)(-1))
+
/* External variables we reference */
extern time_t watchdog_time;
static pthread_mutex_t last_jobs_mutex = PTHREAD_MUTEX_INITIALIZER;
+static pthread_key_t jcr_key; /* Pointer to jcr for each thread */
+
+pthread_once_t key_once = PTHREAD_ONCE_INIT;
+
void lock_jobs()
{
}
}
+void create_jcr_key()
+{
+ int status = pthread_key_create(&jcr_key, NULL);
+ if (status != 0) {
+ berrno be;
+ Jmsg1(NULL, M_ABORT, 0, _("pthread key create failed: ERR=%s\n"),
+ be.bstrerror(status));
+ }
+}
+
/*
* Create a Job Control Record and link it into JCR chain
* Returns newly allocated JCR
JCR *jcr;
MQUEUE_ITEM *item = NULL;
struct sigaction sigtimer;
+ int status;
Dmsg0(dbglvl, "Enter new_jcr\n");
+ status = pthread_once(&key_once, create_jcr_key);
+ if (status != 0) {
+ berrno be;
+ Jmsg1(NULL, M_ABORT, 0, _("pthread_once failed. ERR=%s\n"), be.bstrerror(status));
+ }
jcr = (JCR *)malloc(size);
memset(jcr, 0, size);
jcr->my_thread_id = pthread_self();
jcr->JobType = JT_SYSTEM; /* internal job until defined */
jcr->JobLevel = L_NONE;
set_jcr_job_status(jcr, JS_Created); /* ready to run */
-
+ set_jcr_in_tsd(jcr);
sigtimer.sa_flags = 0;
sigtimer.sa_handler = timeout_handler;
sigfillset(&sigtimer.sa_mask);
*/
static void free_common_jcr(JCR *jcr)
{
- struct s_last_job *je, last_job;
-
- /* Keep some statistics */
- switch (jcr->JobType) {
- case JT_BACKUP:
- case JT_VERIFY:
- case JT_RESTORE:
- case JT_MIGRATE:
- case JT_COPY:
- case JT_ADMIN:
- num_jobs_run++;
- last_job.Errors = jcr->Errors;
- last_job.JobType = jcr->JobType;
- last_job.JobId = jcr->JobId;
- last_job.VolSessionId = jcr->VolSessionId;
- last_job.VolSessionTime = jcr->VolSessionTime;
- bstrncpy(last_job.Job, jcr->Job, sizeof(last_job.Job));
- last_job.JobFiles = jcr->JobFiles;
- last_job.JobBytes = jcr->JobBytes;
- last_job.JobStatus = jcr->JobStatus;
- last_job.JobLevel = jcr->JobLevel;
- last_job.start_time = jcr->start_time;
- last_job.end_time = time(NULL);
- /* Keep list of last jobs, but not Console where JobId==0 */
- if (last_job.JobId > 0) {
- je = (struct s_last_job *)malloc(sizeof(struct s_last_job));
- memcpy((char *)je, (char *)&last_job, sizeof(last_job));
- if (!last_jobs) {
- init_last_jobs_list();
- }
- last_jobs->append(je);
- if (last_jobs->size() > max_last_jobs) {
- je = (struct s_last_job *)last_jobs->first();
- last_jobs->remove(je);
- free(je);
- }
- }
- break;
- default:
- break;
- }
jcr->destroy_mutex();
if (jcr->msg_queue) {
free_guid_list(jcr->id_list);
jcr->id_list = NULL;
}
+ /* Invalidate the tsd jcr data */
+ set_jcr_in_tsd(INVALID_JCR);
free(jcr);
}
#ifdef DEBUG
void b_free_jcr(const char *file, int line, JCR *jcr)
{
+ struct s_last_job *je, last_job;
+
Dmsg3(dbglvl, "Enter free_jcr jid=%u from %s:%d\n", jcr->JobId, file, line);
#else
void free_jcr(JCR *jcr)
{
+ struct s_last_job *je, last_job;
Dmsg3(dbglvl, "Enter free_jcr jid=%u use_count=%d Job=%s\n",
jcr->JobId, jcr->use_count(), jcr->Job);
jcr->JobId, jcr->use_count(), jcr->Job);
}
remove_jcr(jcr); /* remove Jcr from chain */
- unlock_jcr_chain();
job_end_pop(jcr); /* pop and call hooked routines */
Dmsg1(dbglvl, "End job=%d\n", jcr->JobId);
+
+ /* Keep some statistics */
+ switch (jcr->JobType) {
+ case JT_BACKUP:
+ case JT_VERIFY:
+ case JT_RESTORE:
+ case JT_MIGRATE:
+ case JT_COPY:
+ case JT_ADMIN:
+ num_jobs_run++;
+ last_job.Errors = jcr->Errors;
+ last_job.JobType = jcr->JobType;
+ last_job.JobId = jcr->JobId;
+ last_job.VolSessionId = jcr->VolSessionId;
+ last_job.VolSessionTime = jcr->VolSessionTime;
+ bstrncpy(last_job.Job, jcr->Job, sizeof(last_job.Job));
+ last_job.JobFiles = jcr->JobFiles;
+ last_job.JobBytes = jcr->JobBytes;
+ last_job.JobStatus = jcr->JobStatus;
+ last_job.JobLevel = jcr->JobLevel;
+ last_job.start_time = jcr->start_time;
+ last_job.end_time = time(NULL);
+ /* Keep list of last jobs, but not Console where JobId==0 */
+ if (last_job.JobId > 0) {
+ je = (struct s_last_job *)malloc(sizeof(struct s_last_job));
+ memcpy((char *)je, (char *)&last_job, sizeof(last_job));
+ if (!last_jobs) {
+ init_last_jobs_list();
+ }
+ last_jobs->append(je);
+ if (last_jobs->size() > max_last_jobs) {
+ je = (struct s_last_job *)last_jobs->first();
+ last_jobs->remove(je);
+ free(je);
+ }
+ }
+ break;
+ default:
+ break;
+
+ }
if (jcr->daemon_free_jcr) {
jcr->daemon_free_jcr(jcr); /* call daemon free routine */
}
+
+ unlock_jcr_chain();
free_common_jcr(jcr);
close_msg(NULL); /* flush any daemon messages */
garbage_collect_memory_pool();
Dmsg0(dbglvl, "Exit free_jcr\n");
}
-
-/*
- * Find which JobId corresponds to the current thread
- */
-uint32_t get_jobid_from_tid()
+
+void set_jcr_in_tsd(JCR *jcr)
{
- return get_jobid_from_tid(pthread_self());
+ int status = pthread_setspecific(jcr_key, (void *)jcr);
+ if (status != 0) {
+ berrno be;
+ Jmsg1(jcr, M_ABORT, 0, _("pthread_setspecific failed: ERR=%s\n"), be.bstrerror(status));
+ }
}
-uint32_t get_jobid_from_tid(pthread_t tid)
+JCR *get_jcr_from_tsd()
{
- JCR *jcr;
- uint32_t JobId = 0;
- foreach_jcr(jcr) {
- if (pthread_equal(jcr->my_thread_id, tid)) {
- JobId = (uint32_t)jcr->JobId;
- break;
- }
+ JCR *jcr = (JCR *)pthread_getspecific(jcr_key);
+// printf("get_jcr_from_tsd: jcr=%p\n", jcr);
+ /* set any INVALID_JCR to NULL which the rest of Bacula understands */
+ if (jcr == INVALID_JCR) {
+ jcr = NULL;
}
- endeach_jcr(jcr);
- return JobId;
+ return jcr;
}
+
/*
- * Find the jcr that corresponds to the current thread
+ * Find which JobId corresponds to the current thread
*/
-JCR *get_jcr_from_tid()
-{
- return get_jcr_from_tid(pthread_self());
-}
-
-JCR *get_jcr_from_tid(pthread_t tid)
+uint32_t get_jobid_from_tsd()
{
JCR *jcr;
- JCR *rtn_jcr = NULL;
-
- foreach_jcr(jcr) {
- if (pthread_equal(jcr->my_thread_id, tid)) {
- rtn_jcr = jcr;
- break;
- }
+ uint32_t JobId = 0;
+ jcr = get_jcr_from_tsd();
+// printf("get_jobid_from_tsr: jcr=%p\n", jcr);
+ if (jcr) {
+ JobId = (uint32_t)jcr->JobId;
}
- endeach_jcr(jcr);
- return rtn_jcr;
+ return JobId;
}
-
-
/*
* Given a JobId, find the JCR
* Returns: jcr on success
projects / bacula / bacula / blobdiff