many others, a complete list can be found in the file AUTHORS.
This program is Free Software; you can redistribute it and/or
modify it under the terms of version two of the GNU General Public
- License as published by the Free Software Foundation plus additions
- that are listed in the file LICENSE.
+ License as published by the Free Software Foundation and included
+ in the file LICENSE.
This program is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
DCR *acquire_device_for_append(DCR *dcr);
bool acquire_device_for_read(DCR *dcr);
bool release_device(DCR *dcr);
-DCR *new_dcr(JCR *jcr, DEVICE *dev);
+DCR *new_dcr(JCR *jcr, DCR *dcr, DEVICE *dev);
void free_dcr(DCR *dcr);
void detach_dcr_from_dev(DCR *dcr);
bool open_device(DCR *dcr);
bool first_open_device(DCR *dcr);
bool fixup_device_block_write_error(DCR *dcr);
-void _lock_device(const char *file, int line, DEVICE *dev);
-void _unlock_device(const char *file, int line, DEVICE *dev);
-void _block_device(const char *file, int line, DEVICE *dev, int state);
-void _unblock_device(const char *file, int line, DEVICE *dev);
-void _steal_device_lock(const char *file, int line, DEVICE *dev, bsteal_lock_t *hold, int state);
-void _give_back_device_lock(const char *file, int line, DEVICE *dev, bsteal_lock_t *hold);
void set_new_volume_parameters(DCR *dcr);
void set_new_file_parameters(DCR *dcr);
bool is_device_unmounted(DEVICE *dev);
-uint32_t get_jobid_from_tid();
/* From dircmd.c */
void *handle_connection_request(void *arg);
bool unser_volume_label(DEVICE *dev, DEV_RECORD *rec);
bool unser_session_label(SESSION_LABEL *label, DEV_RECORD *rec);
+/* From locks.c */
+void _lock_device(const char *file, int line, DEVICE *dev);
+void _unlock_device(const char *file, int line, DEVICE *dev);
+void _block_device(const char *file, int line, DEVICE *dev, int state);
+void _unblock_device(const char *file, int line, DEVICE *dev);
+void _steal_device_lock(const char *file, int line, DEVICE *dev, bsteal_lock_t *hold, int state);
+void _give_back_device_lock(const char *file, int line, DEVICE *dev, bsteal_lock_t *hold);
+
+
/* From match_bsr.c */
int match_bsr(BSR *bsr, DEV_RECORD *rec, VOLUME_LABEL *volrec,
SESSION_LABEL *sesrec);
void term_reservations_lock();
void _lock_reservations();
void _unlock_reservations();
+void _lock_volumes();
+void _unlock_volumes();
void release_volume(DCR *dcr);
VOLRES *reserve_volume(DCR *dcr, const char *VolumeName);
VOLRES *find_volume(const char *VolumeName);
void release_msgs(JCR *jcr);
extern int reservations_lock_count;
+extern int vol_list_lock_count;
#ifdef SD_DEBUG_LOCK
+
#define lock_reservations() \
do { Dmsg4(sd_dbglvl, "lock_reservations at %s:%d precnt=%d JobId=%u\n", \
__FILE__, __LINE__, \
- reservations_lock_count, get_jobid_from_tid()); \
+ reservations_lock_count, get_jobid_from_tid(pthread_self())); \
_lock_reservations(); \
Dmsg1(sd_dbglvl, "lock_reservations: got lock JobId=%u\n", \
- get_jobid_from_tid()); \
+ get_jobid_from_tid(pthread_self())); \
} while (0)
#define unlock_reservations() \
do { Dmsg4(sd_dbglvl, "unlock_reservations at %s:%d precnt=%d JobId=%u\n", \
__FILE__, __LINE__, \
- reservations_lock_count, get_jobid_from_tid()); \
+ reservations_lock_count, get_jobid_from_tid(pthread_self())); \
_unlock_reservations(); } while (0)
+
+#define lock_volumes() \
+ do { Dmsg4(sd_dbglvl, "lock_volumes at %s:%d precnt=%d JobId=%u\n", \
+ __FILE__, __LINE__, \
+ vol_list_lock_count, get_jobid_from_tid(pthread_self())); \
+ _lock_volumes(); \
+ Dmsg1(sd_dbglvl, "lock_volumes: got lock JobId=%u\n", \
+ get_jobid_from_tid(pthread_self())); \
+ } while (0)
+
+#define unlock_volumes() \
+ do { Dmsg4(sd_dbglvl, "unlock_volumes at %s:%d precnt=%d JobId=%u\n", \
+ __FILE__, __LINE__, \
+ vol_list_lock_count, get_jobid_from_tid(pthread_self())); \
+ _unlock_volumes(); } while (0)
+
#else
+
#define lock_reservations() _lock_reservations()
#define unlock_reservations() _unlock_reservations()
+#define lock_volumes() _lock_volumes()
+#define unlock_volumes() _unlock_volumes()
+
#endif
/* From wait.c */
int wait_for_sysop(DCR *dcr);
-bool wait_for_device(JCR *jcr, bool first);
+bool wait_for_device(JCR *jcr, int &retries);