[prev in list] [next in list] [prev in thread] [next in thread]
List: bacula-commits
Subject: [Bacula-commits] [bacula.org] Bacula Community source branch Branch-5.2 updated. 1cb3a4792afecf646aa
From: git () bacula ! org
Date: 2013-02-19 14:40:55
Message-ID: 20130219144056.54E0A39C01B () bacula ! bacula ! org
[Download RAW message or body]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Bacula Community source".
The branch, Branch-5.2 has been updated
via 1cb3a4792afecf646aab1f3404f768e4a749c6ea (commit)
via 8709a049177a84b7373094f1afa524e5dbebad47 (commit)
from c4c7450f4f6691db2ccb8f251e59ad8d25b780a7 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 1cb3a4792afecf646aab1f3404f768e4a749c6ea
Author: Kern Sibbald <kern@sibbald.com>
Date: Tue Feb 19 15:40:48 2013 +0100
Tweak version
commit 8709a049177a84b7373094f1afa524e5dbebad47
Author: Kern Sibbald <kern@sibbald.com>
Date: Tue Feb 19 15:40:28 2013 +0100
Add missing vol_mgr.h file
-----------------------------------------------------------------------
Summary of changes:
diff --git a/bacula/src/stored/vol_mgr.h b/bacula/src/stored/vol_mgr.h
new file mode 100644
index 0000000..44659ed
--- /dev/null
+++ b/bacula/src/stored/vol_mgr.h
@@ -0,0 +1,100 @@
+/*
+ Bacula ® - The Network Backup Solution
+
+ Copyright (C) 2000-2013 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.
+ This program is Free Software; you can redistribute it and/or
+ modify it under the terms of version three of the GNU Affero General Public
+ 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
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301, USA.
+
+ Bacula ® is a registered trademark of Kern Sibbald.
+ The licensor of Bacula is the Free Software Foundation Europe
+ (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
+ Switzerland, email:ftf@fsfeurope.org.
+*/
+/*
+ * Pulled out of dev.h
+ *
+ * Kern Sibbald, MMXIII
+ *
+ */
+
+/*
+ * Some details of how volume reservations work
+ *
+ * class VOLRES:
+ * set_in_use() volume being used on current drive
+ * clear_in_use() no longer being used. Can be re-used or moved.
+ * set_swapping() set volume being moved to another drive
+ * is_swapping() volume is being moved to another drive
+ * clear_swapping() volume normal
+ *
+ */
+
+#ifndef __VOL_MGR_H
+#define __VOL_MGR_H 1
+
+class VOLRES;
+VOLRES *vol_walk_start();
+VOLRES *vol_walk_next(VOLRES *prev_vol);
+void vol_walk_end(VOLRES *vol);
+
+/*
+ * Volume reservation class -- see vol_mgr.c and reserve.c
+ */
+class VOLRES {
+ bool m_swapping; /* set when swapping to another drive */
+ bool m_in_use; /* set when volume reserved or in use */
+ bool m_reading; /* set when reading */
+ int32_t m_slot; /* slot of swapping volume */
+ uint32_t m_JobId; /* JobId for read volumes */
+ volatile int32_t m_use_count; /* Use count */
+ pthread_mutex_t m_mutex; /* Vol muntex */
+public:
+ dlink link;
+ char *vol_name; /* Volume name */
+ DEVICE *dev; /* Pointer to device to which we are attached */
+
+ void init_mutex() { pthread_mutex_init(&m_mutex, NULL); };
+ void destroy_mutex() { pthread_mutex_destroy(&m_mutex); };
+ void Lock() { P(m_mutex); };
+ void Unlock() { V(m_mutex); };
+ void inc_use_count(void) {P(m_mutex); m_use_count++; V(m_mutex); };
+ void dec_use_count(void) {P(m_mutex); m_use_count--; V(m_mutex); };
+ int32_t use_count() const { return m_use_count; };
+ bool is_swapping() const { return m_swapping; };
+ bool is_reading() const { return m_reading; };
+ bool is_writing() const { return !m_reading; };
+ void set_reading() { m_reading = true; };
+ void clear_reading() { m_reading = false; };
+ void set_swapping() { m_swapping = true; };
+ void clear_swapping() { m_swapping = false; };
+ bool is_in_use() const { return m_in_use; };
+ void set_in_use() { m_in_use = true; };
+ void clear_in_use() { m_in_use = false; };
+ void set_slot(int32_t slot) { m_slot = slot; };
+ void clear_slot() { m_slot = -1; };
+ int32_t get_slot() const { return m_slot; };
+ uint32_t get_jobid() const { return m_JobId; };
+ void set_jobid(uint32_t JobId) { m_JobId = JobId; };
+};
+
+#define foreach_vol(vol) \
+ for (vol=vol_walk_start(); vol; (vol=vol_walk_next(vol)) )
+
+#define endeach_vol(vol) vol_walk_end(vol)
+
+#endif
diff --git a/bacula/src/version.h b/bacula/src/version.h
index fa713b2..6f1d7e0 100644
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -1,8 +1,8 @@
#undef VERSION
#define VERSION "5.2.13"
-#define BDATE "30 January 2013"
-#define LSMDATE "30Jan13"
+#define BDATE "19 February 2013"
+#define LSMDATE "19Jan13"
#define PROG_COPYRIGHT "Copyright (C) %d-2012 Free Software Foundation Europe e.V.\n"
#define BYEAR "2013" /* year for copyright messages in progs */
hooks/post-receive
--
Bacula Community source
------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_d2d_feb
_______________________________________________
Bacula-commits mailing list
Bacula-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/bacula-commits
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic