Changeset 2227


Ignore:
Timestamp:
Jun 17, 2009, 2:45:52 PM (10 years ago)
Author:
bruno
Message:

Remove the iamhere function (will hopefully suppress valgrind errors at restore time)

Location:
branches/2.2.9/mondo/src
Files:
11 edited

Legend:

Unmodified
Added
Removed
  • branches/2.2.9/mondo/src/common/libmondo-archive.c

    r2216 r2227  
    14751475                    maintain_collection_of_recent_archives(bkpinfo->tmpdir,
    14761476                                                       storing_afioball_fname);
    1477                     iamhere("Writing EXAT files");
     1477                    log_it("%s","Writing EXAT files");
    14781478                    res +=
    14791479                        write_EXAT_files_to_tape(curr_xattr_list_fname,
     
    19991999    log_msg(1, "--> tmp = '%s'", tmp);
    20002000    if (strstr(tmp, "NTFS")) {
    2001         iamhere("TRUE");
     2001        log_it("%s","TRUE");
    20022002        ret = TRUE;
    20032003    } else {
    2004         iamhere("FALSE");
     2004        log_it("%s","FALSE");
    20052005        ret = FALSE;
    20062006    }
     
    22712271            register_in_tape_catalog(fileset, curr_set_no, -1, curr_afioball_fname);
    22722272            maintain_collection_of_recent_archives(bkpinfo->tmpdir, curr_afioball_fname);
    2273             iamhere("Writing EXAT files");
     2273            log_it("%s","Writing EXAT files");
    22742274            res +=
    22752275                write_EXAT_files_to_tape(curr_xattr_list_fname,
     
    34503450                 media_descriptor_string(g_backup_media_type));
    34513451            chdir("/");
    3452             iamhere("Before calling verification of image()");
     3452            log_it("%s","Before calling verification of image()");
    34533453            if (bkpinfo->backup_media_type == usb) {
    34543454                res += verify_usb_image();
     
    34563456                res += verify_cd_image();
    34573457            }
    3458             iamhere("After calling verification of image()");
     3458            log_it("%s","After calling verification of image()");
    34593459        }
    34603460        if (!res) {
  • branches/2.2.9/mondo/src/common/libmondo-filelist.c

    r2211 r2227  
    513513                "getfacl --all-effective -P %s 2>> %s | gzip -c1 > %s 2>> %s",
    514514                filelist, MONDO_LOGFILE, facl_fname, MONDO_LOGFILE);
    515         iamhere(command);
     515        log_it("%s",command);
    516516        retval = system(command);
    517517        paranoid_free(command);
     
    592592    pout = popen(syscall_pout, "w");
    593593    if (!pout) {
    594         iamhere("Unable to openout to syscall_pout");
     594        log_it("%s","Unable to openout to syscall_pout");
    595595        return (1);
    596596    }
     
    598598    if (!pin) {
    599599        pclose(pout);
    600         iamhere("Unable to openin from syscall");
     600        log_it("%s","Unable to openin from syscall");
    601601        return (1);
    602602    }
     
    605605        pclose(pin);
    606606        pclose(pout);
    607         iamhere("Unable to openin masklist");
     607        log_it("%s","Unable to openin masklist");
    608608        return (1);
    609609    }
     
    18811881    log_msg(3, "Adding %s to filelist", list_of_files_fname);
    18821882    if (!(fin = fopen(list_of_files_fname, "r"))) {
    1883         iamhere(list_of_files_fname);
     1883        log_it("%s",list_of_files_fname);
    18841884        return (1);
    18851885    }
  • branches/2.2.9/mondo/src/common/libmondo-stream.c

    r2211 r2227  
    555555    last = g_tapecatalog->entries - 1;
    556556    if (last <= 0) {
    557         iamhere("Too early to start deleting from collection.");
     557        log_it("%s","Too early to start deleting from collection.");
    558558        return (0);
    559559    }
     
    568568    }
    569569    if (curr < 0) {
    570         iamhere
     570        log_it("%s",
    571571            ("Not far enough into tape to start deleting old archives from collection.");
    572572        return (0);
     
    17171717                   g_tape_stream) / 1024;
    17181718        if (g_sigpipe) {
    1719             iamhere("Sigpipe occurred recently. I'll start a new tape.");
     1719            log_it("%s","Sigpipe occurred recently. I'll start a new tape.");
    17201720            fclose(fin);
    17211721            g_sigpipe = FALSE;
  • branches/2.2.9/mondo/src/common/libmondo-verify.c

    r2211 r2227  
    281281    }
    282282
    283     iamhere("before vsbf");
     283    log_it("%s","before vsbf");
    284284    sprintf(tmp, "Verifying %s#%d's big files",
    285285            media_descriptor_string(bkpinfo->backup_media_type),
    286286            g_current_media_number);
    287287    open_evalcall_form(tmp);
    288     iamhere("after vsbf");
     288    log_it("%s","after vsbf");
    289289    sprintf(mountpoint, "%s/archives", mtpt);
    290290    if (last_bigfile_num == -1) {
     
    780780    res = read_header_block_from_stream(&size, fname, &ctrl_chr);
    781781    if (ctrl_chr != BLK_START_AFIOBALLS) {
    782         iamhere("YOU SHOULD NOT GET HERE");
    783         iamhere("Grabbing the EXAT files");
     782        log_it("%s","YOU SHOULD NOT GET HERE");
     783        log_it("%s","Grabbing the EXAT files");
    784784        if (ctrl_chr == BLK_START_EXTENDED_ATTRIBUTES) {
    785785            res =
     
    805805        }
    806806        if (ctrl_chr == BLK_START_EXTENDED_ATTRIBUTES) {
    807             iamhere("Reading EXAT files from tape");
     807            log_it("%s","Reading EXAT files from tape");
    808808            res =
    809809                read_EXAT_files_from_tape(&size, fname, &ctrl_chr,
     
    895895    if (ctrl_chr != BLK_START_BIGGIEFILES) {
    896896        if (ctrl_chr == BLK_START_EXTENDED_ATTRIBUTES) {
    897             iamhere("Grabbing the EXAT biggiefiles");
     897            log_it("%s","Grabbing the EXAT biggiefiles");
    898898            res =
    899899                read_EXAT_files_from_tape(&size, orig_fname,
     
    10191019    paranoid_free(tmp);
    10201020    verify_afioballs_on_CD(mountpoint);
    1021     iamhere("before verify_all_slices");
     1021    log_it("%s","before verify_all_slices");
    10221022    verify_all_slices_on_CD(mountpoint);
    10231023
     
    11411141    }
    11421142    verify_afioballs_on_CD(mountpoint);
    1143     iamhere("before verify_all_slices");
     1143    log_it("%s","before verify_all_slices");
    11441144    verify_all_slices_on_CD(mountpoint);
    11451145
  • branches/2.2.9/mondo/src/common/newt-specific.c

    r2211 r2227  
    14001400        assert_string_is_neither_NULL_nor_zerolength(source_file);
    14011401
    1402         iamhere("entering");
     1402        log_it("%s","entering");
    14031403        if (!(fin = fopen(source_file, "r"))) {
    14041404            log_OS_error(source_file);
     
    14831483        }
    14841484        paranoid_free(tmp);
    1485         iamhere("leaving");
     1485        log_it("%s","leaving");
    14861486        return (0);
    14871487    }
     
    14991499        char *tmp = NULL;
    15001500
    1501         iamhere("entering");
     1501        log_it("%s","entering");
    15021502        assert(flentry != NULL);
    15031503        if (flentry->severity == 0) {
     
    15151515        paranoid_free(tmp);
    15161516
    1517         iamhere("leaving");
     1517        log_it("%s","leaving");
    15181518        return (comment);
    15191519    }
  • branches/2.2.9/mondo/src/include/my-stuff.h

    r2188 r2227  
    277277 */
    278278#define paranoid_MR_finish(x) {free_MR_global_filenames (); finish(x); }
    279 
    280 /**
    281  * Log file, function, line, and @p x.
    282  */
    283 #define iamhere(x) {log_it("%s, %s, %ld: %s", __FILE__, __FUNCTION__, __LINE__, x);}
    284279
    285280/**
  • branches/2.2.9/mondo/src/mondorestore/mondo-prep.c

    r2222 r2227  
    240240
    241241//  do_this_last[0] = '\0';
    242     iamhere("STARTING");
     242    log_it("%s","STARTING");
    243243    log_msg(1, "OK, opened i-want-my-lvm. Shutting down LVM volumes...");
    244244    if (find_home_of_exe("lvm"))    // found it :) cool
     
    417417    system("sync");
    418418    sleep(1);
    419     iamhere("ENDING");
     419    log_it("%s","ENDING");
    420420    if (retval > 2) {
    421421        log_msg(1, "%d errors. I'm reporting this.", retval);
     
    16131613            system("sync");
    16141614#else
    1615             iamhere("New, kernel-friendly partition remover");
     1615            log_it("%s","New, kernel-friendly partition remover");
    16161616            for (i = 20; i > 0; i--) {
    16171617                fprintf(pout_to_fdisk, "d\n%d\n", i);
     
    25912591        log_it("--- Hugo, 2002/11/20");
    25922592    }
    2593     iamhere("Resizing mountlist");
     2593    log_it("%s","Resizing mountlist");
    25942594    make_list_of_drives_in_mountlist(mountlist, drivelist);
    2595     iamhere("Back from MLoDiM");
     2595    log_it("%s","Back from MLoDiM");
    25962596    for (driveno = 0; driveno < drivelist->entries; driveno++) {
    25972597        resize_drive_proportionately_to_suit_new_drives(mountlist,
  • branches/2.2.9/mondo/src/mondorestore/mondo-rstr-compare.c

    r2211 r2227  
    576576
    577577    /* edit_mountlist if wanted */
    578     iamhere("About to edit mountlist");
     578    log_it("%s","About to edit mountlist");
    579579    if (g_text_mode) {
    580580        save_mountlist_to_disk(mountlist, g_mountlist_fname);
     
    585585        res = edit_mountlist(g_mountlist_fname, mountlist, raidlist);
    586586    }
    587     iamhere("Finished editing mountlist");
     587    log_it("%s","Finished editing mountlist");
    588588    if (res) {
    589589        paranoid_MR_finish(1);
     
    594594    g_current_media_number = 1;
    595595    mvaddstr_and_log_it(1, 30, "Comparing Automatically");
    596     iamhere("Pre-MAD");
     596    log_it("%s","Pre-MAD");
    597597    retval = mount_all_devices(mountlist, FALSE);
    598     iamhere("Post-MAD");
     598    log_it("%s","Post-MAD");
    599599    if (retval) {
    600600        unmount_all_devices(mountlist);
  • branches/2.2.9/mondo/src/mondorestore/mondo-rstr-newt.c

    r2211 r2227  
    20672067    int res = 0;
    20682068
    2069     iamhere("entering eml");
     2069    log_it("%s","entering eml");
    20702070
    20712071    if (g_text_mode) {
     
    20762076        res = edit_mountlist_in_newt(mountlist_fname, mountlist, raidlist);
    20772077    }
    2078     iamhere("leaving eml");
     2078    log_it("%s","leaving eml");
    20792079    return (res);
    20802080}
     
    27322732    assert(disklist != NULL);
    27332733
    2734     iamhere("malloc'ing");
     2734    log_it("%s","malloc'ing");
    27352735    malloc_string(tmp);
    27362736    malloc_string(help_text);
     
    27602760           sizeof(struct list_of_disks));
    27612761
    2762     iamhere("Post-malloc");
     2762    log_it("%s","Post-malloc");
    27632763    strcpy(help_text,
    27642764           "   Edit this RAID device's list of partitions. Choose OK or Cancel when done.");
  • branches/2.2.9/mondo/src/mondorestore/mondo-rstr-tools.c

    r2211 r2227  
    15661566                            0,
    15671567                            "Running GRUB...                                                 ");
    1568         iamhere(command);
     1568        log_it("%s",command);
    15691569        res = run_program_and_log_output(command, 1);
    15701570        if (res) {
     
    23112311                MONDO_CFG_FILE_STUB);
    23122312        sprintf(command, "cp -f %s %s", tmp, cfg_file);
    2313         iamhere(command);
     2313        log_it("%s",command);
    23142314        if (strcmp(tmp, cfg_file)
    23152315            && run_program_and_log_output(command, 1)) {
     
    23232323            call_program_and_get_last_line_of_output("pwd"),
    23242324            MOUNTLIST_FNAME_STUB, mountlist_file);
    2325         iamhere(command);
     2325        log_it("%s",command);
    23262326        if (extract_mountlist_stub) {
    23272327            if (strcmp(tmp, cfg_file)
     
    23442344    run_program_and_log_output("umount " MNT_CDROM, FALSE);
    23452345    if (!does_file_exist(cfg_file)) {
    2346         iamhere(cfg_file);
     2346        log_it("%s",cfg_file);
    23472347        log_msg(1, "%s not found", cfg_file);
    23482348        log_to_screen
     
    24192419
    24202420    assert(wait_for_percentage <= 100);
    2421     iamhere("wait_until_software_raids_are_prepped");
     2421    log_it("%s","wait_until_software_raids_are_prepped");
    24222422    while (unfinished_mdstat_devices > 0) {
    24232423            // FIXME: Prefix '/dev/' should really be dynamic!
  • branches/2.2.9/mondo/src/mondorestore/mondorestore.c

    r2211 r2227  
    262262    int retval = 0;
    263263
    264     iamhere("inside catchall");
     264    log_it("%s","inside catchall");
    265265    assert(bkpinfo != NULL);
    266266    assert(mountlist != NULL);
    267267    assert(raidlist != NULL);
    268268    malloc_string(tmp);
    269     iamhere("pre wrm");
     269    log_it("%s","pre wrm");
    270270    c = which_restore_mode();
    271     iamhere("post wrm");
     271    log_it("%s","post wrm");
    272272    if (c == 'I' || c == 'C') {
    273273        interactively_obtain_media_parameters_from_user(FALSE);
     
    286286    }
    287287
    288     iamhere("post int");
     288    log_it("%s","post int");
    289289
    290290    if (bkpinfo->backup_media_type == iso) {
     
    465465    }
    466466
    467     iamhere("About to load config file");
     467    log_it("%s","About to load config file");
    468468    get_cfg_file_from_archive_or_bust();
    469469    read_cfg_file_into_bkpinfo(g_mondo_cfg_file);
    470     iamhere("Done loading config file; resizing ML");
     470    log_it("%s","Done loading config file; resizing ML");
    471471    if (bkpinfo->backup_media_type == nfs) {
    472472        strcpy(tmp, bkpinfo->prefix);
     
    493493    }
    494494    for (done = FALSE; !done;) {
    495         iamhere("About to edit mountlist");
     495        log_it("%s","About to edit mountlist");
    496496        if (g_text_mode) {
    497497            save_mountlist_to_disk(mountlist, g_mountlist_fname);
     
    502502            res = edit_mountlist(g_mountlist_fname, mountlist, raidlist);
    503503        }
    504         iamhere("Finished editing mountlist");
     504        log_it("%s","Finished editing mountlist");
    505505        if (res) {
    506506            paranoid_MR_finish(1);
     
    681681    }
    682682
    683     iamhere("About to leave interactive_mode()");
     683    log_it("%s","About to leave interactive_mode()");
    684684    if (retval) {
    685685        mvaddstr_and_log_it(g_currentY++,
     
    691691    paranoid_free(fstab_fname);
    692692    paranoid_free(old_restpath);
    693     iamhere("Leaving interactive_mode()");
     693    log_it("%s","Leaving interactive_mode()");
    694694    return (retval);
    695695}
     
    885885        return (retval);
    886886    }
    887     iamhere("Restoring everything");
     887    log_it("%s","Restoring everything");
    888888    retval += restore_everything(NULL);
    889889    clean_multipathconf();
     
    10061006                                 "Restore files to where? )",
    10071007                                 bkpinfo->restore_path, MAX_STR_LEN / 4)) {
    1008             iamhere("Restoring everything");
     1008            log_it("%s","Restoring everything");
    10091009            retval += restore_everything(filelist);
    10101010            free_filelist(filelist);
     
    20352035
    20362036        if (g_getfattr) {
    2037             iamhere("Restoring xattr stuff");
     2037            log_it("%s","Restoring xattr stuff");
    20382038            res = set_fattr_list(filelist_subset_fname, xattr_fname);
    20392039            if (res) {
     
    20462046
    20472047        if (g_getfacl) {
    2048             iamhere("Restoring acl stuff");
     2048            log_it("%s","Restoring acl stuff");
    20492049            res = set_acl_list(filelist_subset_fname, acl_fname);
    20502050            if (res) {
     
    21822182            res =
    21832183                restore_a_biggiefile_from_CD(bigfileno, filelist, pathname_of_last_biggie_restored);
    2184             iamhere(pathname_of_last_biggie_restored);
     2184            log_it("%s",pathname_of_last_biggie_restored);
    21852185            if (fbw && pathname_of_last_biggie_restored[0]) {
    21862186                fprintf(fbw, "%s\n", pathname_of_last_biggie_restored);
     
    25052505        fclose(fbw);
    25062506        if (length_of_file(biggies_whose_EXATs_we_should_set) > 2) {
    2507             iamhere("Setting biggie-EXATs");
     2507            log_it("%s","Setting biggie-EXATs");
    25082508            if (g_getfattr) {
    25092509                if (length_of_file(xattr_fname) > 0) {
     
    25222522            }
    25232523        } else {
    2524             iamhere
     2524            log_it("%s",
    25252525                ("No biggiefiles selected. So, no biggie-EXATs to set.");
    25262526        }
     
    26312631        }
    26322632        if (ctrl_chr == BLK_START_EXTENDED_ATTRIBUTES) {
    2633             iamhere("Reading EXAT files from tape");
     2633            log_it("%s","Reading EXAT files from tape");
    26342634            res =
    26352635                read_EXAT_files_from_tape(&tmp_size, tmp_fname,
     
    29452945    }
    29462946
    2947     iamhere("what time is it");
     2947    log_it("%s","what time is it");
    29482948
    29492949    /* Process command-line parameters */
     
    31283128        log_msg(2, "FYI, MOUNTLIST_FNAME = %s ", g_mountlist_fname);
    31293129
    3130         iamhere("About to call load_mountlist and load_raidtab");
     3130        log_it("%s","About to call load_mountlist and load_raidtab");
    31313131        strcpy(bkpinfo->restore_path, MNT_RESTORING);
    31323132        read_cfg_file_into_bkpinfo(g_mondo_cfg_file);
    31333133        retval = load_mountlist(mountlist, g_mountlist_fname);
    31343134        retval += load_raidtab_into_raidlist(raidlist, RAIDTAB_FNAME);
    3135         iamhere
    3136             ("Returned from calling load_mountlist and load_raidtab successfully");
     3135        log_it("%s","Returned from calling load_mountlist and load_raidtab successfully");
    31373136
    31383137        // BCO:To be reviewed
     
    31583157
    31593158        if (bkpinfo->restore_mode == nuke) {
    3160             iamhere("nuking");
     3159            log_it("%s","nuking");
    31613160            retval += nuke_mode(mountlist, raidlist);
    31623161        } else if (bkpinfo->restore_mode == interactive) {
    3163             iamhere("catchall");
     3162            log_it("%s","catchall");
    31643163            retval += catchall_mode(mountlist, raidlist);
    31653164        } else if (bkpinfo->restore_mode == compare) {
    3166             iamhere("compare");
     3165            log_it("%s","compare");
    31673166            retval += compare_mode(mountlist, raidlist);
    31683167        } else if (bkpinfo->restore_mode == isoonly) {
    3169             iamhere("iso");
     3168            log_it("%s","iso");
    31703169            retval = iso_mode(mountlist, raidlist, FALSE);
    31713170        } else if (bkpinfo->restore_mode == mbr) {
    3172             iamhere("mbr");
     3171            log_it("%s","mbr");
    31733172            retval = mount_all_devices(mountlist, TRUE);
    31743173            if (!retval) {
     
    31803179            }
    31813180        } else if (bkpinfo->restore_mode == isonuke) {
    3182             iamhere("isonuke");
     3181            log_it("%s","isonuke");
    31833182            retval = iso_mode(mountlist, raidlist, TRUE);
    31843183        } else {
    3185             iamhere("catchall (no mode specified in command-line call");
     3184            log_it("%s","catchall (no mode specified in command-line call");
    31863185            retval += catchall_mode(mountlist, raidlist);
    31873186        }
Note: See TracChangeset for help on using the changeset viewer.