Skip to content

Commit

Permalink
more rename
Browse files Browse the repository at this point in the history
  • Loading branch information
@pstorz
pstorz committed Nov 22, 2018
1 parent 723f1bb commit ed0b86b
Show file tree
Hide file tree
Showing 8 changed files with 164 additions and 161 deletions.
8 changes: 4 additions & 4 deletions src/dird/dird.h
View file
Expand Up @@ -131,13 +131,13 @@ enum s_mapping_type {
* Slot list definition
*/
struct vol_list_t {
dlink link; /**< Link for list */
slot_number_t SlotNumber; /**< Unique Slot Number */
dlink link; /** Link for list */
slot_number_t PhysicalSlotNumber; /**< Unique Slot Number */
slot_number_t LogicalDriveNumber; /**< Drive number when slot_type_drive or actual slot number */
slot_number_t CurrentlyLoadedSlot;/**< Volume loaded in drive when slot_type_drive */
slot_flags_t Flags; /**< Slot specific flags see e_slot_flag enum */
slot_type Type; /**< See slot_type_* */
slot_status SlotStatus; /**< See slot_status_* */
slot_number_t SlotOrDriveNumber; /**< Drive number when slot_type_drive or actual slot number */
slot_number_t CurrentlyLoadedSlot; /**< Volume loaded in drive when slot_type_drive */
char *VolName; /**< Actual Volume Name */
};

Expand Down
25 changes: 13 additions & 12 deletions src/dird/ndmp_dma_storage.c
View file
Expand Up @@ -210,7 +210,7 @@ void do_ndmp_native_storage_status(UAContext *ua, STORERES *store, char *cmd)
int i = 0;
if (store->rss->ndmp_deviceinfo) {
ua->info_msg("NDMP Devices for storage %s:(%s)\n", store->name(), store->rss->smc_ident);
ua->info_msg(" SlotNumber Device Model (JobId) \n");
ua->info_msg(" PhysicalSlotNumber Device Model (JobId) \n");
for (auto devinfo = store->rss->ndmp_deviceinfo->begin();
devinfo != store->rss->ndmp_deviceinfo->end();
devinfo++) {
Expand Down Expand Up @@ -484,7 +484,7 @@ dlist *ndmp_get_vol_list(UAContext *ua, STORERES *store, bool listall, bool scan
} else {
vl->SlotStatus = slot_status_empty;
}
vl->SlotNumber = edp->element_address;
vl->PhysicalSlotNumber = edp->element_address;
break;
default:
free(vl);
Expand All @@ -500,7 +500,7 @@ dlist *ndmp_get_vol_list(UAContext *ua, STORERES *store, bool listall, bool scan
* Normal slot
*/
vl->Type = slot_type_storage;
vl->SlotNumber = edp->element_address;
vl->PhysicalSlotNumber = edp->element_address;
if (!edp->Full) {
free(vl);
continue;
Expand Down Expand Up @@ -529,7 +529,7 @@ dlist *ndmp_get_vol_list(UAContext *ua, STORERES *store, bool listall, bool scan
* Normal slot
*/
vl->Type = slot_type_storage;
vl->SlotNumber = edp->element_address;
vl->PhysicalSlotNumber = edp->element_address;
if (edp->Full) {
vl->SlotStatus = slot_status_full;
fill_volume_name(vl, edp);
Expand All @@ -539,10 +539,10 @@ dlist *ndmp_get_vol_list(UAContext *ua, STORERES *store, bool listall, bool scan
break;
case SMC_ELEM_TYPE_IEE:
/*
* Import/Export SlotOrDriveNumber
* Import/Export LogicalDriveNumber
*/
vl->Type = slot_type_import;
vl->SlotNumber = edp->element_address;
vl->PhysicalSlotNumber = edp->element_address;
if (edp->Full) {
vl->SlotStatus = slot_status_full;
fill_volume_name(vl, edp);
Expand All @@ -566,7 +566,7 @@ dlist *ndmp_get_vol_list(UAContext *ua, STORERES *store, bool listall, bool scan
* Drive
*/
vl->Type = slot_type_drive;
vl->SlotNumber = edp->element_address;
vl->PhysicalSlotNumber = edp->element_address;
if (edp->Full) {
slot_number_t slot_mapping;

Expand All @@ -580,22 +580,22 @@ dlist *ndmp_get_vol_list(UAContext *ua, STORERES *store, bool listall, bool scan
break;
default:
vl->Type = slot_type_unknown;
vl->SlotNumber = edp->element_address;
vl->PhysicalSlotNumber = edp->element_address;
break;
}
}

/*
* Map physical storage address to logical one using the storage mappings.
*/
vl->SlotOrDriveNumber = get_slotnumber_by_element_address(store, slot_type_storage, edp->element_address);
vl->LogicalDriveNumber = get_slotnumber_by_element_address(store, vl->Type, edp->element_address);

if (vl->VolName) {
Dmsg6(100, "Add index = %hd slot=%hd loaded=%hd type=%hd content=%hd Vol=%s to SD list.\n",
vl->SlotNumber, vl->SlotOrDriveNumber, vl->CurrentlyLoadedSlot, vl->Type, vl->SlotStatus, NPRT(vl->VolName));
vl->PhysicalSlotNumber, vl->LogicalDriveNumber, vl->CurrentlyLoadedSlot, vl->Type, vl->SlotStatus, NPRT(vl->VolName));
} else {
Dmsg5(100, "Add index = %hd slot=%hd loaded=%hd type=%hd content=%hd Vol=NULL to SD list.\n",
vl->SlotNumber, vl->SlotOrDriveNumber, vl->CurrentlyLoadedSlot, vl->Type, vl->SlotStatus);
vl->PhysicalSlotNumber, vl->LogicalDriveNumber, vl->CurrentlyLoadedSlot, vl->Type, vl->SlotStatus);
}

vol_list->binary_insert(vl, storage_compare_vol_list_entry);
Expand Down Expand Up @@ -664,7 +664,8 @@ slot_number_t ndmp_get_num_slots(UAContext *ua, STORERES *store)
return slots;
}

return store->rss->storage_mapping.se_count;
return store->rss->storage_mapping.se_count
+ store->rss->storage_mapping.iee_count;
}

/**
Expand Down
58 changes: 29 additions & 29 deletions src/dird/sd_cmds.c
View file
Expand Up @@ -34,7 +34,7 @@

/* Commands sent to Storage daemon */
static char readlabelcmd[] =
"readlabel %s SlotOrDriveNumber=%hd drive=%hd\n";
"readlabel %s LogicalDriveNumber=%hd drive=%hd\n";
static char changerlistallcmd[] =
"autochanger listall %s \n";
static char changerlistcmd[] =
Expand Down Expand Up @@ -72,7 +72,7 @@ static char OKSecureEraseCmd[] =

/* Commands received from storage daemon that need scanning */
static char readlabelresponse[] =
"3001 Volume=%s SlotOrDriveNumber=%hd";
"3001 Volume=%s LogicalDriveNumber=%hd";
static char changerslotsresponse[] =
"slots=%hd\n";
static char changerdrivesresponse[] =
Expand Down Expand Up @@ -169,7 +169,7 @@ void close_sd_bsock(UAContext *ua)
/**
* We get the volume name from the SD
*/
char *get_volume_name_from_SD(UAContext *ua, slot_number_t SlotOrDriveNumber, drive_number_t drive)
char *get_volume_name_from_SD(UAContext *ua, slot_number_t LogicalDriveNumber, drive_number_t drive)
{
BSOCK *sd;
STORERES *store = ua->jcr->res.wstore;
Expand All @@ -190,11 +190,11 @@ char *get_volume_name_from_SD(UAContext *ua, slot_number_t SlotOrDriveNumber, dr
* specific slot of the autochanger using the drive number given.
* This could change the loaded volume in the drive.
*/
sd->fsend(readlabelcmd, dev_name, SlotOrDriveNumber, drive);
sd->fsend(readlabelcmd, dev_name, LogicalDriveNumber, drive);
Dmsg1(100, "Sent: %s", sd->msg);

/*
* Get Volume name in this SlotOrDriveNumber
* Get Volume name in this LogicalDriveNumber
*/
while (sd->recv() >= 0) {
ua->send_msg("%s", sd->msg);
Expand Down Expand Up @@ -222,23 +222,23 @@ char *get_volume_name_from_SD(UAContext *ua, slot_number_t SlotOrDriveNumber, dr
*
* Input (output of mxt-changer list):
*
* 0:vol2 SlotOrDriveNumber num:Volume Name
* 0:vol2 LogicalDriveNumber num:Volume Name
*
* Input (output of mxt-changer listall):
*
* Drive content: D:Drive num:F:SlotOrDriveNumber loaded:Volume Name
* Drive content: D:Drive num:F:LogicalDriveNumber loaded:Volume Name
* D:0:F:2:vol2 or D:Drive num:E
* D:1:F:42:vol42
* D:3:E
*
* SlotOrDriveNumber content:
* S:1:F:vol1 S:SlotOrDriveNumber num:F:Volume Name
* S:2:E or S:SlotOrDriveNumber num:E
* LogicalDriveNumber content:
* S:1:F:vol1 S:LogicalDriveNumber num:F:Volume Name
* S:2:E or S:LogicalDriveNumber num:E
* S:3:F:vol4
*
* Import/Export tray slots:
* I:10:F:vol10 I:SlotOrDriveNumber num:F:Volume Name
* I:11:E or I:SlotOrDriveNumber num:E
* I:10:F:vol10 I:LogicalDriveNumber num:F:Volume Name
* I:11:E or I:LogicalDriveNumber num:E
* I:12:F:vol40
*
* If a drive is loaded, the slot *should* be empty
Expand Down Expand Up @@ -360,9 +360,9 @@ dlist *native_get_vol_list(UAContext *ua, STORERES *store, bool listall, bool sc
/*
* Scanning -- require only valid slot
*/
vl->SlotOrDriveNumber = atoi(field1);
if (vl->SlotOrDriveNumber <= 0) {
ua->error_msg(_("Invalid SlotOrDriveNumber number: %s\n"), sd->msg);
vl->LogicalDriveNumber = atoi(field1);
if (vl->LogicalDriveNumber <= 0) {
ua->error_msg(_("Invalid LogicalDriveNumber number: %s\n"), sd->msg);
free(vl);
continue;
}
Expand All @@ -374,7 +374,7 @@ dlist *native_get_vol_list(UAContext *ua, STORERES *store, bool listall, bool sc
} else {
vl->SlotStatus = slot_status_empty;
}
vl->SlotNumber = INDEX_SLOT_OFFSET + vl->SlotOrDriveNumber;
vl->PhysicalSlotNumber = INDEX_SLOT_OFFSET + vl->LogicalDriveNumber;
} else if (!listall) {
/*
* Not scanning and not listall.
Expand All @@ -384,8 +384,8 @@ dlist *native_get_vol_list(UAContext *ua, STORERES *store, bool listall, bool sc
continue;
}

if (!is_an_integer(field1) || (vl->SlotOrDriveNumber = atoi(field1)) <= 0) {
ua->error_msg(_("Invalid SlotOrDriveNumber number: %s\n"), field1);
if (!is_an_integer(field1) || (vl->LogicalDriveNumber = atoi(field1)) <= 0) {
ua->error_msg(_("Invalid LogicalDriveNumber number: %s\n"), field1);
free(vl);
continue;
}
Expand All @@ -399,7 +399,7 @@ dlist *native_get_vol_list(UAContext *ua, STORERES *store, bool listall, bool sc
vl->Type = slot_type_storage;
vl->SlotStatus = slot_status_full;
vl->VolName = bstrdup(field2);
vl->SlotNumber = INDEX_SLOT_OFFSET + vl->SlotOrDriveNumber;
vl->PhysicalSlotNumber = INDEX_SLOT_OFFSET + vl->LogicalDriveNumber;
} else {
/*
* Listall.
Expand All @@ -425,31 +425,31 @@ dlist *native_get_vol_list(UAContext *ua, STORERES *store, bool listall, bool sc
}

/*
* For drives the SlotOrDriveNumber is the actual drive number.
* For drives the LogicalDriveNumber is the actual drive number.
* For any other type its the actual slot number.
*/
switch (vl->Type) {
case slot_type_drive:
if (!is_an_integer(field2) || (vl->SlotOrDriveNumber = atoi(field2)) < 0) {
if (!is_an_integer(field2) || (vl->LogicalDriveNumber = atoi(field2)) < 0) {
ua->error_msg(_("Invalid Drive number: %s\n"), field2);
free(vl);
continue;
}
vl->SlotNumber = INDEX_DRIVE_OFFSET + vl->SlotOrDriveNumber;
if (vl->SlotNumber >= INDEX_MAX_DRIVES) {
vl->PhysicalSlotNumber = INDEX_DRIVE_OFFSET + vl->LogicalDriveNumber;
if (vl->PhysicalSlotNumber >= INDEX_MAX_DRIVES) {
ua->error_msg(_("Drive number %hd greater then INDEX_MAX_DRIVES(%hd) please increase define\n"),
vl->SlotOrDriveNumber, INDEX_MAX_DRIVES);
vl->LogicalDriveNumber, INDEX_MAX_DRIVES);
free(vl);
continue;
}
break;
default:
if (!is_an_integer(field2) || (vl->SlotOrDriveNumber = atoi(field2)) <= 0) {
ua->error_msg(_("Invalid SlotOrDriveNumber number: %s\n"), field2);
if (!is_an_integer(field2) || (vl->LogicalDriveNumber = atoi(field2)) <= 0) {
ua->error_msg(_("Invalid LogicalDriveNumber number: %s\n"), field2);
free(vl);
continue;
}
vl->SlotNumber = INDEX_SLOT_OFFSET + vl->SlotOrDriveNumber;
vl->PhysicalSlotNumber = INDEX_SLOT_OFFSET + vl->LogicalDriveNumber;
break;
}

Expand Down Expand Up @@ -486,10 +486,10 @@ dlist *native_get_vol_list(UAContext *ua, STORERES *store, bool listall, bool sc

if (vl->VolName) {
Dmsg6(100, "Add index = %hd slot=%hd loaded=%hd type=%hd content=%hd Vol=%s to SD list.\n",
vl->SlotNumber, vl->SlotOrDriveNumber, vl->CurrentlyLoadedSlot, vl->Type, vl->SlotStatus, NPRT(vl->VolName));
vl->PhysicalSlotNumber, vl->LogicalDriveNumber, vl->CurrentlyLoadedSlot, vl->Type, vl->SlotStatus, NPRT(vl->VolName));
} else {
Dmsg5(100, "Add index = %hd slot=%hd loaded=%hd type=%hd content=%hd Vol=NULL to SD list.\n",
vl->SlotNumber, vl->SlotOrDriveNumber, vl->CurrentlyLoadedSlot, vl->Type, vl->SlotStatus);
vl->PhysicalSlotNumber, vl->LogicalDriveNumber, vl->CurrentlyLoadedSlot, vl->Type, vl->SlotStatus);
}

vol_list->binary_insert(vl, storage_compare_vol_list_entry);
Expand Down
22 changes: 12 additions & 10 deletions src/dird/storage.c
View file
Expand Up @@ -533,10 +533,10 @@ int storage_compare_vol_list_entry(void *e1, void *e2)
ASSERT(v1);
ASSERT(v2);

if (v1->SlotNumber == v2->SlotNumber) {
if (v1->PhysicalSlotNumber == v2->PhysicalSlotNumber) {
return 0;
} else {
return (v1->SlotNumber < v2->SlotNumber) ? -1 : 1;
return (v1->PhysicalSlotNumber < v2->PhysicalSlotNumber) ? -1 : 1;
}
}

Expand Down Expand Up @@ -779,7 +779,7 @@ vol_list_t *vol_is_loaded_in_drive(STORERES *store, changer_vol_list_t *vol_list
while (vl) {
switch (vl->Type) {
case slot_type_drive:
Dmsg2(100, "Checking drive %hd for loaded volume == %hd\n", vl->SlotOrDriveNumber, vl->CurrentlyLoadedSlot);
Dmsg2(100, "Checking drive %hd for loaded volume == %hd\n", vl->LogicalDriveNumber, vl->CurrentlyLoadedSlot);
if (vl->CurrentlyLoadedSlot == slot) {
return vl;
}
Expand Down Expand Up @@ -870,23 +870,24 @@ void invalidate_vol_list(STORERES *store)
}

/**
* calculate the element address for given index and slot_type
* calculate the element address for given slotnumber and slot_type
*/
slot_number_t get_element_address_by_slotnumber(STORERES *store, slot_type slot_type, slot_number_t index)
slot_number_t get_element_address_by_slotnumber(STORERES *store, slot_type slot_type, slot_number_t slotnumber)
{
if (slot_type == slot_type_storage) {
return (store->rss->storage_mapping.se_addr + index
return (store->rss->storage_mapping.se_addr + slotnumber
- 1); // normal slots count start from 1

} else if(slot_type == slot_type_import) {
return (store->rss->storage_mapping.iee_addr + index
return (store->rss->storage_mapping.iee_addr + slotnumber
- store->rss->storage_mapping.se_count // i/e slots follow after normal slots
- 1); // normal slots count start from 1

} else if (slot_type == slot_type_picker) {
return (store->rss->storage_mapping.mte_addr + index);
return (store->rss->storage_mapping.mte_addr + slotnumber);

} else if (slot_type == slot_type_drive) {
return (store->rss->storage_mapping.dte_addr + index);
return (store->rss->storage_mapping.dte_addr + slotnumber);

} else if (slot_type == slot_type_unknown){
return -1;
Expand All @@ -897,7 +898,7 @@ slot_number_t get_element_address_by_slotnumber(STORERES *store, slot_type slot_
}

/**
* calculate the index for element address and slot_type
* calculate the slotnumber for element address and slot_type
*/
slot_number_t get_slotnumber_by_element_address(STORERES *store, slot_type slot_type, slot_number_t element_addr)
{
Expand All @@ -907,6 +908,7 @@ slot_number_t get_slotnumber_by_element_address(STORERES *store, slot_type slot_

} else if(slot_type == slot_type_import) {
return (element_addr - store->rss->storage_mapping.iee_addr
+ store->rss->storage_mapping.se_count // i/e slots follow after normal slots
+ 1); // slots count start from 1

} else if (slot_type == slot_type_picker) {
Expand Down

0 comments on commit ed0b86b

Please sign in to comment.