X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=bacula%2Fsrc%2Fstored%2Fbtape.c;h=60ea8d3c5eced9fc8f6eec66f9fe73f3fac02f59;hb=6fc016ea3c4f5698462494319733199e2de9a9af;hp=674307dbb3a28581f1f5ab2ddedd6be42e1a9406;hpb=9ce656ccfd75bfa6ec326d2ea6a3a68b3143e2b2;p=bacula%2Fbacula diff --git a/bacula/src/stored/btape.c b/bacula/src/stored/btape.c index 674307dbb3..60ea8d3c5e 100644 --- a/bacula/src/stored/btape.c +++ b/bacula/src/stored/btape.c @@ -14,7 +14,7 @@ * */ /* - Copyright (C) 2000-2004 Kern Sibbald and John Walker + Copyright (C) 2000-2005 Kern Sibbald This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -36,29 +36,33 @@ #include "bacula.h" #include "stored.h" +/* Dummy functions */ +int generate_daemon_event(JCR *jcr, const char *event) { return 1; } /* External subroutines */ extern void free_config_resources(); -extern char *edit_device_codes(JCR *jcr, char *omsg, const char *imsg, const char *cmd); /* Exported variables */ int quit = 0; char buf[100000]; int bsize = TAPE_BSIZE; char VolName[MAX_NAME_LENGTH]; -bool forge_on = false; +STORES *me = NULL; /* our Global resource */ +bool forge_on = false; /* proceed inspite of I/O errors */ +pthread_mutex_t device_release_mutex = PTHREAD_MUTEX_INITIALIZER; +pthread_cond_t wait_device_release = PTHREAD_COND_INITIALIZER; /* - * If you change the format of the state file, + * If you change the format of the state file, * increment this value - */ + */ static uint32_t btape_state_level = 2; DEVICE *dev = NULL; DCR *dcr; DEVRES *device = NULL; - + /* Forward referenced subroutines */ static void do_tape_cmds(); static void helpcmd(); @@ -73,9 +77,9 @@ static void qfillcmd(); static void statcmd(); static void unfillcmd(); static int flush_block(DEV_BLOCK *block, int dump); -static bool quickie_cb(JCR *jcr, DEVICE *dev, DEV_BLOCK *block, DEV_RECORD *rec); +static bool quickie_cb(DCR *dcr, DEV_RECORD *rec); static bool compare_blocks(DEV_BLOCK *last_block, DEV_BLOCK *block); -static bool my_mount_next_read_volume(JCR *jcr, DEVICE *dev, DEV_BLOCK *block); +static bool my_mount_next_read_volume(DCR *dcr); static void scan_blocks(); static void set_volume_name(const char *VolName, int volnum); static void rawfill_cmd(); @@ -124,7 +128,7 @@ static uint32_t last_block_num1 = 0; static uint32_t last_block_num2 = 0; static uint32_t last_block_num = 0; static uint32_t BlockNumber = 0; -static bool simple = true; +static bool simple = true; static const char *VolumeName = NULL; static int vol_num = 0; @@ -139,21 +143,44 @@ int get_cmd(const char *prompt); /********************************************************************* * - * Main Bacula Pool Creation Program + * Main Bacula Pool Creation Program * */ int main(int margc, char *margv[]) { - int ch; + int ch, i; + uint32_t x32, y32; + uint64_t x64, y64; + char buf[1000]; /* Sanity checks */ - if (TAPE_BSIZE % DEV_BSIZE != 0 || TAPE_BSIZE / DEV_BSIZE == 0) { + if (TAPE_BSIZE % B_DEV_BSIZE != 0 || TAPE_BSIZE / B_DEV_BSIZE == 0) { Emsg2(M_ABORT, 0, "Tape block size (%d) not multiple of system size (%d)\n", - TAPE_BSIZE, DEV_BSIZE); + TAPE_BSIZE, B_DEV_BSIZE); } if (TAPE_BSIZE != (1 << (ffs(TAPE_BSIZE)-1))) { Emsg1(M_ABORT, 0, "Tape block size (%d) is not a power of 2\n", TAPE_BSIZE); } + if (sizeof(off_t) < 8) { + Pmsg1(-1, "\n\n!!!! Warning large disk addressing disabled. off_t=%d should be 8 or more !!!!!\n\n\n", + sizeof(off_t)); + } + x32 = 123456789; + bsnprintf(buf, sizeof(buf), "%u", x32); + i = bsscanf(buf, "%u", &y32); + if (i != 1 || x32 != y32) { + Pmsg3(-1, "32 bit printf/scanf problem. i=%d x32=%u y32=%u\n", i, x32, y32); + exit(1); + } + x64 = 123456789; + x64 = x64 << 32; + x64 += 123456789; + bsnprintf(buf, sizeof(buf), "%" llu, x64); + i = bsscanf(buf, "%llu", &y64); + if (i != 1 || x64 != y64) { + Pmsg3(-1, "64 bit printf/scanf problem. i=%d x64=%" llu " y64=%" llu "\n", i, x64, y64); + exit(1); + } printf("Tape block granularity is %d bytes.\n", TAPE_BSIZE); @@ -164,49 +191,49 @@ int main(int margc, char *margv[]) while ((ch = getopt(margc, margv, "b:c:d:psv?")) != -1) { switch (ch) { case 'b': /* bootstrap file */ - bsr = parse_bsr(NULL, optarg); -// dump_bsr(bsr, true); - break; + bsr = parse_bsr(NULL, optarg); +// dump_bsr(bsr, true); + break; case 'c': /* specify config file */ - if (configfile != NULL) { - free(configfile); - } - configfile = bstrdup(optarg); - break; + if (configfile != NULL) { + free(configfile); + } + configfile = bstrdup(optarg); + break; case 'd': /* set debug level */ - debug_level = atoi(optarg); - if (debug_level <= 0) { - debug_level = 1; - } - break; + debug_level = atoi(optarg); + if (debug_level <= 0) { + debug_level = 1; + } + break; case 'p': - forge_on = true; - break; + forge_on = true; + break; case 's': - signals = false; - break; + signals = false; + break; case 'v': - verbose++; - break; + verbose++; + break; case '?': default: - helpcmd(); - exit(0); + helpcmd(); + exit(0); - } + } } margc -= optind; margv += optind; cmd = get_pool_memory(PM_FNAME); args = get_pool_memory(PM_FNAME); - + if (signals) { init_signals(terminate_btape); } @@ -231,8 +258,11 @@ int main(int margc, char *margv[]) exit(1); } - jcr = setup_jcr("btape", margv[0], bsr, NULL); - dev = setup_to_access_device(jcr, 0); /* acquire for write */ + jcr = setup_jcr("btape", margv[0], bsr, NULL, 0); /* write */ + if (!jcr) { + exit(1); + } + dev = jcr->dcr->dev; if (!dev) { exit(1); } @@ -243,7 +273,7 @@ int main(int margc, char *margv[]) Dmsg0(200, "Do tape commands\n"); do_tape_cmds(); - + terminate: terminate_btape(0); return 0; @@ -278,14 +308,15 @@ static void terminate_btape(int stat) } if (debug_level > 10) - print_memory_pool_stats(); + print_memory_pool_stats(); if (this_block) { free_block(this_block); } + stop_watchdog(); term_msg(); - close_memory_pool(); /* free memory in pool */ + close_memory_pool(); /* free memory in pool */ sm_dump(false); exit(stat); @@ -294,19 +325,20 @@ static void terminate_btape(int stat) static bool open_the_device() { DEV_BLOCK *block; - + block = new_block(dev); lock_device(dev); - if (!(dev->state & ST_OPENED)) { - Dmsg1(200, "Opening device %s\n", jcr->VolumeName); - if (open_dev(dev, jcr->VolumeName, OPEN_READ_WRITE) < 0) { + if (!dev->is_open()) { + Dmsg1(200, "Opening device %s\n", dcr->VolumeName); + if (open_dev(dev, dcr->VolumeName, OPEN_READ_WRITE) < 0) { Emsg1(M_FATAL, 0, _("dev open failed: %s\n"), dev->errmsg); - unlock_device(dev); - free_block(block); - return false; + unlock_device(dev); + free_block(block); + return false; } } - Pmsg1(000, "open_dev %s OK\n", dev_name(dev)); + Pmsg1(000, "open_dev %s OK\n", dev->print_name()); + dev->set_append(); /* put volume in append mode */ unlock_device(dev); free_block(block); return true; @@ -319,19 +351,19 @@ void quitcmd() } /* - * Write a label to the tape + * Write a label to the tape */ static void labelcmd() { if (VolumeName) { - pm_strcpy(&cmd, VolumeName); + pm_strcpy(cmd, VolumeName); } else { if (!get_cmd("Enter Volume Name: ")) { - return; + return; } } - - if (!(dev->state & ST_OPENED)) { + + if (!dev->is_open()) { if (!first_open_device(dev)) { Pmsg1(0, "Device open failed. ERR=%s\n", strerror_dev(dev)); } @@ -342,16 +374,14 @@ static void labelcmd() } /* - * Read the tape label + * Read the tape label */ static void readlabelcmd() { int save_debug_level = debug_level; int stat; - DEV_BLOCK *block; - block = new_block(dev); - stat = read_dev_volume_label(dcr, block); + stat = read_dev_volume_label(dcr); switch (stat) { case VOL_NO_LABEL: Pmsg0(0, "Volume has no label.\n"); @@ -380,9 +410,8 @@ static void readlabelcmd() } debug_level = 20; - dump_volume_label(dev); + dump_volume_label(dev); debug_level = save_debug_level; - free_block(block); } @@ -396,11 +425,11 @@ static void loadcmd() if (!load_dev(dev)) { Pmsg1(0, "Bad status from load. ERR=%s\n", strerror_dev(dev)); } else - Pmsg1(0, "Loaded %s\n", dev_name(dev)); + Pmsg1(0, "Loaded %s\n", dev->print_name()); } /* - * Rewind the tape. + * Rewind the tape. */ static void rewindcmd() { @@ -408,12 +437,12 @@ static void rewindcmd() Pmsg1(0, "Bad status from rewind. ERR=%s\n", strerror_dev(dev)); clrerror_dev(dev, -1); } else { - Pmsg1(0, "Rewound %s\n", dev_name(dev)); + Pmsg1(0, "Rewound %s\n", dev->print_name()); } } /* - * Clear any tape error + * Clear any tape error */ static void clearcmd() { @@ -421,7 +450,7 @@ static void clearcmd() } /* - * Write and end of file on the tape + * Write and end of file on the tape */ static void weofcmd() { @@ -438,12 +467,12 @@ static void weofcmd() Pmsg2(0, "Bad status from weof %d. ERR=%s\n", stat, strerror_dev(dev)); return; } else { - Pmsg3(0, "Wrote %d EOF%s to %s\n", num, num==1?"":"s", dev_name(dev)); + Pmsg3(0, "Wrote %d EOF%s to %s\n", num, num==1?"":"s", dev->print_name()); } } -/* Go to the end of the medium -- raw command +/* Go to the end of the medium -- raw command * The idea was orginally that the end of the Bacula * medium would be flagged differently. This is not * currently the case. So, this is identical to the @@ -469,7 +498,7 @@ static void eodcmd() } /* - * Backspace file + * Backspace file */ static void bsfcmd() { @@ -489,7 +518,7 @@ static void bsfcmd() } /* - * Backspace record + * Backspace record */ static void bsrcmd() { @@ -508,7 +537,7 @@ static void bsrcmd() } /* - * List device capabilities as defined in the + * List device capabilities as defined in the * stored.conf file. */ static void capcmd() @@ -520,6 +549,7 @@ static void capcmd() printf("%sFSR ", dev->capabilities & CAP_FSR ? "" : "!"); printf("%sFSF ", dev->capabilities & CAP_FSF ? "" : "!"); printf("%sFASTFSF ", dev->capabilities & CAP_FASTFSF ? "" : "!"); + printf("%sBSFATEOM ", dev->capabilities & CAP_BSFATEOM ? "" : "!"); printf("%sEOM ", dev->capabilities & CAP_EOM ? "" : "!"); printf("%sREM ", dev->capabilities & CAP_REM ? "" : "!"); printf("%sRACCESS ", dev->capabilities & CAP_RACCESS ? "" : "!"); @@ -527,18 +557,19 @@ static void capcmd() printf("%sLABEL ", dev->capabilities & CAP_LABEL ? "" : "!"); printf("%sANONVOLS ", dev->capabilities & CAP_ANONVOLS ? "" : "!"); printf("%sALWAYSOPEN ", dev->capabilities & CAP_ALWAYSOPEN ? "" : "!"); + printf("%sMTIOCGET ", dev->capabilities & CAP_MTIOCGET ? "" : "!"); printf("\n"); printf(_("Device status:\n")); - printf("%sOPENED ", dev->state & ST_OPENED ? "" : "!"); - printf("%sTAPE ", dev->state & ST_TAPE ? "" : "!"); - printf("%sLABEL ", dev->state & ST_LABEL ? "" : "!"); + printf("%sOPENED ", dev->is_open() ? "" : "!"); + printf("%sTAPE ", dev->is_tape() ? "" : "!"); + printf("%sLABEL ", dev->is_labeled() ? "" : "!"); printf("%sMALLOC ", dev->state & ST_MALLOC ? "" : "!"); - printf("%sAPPEND ", dev->state & ST_APPEND ? "" : "!"); - printf("%sREAD ", dev->state & ST_READ ? "" : "!"); - printf("%sEOT ", dev->state & ST_EOT ? "" : "!"); + printf("%sAPPEND ", dev->can_append() ? "" : "!"); + printf("%sREAD ", dev->can_read() ? "" : "!"); + printf("%sEOT ", dev->at_eot() ? "" : "!"); printf("%sWEOT ", dev->state & ST_WEOT ? "" : "!"); - printf("%sEOF ", dev->state & ST_EOF ? "" : "!"); + printf("%sEOF ", dev->at_eof() ? "" : "!"); printf("%sNEXTVOL ", dev->state & ST_NEXTVOL ? "" : "!"); printf("%sSHORT ", dev->state & ST_SHORT ? "" : "!"); printf("\n"); @@ -554,7 +585,7 @@ static void capcmd() } /* - * Test writting larger and larger records. + * Test writting larger and larger records. * This is a torture test for records. */ static void rectestcmd() @@ -585,11 +616,11 @@ static void rectestcmd() rec->data_len = i; sm_check(__FILE__, __LINE__, false); if (write_record_to_block(block, rec)) { - empty_block(block); - blkno++; + empty_block(block); + blkno++; Pmsg2(0, "Block %d i=%d\n", blkno, i); } else { - break; + break; } sm_check(__FILE__, __LINE__, false); } @@ -607,7 +638,7 @@ static void rectestcmd() */ static int re_read_block_test() { - DEV_BLOCK *block; + DEV_BLOCK *block = dcr->block; DEV_RECORD *rec; int stat = 0; int len; @@ -619,44 +650,44 @@ static int re_read_block_test() Pmsg0(-1, _("\n=== Write, backup, and re-read test ===\n\n" "I'm going to write three records and an EOF\n" - "then backup over the EOF and re-read the last record.\n" + "then backup over the EOF and re-read the last record.\n" "Bacula does this after writing the last block on the\n" "tape to verify that the block was written correctly.\n\n" - "This is not an *essential* feature ...\n\n")); + "This is not an *essential* feature ...\n\n")); rewindcmd(); - block = new_block(dev); + empty_block(block); rec = new_record(); rec->data = check_pool_memory_size(rec->data, block->buf_len); len = rec->data_len = block->buf_len-100; memset(rec->data, 1, rec->data_len); if (!write_record_to_block(block, rec)) { - Pmsg0(0, _("Error writing record to block.\n")); + Pmsg0(0, _("Error writing record to block.\n")); goto bail_out; } - if (!write_block_to_dev(dcr, block)) { - Pmsg0(0, _("Error writing block to device.\n")); + if (!write_block_to_dev(dcr)) { + Pmsg0(0, _("Error writing block to device.\n")); goto bail_out; } else { Pmsg1(0, _("Wrote first record of %d bytes.\n"), rec->data_len); } memset(rec->data, 2, rec->data_len); if (!write_record_to_block(block, rec)) { - Pmsg0(0, _("Error writing record to block.\n")); + Pmsg0(0, _("Error writing record to block.\n")); goto bail_out; } - if (!write_block_to_dev(dcr, block)) { - Pmsg0(0, _("Error writing block to device.\n")); + if (!write_block_to_dev(dcr)) { + Pmsg0(0, _("Error writing block to device.\n")); goto bail_out; } else { Pmsg1(0, _("Wrote second record of %d bytes.\n"), rec->data_len); } memset(rec->data, 3, rec->data_len); if (!write_record_to_block(block, rec)) { - Pmsg0(0, _("Error writing record to block.\n")); + Pmsg0(0, _("Error writing record to block.\n")); goto bail_out; } - if (!write_block_to_dev(dcr, block)) { - Pmsg0(0, _("Error writing block to device.\n")); + if (!write_block_to_dev(dcr)) { + Pmsg0(0, _("Error writing block to device.\n")); goto bail_out; } else { Pmsg1(0, _("Wrote third record of %d bytes.\n"), rec->data_len); @@ -672,7 +703,7 @@ static int re_read_block_test() if (dev_cap(dev, CAP_TWOEOF)) { if (!bsf_dev(dev, 1)) { Pmsg1(0, _("Backspace file failed! ERR=%s\n"), strerror_dev(dev)); - goto bail_out; + goto bail_out; } } Pmsg0(0, "Backspaced over EOF OK.\n"); @@ -681,19 +712,21 @@ static int re_read_block_test() goto bail_out; } Pmsg0(0, "Backspace record OK.\n"); - if (!read_block_from_dev(dcr, block, NO_BLOCK_NUMBER_CHECK)) { - Pmsg1(0, _("Read block failed! ERR=%s\n"), strerror(dev->dev_errno)); + if (!read_block_from_dev(dcr, NO_BLOCK_NUMBER_CHECK)) { + berrno be; + Pmsg1(0, _("Read block failed! ERR=%s\n"), be.strerror(dev->dev_errno)); goto bail_out; } memset(rec->data, 0, rec->data_len); if (!read_record_from_block(block, rec)) { - Pmsg1(0, _("Read block failed! ERR=%s\n"), strerror(dev->dev_errno)); + berrno be; + Pmsg1(0, _("Read block failed! ERR=%s\n"), be.strerror(dev->dev_errno)); goto bail_out; } for (int i=0; idata[i] != 3) { Pmsg0(0, _("Bad data in record. Test failed!\n")); - goto bail_out; + goto bail_out; } } Pmsg0(0, _("\nBlock re-read correct. Test succeeded!\n")); @@ -702,7 +735,6 @@ static int re_read_block_test() stat = 1; bail_out: - free_block(block); free_record(rec); if (stat == 0) { Pmsg0(0, _("This is not terribly serious since Bacula only uses\n" @@ -711,7 +743,7 @@ bail_out: "if you add:\n\n" "Backward Space Record = No\n\n" "to your Storage daemon's Device resource definition.\n")); - } + } return stat; } @@ -731,10 +763,10 @@ static int write_read_test() Pmsg0(-1, _("\n=== Write, rewind, and re-read test ===\n\n" "I'm going to write 1000 records and an EOF\n" - "then write 1000 records and an EOF, then rewind,\n" + "then write 1000 records and an EOF, then rewind,\n" "and re-read the data to verify that it is correct.\n\n" - "This is an *essential* feature ...\n\n")); - block = new_block(dev); + "This is an *essential* feature ...\n\n")); + block = dcr->block; rec = new_record(); if (!rewind_dev(dev)) { Pmsg1(0, "Bad status from rewind. ERR=%s\n", strerror_dev(dev)); @@ -746,15 +778,15 @@ static int write_read_test() for (i=1; i<=1000; i++) { p = (int *)rec->data; for (j=0; jdata_len); @@ -762,15 +794,15 @@ static int write_read_test() for (i=1001; i<=2000; i++) { p = (int *)rec->data; for (j=0; jdata_len); @@ -786,27 +818,31 @@ static int write_read_test() } for (i=1; i<=2000; i++) { read_again: - if (!read_block_from_dev(dcr, block, NO_BLOCK_NUMBER_CHECK)) { - if (dev_state(dev, ST_EOF)) { + if (!read_block_from_dev(dcr, NO_BLOCK_NUMBER_CHECK)) { + berrno be; + if (dev_state(dev, ST_EOF)) { Pmsg0(-1, _("Got EOF on tape.\n")); - goto read_again; - } - Pmsg1(0, _("Read block failed! ERR=%s\n"), strerror(dev->dev_errno)); - goto bail_out; + if (i == 1001) { + goto read_again; + } + } + Pmsg2(0, _("Read block %d failed! ERR=%s\n"), i, be.strerror(dev->dev_errno)); + goto bail_out; } memset(rec->data, 0, rec->data_len); if (!read_record_from_block(block, rec)) { - Pmsg1(0, _("Read record failed! ERR=%s\n"), strerror(dev->dev_errno)); - goto bail_out; + berrno be; + Pmsg2(0, _("Read record failed. Block %d! ERR=%s\n"), i, be.strerror(dev->dev_errno)); + goto bail_out; } p = (int *)rec->data; for (j=0; jblock; DEV_RECORD *rec; int stat = 0; int len, i, j; @@ -836,13 +871,14 @@ static int position_test() int recno = 0; int file = 0, blk = 0; int *p; + bool got_eof = false; Pmsg0(-1, _("\n=== Write, rewind, and position test ===\n\n" "I'm going to write 1000 records and an EOF\n" - "then write 1000 records and an EOF, then rewind,\n" + "then write 1000 records and an EOF, then rewind,\n" "and position to a few blocks and verify that it is correct.\n\n" - "This is an *essential* feature ...\n\n")); - block = new_block(dev); + "This is an *essential* feature ...\n\n")); + empty_block(block); rec = new_record(); if (!rewind_dev(dev)) { Pmsg1(0, "Bad status from rewind. ERR=%s\n", strerror_dev(dev)); @@ -854,15 +890,15 @@ static int position_test() for (i=1; i<=1000; i++) { p = (int *)rec->data; for (j=0; jdata_len); @@ -870,15 +906,15 @@ static int position_test() for (i=1001; i<=2000; i++) { p = (int *)rec->data; for (j=0; jdata_len); @@ -897,77 +933,89 @@ static int position_test() /* Set up next item to read based on where we are */ switch (recno) { case 0: - recno = 5; - file = 0; - blk = 4; - break; + recno = 5; + file = 0; + blk = 4; + break; case 5: - recno = 201; - file = 0; - blk = 200; - break; + recno = 201; + file = 0; + blk = 200; + break; case 201: - recno = 1000; - file = 0; - blk = 999; - break; + recno = 1000; + file = 0; + blk = 999; + break; case 1000: - recno = 1001; - file = 1; - blk = 0; - break; + recno = 1001; + file = 1; + blk = 0; + break; case 1001: - recno = 1601; - file = 1; - blk = 600; - break; + recno = 1601; + file = 1; + blk = 600; + break; case 1601: - recno = 2000; - file = 1; - blk = 999; - break; + recno = 2000; + file = 1; + blk = 999; + break; case 2000: - ok = false; - continue; + ok = false; + continue; } Pmsg2(-1, "Reposition to file:block %d:%d\n", file, blk); if (!reposition_dev(dev, file, blk)) { Pmsg0(0, "Reposition error.\n"); - goto bail_out; + goto bail_out; } read_again: - if (!read_block_from_dev(dcr, block, NO_BLOCK_NUMBER_CHECK)) { - if (dev_state(dev, ST_EOF)) { + if (!read_block_from_dev(dcr, NO_BLOCK_NUMBER_CHECK)) { + berrno be; + if (dev_state(dev, ST_EOF)) { Pmsg0(-1, _("Got EOF on tape.\n")); - goto read_again; - } - Pmsg1(0, _("Read block failed! ERR=%s\n\n"), strerror(dev->dev_errno)); + if (!got_eof) { + got_eof = true; + goto read_again; + } + } + Pmsg4(0, _("Read block %d failed! file=%d blk=%d. ERR=%s\n\n"), + recno, file, blk, be.strerror(dev->dev_errno)); Pmsg0(0, _("This may be because the tape drive block size is not\n" " set to variable blocking as normally used by Bacula.\n" " Please see the Tape Testing chapter in the manual and \n" - " look for using mt with defblksize and setoptions\n")); - goto bail_out; + " look for using mt with defblksize and setoptions\n" + "If your tape drive block size is correct, then perhaps\n" + " your SCSI driver is *really* stupid and does not\n" + " correctly report the file:block after a FSF. In this\n" + " case try setting:\n" + " Fast Forward Space File = no\n" + " in your Device resource.\n")); + + goto bail_out; } memset(rec->data, 0, rec->data_len); if (!read_record_from_block(block, rec)) { - Pmsg1(0, _("Read record failed! ERR=%s\n"), strerror(dev->dev_errno)); - goto bail_out; + berrno be; + Pmsg1(0, _("Read record failed! ERR=%s\n"), be.strerror(dev->dev_errno)); + goto bail_out; } p = (int *)rec->data; for (j=0; jfile, dev->file == 3 ? "correct!" : "NOT correct!!!!"); if (dev->file != 3) { @@ -1017,7 +1065,7 @@ static int append_test() } Pmsg0(-1, _("\nNow the important part, I am going to attempt to append to the tape.\n\n")); - wrcmd(); + wrcmd(); weofcmd(); if (dev_cap(dev, CAP_TWOEOF)) { weofcmd(); @@ -1027,7 +1075,7 @@ static int append_test() Pmsg0(-1, "Doing Bacula scan of blocks:\n"); scan_blocks(); Pmsg0(-1, _("End scanning the tape.\n")); - Pmsg2(-1, _("We should be in file 4. I am at file %d. This is %s\n"), + Pmsg2(-1, _("We should be in file 4. I am at file %d. This is %s\n"), dev->file, dev->file == 4 ? "correct!" : "NOT correct!!!!"); if (dev->file != 4) { @@ -1044,14 +1092,14 @@ static int autochanger_test() { POOLMEM *results, *changer; int slot, status, loaded; - int timeout = jcr->device->max_changer_wait; + int timeout = dcr->device->max_changer_wait; int sleep_time = 0; Dmsg1(100, "Max changer wait = %d sec\n", timeout); if (!dev_cap(dev, CAP_AUTOCHANGER)) { return 1; } - if (!(jcr->device && jcr->device->changer_name && jcr->device->changer_command)) { + if (!(dcr->device && dcr->device->changer_name && dcr->device->changer_command)) { Pmsg0(-1, "\nAutochanger enabled, but no name or no command device specified.\n"); return 1; } @@ -1073,18 +1121,18 @@ static int autochanger_test() try_again: slot = 1; - jcr->VolCatInfo.Slot = slot; + dcr->VolCatInfo.Slot = slot; /* Find out what is loaded, zero means device is unloaded */ Pmsg0(-1, _("3301 Issuing autochanger \"loaded\" command.\n")); - changer = edit_device_codes(jcr, changer, jcr->device->changer_command, - "loaded"); + changer = edit_device_codes(dcr, changer, "loaded"); status = run_program(changer, timeout, results); - Dmsg3(100, "run_prog: %s stat=%d result=%s\n", changer, status, results); + Dmsg3(100, "run_prog: %s stat=%d result=\"%s\"\n", changer, status, results); if (status == 0) { loaded = atoi(results); } else { + berrno be; Pmsg1(-1, _("3991 Bad autochanger command: %s\n"), changer); - Pmsg2(-1, _("3991 status=%d result=%s\n"), status, results); + Pmsg2(-1, _("3991 result=\"%s\": ERR=%s\n"), results, be.strerror(status)); goto bail_out; } if (loaded) { @@ -1094,71 +1142,76 @@ try_again: } Dmsg1(100, "Results from loaded query=%s\n", results); if (loaded) { - jcr->VolCatInfo.Slot = loaded; + dcr->VolCatInfo.Slot = loaded; offline_or_rewind_dev(dev); /* We are going to load a new tape, so close the device */ force_close_dev(dev); Pmsg2(-1, _("3302 Issuing autochanger \"unload %d %d\" command.\n"), - loaded, dev->drive_index); - changer = edit_device_codes(jcr, changer, - jcr->device->changer_command, "unload"); + loaded, dev->drive_index); + changer = edit_device_codes(dcr, changer, "unload"); status = run_program(changer, timeout, results); Pmsg2(-1, "unload status=%s %d\n", status==0?"OK":"Bad", status); if (status != 0) { + berrno be; Pmsg1(-1, _("3992 Bad autochanger command: %s\n"), changer); - Pmsg2(-1, _("3992 status=%d result=%s\n"), status, results); + Pmsg2(-1, _("3992 result=\"%s\": ERR=%s\n"), results, be.strerror(status)); } } /* * Load the Slot 1 */ - + slot = 1; - jcr->VolCatInfo.Slot = slot; - Pmsg2(-1, _("3303 Issuing autochanger \"load slot %d %d\" command.\n"), + dcr->VolCatInfo.Slot = slot; + Pmsg2(-1, _("3303 Issuing autochanger \"load slot %d %d\" command.\n"), slot, dev->drive_index); - changer = edit_device_codes(jcr, changer, jcr->device->changer_command, "load"); + changer = edit_device_codes(dcr, changer, "load"); Dmsg1(100, "Changer=%s\n", changer); force_close_dev(dev); status = run_program(changer, timeout, results); if (status == 0) { Pmsg2(-1, _("3303 Autochanger \"load slot %d %d\" status is OK.\n"), - slot, dev->drive_index); + slot, dev->drive_index); } else { + berrno be; Pmsg1(-1, _("3993 Bad autochanger command: %s\n"), changer); - Pmsg2(-1, _("3993 status=%d result=%s\n"), status, results); + Pmsg2(-1, _("3993 result=\"%s\": ERR=%s\n"), results, be.strerror(status)); goto bail_out; } if (!open_the_device()) { goto bail_out; } + /* + * Start with sleep_time 0 then increment by 30 seconds if we get + * a failure. + */ bmicrosleep(sleep_time, 0); - if (!rewind_dev(dev)) { + if (!rewind_dev(dev) || weof_dev(dev,1) < 0) { Pmsg1(0, "Bad status from rewind. ERR=%s\n", strerror_dev(dev)); clrerror_dev(dev, -1); Pmsg0(-1, "\nThe test failed, probably because you need to put\n" - "a longer sleep time in the mtx-script in the load) case.\n" + "a longer sleep time in the mtx-script in the load) case.\n" "Adding a 30 second sleep and trying again ...\n"); sleep_time += 30; goto try_again; } else { - Pmsg1(0, "Rewound %s\n", dev_name(dev)); + Pmsg1(0, "Rewound %s\n", dev->print_name()); } - + if ((status = weof_dev(dev, 1)) < 0) { Pmsg2(0, "Bad status from weof %d. ERR=%s\n", status, strerror_dev(dev)); goto bail_out; } else { - Pmsg1(0, "Wrote EOF to %s\n", dev_name(dev)); + Pmsg1(0, "Wrote EOF to %s\n", dev->print_name()); } if (sleep_time) { Pmsg1(-1, "\nThe test worked this time. Please add:\n\n" " sleep %d\n\n" "to your mtx-changer script in the load) case.\n\n", - sleep_time); + sleep_time); } else { Pmsg0(-1, "\nThe test autochanger worked!!\n\n"); } @@ -1188,26 +1241,26 @@ static void autochangercmd() static int fsf_test() { bool set_off = false; - + Pmsg0(-1, _("\n\n=== Forward space files test ===\n\n" "This test is essential to Bacula.\n\n" "I'm going to write five files then test forward spacing\n\n")); argc = 1; rewindcmd(); wrcmd(); - weofcmd(); /* end file 0 */ + weofcmd(); /* end file 0 */ wrcmd(); wrcmd(); - weofcmd(); /* end file 1 */ + weofcmd(); /* end file 1 */ wrcmd(); wrcmd(); wrcmd(); - weofcmd(); /* end file 2 */ + weofcmd(); /* end file 2 */ wrcmd(); wrcmd(); - weofcmd(); /* end file 3 */ + weofcmd(); /* end file 3 */ wrcmd(); - weofcmd(); /* end file 4 */ + weofcmd(); /* end file 4 */ if (dev_cap(dev, CAP_TWOEOF)) { weofcmd(); } @@ -1219,7 +1272,7 @@ test_again: Pmsg1(0, "Bad status from fsr. ERR=%s\n", strerror_dev(dev)); goto bail_out; } - Pmsg2(-1, _("We should be in file 1. I am at file %d. This is %s\n"), + Pmsg2(-1, _("We should be in file 1. I am at file %d. This is %s\n"), dev->file, dev->file == 1 ? "correct!" : "NOT correct!!!!"); if (dev->file != 1) { @@ -1231,7 +1284,7 @@ test_again: Pmsg1(0, "Bad status from fsr. ERR=%s\n", strerror_dev(dev)); goto bail_out; } - Pmsg2(-1, _("We should be in file 3. I am at file %d. This is %s\n"), + Pmsg2(-1, _("We should be in file 3. I am at file %d. This is %s\n"), dev->file, dev->file == 3 ? "correct!" : "NOT correct!!!!"); if (dev->file != 3) { @@ -1244,7 +1297,7 @@ test_again: Pmsg1(0, "Bad status from fsr. ERR=%s\n", strerror_dev(dev)); goto bail_out; } - Pmsg2(-1, _("We should be in file 4. I am at file %d. This is %s\n"), + Pmsg2(-1, _("We should be in file 4. I am at file %d. This is %s\n"), dev->file, dev->file == 4 ? "correct!" : "NOT correct!!!!"); if (dev->file != 4) { @@ -1261,7 +1314,7 @@ test_again: if (!fsf_dev(dev, 1)) { Pmsg1(0, "Bad status from fsr. ERR=%s\n", strerror_dev(dev)); } - Pmsg2(-1, _("We should be in file 5. I am at file %d. This is %s\n"), + Pmsg2(-1, _("We should be in file 5. I am at file %d. This is %s\n"), dev->file, dev->file == 5 ? "correct!" : "NOT correct!!!!"); if (dev->file != 5) { goto bail_out; @@ -1278,7 +1331,10 @@ bail_out: set_off = true; goto test_again; } - Pmsg0(-1, "You must correct this error or Bacula will not work.\n"); + Pmsg0(-1, "You must correct this error or Bacula will not work.\n" + "Some systems, e.g. OpenBSD, require you to set\n" + " Use MTIOCGET= no\n" + "in your device resource. Use with caution.\n"); return -2; } @@ -1286,7 +1342,7 @@ bail_out: -/* +/* * This is a general test of Bacula's functions * needed to read and write the tape. */ @@ -1302,44 +1358,44 @@ static void testcmd() } stat = append_test(); - if (stat == 1) { /* OK get out */ + if (stat == 1) { /* OK get out */ goto all_done; } - if (stat == -1) { /* first test failed */ + if (stat == -1) { /* first test failed */ if (dev_cap(dev, CAP_EOM) || dev_cap(dev, CAP_FASTFSF)) { Pmsg0(-1, "\nAppend test failed. Attempting again.\n" "Setting \"Hardware End of Medium = no\n" " and \"Fast Forward Space File = no\n" "and retrying append test.\n\n"); - dev->capabilities &= ~CAP_EOM; /* turn off eom */ - dev->capabilities &= ~CAP_FASTFSF; /* turn off fast fsf */ - stat = append_test(); - if (stat == 1) { + dev->capabilities &= ~CAP_EOM; /* turn off eom */ + dev->capabilities &= ~CAP_FASTFSF; /* turn off fast fsf */ + stat = append_test(); + if (stat == 1) { Pmsg0(-1, "\n\nIt looks like the test worked this time, please add:\n\n" " Hardware End of Medium = No\n\n" " Fast Forward Space File = No\n" "to your Device resource in the Storage conf file.\n"); - goto all_done; - } - if (stat == -1) { + goto all_done; + } + if (stat == -1) { Pmsg0(-1, "\n\nThat appears *NOT* to have corrected the problem.\n"); - goto failed; - } - /* Wrong count after append */ - if (stat == -2) { + goto failed; + } + /* Wrong count after append */ + if (stat == -2) { Pmsg0(-1, "\n\nIt looks like the append failed. Attempting again.\n" "Setting \"BSF at EOM = yes\" and retrying append test.\n"); - dev->capabilities |= CAP_BSFATEOM; /* backspace on eom */ - stat = append_test(); - if (stat == 1) { + dev->capabilities |= CAP_BSFATEOM; /* backspace on eom */ + stat = append_test(); + if (stat == 1) { Pmsg0(-1, "\n\nIt looks like the test worked this time, please add:\n\n" " Hardware End of Medium = No\n" " Fast Forward Space File = No\n" " BSF at EOM = yes\n\n" "to your Device resource in the Storage conf file.\n"); - goto all_done; - } - } + goto all_done; + } + } } failed: @@ -1355,7 +1411,11 @@ failed: "nnn must match your tape driver's block size, which\n" "can be determined by reading your tape manufacturers\n" "information, and the information on your kernel dirver.\n" - "Fixed block sizes, however, are not normally an ideal solution.\n"); + "Fixed block sizes, however, are not normally an ideal solution.\n" + "\n" + "Some systems, e.g. OpenBSD, require you to set\n" + " Use MTIOCGET= no\n" + "in your device resource. Use with caution.\n"); return; } @@ -1369,7 +1429,7 @@ all_done: "End of File mark.\n" "3 blocks of 64448 bytes in file 3\n" "End of File mark.\n" - "1 block of 64448 bytes in file 4\n" + "1 block of 64448 bytes in file 4\n" "End of File mark.\n" "Total files=4, blocks=7, bytes = 451,136\n" "=== End sample correct output ===\n\n")); @@ -1383,10 +1443,10 @@ all_done: re_read_block_test(); } - fsf_test(); /* do fast forward space file test */ + fsf_test(); /* do fast forward space file test */ + + autochanger_test(); /* do autochanger test */ - autochanger_test(); /* do autochanger test */ - } /* Forward space a file */ @@ -1416,7 +1476,7 @@ static void fsrcmd() if (num <= 0) { num = 1; } - if (!fsr_dev(dev, num)) { + if (!dev->fsr(num)) { Pmsg1(0, "Bad status from fsr. ERR=%s\n", strerror_dev(dev)); return; } @@ -1429,14 +1489,15 @@ static void fsrcmd() */ static void wrcmd() { - DEV_BLOCK *block; - DEV_RECORD *rec; + DEV_BLOCK *block = dcr->block; + DEV_RECORD *rec = dcr->rec; int i; sm_check(__FILE__, __LINE__, false); - block = new_block(dev); - rec = new_record(); - dump_block(block, "test"); + empty_block(block); + if (verbose > 1) { + dump_block(block, "test"); + } i = block->buf_len - 100; ASSERT (i > 0); @@ -1445,11 +1506,11 @@ static void wrcmd() rec->data_len = i; sm_check(__FILE__, __LINE__, false); if (!write_record_to_block(block, rec)) { - Pmsg0(0, _("Error writing record to block.\n")); + Pmsg0(0, _("Error writing record to block.\n")); goto bail_out; } - if (!write_block_to_dev(dcr, block)) { - Pmsg0(0, _("Error writing block to device.\n")); + if (!write_block_to_dev(dcr)) { + Pmsg0(0, _("Error writing block to device.\n")); goto bail_out; } else { Pmsg1(0, _("Wrote one record of %d bytes.\n"), i); @@ -1458,12 +1519,10 @@ static void wrcmd() bail_out: sm_check(__FILE__, __LINE__, false); - free_record(rec); - free_block(block); sm_check(__FILE__, __LINE__, false); } -/* +/* * Read a record from the tape */ static void rrcmd() @@ -1484,8 +1543,9 @@ static void rrcmd() if (stat > 0 && stat <= len) { errno = 0; } + berrno be; Pmsg3(0, _("Read of %d bytes gives stat=%d. ERR=%s\n"), - len, stat, strerror(errno)); + len, stat, be.strerror()); free(buf); } @@ -1508,57 +1568,58 @@ static void scancmd() bytes = 0; if (dev->state & ST_EOT) { Pmsg0(0, "End of tape\n"); - return; + return; } update_pos_dev(dev); tot_files = dev->file; Pmsg1(0, _("Starting scan at file %u\n"), dev->file); for (;;) { if ((stat = read(dev->fd, buf, sizeof(buf))) < 0) { - clrerror_dev(dev, -1); - Mmsg2(&dev->errmsg, "read error on %s. ERR=%s.\n", - dev->dev_name, strerror(dev->dev_errno)); + berrno be; + clrerror_dev(dev, -1); + Mmsg2(dev->errmsg, "read error on %s. ERR=%s.\n", + dev->dev_name, be.strerror()); Pmsg2(0, "Bad status from read %d. ERR=%s\n", stat, strerror_dev(dev)); - if (blocks > 0) - printf("%d block%s of %d bytes in file %d\n", + if (blocks > 0) + printf("%d block%s of %d bytes in file %d\n", blocks, blocks>1?"s":"", block_size, dev->file); - return; + return; } Dmsg1(200, "read status = %d\n", stat); /* sleep(1); */ if (stat != block_size) { - update_pos_dev(dev); - if (blocks > 0) { - printf("%d block%s of %d bytes in file %d\n", + update_pos_dev(dev); + if (blocks > 0) { + printf("%d block%s of %d bytes in file %d\n", blocks, blocks>1?"s":"", block_size, dev->file); - blocks = 0; - } - block_size = stat; + blocks = 0; + } + block_size = stat; } - if (stat == 0) { /* EOF */ - update_pos_dev(dev); + if (stat == 0) { /* EOF */ + update_pos_dev(dev); printf("End of File mark.\n"); - /* Two reads of zero means end of tape */ - if (dev->state & ST_EOF) - dev->state |= ST_EOT; - else { - dev->state |= ST_EOF; - dev->file++; - } - if (dev->state & ST_EOT) { + /* Two reads of zero means end of tape */ + if (dev->state & ST_EOF) + dev->state |= ST_EOT; + else { + dev->state |= ST_EOF; + dev->file++; + } + if (dev->state & ST_EOT) { printf("End of tape\n"); - break; - } - } else { /* Got data */ - dev->state &= ~ST_EOF; - blocks++; - tot_blocks++; - bytes += stat; + break; + } + } else { /* Got data */ + dev->state &= ~ST_EOF; + blocks++; + tot_blocks++; + bytes += stat; } } update_pos_dev(dev); tot_files = dev->file - tot_files; - printf("Total files=%d, blocks=%d, bytes = %s\n", tot_files, tot_blocks, + printf("Total files=%d, blocks=%d, bytes = %s\n", tot_files, tot_blocks, edit_uint64_with_commas(bytes, ec1)); } @@ -1574,79 +1635,78 @@ static void scan_blocks() int blocks, tot_blocks, tot_files; uint32_t block_size; uint64_t bytes; - DEV_BLOCK *block; + DEV_BLOCK *block = dcr->block; char ec1[50]; - block = new_block(dev); blocks = block_size = tot_blocks = 0; bytes = 0; + empty_block(block); update_pos_dev(dev); tot_files = dev->file; for (;;) { - if (!read_block_from_device(dcr, block, NO_BLOCK_NUMBER_CHECK)) { + if (!read_block_from_device(dcr, NO_BLOCK_NUMBER_CHECK)) { Dmsg1(100, "!read_block(): ERR=%s\n", strerror_dev(dev)); - if (dev->state & ST_EOT) { - if (blocks > 0) { - printf("%d block%s of %d bytes in file %d\n", + if (dev->state & ST_EOT) { + if (blocks > 0) { + printf("%d block%s of %d bytes in file %d\n", blocks, blocks>1?"s":"", block_size, dev->file); - blocks = 0; - } - goto bail_out; - } - if (dev->state & ST_EOF) { - if (blocks > 0) { - printf("%d block%s of %d bytes in file %d\n", + blocks = 0; + } + goto bail_out; + } + if (dev->state & ST_EOF) { + if (blocks > 0) { + printf("%d block%s of %d bytes in file %d\n", blocks, blocks>1?"s":"", block_size, dev->file); - blocks = 0; - } + blocks = 0; + } printf(_("End of File mark.\n")); - continue; - } - if (dev->state & ST_SHORT) { - if (blocks > 0) { - printf("%d block%s of %d bytes in file %d\n", + continue; + } + if (dev->state & ST_SHORT) { + if (blocks > 0) { + printf("%d block%s of %d bytes in file %d\n", blocks, blocks>1?"s":"", block_size, dev->file); - blocks = 0; - } + blocks = 0; + } printf(_("Short block read.\n")); - continue; - } + continue; + } printf(_("Error reading block. ERR=%s\n"), strerror_dev(dev)); - goto bail_out; + goto bail_out; } if (block->block_len != block_size) { - if (blocks > 0) { - printf("%d block%s of %d bytes in file %d\n", + if (blocks > 0) { + printf("%d block%s of %d bytes in file %d\n", blocks, blocks>1?"s":"", block_size, dev->file); - blocks = 0; - } - block_size = block->block_len; + blocks = 0; + } + block_size = block->block_len; } blocks++; tot_blocks++; bytes += block->block_len; Dmsg6(100, "Blk_blk=%u dev_blk=%u blen=%u bVer=%d SessId=%u SessTim=%u\n", - block->BlockNumber, dev->block_num, block->block_len, block->BlockVer, - block->VolSessionId, block->VolSessionTime); + block->BlockNumber, dev->block_num, block->block_len, block->BlockVer, + block->VolSessionId, block->VolSessionTime); if (verbose == 1) { - DEV_RECORD *rec = new_record(); - read_record_from_block(block, rec); + DEV_RECORD *rec = new_record(); + read_record_from_block(block, rec); Pmsg8(-1, "Blk_block: %u dev_blk=%u blen=%u First rec FI=%s SessId=%u SessTim=%u Strm=%s rlen=%d\n", - block->BlockNumber, dev->block_num, block->block_len, - FI_to_ascii(rec->FileIndex), rec->VolSessionId, rec->VolSessionTime, - stream_to_ascii(rec->Stream, rec->FileIndex), rec->data_len); - rec->remainder = 0; - free_record(rec); + block->BlockNumber, dev->block_num, block->block_len, + FI_to_ascii(rec->FileIndex), rec->VolSessionId, rec->VolSessionTime, + stream_to_ascii(rec->Stream, rec->FileIndex), rec->data_len); + rec->remainder = 0; + free_record(rec); } else if (verbose > 1) { dump_block(block, ""); } } bail_out: - free_block(block); tot_files = dev->file - tot_files; - printf("Total files=%d, blocks=%d, bytes = %s\n", tot_files, tot_blocks, + printf("Total files=%d, blocks=%d, bytes = %s\n", tot_files, tot_blocks, edit_uint64_with_commas(bytes, ec1)); } @@ -1663,14 +1723,14 @@ static void statcmd() } -/* +/* * First we label the tape, then we fill * it with data get a new tape and write a few blocks. - */ + */ static void fillcmd() { DEV_RECORD rec; - DEV_BLOCK *block; + DEV_BLOCK *block = dcr->block; char ec1[50]; int fd; uint32_t i; @@ -1683,22 +1743,22 @@ static void fillcmd() last_block_num = 0; BlockNumber = 0; - Pmsg0(-1, "\n\ -This command simulates Bacula writing to a tape.\n\ -It requires either one or two blank tapes, which it\n\ -will label and write.\n\n\ -If you have an autochanger configured, it will use\n\ -the tapes that are in slots 1 and 2, otherwise, you will\n\ -be prompted to insert the tapes when necessary.\n\n\ -It will print a status approximately\n\ -every 322 MB, and write an EOF every 3.2 GB. If you have\n\ -selected the simple test option, after writing the first tape\n\ -it will rewind it and re-read the last block written.\n\n\ -If you have selected the multiple tape test, when the first tape\n\ -fills, it will ask for a second, and after writing a few more \n\ -blocks, it will stop. Then it will begin re-reading the\n\ -two tapes.\n\n\ -This may take a long time -- hours! ...\n\n"); + Pmsg0(-1, "\n" +"This command simulates Bacula writing to a tape.\n" +"It requires either one or two blank tapes, which it\n" +"will label and write.\n\n" +"If you have an autochanger configured, it will use\n" +"the tapes that are in slots 1 and 2, otherwise, you will\n" +"be prompted to insert the tapes when necessary.\n\n" +"It will print a status approximately\n" +"every 322 MB, and write an EOF every 3.2 GB. If you have\n" +"selected the simple test option, after writing the first tape\n" +"it will rewind it and re-read the last block written.\n\n" +"If you have selected the multiple tape test, when the first tape\n" +"fills, it will ask for a second, and after writing a few more \n" +"blocks, it will stop. Then it will begin re-reading the\n" +"two tapes.\n\n" +"This may take a long time -- hours! ...\n\n"); get_cmd("Do you want to run the simplified test (s) with one tape\n" "or the complete multiple tape (m) test: (s/m) "); @@ -1706,27 +1766,37 @@ This may take a long time -- hours! ...\n\n"); Pmsg0(-1, "Simple test (single tape) selected.\n"); simple = true; } else if (cmd[0] == 'm') { - Pmsg0(-1, "Multiple tape test selected.\n"); + Pmsg0(-1, "Multiple tape test selected.\n"); simple = false; } else { Pmsg0(000, "Command aborted.\n"); return; } - Dmsg1(20, "Begin append device=%s\n", dev_name(dev)); + Dmsg1(20, "Begin append device=%s\n", dev->print_name()); Dmsg1(20, "MaxVolSize=%s\n", edit_uint64(dev->max_volume_size, ec1)); /* Use fixed block size to simplify read back */ min_block_size = dev->min_block_size; dev->min_block_size = dev->max_block_size; + set_volume_name("TestVolume1", 1); - /* + if (!dev->rewind()) { + Pmsg0(000, "Rewind failed.\n"); + } + if (!dev->weof()) { + Pmsg0(000, "Write EOF failed.\n"); + } + labelcmd(); + dev->set_append(); /* force volume to be relabeled */ + + /* * Acquire output device for writing. Note, after acquiring a - * device, we MUST release it, which is done at the end of this - * subroutine. + * device, we MUST release it, which is done at the end of this + * subroutine. */ Dmsg0(100, "just before acquire_device\n"); - if (!acquire_device_for_append(jcr)) { + if (!acquire_device_for_append(dcr)) { set_jcr_job_status(jcr, JS_ErrorTerminated); return; } @@ -1736,13 +1806,13 @@ This may take a long time -- hours! ...\n\n"); /* * Write Begin Session Record */ - if (!write_session_label(dcr, block, SOS_LABEL)) { + if (!write_session_label(dcr, SOS_LABEL)) { set_jcr_job_status(jcr, JS_ErrorTerminated); Jmsg1(jcr, M_FATAL, 0, _("Write session label failed. ERR=%s\n"), - strerror_dev(dev)); + strerror_dev(dev)); ok = false; } - Pmsg0(-1, "Wrote Start Of Session label.\n"); + Pmsg0(-1, "Wrote Start of Session label.\n"); memset(&rec, 0, sizeof(rec)); rec.data = get_memory(100000); /* max record size */ @@ -1750,7 +1820,7 @@ This may take a long time -- hours! ...\n\n"); #define REC_SIZE 32768 rec.data_len = REC_SIZE; - /* + /* * Put some random data in the record */ fd = open("/dev/urandom", O_RDONLY); @@ -1761,15 +1831,15 @@ This may take a long time -- hours! ...\n\n"); uint32_t *p = (uint32_t *)rec.data; srandom(time(NULL)); for (i=0; idcr->VolFirstIndex = 0; - time(&jcr->run_time); /* start counting time for rates */ + time(&jcr->run_time); /* start counting time for rates */ if (simple) { Pmsg0(-1, "Begin writing Bacula records to tape ...\n"); } else { @@ -1785,90 +1855,90 @@ This may take a long time -- hours! ...\n\n"); uint32_t *lp = (uint32_t *)rec.data; lp[0] += lp[13]; for (i=1; i < (rec.data_len-sizeof(uint32_t))/sizeof(uint32_t)-1; i++) { - lp[i] += lp[i-1]; + lp[i] += lp[i-1]; } Dmsg4(250, "before write_rec FI=%d SessId=%d Strm=%s len=%d\n", - rec.FileIndex, rec.VolSessionId, stream_to_ascii(rec.Stream, rec.FileIndex), - rec.data_len); - + rec.FileIndex, rec.VolSessionId, stream_to_ascii(rec.Stream, rec.FileIndex), + rec.data_len); + while (!write_record_to_block(block, &rec)) { - /* - * When we get here we have just filled a block - */ + /* + * When we get here we have just filled a block + */ Dmsg2(150, "!write_record_to_block data_len=%d rem=%d\n", rec.data_len, - rec.remainder); - - /* Write block to tape */ - if (!flush_block(block, 1)) { - break; - } - - /* Every 5000 blocks (approx 322MB) report where we are. - */ - if ((block->BlockNumber % 5000) == 0) { - now = time(NULL); - now -= jcr->run_time; - if (now <= 0) { - now = 1; /* prevent divide error */ - } - kbs = (double)dev->VolCatInfo.VolCatBytes / (1000.0 * (double)now); - Pmsg4(-1, "Wrote blk_block=%u, dev_blk_num=%u VolBytes=%s rate=%.1f KB/s\n", - block->BlockNumber, dev->block_num, - edit_uint64_with_commas(dev->VolCatInfo.VolCatBytes, ec1), (float)kbs); - } - /* Every 15000 blocks (approx 1GB) write an EOF. - */ - if ((block->BlockNumber % 15000) == 0) { + rec.remainder); + + /* Write block to tape */ + if (!flush_block(block, 1)) { + break; + } + + /* Every 5000 blocks (approx 322MB) report where we are. + */ + if ((block->BlockNumber % 5000) == 0) { + now = time(NULL); + now -= jcr->run_time; + if (now <= 0) { + now = 1; /* prevent divide error */ + } + kbs = (double)dev->VolCatInfo.VolCatBytes / (1000.0 * (double)now); + Pmsg4(-1, "Wrote blk_block=%u, dev_blk_num=%u VolBytes=%s rate=%.1f KB/s\n", + block->BlockNumber, dev->block_num, + edit_uint64_with_commas(dev->VolCatInfo.VolCatBytes, ec1), (float)kbs); + } + /* Every 15000 blocks (approx 1GB) write an EOF. + */ + if ((block->BlockNumber % 15000) == 0) { Pmsg0(-1, "Flush block, write EOF\n"); - flush_block(block, 0); - weof_dev(dev, 1); - } - - /* Get out after writing 10 blocks to the second tape */ - if (++BlockNumber > 10 && stop != 0) { /* get out */ - break; - } + flush_block(block, 0); + weof_dev(dev, 1); + } + + /* Get out after writing 10 blocks to the second tape */ + if (++BlockNumber > 10 && stop != 0) { /* get out */ + break; + } } if (!ok) { Pmsg0(000, _("Not OK\n")); - break; + break; } jcr->JobBytes += rec.data_len; /* increment bytes this job */ Dmsg4(190, "write_record FI=%s SessId=%d Strm=%s len=%d\n", - FI_to_ascii(rec.FileIndex), rec.VolSessionId, - stream_to_ascii(rec.Stream, rec.FileIndex), rec.data_len); + FI_to_ascii(rec.FileIndex), rec.VolSessionId, + stream_to_ascii(rec.Stream, rec.FileIndex), rec.data_len); /* Get out after writing 10 blocks to the second tape */ - if (BlockNumber > 10 && stop != 0) { /* get out */ + if (BlockNumber > 10 && stop != 0) { /* get out */ Pmsg0(-1, "Done writing ...\n"); - break; + break; } } if (vol_num > 1) { Dmsg0(100, "Write_end_session_label()\n"); /* Create Job status for end of session label */ if (!job_canceled(jcr) && ok) { - set_jcr_job_status(jcr, JS_Terminated); + set_jcr_job_status(jcr, JS_Terminated); } else if (!ok) { - set_jcr_job_status(jcr, JS_ErrorTerminated); + set_jcr_job_status(jcr, JS_ErrorTerminated); } - if (!write_session_label(dcr, block, EOS_LABEL)) { + if (!write_session_label(dcr, EOS_LABEL)) { Pmsg1(000, _("Error writting end session label. ERR=%s\n"), strerror_dev(dev)); - ok = false; + ok = false; } /* Write out final block of this session */ - if (!write_block_to_device(dcr, block)) { + if (!write_block_to_device(dcr)) { Pmsg0(-1, _("Set ok=false after write_block_to_device.\n")); - ok = false; + ok = false; } - Pmsg0(-1, _("Wrote End Of Session label.\n")); + Pmsg0(-1, _("Wrote End of Session label.\n")); /* Save last block info for second tape */ last_block_num2 = last_block_num; last_file2 = last_file; if (last_block2) { - free_block(last_block2); + free_block(last_block2); } last_block2 = dup_block(last_block); } @@ -1887,21 +1957,17 @@ This may take a long time -- hours! ...\n\n"); write(fd, first_block->buf, first_block->buf_len); close(fd); Pmsg2(-1, "Wrote state file last_block_num1=%d last_block_num2=%d\n", - last_block_num1, last_block_num2); + last_block_num1, last_block_num2); } else { + berrno be; Pmsg2(-1, _("Could not create state file: %s ERR=%s\n"), buf, - strerror(errno)); - } - - /* Release the device if multiple tapes being used */ - if (!simple && !release_device(jcr)) { - Pmsg0(-1, _("Error in release_device\n")); - ok = false; + be.strerror()); } - Pmsg2(-1, _("\n\nDone filling tape%s. Now beginning re-read of %stape ...\n"), - simple?"":"s", simple?"":"first "); + Pmsg4(-1, _("\n\nDone filling tape%s at %d:%d. Now beginning re-read of %stape ...\n"), + simple?"":"s", jcr->dcr->dev->file, jcr->dcr->dev->block_num, simple?"":"first "); + jcr->dcr->block = block; do_unfill(); dev->min_block_size = min_block_size; @@ -1924,7 +1990,7 @@ static void unfillcmd() sprintf(buf, "%s/btape.state", working_directory); fd = open(buf, O_RDONLY); if (fd >= 0) { - uint32_t state_level; + uint32_t state_level; read(fd, &state_level, sizeof(btape_state_level)); read(fd, &simple, sizeof(simple)); read(fd, &last_block_num1, sizeof(last_block_num1)); @@ -1938,11 +2004,12 @@ static void unfillcmd() if (state_level != btape_state_level) { Pmsg0(-1, "\nThe state file level has changed. You must redo\n" "the fill command.\n"); - return; + return; } } else { + berrno be; Pmsg2(-1, "\nCould not find the state file: %s ERR=%s\n" - "You must redo the fill command.\n", buf, strerror(errno)); + "You must redo the fill command.\n", buf, be.strerror()); return; } do_unfill(); @@ -1951,13 +2018,12 @@ static void unfillcmd() static void do_unfill() { - DEV_BLOCK *block; + DEV_BLOCK *block = dcr->block; bool autochanger; dumped = 0; VolBytes = 0; LastBlock = 0; - block = new_block(dev); Dmsg0(20, "Enter do_unfill\n"); dev->capabilities |= CAP_ANONVOLS; /* allow reading any volume */ @@ -1965,7 +2031,7 @@ static void do_unfill() end_of_tape = 0; - time(&jcr->run_time); /* start counting time for rates */ + time(&jcr->run_time); /* start counting time for rates */ stop = 0; file_index = 0; if (last_block) { @@ -1979,12 +2045,12 @@ static void do_unfill() /* Multiple Volume tape */ /* Close device so user can use autochanger if desired */ if (dev_cap(dev, CAP_OFFLINEUNMOUNT)) { - offline_dev(dev); + offline_dev(dev); } autochanger = autoload_device(dcr, 1, NULL); if (!autochanger) { - force_close_dev(dev); - get_cmd(_("Mount first tape. Press enter when ready: ")); + force_close_dev(dev); + get_cmd(_("Mount first tape. Press enter when ready: ")); } free_vol_list(jcr); jcr->dcr = new_dcr(jcr, dev); @@ -1992,28 +2058,33 @@ static void do_unfill() jcr->bsr = NULL; create_vol_list(jcr); close_dev(dev); - dev->state &= ~ST_READ; - if (!acquire_device_for_read(jcr)) { + dev->state &= ~(ST_READ|ST_APPEND); + dev->num_writers = 0; + if (!acquire_device_for_read(dcr)) { Pmsg1(-1, "%s", dev->errmsg); - goto bail_out; + goto bail_out; } } /* * We now have the first tape mounted. - * Note, re-reading last block may have caused us to - * loose track of where we are (block number unknown). + * Note, re-reading last block may have caused us to + * loose track of where we are (block number unknown). */ - rewind_dev(dev); /* get to a known place on tape */ - /* Read the first 1000 records */ - Pmsg0(-1, _("Reading the first 1000 records.\n")); + if (!rewind_dev(dev)) { /* get to a known place on tape */ + goto bail_out; + } + /* Read the first 10000 records */ + Pmsg0(-1, _("Reading the first 10000 records.\n")); + quickie_count = 0; read_records(dcr, quickie_cb, my_mount_next_read_volume); Pmsg4(-1, _("Reposition from %u:%u to %u:%u\n"), dev->file, dev->block_num, - last_file, last_block_num); + last_file, last_block_num); if (!reposition_dev(dev, last_file, last_block_num)) { Pmsg1(-1, "Reposition error. ERR=%s\n", strerror_dev(dev)); + goto bail_out; } Pmsg1(-1, _("Reading block %u.\n"), last_block_num); - if (!read_block_from_device(dcr, block, NO_BLOCK_NUMBER_CHECK)) { + if (!read_block_from_device(dcr, NO_BLOCK_NUMBER_CHECK)) { Pmsg1(-1, _("Error reading block: ERR=%s\n"), strerror_dev(dev)); goto bail_out; } @@ -2046,11 +2117,11 @@ static void do_unfill() autochanger = autoload_device(dcr, 1, NULL); if (!autochanger) { force_close_dev(dev); - get_cmd(_("Mount second tape. Press enter when ready: ")); + get_cmd(_("Mount second tape. Press enter when ready: ")); } - dev->state &= ~ST_READ; - if (!acquire_device_for_read(jcr)) { + dev->clear_read(); + if (!acquire_device_for_read(dcr)) { Pmsg1(-1, "%s", dev->errmsg); goto bail_out; } @@ -2064,7 +2135,7 @@ static void do_unfill() goto bail_out; } Pmsg1(-1, _("Reading block %d.\n"), dev->block_num); - if (!read_block_from_device(dcr, block, NO_BLOCK_NUMBER_CHECK)) { + if (!read_block_from_device(dcr, NO_BLOCK_NUMBER_CHECK)) { Pmsg1(-1, _("Error reading block: ERR=%s\n"), strerror_dev(dev)); goto bail_out; } @@ -2074,13 +2145,13 @@ static void do_unfill() /* Now find and compare the last block */ Pmsg4(-1, _("Reposition from %u:%u to %u:%u\n"), dev->file, dev->block_num, - last_file, last_block_num); + last_file, last_block_num); if (!reposition_dev(dev, last_file, last_block_num)) { Pmsg1(-1, "Reposition error. ERR=%s\n", strerror_dev(dev)); goto bail_out; } Pmsg1(-1, _("Reading block %d.\n"), dev->block_num); - if (!read_block_from_device(dcr, block, NO_BLOCK_NUMBER_CHECK)) { + if (!read_block_from_device(dcr, NO_BLOCK_NUMBER_CHECK)) { Pmsg1(-1, _("Error reading block: ERR=%s\n"), strerror_dev(dev)); goto bail_out; } @@ -2089,35 +2160,43 @@ static void do_unfill() } bail_out: - free_block(block); free_block(last_block1); free_block(last_block2); free_block(first_block); } -/* Read 1000 records then stop */ -static bool quickie_cb(JCR *jcr, DEVICE *dev, DEV_BLOCK *block, DEV_RECORD *rec) +/* Read 10000 records then stop */ +static bool quickie_cb(DCR *dcr, DEV_RECORD *rec) { + DEVICE *dev = dcr->dev; + if (dev->file != 0) { + Pmsg3(-1, "ERROR! device at %d:%d count=%d\n", dev->file, dev->block_num, + quickie_count); + return false; + } quickie_count++; - return quickie_count <= 1000; + if (quickie_count == 10000) { + Pmsg2(-1, "1000 records read now at %d:%d\n", dev->file, dev->block_num); + } + return quickie_count < 10000; } -static bool compare_blocks(DEV_BLOCK *last_block, DEV_BLOCK *block) +static bool compare_blocks(DEV_BLOCK *last_block, DEV_BLOCK *block) { char *p, *q; uint32_t CheckSum, block_len; ser_declare; - p = last_block->buf; + p = last_block->buf; q = block->buf; unser_begin(q, BLKHDR2_LENGTH); unser_uint32(CheckSum); unser_uint32(block_len); while (q < (block->buf+block_len)) { if (*p == *q) { - p++; - q++; - continue; + p++; + q++; + continue; } Pmsg0(-1, "\n"); dump_block(last_block, _("Last block written")); @@ -2149,10 +2228,10 @@ static bool compare_blocks(DEV_BLOCK *last_block, DEV_BLOCK *block) static int flush_block(DEV_BLOCK *block, int dump) { char ec1[50]; - lock_device(dev); DEV_BLOCK *tblock; uint32_t this_file, this_block_num; + lock_device(dev); if (!this_block) { this_block = new_block(dev); } @@ -2162,32 +2241,32 @@ static int flush_block(DEV_BLOCK *block, int dump) /* Copy block */ this_file = dev->file; this_block_num = dev->block_num; - if (!write_block_to_dev(dcr, block)) { - Pmsg3(000, "Last block at: %u:%u this_dev_block_num=%d\n", - last_file, last_block_num, this_block_num); + if (!write_block_to_dev(dcr)) { + Pmsg3(000, "Last block at: %u:%u this_dev_block_num=%d\n", + last_file, last_block_num, this_block_num); if (vol_num == 1) { - /* - * This is 1st tape, so save first tape info separate - * from second tape info - */ - last_block_num1 = last_block_num; - last_file1 = last_file; - last_block1 = dup_block(last_block); - last_block2 = dup_block(last_block); - first_block = dup_block(block); /* first block second tape */ + /* + * This is 1st tape, so save first tape info separate + * from second tape info + */ + last_block_num1 = last_block_num; + last_file1 = last_file; + last_block1 = dup_block(last_block); + last_block2 = dup_block(last_block); + first_block = dup_block(block); /* first block second tape */ } if (verbose) { - Pmsg3(000, "Block not written: FileIndex=%u blk_block=%u Size=%u\n", - (unsigned)file_index, block->BlockNumber, block->block_len); + Pmsg3(000, "Block not written: FileIndex=%u blk_block=%u Size=%u\n", + (unsigned)file_index, block->BlockNumber, block->block_len); dump_block(last_block, "Last block written"); Pmsg0(-1, "\n"); dump_block(block, "Block not written"); } if (stop == 0) { - eot_block = block->BlockNumber; - eot_block_len = block->block_len; - eot_FileIndex = file_index; - stop = 1; + eot_block = block->BlockNumber; + eot_block_len = block->block_len; + eot_FileIndex = file_index; + stop = 1; } now = time(NULL); now -= jcr->run_time; @@ -2196,35 +2275,37 @@ static int flush_block(DEV_BLOCK *block, int dump) } kbs = (double)dev->VolCatInfo.VolCatBytes / (1000 * now); vol_size = dev->VolCatInfo.VolCatBytes; - Pmsg2(000, "End of tape. VolumeCapacity=%s. Write rate = %.1f KB/s\n", - edit_uint64_with_commas(dev->VolCatInfo.VolCatBytes, ec1), kbs); + Pmsg4(000, "End of tape %d:%d. VolumeCapacity=%s. Write rate = %.1f KB/s\n", + dev->file, dev->block_num, + edit_uint64_with_commas(dev->VolCatInfo.VolCatBytes, ec1), kbs); if (simple) { - stop = -1; /* stop, but do simplified test */ + stop = -1; /* stop, but do simplified test */ } else { - /* Full test in progress */ - if (!fixup_device_block_write_error(jcr->dcr, block)) { + /* Full test in progress */ + if (!fixup_device_block_write_error(jcr->dcr)) { Pmsg1(000, _("Cannot fixup device error. %s\n"), strerror_dev(dev)); - ok = false; - unlock_device(dev); - return 0; - } - BlockNumber = 0; /* start counting for second tape */ + ok = false; + unlock_device(dev); + return 0; + } + BlockNumber = 0; /* start counting for second tape */ } unlock_device(dev); - return 1; /* end of tape reached */ + return 1; /* end of tape reached */ } /* Save contents after write so that the header is serialized */ memcpy(this_block->buf, block->buf, this_block->buf_len); /* - * Toggle between two allocated blocks for efficiency. + * Note, we always read/write to block, but we toggle + * copying it to one or another of two allocated blocks. * Switch blocks so that the block just successfully written is - * always in last_block. + * always in last_block. */ tblock = last_block; - last_block = this_block; + last_block = this_block; this_block = tblock; last_file = this_file; last_block_num = this_block_num; @@ -2234,14 +2315,14 @@ static int flush_block(DEV_BLOCK *block, int dump) } -/* +/* * First we label the tape, then we fill * it with data get a new tape and write a few blocks. - */ + */ static void qfillcmd() { - DEV_BLOCK *block; - DEV_RECORD *rec; + DEV_BLOCK *block = dcr->block; + DEV_RECORD *rec = dcr->rec; int i, count; Pmsg0(0, "Test writing blocks of 64512 bytes to tape.\n"); @@ -2254,8 +2335,6 @@ static void qfillcmd() } sm_check(__FILE__, __LINE__, false); - block = new_block(dev); - rec = new_record(); i = block->buf_len - 100; ASSERT (i > 0); @@ -2267,15 +2346,15 @@ static void qfillcmd() for (i=0; i < count; i++) { if (i % 100 == 0) { printf("+"); - fflush(stdout); + fflush(stdout); } if (!write_record_to_block(block, rec)) { - Pmsg0(0, _("Error writing record to block.\n")); - goto bail_out; + Pmsg0(0, _("Error writing record to block.\n")); + goto bail_out; } - if (!write_block_to_dev(dcr, block)) { - Pmsg0(0, _("Error writing block to device.\n")); - goto bail_out; + if (!write_block_to_dev(dcr)) { + Pmsg0(0, _("Error writing block to device.\n")); + goto bail_out; } } printf("\n"); @@ -2288,10 +2367,6 @@ static void qfillcmd() bail_out: sm_check(__FILE__, __LINE__, false); - free_record(rec); - free_block(block); - sm_check(__FILE__, __LINE__, false); - } /* @@ -2299,7 +2374,7 @@ bail_out: */ static void rawfill_cmd() { - DEV_BLOCK *block; + DEV_BLOCK *block = dcr->block; int stat; int fd; uint32_t block_num = 0; @@ -2307,7 +2382,6 @@ static void rawfill_cmd() int my_errno; uint32_t i; - block = new_block(dev); fd = open("/dev/urandom", O_RDONLY); if (fd) { read(fd, block->buf, block->buf_len); @@ -2316,7 +2390,7 @@ static void rawfill_cmd() uint32_t *p = (uint32_t *)block->buf; srandom(time(NULL)); for (i=0; ibuf_len/sizeof(uint32_t); i++) { - p[i] = random(); + p[i] = random(); } } p = (uint32_t *)block->buf; @@ -2325,40 +2399,39 @@ static void rawfill_cmd() *p = block_num; stat = write(dev->fd, block->buf, block->buf_len); if (stat == (int)block->buf_len) { - if ((block_num++ % 100) == 0) { + if ((block_num++ % 100) == 0) { printf("+"); - fflush(stdout); - } - p[0] += p[13]; - for (i=1; i<(block->buf_len-sizeof(uint32_t))/sizeof(uint32_t)-1; i++) { - p[i] += p[i-1]; - } - continue; + fflush(stdout); + } + p[0] += p[13]; + for (i=1; i<(block->buf_len-sizeof(uint32_t))/sizeof(uint32_t)-1; i++) { + p[i] += p[i-1]; + } + continue; } break; } my_errno = errno; printf("\n"); + berrno be; printf("Write failed at block %u. stat=%d ERR=%s\n", block_num, stat, - strerror(my_errno)); + be.strerror(my_errno)); weofcmd(); - free_block(block); } /* - * Fill a tape using raw write() command + * Fill a tape using Bacula block writes */ static void bfill_cmd() { - DEV_BLOCK *block; + DEV_BLOCK *block = dcr->block; uint32_t block_num = 0; uint32_t *p; int my_errno; - int fd; + int fd; uint32_t i; - block = new_block(dev); fd = open("/dev/urandom", O_RDONLY); if (fd) { read(fd, block->buf, block->buf_len); @@ -2367,7 +2440,7 @@ static void bfill_cmd() uint32_t *p = (uint32_t *)block->buf; srandom(time(NULL)); for (i=0; ibuf_len/sizeof(uint32_t); i++) { - p[i] = random(); + p[i] = random(); } } p = (uint32_t *)block->buf; @@ -2376,27 +2449,26 @@ static void bfill_cmd() *p = block_num; block->binbuf = block->buf_len; block->bufp = block->buf + block->binbuf; - if (!write_block_to_dev(dcr, block)) { - break; + if (!write_block_to_dev(dcr)) { + break; } if ((block_num++ % 100) == 0) { printf("+"); - fflush(stdout); + fflush(stdout); } p[0] += p[13]; for (i=1; i<(block->buf_len/sizeof(uint32_t)-1); i++) { - p[i] += p[i-1]; + p[i] += p[i-1]; } } my_errno = errno; printf("\n"); - printf("Write failed at block %u.\n", block_num); + printf("Write failed at block %u.\n", block_num); weofcmd(); - free_block(block); } -struct cmdstruct { const char *key; void (*func)(); const char *help; }; +struct cmdstruct { const char *key; void (*func)(); const char *help; }; static struct cmdstruct commands[] = { {"autochanger", autochangercmd, "test autochanger"}, {"bsf", bsfcmd, "backspace file"}, @@ -2413,20 +2485,20 @@ static struct cmdstruct commands[] = { {"help", helpcmd, "print this command"}, {"label", labelcmd, "write a Bacula label to the tape"}, {"load", loadcmd, "load a tape"}, - {"quit", quitcmd, "quit btape"}, + {"quit", quitcmd, "quit btape"}, {"rawfill", rawfill_cmd, "use write() to fill tape"}, {"readlabel", readlabelcmd, "read and print the Bacula tape label"}, {"rectest", rectestcmd, "test record handling functions"}, {"rewind", rewindcmd, "rewind the tape"}, - {"scan", scancmd, "read() tape block by block to EOT and report"}, + {"scan", scancmd, "read() tape block by block to EOT and report"}, {"scanblocks", scan_blocks, "Bacula read block by block to EOT and report"}, {"status", statcmd, "print tape status"}, {"test", testcmd, "General test Bacula tape functions"}, {"weof", weofcmd, "write an EOF on the tape"}, - {"wr", wrcmd, "write a single Bacula block"}, + {"wr", wrcmd, "write a single Bacula block"}, {"rr", rrcmd, "read a single record"}, {"qfill", qfillcmd, "quick fill command"}, - }; + }; #define comsize (sizeof(commands)/sizeof(struct cmdstruct)) static void @@ -2440,15 +2512,15 @@ do_tape_cmds() found = false; parse_args(cmd, &args, &argc, argk, argv, MAX_CMD_ARGS); for (i=0; i 0 && fstrsch(argk[0], commands[i].key)) { - (*commands[i].func)(); /* go execute command */ - found = true; - break; - } + if (argc > 0 && fstrsch(argk[0], commands[i].key)) { + (*commands[i].func)(); /* go execute command */ + found = true; + break; + } if (!found) Pmsg1(0, _("%s is an illegal command\n"), cmd); if (quit) - break; + break; } } @@ -2466,6 +2538,7 @@ static void helpcmd() static void usage() { fprintf(stderr, _( +"Copyright (C) 2000-2005 Kern Sibbald.\n" "\nVersion: " VERSION " (" BDATE ")\n\n" "Usage: btape \n" " -b specify bootstrap file\n" @@ -2474,17 +2547,17 @@ static void usage() " -p proceed inspite of I/O errors\n" " -s turn off signals\n" " -v be verbose\n" -" -? print this message.\n" +" -? print this message.\n" "\n")); } -/* +/* * Get next input command from terminal. This * routine is REALLY primitive, and should be enhanced * to have correct backspacing, etc. */ -int +int get_cmd(const char *prompt) { int i = 0; @@ -2495,16 +2568,16 @@ get_cmd(const char *prompt) * up a bit. */ cmd[i] = 0; - while ((ch = fgetc(stdin)) != EOF) { + while ((ch = fgetc(stdin)) != EOF) { if (ch == '\n') { - strip_trailing_junk(cmd); - return 1; + strip_trailing_junk(cmd); + return 1; } else if (ch == 4 || ch == 0xd3 || ch == 0x8) { - if (i > 0) - cmd[--i] = 0; - continue; - } - + if (i > 0) + cmd[--i] = 0; + continue; + } + cmd[i++] = ch; cmd[i] = 0; } @@ -2513,20 +2586,19 @@ get_cmd(const char *prompt) } /* Dummies to replace askdir.c */ -bool dir_update_file_attributes(DCR *dcr, DEV_RECORD *rec) { return 1;} -bool dir_send_job_status(JCR *jcr) {return 1;} +bool dir_update_file_attributes(DCR *dcr, DEV_RECORD *rec) { return 1;} +bool dir_send_job_status(JCR *jcr) {return 1;} -bool dir_update_volume_info(DCR *dcr, bool relabel) -{ +bool dir_update_volume_info(DCR *dcr, bool relabel) +{ return 1; } -bool dir_get_volume_info(DCR *dcr, enum get_vol_info_rw writing) +bool dir_get_volume_info(DCR *dcr, enum get_vol_info_rw writing) { - JCR *jcr = dcr->jcr; Dmsg0(20, "Enter dir_get_volume_info\n"); - bstrncpy(jcr->VolCatInfo.VolCatName, jcr->VolumeName, sizeof(jcr->VolCatInfo.VolCatName)); + bstrncpy(dcr->VolCatInfo.VolCatName, dcr->VolumeName, sizeof(dcr->VolCatInfo.VolCatName)); return 1; } @@ -2537,19 +2609,17 @@ bool dir_create_jobmedia_record(DCR *dcr) } -bool dir_find_next_appendable_volume(DCR *dcr) -{ - JCR *jcr = dcr->jcr; +bool dir_find_next_appendable_volume(DCR *dcr) +{ Dmsg1(20, "Enter dir_find_next_appendable_volume. stop=%d\n", stop); - return jcr->VolumeName[0] != 0; + return dcr->VolumeName[0] != 0; } bool dir_ask_sysop_to_mount_volume(DCR *dcr) { DEVICE *dev = dcr->dev; - JCR *jcr = dcr->jcr; Dmsg0(20, "Enter dir_ask_sysop_to_mount_volume\n"); - if (jcr->VolumeName[0] == 0) { + if (dcr->VolumeName[0] == 0) { return dir_ask_sysop_to_create_appendable_volume(dcr); } /* Close device so user can use autochanger if desired */ @@ -2558,14 +2628,14 @@ bool dir_ask_sysop_to_mount_volume(DCR *dcr) } force_close_dev(dev); Pmsg1(-1, "%s", dev->errmsg); /* print reason */ - if (jcr->VolumeName[0] == 0 || strcmp(jcr->VolumeName, "TestVolume2") == 0) { + if (dcr->VolumeName[0] == 0 || strcmp(dcr->VolumeName, "TestVolume2") == 0) { fprintf(stderr, "Mount second Volume on device %s and press return when ready: ", - dev_name(dev)); + dev->print_name()); } else { fprintf(stderr, "Mount Volume \"%s\" on device %s and press return when ready: ", - jcr->VolumeName, dev_name(dev)); + dcr->VolumeName, dev->print_name()); } - getchar(); + getchar(); return true; } @@ -2573,7 +2643,6 @@ bool dir_ask_sysop_to_create_appendable_volume(DCR *dcr) { bool autochanger; DEVICE *dev = dcr->dev; - JCR *jcr = dcr->jcr; Dmsg0(20, "Enter dir_ask_sysop_to_create_appendable_volume\n"); if (stop == 0) { set_volume_name("TestVolume1", 1); @@ -2588,22 +2657,24 @@ bool dir_ask_sysop_to_create_appendable_volume(DCR *dcr) if (!autochanger) { force_close_dev(dev); fprintf(stderr, "Mount blank Volume on device %s and press return when ready: ", - dev_name(dev)); - getchar(); + dev->print_name()); + getchar(); } - open_device(jcr, dev); + open_device(dcr); labelcmd(); VolumeName = NULL; BlockNumber = 0; return true; } -static bool my_mount_next_read_volume(JCR *jcr, DEVICE *dev, DEV_BLOCK *block) +static bool my_mount_next_read_volume(DCR *dcr) { char ec1[50]; + JCR *jcr = dcr->jcr; + DEV_BLOCK *block = dcr->block; Dmsg0(20, "Enter my_mount_next_read_volume\n"); - Pmsg1(000, "End of Volume \"%s\"\n", jcr->VolumeName); + Pmsg1(000, "End of Volume \"%s\"\n", dcr->VolumeName); if (LastBlock != block->BlockNumber) { VolBytes += block->block_len; @@ -2616,9 +2687,9 @@ static bool my_mount_next_read_volume(JCR *jcr, DEVICE *dev, DEV_BLOCK *block) } kbs = (double)VolBytes / (1000.0 * (double)now); Pmsg3(-1, "Read block=%u, VolBytes=%s rate=%.1f KB/s\n", block->BlockNumber, - edit_uint64_with_commas(VolBytes, ec1), (float)kbs); + edit_uint64_with_commas(VolBytes, ec1), (float)kbs); - if (strcmp(jcr->VolumeName, "TestVolume2") == 0) { + if (strcmp(dcr->VolumeName, "TestVolume2") == 0) { end_of_tape = 1; return false; } @@ -2628,24 +2699,21 @@ static bool my_mount_next_read_volume(JCR *jcr, DEVICE *dev, DEV_BLOCK *block) jcr->bsr = NULL; create_vol_list(jcr); close_dev(dev); - dev->state &= ~ST_READ; - if (!acquire_device_for_read(jcr)) { - Pmsg2(0, "Cannot open Dev=%s, Vol=%s\n", dev_name(dev), jcr->VolumeName); + dev->clear_read(); + if (!acquire_device_for_read(dcr)) { + Pmsg2(0, "Cannot open Dev=%s, Vol=%s\n", dev->print_name(), dcr->VolumeName); return false; } - return true; /* next volume mounted */ + return true; /* next volume mounted */ } -static void set_volume_name(const char *VolName, int volnum) +static void set_volume_name(const char *VolName, int volnum) { DCR *dcr = jcr->dcr; VolumeName = VolName; vol_num = volnum; - pm_strcpy(&jcr->VolumeName, VolName); bstrncpy(dev->VolCatInfo.VolCatName, VolName, sizeof(dev->VolCatInfo.VolCatName)); - bstrncpy(jcr->VolCatInfo.VolCatName, VolName, sizeof(jcr->VolCatInfo.VolCatName)); bstrncpy(dcr->VolCatInfo.VolCatName, VolName, sizeof(dcr->VolCatInfo.VolCatName)); bstrncpy(dcr->VolumeName, VolName, sizeof(dcr->VolumeName)); - jcr->VolCatInfo.Slot = volnum; dcr->VolCatInfo.Slot = volnum; }