Commit 91f4820f authored by claes's avatar claes

Test prints removed

parent 505a0bc5
...@@ -409,8 +409,8 @@ dbs_Map(pwr_tStatus *sts, const char *filename) ...@@ -409,8 +409,8 @@ dbs_Map(pwr_tStatus *sts, const char *filename)
errno = 0; errno = 0;
ret = read(fd, &file, sizeof(file)); ret = read(fd, &file, sizeof(file));
printf("st_size...: %ld\n", sb.st_size); // printf("st_size...: %ld\n", sb.st_size);
printf("size......: %d\n", file.size); // printf("size......: %d\n", file.size);
base = mmap(NULL, sb.st_size, PROT_READ, MAP_SHARED, fd, 0); base = mmap(NULL, sb.st_size, PROT_READ, MAP_SHARED, fd, 0);
if (base == NULL) { if (base == NULL) {
......
...@@ -404,7 +404,6 @@ void wb_erep::loadCommonMeta( pwr_tStatus *status) ...@@ -404,7 +404,6 @@ void wb_erep::loadCommonMeta( pwr_tStatus *status)
strcpy( fname, fdir); strcpy( fname, fdir);
strcat( fname, load_cNameCmnVolumeList); strcat( fname, load_cNameCmnVolumeList);
cout << "File : " << fname << endl;
ifstream fpm( fname, ios::in); ifstream fpm( fname, ios::in);
if ( !fpm) { if ( !fpm) {
if ( i == 0) { if ( i == 0) {
...@@ -465,8 +464,6 @@ void wb_erep::loadMeta( pwr_tStatus *status, char *db) ...@@ -465,8 +464,6 @@ void wb_erep::loadMeta( pwr_tStatus *status, char *db)
strcpy( fname, load_cNameVolumeList); strcpy( fname, load_cNameVolumeList);
dcli_translate_filename( fname, fname); dcli_translate_filename( fname, fname);
cout << "File : " << fname << endl;
ifstream fpm( fname, ios::in); ifstream fpm( fname, ios::in);
if ( !fpm) { if ( !fpm) {
*status = LDH__PROJCONFIG; *status = LDH__PROJCONFIG;
...@@ -494,7 +491,6 @@ void wb_erep::loadMeta( pwr_tStatus *status, char *db) ...@@ -494,7 +491,6 @@ void wb_erep::loadMeta( pwr_tStatus *status, char *db)
if ( line[0] == '#') if ( line[0] == '#')
continue; continue;
cout << line << endl;
nr = dcli_parse( line, " ", "", (char *)vol_array, nr = dcli_parse( line, " ", "", (char *)vol_array,
sizeof(vol_array)/sizeof(vol_array[0]), sizeof(vol_array)/sizeof(vol_array[0]),
sizeof(vol_array[0]), 0); sizeof(vol_array[0]), 0);
...@@ -514,7 +510,7 @@ void wb_erep::loadMeta( pwr_tStatus *status, char *db) ...@@ -514,7 +510,7 @@ void wb_erep::loadMeta( pwr_tStatus *status, char *db)
strcat( vname, vol_array[0]); strcat( vname, vol_array[0]);
strcat( vname, ".dbs"); strcat( vname, ".dbs");
dcli_translate_filename( vname, vname); dcli_translate_filename( vname, vname);
cout << "Found: " << found_file << endl;
// Load... // Load...
try { try {
vrep = new wb_vrepdbs( this, vname); vrep = new wb_vrepdbs( this, vname);
...@@ -533,11 +529,9 @@ void wb_erep::loadMeta( pwr_tStatus *status, char *db) ...@@ -533,11 +529,9 @@ void wb_erep::loadMeta( pwr_tStatus *status, char *db)
strcpy( vname, m_dir_list[i]); strcpy( vname, m_dir_list[i]);
strcat( vname, vol_array[0]); strcat( vname, vol_array[0]);
strcat( vname, ".dbs"); strcat( vname, ".dbs");
cout << "Try: " << vname << endl;
sts = dcli_search_file( vname, found_file, DCLI_DIR_SEARCH_INIT); sts = dcli_search_file( vname, found_file, DCLI_DIR_SEARCH_INIT);
dcli_search_file( vname, found_file, DCLI_DIR_SEARCH_END); dcli_search_file( vname, found_file, DCLI_DIR_SEARCH_END);
if ( ODD(sts)) { if ( ODD(sts)) {
cout << "Found: " << found_file << endl;
// Load... // Load...
try { try {
vrep = new wb_vrepdbs( this, vname); vrep = new wb_vrepdbs( this, vname);
...@@ -563,11 +557,9 @@ void wb_erep::loadMeta( pwr_tStatus *status, char *db) ...@@ -563,11 +557,9 @@ void wb_erep::loadMeta( pwr_tStatus *status, char *db)
strcpy( vname, "$pwrp_load/"); strcpy( vname, "$pwrp_load/");
strcat( vname, vol_array[0]); strcat( vname, vol_array[0]);
strcat( vname, ".dbs"); strcat( vname, ".dbs");
cout << "Try: " << vname << endl;
sts = dcli_search_file( vname, found_file, DCLI_DIR_SEARCH_INIT); sts = dcli_search_file( vname, found_file, DCLI_DIR_SEARCH_INIT);
dcli_search_file( vname, found_file, DCLI_DIR_SEARCH_END); dcli_search_file( vname, found_file, DCLI_DIR_SEARCH_END);
if ( ODD(sts)) { if ( ODD(sts)) {
cout << "Found: " << found_file << endl;
// Load... // Load...
try { try {
vrep = new wb_vrepdbs( this, found_file); vrep = new wb_vrepdbs( this, found_file);
......
...@@ -66,7 +66,7 @@ void wb_merep:: copyFiles(const char *dirName) ...@@ -66,7 +66,7 @@ void wb_merep:: copyFiles(const char *dirName)
wb_vrepdbs *dp = (wb_vrepdbs *)it->second; wb_vrepdbs *dp = (wb_vrepdbs *)it->second;
char cmd[512]; char cmd[512];
sprintf(cmd, "cp %s %s", dp->fileName(), dirName); sprintf(cmd, "cp %s %s", dp->fileName(), dirName);
printf("%s\n", cmd); // printf("%s\n", cmd);
system(cmd); system(cmd);
} }
} }
...@@ -81,18 +81,17 @@ wb_orep *wb_merep::object(pwr_tStatus *sts, pwr_tOid oid) ...@@ -81,18 +81,17 @@ wb_orep *wb_merep::object(pwr_tStatus *sts, pwr_tOid oid)
void wb_merep::addDbs( pwr_tStatus *sts, wb_mvrep *mvrep) void wb_merep::addDbs( pwr_tStatus *sts, wb_mvrep *mvrep)
{ {
printf("wb_merep::addDbs: %d, %s\n", mvrep->vid(), mvrep->name()); // printf("wb_merep::addDbs: %d, %s\n", mvrep->vid(), mvrep->name());
mvrep_iterator it = m_mvrepdbs.find( mvrep->vid()); mvrep_iterator it = m_mvrepdbs.find( mvrep->vid());
if ( it == m_mvrepdbs.end()) { if ( it == m_mvrepdbs.end()) {
// Look for vrep in erep list... TODO // Look for vrep in erep list... TODO
m_mvrepdbs[mvrep->vid()] = mvrep; m_mvrepdbs[mvrep->vid()] = mvrep;
mvrep->ref(); mvrep->ref();
cout << "merep Metavolume " << mvrep->vid() << ": " << mvrep->name() << " inserted\n";
*sts = LDH__SUCCESS; *sts = LDH__SUCCESS;
} }
else { else {
printf("wb_merep::addDbs, existed: %d, %s\n", mvrep->vid(), mvrep->name()); // printf("wb_merep::addDbs, existed: %d, %s\n", mvrep->vid(), mvrep->name());
*sts = LDH__VOLIDALREXI; *sts = LDH__VOLIDALREXI;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment