deon/tsmpipe
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Commiting updates from previous debug

Browse Source
This commit is contained in:
Deon George 2016-06-23 12:33:51 +10:00
parent 9df5e78979
commit 5fba535053
2 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/dsmlist.c
View File

@ -31,7 +31,7 @@ char *units(double size) {
while (size >= base && div < (int)(sizeof SIZES / sizeof *SIZES)-1) { while (size >= base && div < (int)(sizeof SIZES / sizeof *SIZES)-1) {
if (verbose > 2) if (verbose > 2)
fprintf(stderr,"BEFORE: %s: SIZE: [%3.2f], DIV: [%d], REM: [%3.2f]\n",__func__,size,div,rem); fprintf(stderr,"%s: BEFORE - SIZE: [%3.2f], DIV: [%d], REM: [%3.2f]\n",__func__,size,div,rem);
rem = ((int)size % base); rem = ((int)size % base);
size /= base; size /= base;
@ -39,7 +39,7 @@ char *units(double size) {
} }
if (verbose > 2) if (verbose > 2)
fprintf(stderr,"AFTER: %s: SIZE: [%3.2f], DIV: [%d], REM: [%3.2f]\n",__func__,size,div,rem); fprintf(stderr,"%s: AFTER - SIZE: [%3.2f], DIV: [%d], REM: [%3.2f]\n",__func__,size,div,rem);
sprintf(s,"%3.2f %s",size,SIZES[div]); sprintf(s,"%3.2f %s",size,SIZES[div]);
@ -50,6 +50,7 @@ char *units(double size) {
* Our Callback to show what is in TSM * Our Callback to show what is in TSM
*/ */
int tsm_listfile_cb(dsmQueryType qType, DataBlk *qResp, void *userdata, dsBool_t friendly) { int tsm_listfile_cb(dsmQueryType qType, DataBlk *qResp, void *userdata, dsBool_t friendly) {
extern int verbose;
char stor[2]; char stor[2];
char state[3]; char state[3];
char ced[4]; char ced[4];
@ -172,6 +173,8 @@ int tsm_listfile_cb(dsmQueryType qType, DataBlk *qResp, void *userdata, dsBool_t
(respBackup.encryptionType & DSM_ENCRYPT_USER ? "U" : "-"))); (respBackup.encryptionType & DSM_ENCRYPT_USER ? "U" : "-")));
strcat(ced,respBackup.clientDeduplicated ? "D" : "-"); strcat(ced,respBackup.clientDeduplicated ? "D" : "-");
if (verbose > 2)
fprintf(stderr,"%s: clientDeduplicated: %d\n",__func__,respBackup.clientDeduplicated);
#ifdef USE_DIGEST #ifdef USE_DIGEST
// Object Info // Object Info

26
lib/dsmsession.c
View File

@ -306,19 +306,28 @@ dsInt16_t tsm_queryfile(dsUint32_t dsmHandle, dsmQueryType qType, tsm_query_call
case qtArchive: case qtArchive:
qDataP = &qaData; qDataP = &qaData;
qryRespArchiveData qaResp;
qResp.bufferLen = sizeof(qaResp);
qResp.bufferPtr = (char *) &qaResp;
qaResp.stVersion = qryRespArchiveDataVersion;
if (verbose) if (verbose)
fprintf(stderr,"%s: Query filespace %s\n",__func__,dsmObjnameToStr(*qaData.objName)); fprintf(stderr,"%s: Query filespace %s\n",__func__,dsmObjnameToStr(*qaData.objName));
qryRespArchiveData qaResp;
qaResp.stVersion = qryRespArchiveDataVersion;
qResp.bufferPtr = (char *) &qaResp;
qResp.bufferLen = sizeof(qaResp);
break; break;
case qtBackup: case qtBackup:
qDataP = &qbData; qDataP = &qbData;
qryRespBackupData qbResp;
qResp.bufferLen = sizeof(qbResp);
qResp.bufferPtr = (char *) &qbResp;
qbResp.stVersion = qryRespBackupDataVersion;
if (verbose) if (verbose)
fprintf(stderr,"%s: Query filespace %s\n",__func__,dsmObjnameToStr(*qbData.objName)); fprintf(stderr,"%s: Query filespace %s\n",__func__,dsmObjnameToStr(*qbData.objName));
if (verbose > 1) { if (verbose > 1) {
@ -326,11 +335,6 @@ dsInt16_t tsm_queryfile(dsUint32_t dsmHandle, dsmQueryType qType, tsm_query_call
fprintf(stderr,"%s: OBJSTATE : %s\n",__func__,qbData.objState==DSM_ACTIVE ? "DSM_ACTIVE" : "DSM_ANY_MATCH"); fprintf(stderr,"%s: OBJSTATE : %s\n",__func__,qbData.objState==DSM_ACTIVE ? "DSM_ACTIVE" : "DSM_ANY_MATCH");
} }
qryRespBackupData qbResp;
qbResp.stVersion = qryRespBackupDataVersion;
qResp.bufferPtr = (char *) &qbResp;
qResp.bufferLen = sizeof(qbResp);
break; break;
default: default:
@ -381,7 +385,7 @@ dsInt16_t tsm_queryfile(dsUint32_t dsmHandle, dsmQueryType qType, tsm_query_call
} }
if (rc != DSM_RC_FINISHED && rc != DSM_RC_MORE_DATA) { if (rc != DSM_RC_FINISHED && rc != DSM_RC_MORE_DATA) {
printf("%s: dsmGetNextObj() failed %s\n",__func__,tsm_printerr(dsmHandle,rc)); printf("%s: dsmGetNextQObj() failed %s\n",__func__,tsm_printerr(dsmHandle,rc));
return rc; return rc;
} }