- Tweak #ifdefing a bit in new Win32 stream code.

- Fix #ifdeffing for FD_NO_SEND_TEST.
- Add documentation of performance #defines

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@2545 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/src/filed/backup.c b/bacula/src/filed/backup.c
index 05930b9803a9a40d935829e63297018402d49a19..175634d217749d11e1001b32fd8104a0fa4c834e 100644 (file)
--- a/bacula/src/filed/backup.c
+++ b/bacula/src/filed/backup.c
@@ -371,13 +371,16 @@ static int save_file(FF_PKT *ff_pkt, void *vjcr, bool top_level)
  * Currently this is not a problem as the only other stream, resource forks,
  * are not handled as sparse files.
  */
-int send_data(JCR *jcr, int stream, FF_PKT *ff_pkt, struct CHKSUM *chksum)
+static int send_data(JCR *jcr, int stream, FF_PKT *ff_pkt, struct CHKSUM *chksum)
 {
    BSOCK *sd = jcr->store_bsock;
    uint64_t fileAddr = 0;             /* file address */
    char *rbuf, *wbuf;
    int rsize = jcr->buf_size;      /* read buffer size */
    POOLMEM *msgsave;
+#ifdef FD_NO_SEND_TEST
+   return 1;
+#endif
 
    msgsave = sd->msg;
    rbuf = sd->msg;                    /* read buffer */
@@ -534,6 +537,9 @@ static bool read_and_send_acl(JCR *jcr, int acltype, int stream)
    BSOCK *sd = jcr->store_bsock;
    POOLMEM *msgsave;
    int len;
+#ifdef FD_NO_SEND_TEST
+   return true;
+#endif
 
    len = bacl_get(jcr, acltype);
    if (len < 0) {

diff --git a/bacula/src/version.h b/bacula/src/version.h
index 78f58fd0771d212ed950c6058e79f1e52a770024..eae3792045b4f31cf08d541071a72a532732f550 100644 (file)
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -3,9 +3,9 @@
  */
 
 #undef  VERSION
-#define VERSION "1.38.0"
-#define BDATE   "04 November 2005"
-#define LSMDATE "04Nov05"
+#define VERSION "1.38.1"
+#define BDATE   "05 November 2005"
+#define LSMDATE "05Nov05"
 
 /* Debug flags */
 #undef  DEBUG
@@ -38,6 +38,31 @@
 
 
 /* The following are turned on for performance testing */
+/*  
+ * If you turn on the NO_ATTRIBUTES_TEST and rebuild, the SD
+ *  will receive the attributes from the FD, will write them
+ *  to disk, then when the data is written to tape, it will
+ *  read back the attributes, but they will not be sent to
+ *  the Director. So this will eliminate: 1. the comm time
+ *  to send the attributes to the Director. 2. the time it
+ *  takes the Director to put them in the catalog database.
+ */
 /* #define NO_ATTRIBUTES_TEST 1 */
+
+/* 
+* If you turn on NO_TAPE_WRITE_TEST and rebuild, the SD
+*  will do all normal actions, but will not write to the
+*  Volume.  Note, this means a lot of functions such as
+*  labeling will not work, so you must use it only when 
+*  Bacula is going to append to a Volume. This will eliminate
+*  the time it takes to write to the Volume (not the time
+*  it takes to do any positioning).
+*/
 /* #define NO_TAPE_WRITE_TEST 1 */
+
+/*
+ * If you turn on FD_NO_SEND_TEST and rebuild, the FD will
+ *  not send any attributes or data to the SD. This will
+ *  eliminate the comm time sending to the SD.
+ */
 /* #define FD_NO_SEND_TEST 1 */