int quit = 0;
char buf[100000];
int bsize = TAPE_BSIZE;
-char VolName[100];
+char VolName[MAX_NAME_LENGTH];
DEVICE *dev = NULL;
DEVRES *device = NULL;
static void rrcmd();
static void eodcmd();
static void fillcmd();
+static void qfillcmd();
static void statcmd();
static void unfillcmd();
static int flush_block(DEV_BLOCK *block, int dump);
static void record_cb(JCR *jcr, DEVICE *dev, DEV_BLOCK *block, DEV_RECORD *rec);
static int my_mount_next_read_volume(JCR *jcr, DEVICE *dev, DEV_BLOCK *block);
static void scan_blocks();
+static void set_volume_name(char *VolName, int volnum);
+static void rawfill_cmd();
/* Static variables */
static uint64_t VolBytes;
static time_t now;
static double kbs;
-static long file_index;
+static int32_t file_index;
static int end_of_tape = 0;
static uint32_t LastBlock = 0;
static uint32_t eot_block;
static DEV_BLOCK *this_block = NULL;
static uint32_t last_file = 0;
static uint32_t last_block_num = 0;
-static int simple = TRUE;
+static uint32_t BlockNumber = 0;
+static int simple = FALSE;
static char *VolumeName = NULL;
+static int vol_num;
static JCR *jcr = NULL;
int get_cmd(char *prompt);
-int write_dev(DEVICE *dev, char *buf, size_t len)
-{
- Emsg0(M_ABORT, 0, "write_dev not implemented.\n");
- return 0;
-}
-
-int read_dev(DEVICE *dev, char *buf, size_t len)
-{
- Emsg0(M_ABORT, 0, "read_dev not implemented.\n");
- return 0;
-}
-
-
/*********************************************************************
*
* Main Bacula Pool Creation Program
static void eomcmd()
{
if (!eod_dev(dev)) {
- Pmsg1(0, _("Bad status from eod. ERR=%s\n"), strerror_dev(dev));
+ Pmsg1(0, _("Bad status from MTEOD. ERR=%s\n"), strerror_dev(dev));
return;
} else {
- Pmsg0(0, _("Moved to end of media\n"));
+ Pmsg0(0, _("Moved to end of medium.\n"));
}
}
/*
- * Go to the end of the media (either hardware determined
+ * Go to the end of the medium (either hardware determined
* or defined by two eofs.
*/
static void eodcmd()
goto bail_out;
}
Pmsg0(0, "Backspace record OK.\n");
- if (!read_block_from_dev(jcr, dev, block)) {
+ if (!read_block_from_dev(jcr, dev, block, NO_BLOCK_NUMBER_CHECK)) {
Pmsg1(0, _("Read block failed! ERR=%s\n"), strerror(dev->dev_errno));
goto bail_out;
}
wrcmd();
weofcmd(); /* end file 2 */
rewindcmd();
- Pmsg0(0, _("Now moving to end of media.\n"));
+ Pmsg0(0, _("Now moving to end of medium.\n"));
eodcmd();
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!!!!");
int blocks, tot_blocks, tot_files;
int block_size;
uint64_t bytes;
+ char ec1[50];
blocks = block_size = tot_blocks = 0;
}
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);
}
update_pos_dev(dev);
tot_files = dev->file - tot_files;
- printf("Total files=%d, blocks=%d, bytes = %" lld "\n", tot_files, tot_blocks, bytes);
+ printf("Total files=%d, blocks=%d, bytes = %s\n", tot_files, tot_blocks,
+ edit_uint64_with_commas(bytes, ec1));
}
uint32_t block_size;
uint64_t bytes;
DEV_BLOCK *block;
+ char ec1[50];
block = new_block(dev);
blocks = block_size = tot_blocks = 0;
update_pos_dev(dev);
tot_files = dev->file;
for (;;) {
- if (!read_block_from_device(jcr, dev, block)) {
+ if (!read_block_from_device(jcr, dev, block, NO_BLOCK_NUMBER_CHECK)) {
Dmsg1(100, "!read_block(): ERR=%s\n", strerror_dev(dev));
if (dev->state & ST_EOT) {
if (blocks > 0) {
bail_out:
free_block(block);
tot_files = dev->file - tot_files;
- printf("Total files=%d, blocks=%d, bytes = %" lld "\n", tot_files, tot_blocks, bytes);
+ printf("Total files=%d, blocks=%d, bytes = %s\n", tot_files, tot_blocks,
+ edit_uint64_with_commas(bytes, ec1));
}
DEV_RECORD rec;
DEV_BLOCK *block;
char ec1[50];
- char *p;
ok = TRUE;
stop = 0;
+ vol_num = 0;
- Pmsg0(000, "\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. It will print a status approximately\n\
selected the simple test option, after writing the first tape\n\
it will rewind it and re-read the last block written.\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 \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\
-This may take a long time. I.e. hours! ...\n\n");
+two tapes.\n\n\
+This may take a long time -- hours! ...\n\n");
get_cmd("Insert a blank tape then indicate if you want\n"
"to run the simplified test (s) with one tape or\n"
return;
}
- VolumeName = "TestVolume1";
+ set_volume_name("TestVolume1", 1);
labelcmd();
VolumeName = NULL;
strerror_dev(dev));
ok = FALSE;
}
+ Pmsg0(-1, "Wrote Start Of Session label.\n");
memset(&rec, 0, sizeof(rec));
rec.data = get_memory(100000); /* max record size */
- /*
- * Fill write buffer with random data
- */
+
#define REC_SIZE 32768
- p = rec.data;
- for (int i=0; i < REC_SIZE; ) {
- makeSessionKey(p, NULL, 0);
- p += 16;
- i += 16;
- }
rec.data_len = REC_SIZE;
/*
- * Get Data from File daemon, write to device
+ * Generate data as if from File daemon, write to device
*/
jcr->VolFirstIndex = 0;
time(&jcr->run_time); /* start counting time for rates */
+ Pmsg0(-1, "Begin writing records to first tape ...\n");
for (file_index = 0; ok && !job_canceled(jcr); ) {
- uint64_t *lp;
rec.VolSessionId = jcr->VolSessionId;
rec.VolSessionTime = jcr->VolSessionTime;
rec.FileIndex = ++file_index;
rec.Stream = STREAM_FILE_DATA;
- /* Write file_index at beginning of buffer and add file_index to each
- * uint64_t item to make it unique.
+ /*
+ * Fill the buffer with the file_index negated. Negation ensures that
+ * more bits are turned on.
*/
- lp = (uint64_t *)rec.data;
- *lp++ = (uint64_t)file_index;
- for (uint32_t i=0; i < (REC_SIZE-sizeof(uint64_t))/sizeof(uint64_t); i++) {
- *lp++ = *lp + rec.FileIndex;
+ uint64_t *lp = (uint64_t *)rec.data;
+ for (uint32_t i=0; i < (rec.data_len-sizeof(uint64_t))/sizeof(uint64_t); i++) {
+ *lp++ = ~file_index;
}
Dmsg4(250, "before writ_rec FI=%d SessId=%d Strm=%s len=%d\n",
rec.FileIndex, rec.VolSessionId, stream_to_ascii(rec.Stream, rec.FileIndex),
rec.data_len);
- if (!write_record_to_block(block, &rec)) {
+ while (!write_record_to_block(block, &rec)) {
+ /*
+ * 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);
if (now <= 0) {
now = 1;
}
- kbs = (double)dev->VolCatInfo.VolCatBytes / (1000 * now);
- Pmsg3(000, "Wrote block=%u, VolBytes=%s rate=%.1f KB/s\n", block->BlockNumber,
+ kbs = (double)dev->VolCatInfo.VolCatBytes / (1000.0 * (double)now);
+ Pmsg3(-1, "Wrote block=%u, VolBytes=%s rate=%.1f KB/s\n", block->BlockNumber,
edit_uint64_with_commas(dev->VolCatInfo.VolCatBytes, ec1), (float)kbs);
}
- /* Every 50000 blocks (approx 3.2MB) write an eof.
+ /* Every 15000 blocks (approx 1GB) write an EOF.
*/
- if ((block->BlockNumber % 50000) == 0) {
- Pmsg0(000, "Flush block, write EOF\n");
+ if ((block->BlockNumber % 15000) == 0) {
+ Pmsg0(-1, "Flush block, write EOF\n");
flush_block(block, 0);
weof_dev(dev, 1);
- /* The weof resets the block number */
}
- if (block->BlockNumber > 10 && stop != 0) { /* get out */
- break;
+ /* Get out after writing 10 blocks to the second tape */
+ if (++BlockNumber > 10 && stop != 0) { /* get out */
+ break;
}
}
if (!ok) {
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);
+
+ /* Get out after writing 10 blocks to the second tape */
+ if (BlockNumber > 10 && stop != 0) { /* get out */
+ Pmsg0(-1, "Done writing ...\n");
+ break;
+ }
}
if (stop > 0) {
Dmsg0(100, "Write_end_session_label()\n");
}
/* Write out final block of this session */
if (!write_block_to_device(jcr, dev, block)) {
- Pmsg0(000, _("Set ok=FALSE after write_block_to_device.\n"));
+ Pmsg0(-1, _("Set ok=FALSE after write_block_to_device.\n"));
ok = FALSE;
}
+ Pmsg0(-1, "Wrote End Of Session label.\n");
}
/* Release the device */
if (!release_device(jcr, dev)) {
- Pmsg0(000, _("Error in release_device\n"));
+ Pmsg0(-1, _("Error in release_device\n"));
ok = FALSE;
}
free_block(block);
free_memory(rec.data);
- Pmsg0(000, _("\n\nDone filling tape. Now beginning re-read of tape ...\n"));
+ Pmsg0(-1, _("\n\nDone filling tape. Now beginning re-read of tape ...\n"));
dump_block(last_block, _("Last block written to tape.\n"));
dev->capabilities &= ~CAP_LABEL; /* don't label anything here */
end_of_tape = 0;
+
if (!simple) {
- get_cmd(_("Mount first of two tapes. Press enter when ready: "));
- }
+ /* Close device so user can use autochanger if desired */
+ if (dev_cap(dev, CAP_OFFLINEUNMOUNT)) {
+ offline_dev(dev);
+ }
+ force_close_dev(dev);
+ get_cmd(_("Mount first tape. Press enter when ready: "));
- free_vol_list(jcr);
- pm_strcpy(&jcr->VolumeName, "TestVolume1");
- jcr->bsr = NULL;
- create_vol_list(jcr);
- close_dev(dev);
- dev->state &= ~ST_READ;
- if (!acquire_device_for_read(jcr, dev, block)) {
- Pmsg0(000, dev->errmsg);
- return;
+ free_vol_list(jcr);
+ set_volume_name("TestVolume1", 1);
+ jcr->bsr = NULL;
+ create_vol_list(jcr);
+ close_dev(dev);
+ dev->state &= ~ST_READ;
+ if (!acquire_device_for_read(jcr, dev, block)) {
+ Pmsg1(-1, "%s", dev->errmsg);
+ return;
+ }
}
time(&jcr->run_time); /* start counting time for rates */
* Simplified test, we simply fsf to file, then read the
* last block and make sure it is the same as the saved block.
*/
+ Pmsg0(000, "Rewinding tape ...\n");
if (!rewind_dev(dev)) {
Pmsg1(-1, _("Error rewinding: ERR=%s\n"), strerror_dev(dev));
goto bail_out;
}
if (last_file > 0) {
+ Pmsg1(000, "Forward spacing to last file=%u\n", last_file);
if (!fsf_dev(dev, last_file)) {
Pmsg1(-1, _("Error in FSF: ERR=%s\n"), strerror_dev(dev));
goto bail_out;
Pmsg1(-1, _("Forward space to file %u complete. Reading blocks ...\n"),
last_file);
Pmsg1(-1, _("Now reading to block %u.\n"), last_block_num);
- for (uint32_t i= 0; i < last_block_num; i++) {
- if (!read_block_from_device(jcr, dev, block)) {
+ for (uint32_t i=0; i <= last_block_num; i++) {
+ if (!read_block_from_device(jcr, dev, block, NO_BLOCK_NUMBER_CHECK)) {
Pmsg1(-1, _("Error reading blocks: ERR=%s\n"), strerror_dev(dev));
Pmsg2(-1, _("Wanted block %u error at block %u\n"), last_block_num, i);
goto bail_out;
Pmsg1(-1, _("At block %u\n"), i);
}
}
- dump_block(last_block, _("Last block written"));
- dump_block(block, _("Block read back"));
- Pmsg0(-1, _("Except for the buffer address, the contents of\n"
- "the above two block dumps should be the same.\n"
- "If not you have a problem ...\n"));
+ if (last_block) {
+ dump_block(last_block, _("Last block written"));
+ dump_block(block, _("Block read back"));
+ Pmsg0(-1, _("Except for the buffer address, the contents of\n"
+ "the above two block dumps should be the same.\n"
+ "If not you have a problem ...\n"));
+ }
}
bail_out:
Pmsg0(000, _("Done with reread of fill data.\n"));
}
-
/*
- * We are called here from "unfill" for each record on the
- * tape.
+ * We are called here from "unfill" for each record on the tape.
*/
static void record_cb(JCR *jcr, DEVICE *dev, DEV_BLOCK *block, DEV_RECORD *rec)
{
-
SESSION_LABEL label;
- if (stop > 1) { /* on second tape */
- Pmsg4(000, "Blk: FileIndex=%d: block=%u size=%d vol=%s\n",
+
+ if (stop > 1 && !dumped) { /* on second tape */
+ dumped = 1;
+ dump_block(block, "First block on second tape");
+ Pmsg4(-1, "Blk: FileIndex=%d: block=%u size=%d vol=%s\n",
rec->FileIndex, block->BlockNumber, block->block_len, dev->VolHdr.VolName);
- Pmsg6(000, " Rec: VId=%d VT=%d FI=%s Strm=%s len=%d state=%x\n",
+ Pmsg6(-1, " Rec: VId=%d VT=%d FI=%s Strm=%s len=%d state=%x\n",
rec->VolSessionId, rec->VolSessionTime,
FI_to_ascii(rec->FileIndex), stream_to_ascii(rec->Stream, rec->FileIndex),
rec->data_len, rec->state);
-
- if (!dumped) {
- dumped = 1;
- dump_block(block, "Block not written to previous tape");
- }
}
if (rec->FileIndex < 0) {
if (verbose > 1) {
dump_label_record(dev, rec, 1);
}
switch (rec->FileIndex) {
- case PRE_LABEL:
- Pmsg0(000, "Volume is prelabeled. This tape cannot be scanned.\n");
- return;
- case VOL_LABEL:
- unser_volume_label(dev, rec);
- Pmsg3(000, "VOL_LABEL: block=%u size=%d vol=%s\n", block->BlockNumber,
- block->block_len, dev->VolHdr.VolName);
- stop++;
- break;
- case SOS_LABEL:
- unser_session_label(&label, rec);
- Pmsg1(000, "SOS_LABEL: JobId=%u\n", label.JobId);
- break;
- case EOS_LABEL:
- unser_session_label(&label, rec);
- Pmsg2(000, "EOS_LABEL: block=%u JobId=%u\n", block->BlockNumber,
- label.JobId);
- break;
- case EOM_LABEL:
- Pmsg0(000, "EOM_LABEL:\n");
- break;
- case EOT_LABEL: /* end of all tapes */
- char ec1[50];
+ case PRE_LABEL:
+ Pmsg0(-1, "Volume is prelabeled. This tape cannot be scanned.\n");
+ return;
+ case VOL_LABEL:
+ unser_volume_label(dev, rec);
+ Pmsg3(-1, "VOL_LABEL: block=%u size=%d vol=%s\n", block->BlockNumber,
+ block->block_len, dev->VolHdr.VolName);
+ stop++;
+ break;
+ case SOS_LABEL:
+ unser_session_label(&label, rec);
+ Pmsg1(-1, "SOS_LABEL: JobId=%u\n", label.JobId);
+ break;
+ case EOS_LABEL:
+ unser_session_label(&label, rec);
+ Pmsg2(-1, "EOS_LABEL: block=%u JobId=%u\n", block->BlockNumber,
+ label.JobId);
+ break;
+ case EOM_LABEL:
+ Pmsg0(-1, "EOM_LABEL:\n");
+ break;
+ case EOT_LABEL: /* end of all tapes */
+ char ec1[50];
- if (LastBlock != block->BlockNumber) {
- VolBytes += block->block_len;
- }
- LastBlock = block->BlockNumber;
- now = time(NULL);
- now -= jcr->run_time;
- if (now <= 0) {
- now = 1;
- }
- kbs = (double)VolBytes / (1000 * now);
- Pmsg3(000, "Read block=%u, VolBytes=%s rate=%.1f KB/s\n", block->BlockNumber,
- edit_uint64_with_commas(VolBytes, ec1), (float)kbs);
+ if (LastBlock != block->BlockNumber) {
+ VolBytes += block->block_len;
+ }
+ LastBlock = block->BlockNumber;
+ now = time(NULL);
+ now -= jcr->run_time;
+ if (now <= 0) {
+ now = 1;
+ }
+ kbs = (double)VolBytes / (1000 * now);
+ Pmsg3(000, "Read block=%u, VolBytes=%s rate=%.1f KB/s\n", block->BlockNumber,
+ edit_uint64_with_commas(VolBytes, ec1), (float)kbs);
- Pmsg0(000, "End of all tapes.\n");
+ Pmsg0(000, "End of all tapes.\n");
- break;
- default:
- break;
+ break;
+ default:
+ break;
}
return;
}
+ if (++file_index != rec->FileIndex) {
+ Pmsg3(000, "Incorrect FileIndex in Block %u. Got %d, expected %d.\n",
+ block->BlockNumber, rec->FileIndex, file_index);
+ }
+ /*
+ * Now check that the right data is in the record.
+ */
+ uint64_t *lp = (uint64_t *)rec->data;
+ uint64_t val = ~file_index;
+ for (uint32_t i=0; i < (REC_SIZE-sizeof(uint64_t))/sizeof(uint64_t); i++) {
+ if (*lp++ != val) {
+ Pmsg2(000, "Record %d contains bad data in Block %u.\n",
+ file_index, block->BlockNumber);
+ break;
+ }
+ }
+
if (LastBlock != block->BlockNumber) {
VolBytes += block->block_len;
}
this_block = new_block(dev);
}
/* Copy block */
+ free_memory(this_block->buf);
memcpy(this_block, block, sizeof(DEV_BLOCK));
- if (this_block->buf_len < block->buf_len) {
- free_memory(this_block->buf);
- this_block->buf = get_memory(block->buf_len);
- this_block->buf_len = block->buf_len;
- }
+ this_block->buf = get_memory(block->buf_len);
memcpy(this_block->buf, block->buf, this_block->buf_len);
this_file = dev->file;
this_block_num = dev->block_num;
Pmsg0(000, strerror_dev(dev));
Pmsg3(000, "Block not written: FileIndex=%u Block=%u Size=%u\n",
(unsigned)file_index, block->BlockNumber, block->block_len);
+ Pmsg2(000, "last_block_num=%u this_block_num=%d\n", last_block_num,
+ this_block_num);
if (dump) {
dump_block(block, "Block not written");
}
return 0;
}
stop = 1;
+ BlockNumber = 0; /* start counting for second tape */
}
unlock_device(dev);
return 1; /* end of tape reached */
}
+/*
+ * 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;
+ int i, count;
+
+ Pmsg0(0, "Test writing blocks of 64512 bytes to tape.\n");
+
+ get_cmd("How many blocks do you want to write? (1000): ");
+
+ count = atoi(cmd);
+ if (count <= 0) {
+ count = 1000;
+ }
+
+ sm_check(__FILE__, __LINE__, False);
+ block = new_block(dev);
+ rec = new_record();
+
+ i = block->buf_len - 100;
+ ASSERT (i > 0);
+ rec->data = check_pool_memory_size(rec->data, i);
+ memset(rec->data, i & 0xFF, i);
+ rec->data_len = i;
+ rewindcmd();
+ Pmsg1(0, "Begin writing %d blocks to tape ...\n", count);
+ for (i=0; i < count; i++) {
+ if (i % 100 == 0) {
+ printf("+");
+ }
+ if (!write_record_to_block(block, rec)) {
+ Pmsg0(0, _("Error writing record to block.\n"));
+ goto bail_out;
+ }
+ if (!write_block_to_dev(jcr, dev, block)) {
+ Pmsg0(0, _("Error writing block to device.\n"));
+ goto bail_out;
+ }
+ }
+ printf("\n");
+ weofcmd();
+ weofcmd();
+ rewindcmd();
+ scan_blocks();
+
+bail_out:
+ sm_check(__FILE__, __LINE__, False);
+ free_record(rec);
+ free_block(block);
+ sm_check(__FILE__, __LINE__, False);
+
+}
+
+static void rawfill_cmd()
+{
+ DEV_BLOCK *block;
+ int stat;
+ int fd;
+ uint32_t block_num = 0;
+ uint32_t *p;
+ int my_errno;
+
+ block = new_block(dev);
+ fd = open("/dev/urandom", O_RDONLY);
+ if (fd) {
+ read(fd, block->buf, block->buf_len);
+ } else {
+ Pmsg0(0, "Cannot open /dev/urandom.\n");
+ free_block(block);
+ return;
+ }
+ p = (uint32_t *)block->buf;
+ Pmsg1(0, "Begin writing blocks of %u bytes.\n", block->buf_len);
+ for ( ;; ) {
+ *p = block_num;
+ stat = write(dev->fd, block->buf, block->buf_len);
+ if (stat == (int)block->buf_len) {
+ if ((block_num++ % 100) == 0) {
+ printf("+");
+ }
+ continue;
+ }
+ break;
+ }
+ my_errno = errno;
+ printf("\n");
+ weofcmd();
+ printf("Write failed at block %u. stat=%d ERR=%s\n", block_num, stat,
+ strerror(my_errno));
+ free_block(block);
+
+}
+
struct cmdstruct { char *key; void (*func)(); char *help; };
static struct cmdstruct commands[] = {
{"bsf", bsfcmd, "backspace file"},
{"label", labelcmd, "write a Bacula label to the tape"},
{"load", loadcmd, "load a tape"},
{"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"},
{"rr", rrcmd, "read a single record"},
+ {"qfill", qfillcmd, "quick fill command"},
};
#define comsize (sizeof(commands)/sizeof(struct cmdstruct))
}
/* Dummies to replace askdir.c */
-int dir_get_volume_info(JCR *jcr, int writing) { return 1;}
-int dir_find_next_appendable_volume(JCR *jcr) { return 1;}
+int dir_get_volume_info(JCR *jcr, enum get_vol_info_rw writing) { return 1;}
int dir_update_volume_info(JCR *jcr, VOLUME_CAT_INFO *vol, int relabel) { return 1; }
int dir_create_jobmedia_record(JCR *jcr) { return 1; }
int dir_update_file_attributes(JCR *jcr, DEV_RECORD *rec) { return 1;}
int dir_send_job_status(JCR *jcr) {return 1;}
+
+int dir_find_next_appendable_volume(JCR *jcr)
+{
+ return 1;
+}
+
int dir_ask_sysop_to_mount_volume(JCR *jcr, DEVICE *dev)
{
- Pmsg0(000, dev->errmsg); /* print reason */
+ /* Close device so user can use autochanger if desired */
+ if (dev_cap(dev, CAP_OFFLINEUNMOUNT)) {
+ offline_dev(dev);
+ }
+ force_close_dev(dev);
+ Pmsg1(-1, "%s", dev->errmsg); /* print reason */
fprintf(stderr, "Mount Volume \"%s\" on device %s and press return when ready: ",
jcr->VolumeName, dev_name(dev));
getchar();
int dir_ask_sysop_to_mount_next_volume(JCR *jcr, DEVICE *dev)
{
+ /* Close device so user can use autochanger if desired */
+ if (dev_cap(dev, CAP_OFFLINEUNMOUNT)) {
+ offline_dev(dev);
+ }
+ force_close_dev(dev);
fprintf(stderr, "Mount next Volume on device %s and press return when ready: ",
dev_name(dev));
getchar();
- VolumeName = "TestVolume2";
+ set_volume_name("TestVolume2", 2);
labelcmd();
VolumeName = NULL;
+ BlockNumber = 0;
+ stop = 1;
return 1;
}
if (now <= 0) {
now = 1;
}
- kbs = (double)VolBytes / (1000 * now);
- Pmsg3(000, "Read block=%u, VolBytes=%s rate=%.1f KB/s\n", block->BlockNumber,
+ 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);
if (strcmp(jcr->VolumeName, "TestVolume2") == 0) {
}
free_vol_list(jcr);
- pm_strcpy(&jcr->VolumeName, "TestVolume2");
+ set_volume_name("TestVolume2", 2);
jcr->bsr = NULL;
create_vol_list(jcr);
close_dev(dev);
}
return 1; /* next volume mounted */
}
+
+static void set_volume_name(char *VolName, int volnum)
+{
+ VolumeName = VolName;
+ vol_num = volnum;
+ pm_strcpy(&jcr->VolumeName, VolName);
+ bstrncpy(dev->VolCatInfo.VolCatName, VolName, sizeof(dev->VolCatInfo.VolCatName));
+}