--- IOGrunt.cpp Sun Dec 21 21:17:28 2003 +++ IOGrunt.cpp.mod Sun Dec 21 21:13:52 2003 @@ -47,7 +47,9 @@ /* ## Remarks ...: ## */ /* ## ------------------------------------------------------------------- ## */ /* ## ## */ -/* ## Changes ...: 2003-08-02 (daniel.scheibli@edelbyte.org) ## */ +/* ## Changes ...: 2003-12-21 (daniel.scheibli@edelbyte.org) ## */ +/* ## - Changed NO_DYNAMO_VI to IOMTR_SETTING_VI_SUPPORT ## */ +/* ## 2003-08-02 (daniel.scheibli@edelbyte.org) ## */ /* ## - Integrated the modification contributed by ## */ /* ## Vedran Degoricija, to get the code compile with ## */ /* ## the MS DDK on IA64. ## */ @@ -77,9 +79,7 @@ #include "IOTargetDisk.h" #include "IOTargetTCP.h" -#ifdef NO_DYNAMO_VI - //nop -#else +#if defined(IOMTR_SETTING_VI_SUPPORT) #include "IOTargetVI.h" #endif @@ -91,6 +91,7 @@ #endif + // // Initializing Grunt variables before their first use. // @@ -200,12 +201,10 @@ targets[i] = new TargetDisk; else if ( IsType( target_specs[i].type, GenericTCPType ) ) targets[i] = new TargetTCP; -#if defined(NO_DYNAMO_VI) - // nop -#else +#if defined(IOMTR_SETTING_VI_SUPPORT) else if ( IsType( target_specs[i].type, GenericVIType ) ) targets[i] = new TargetVI; -#endif // NO_DYNAMO_VI +#endif // IOMTR_SETTING_VI_SUPPORT if ( !targets[i] ) return FALSE; @@ -374,9 +373,7 @@ // Create appropriate completion queue object based on targets. // If the Grunt will manage VI targets, the targets will provide a // pointer to the completion queue to use. -#if defined(NO_DYNAMO_VI) - // nop -#else +#if defined(IOMTR_SETTING_VI_SUPPORT) if ( IsType( type, GenericVIType ) ) { // VI targets must know where the data buffer is and its size before @@ -386,7 +383,7 @@ io_cq = &((TargetVI*)targets[0])->vi.vi_cq; } else -#endif // NO_DYNAMO_VI +#endif // IOMTR_SETTING_VI_SUPPORT { // Create completion queue and verify its creation. if ( !(io_cq = new CQAIO) ) --- IOManager.cpp Sun Dec 21 21:17:34 2003 +++ IOManager.cpp.mod Sun Dec 21 21:13:57 2003 @@ -49,7 +49,9 @@ /* ## ## */ /* ## ------------------------------------------------------------------- ## */ /* ## ## */ -/* ## Changes ...: 2003-08-05 (daniel.scheibli@edelbyte.org) ## */ +/* ## Changes ...: 2003-12-21 (daniel.scheibli@edelbyte.org) ## */ +/* ## - Changed NO_DYNAMO_VI to IOMTR_SETTING_VI_SUPPORT ## */ +/* ## 2003-08-05 (daniel.scheibli@edelbyte.org) ## */ /* ## - Massive cleanup of this file (grouping the ## */ /* ## different blocks together). ## */ /* ## 2003-07-27 (daniel.scheibli@edelbyte.org) ## */ @@ -480,9 +482,7 @@ // int Manager::Report_VIs( Target_Spec *vi_spec ) { -#ifdef NO_DYNAMO_VI - return(0); -#else +#if defined(IOMTR_SETTING_VI_SUPPORT) int count = 0, nic_base; VIPL vipl; VINic nic; @@ -610,7 +610,9 @@ // All done. cout << " done." << endl; return count; -#endif // NO_DYNAMO_VI +#else + return(0); +#endif // IOMTR_SETTING_VI_SUPPORT } --- IOManager.h Sun Dec 21 21:17:38 2003 +++ IOManager.h.mod Sun Dec 21 21:14:02 2003 @@ -48,7 +48,10 @@ /* ## ## */ /* ## ------------------------------------------------------------------- ## */ /* ## ## */ -/* ## Changes ...: 2003-07-14 (daniel.scheibli@edelbyte.org) ## */ +/* ## Changes ...: 2003-12-21 (daniel.scheibli@edelbyte.org) ## */ +/* ## - Changed DYNAMO_DESTRUCTIVE to ## */ +/* ## IOMTR_SETTING_OVERRIDE_FS ## */ +/* ## 2003-07-14 (daniel.scheibli@edelbyte.org) ## */ /* ## - Moved to the use of the IOMTR_[OSFAMILY|OS|CPU]_* ## */ /* ## global defines. ## */ /* ## - Integrated the License Statement into this header. ## */ @@ -152,9 +155,9 @@ int Report_Disks( Target_Spec *disk_spec ); #if defined(IOMTR_OSFAMILY_UNIX) // These UNIX-specific methods are defined in IOManagerUNIX.cpp. -#ifdef DYNAMO_DESTRUCTIVE +#if defined(IOMTR_SETTING_OVERRIDE_FS) BOOL Reported_As_Logical(Target_Spec *spec, char *rdisk, int count); -#endif // DYNAMO_DESTRUCTIVE +#endif // IOMTR_SETTING_OVERRIDE_FS BOOL Part_Reported_As_Logical(Target_Spec *spec, char *rdisk, int count); BOOL Sort_Raw_Disk_Names(Target_Spec *disk_spec, int start, int end); --- IOManagerSolaris.cpp Sun Dec 21 21:17:42 2003 +++ IOManagerSolaris.cpp.mod Sun Dec 21 21:14:11 2003 @@ -48,7 +48,10 @@ /* ## ## */ /* ## ------------------------------------------------------------------- ## */ /* ## ## */ -/* ## Changes ...: 2003-10-05 (daniel.scheibli@edelbyte.org) ## */ +/* ## Changes ...: 2003-12-21 (daniel.scheibli@edelbyte.org) ## */ +/* ## - Changed DYNAMO_DESTRUCTIVE to ## */ +/* ## IOMTR_SETTING_OVERRIDE_FS ## */ +/* ## 2003-10-05 (daniel.scheibli@edelbyte.org) ## */ /* ## - Integrated the error correction provided by ## */ /* ## Rob Creecy to prevent the segmentation fault ## */ /* ## when having multiple swap devices configured. ## */ @@ -322,7 +325,7 @@ << endl << " ---> To enable access to the partition/slice mount it or destroy" << endl - << " it or over-ride protection by setting the DYNAMO_DESTRUCTIVE" + << " it or over-ride protection by setting the IOMTR_SETTING_OVERRIDE_FS" << endl << " environment var." << endl << endl; @@ -433,8 +436,8 @@ // Not mounted! Next check if there is a file system on it. if (Has_File_System(file_name, fstype) == TRUE) { -#ifdef DYNAMO_DESTRUCTIVE - if (getenv("DYNAMO_DESTRUCTIVE") != NULL) +#if defined(IOMTR_SETTING_OVERRIDE_FS) + if (getenv("IOMTR_SETTING_OVERRIDE_FS") != NULL) { cout << "WARNING: allowing raw access to unmounted fs: " << file_name << endl; @@ -446,7 +449,7 @@ << ". File system found on disk" << endl; this->is_destructive = TRUE; continue; // jump to start of for-loop -#ifdef DYNAMO_DESTRUCTIVE +#if defined(IOMTR_SETTING_OVERRIDE_FS) } #endif } @@ -729,8 +732,8 @@ // Not mounted! Next check if there is a file system on it. if (Has_File_System(file_name, fstype) == TRUE) { -#ifdef DYNAMO_DESTRUCTIVE - if (getenv("DYNAMO_DESTRUCTIVE") != NULL) +#if defined(IOMTR_SETTING_OVERRIDE_FS) + if (getenv("IOMTR_SETTING_OVERRIDE_FS") != NULL) { cout << "WARNING: allowing raw access to unmounted fs: " << file_name << endl; } @@ -740,7 +743,7 @@ cout << "NOTICE: ignoring " << file_name << ". file system found on disk" << endl; this->is_destructive = TRUE; continue; -#ifdef DYNAMO_DESTRUCTIVE +#if defined(IOMTR_SETTING_OVERRIDE_FS) } #endif } @@ -840,8 +843,8 @@ // Not mounted! Next check if there is a file system on it. if (Has_File_System(file_name, fstype) == TRUE) { -#ifdef DYNAMO_DESTRUCTIVE - if (getenv("DYNAMO_DESTRUCTIVE") != NULL) +#if defined(IOMTR_SETTING_OVERRIDE_FS) + if (getenv("IOMTR_SETTING_OVERRIDE_FS") != NULL) { cout << "WARNING: allowing raw access to unmounted fs: " << file_name << endl; } @@ -851,7 +854,7 @@ cout << "NOTICE: ignoring " << file_name << ". file system found on disk" << endl; this->is_destructive = TRUE; continue; -#ifdef DYNAMO_DESTRUCTIVE +#if defined(IOMTR_SETTING_OVERRIDE_FS) } #endif } @@ -929,7 +932,7 @@ return(FALSE); } -#ifdef DYNAMO_DESTRUCTIVE +#if defined(IOMTR_SETTING_OVERRIDE_FS) BOOL Manager::Reported_As_Logical(Target_Spec *spec, char *rdisk, int count) { int i, retval; @@ -1056,7 +1059,7 @@ fclose(fp); return FALSE; } -#endif // DYNAMO_DESTRUCTIVE +#endif // IOMTR_SETTING_OVERRIDE_FS BOOL Manager::Sort_Raw_Disk_Names(Target_Spec *disk_spec, int start, int end) { --- Makefile-Linux.i386 Sun Dec 21 21:17:46 2003 +++ Makefile-Linux.i386.mod Sun Dec 21 21:14:15 2003 @@ -45,7 +45,10 @@ ## ## ## ------------------------------------------------------------------------- ## ## ## -## Changes ...: 2003-07-27 (daniel.scheibli@edelbyte.org) ## +## Changes ...: 2003-12-21 (daniel.scheibli@edelbyte.org) ## +## - Changed DYNAMO_DESTRUCTIVE to IOMTR_SETTING_OVERRIDE_FS ## +## - Changed NO_DYNAMO_VI to IOMTR_SETTING_VI_SUPPORT ## +## 2003-07-27 (daniel.scheibli@edelbyte.org) ## ## - Removed the [BIG|LITTLE]_ENDIAN_ARCH defines, because ## ## they have been replaced by IsBigEndian() function calls. ## ## 2003-07-13 (daniel.scheibli@edelbyte.org) ## @@ -90,7 +93,7 @@ # Some common definitions used. # Note 1) -DWORKAROUND_MOD_BUG can be dropped if -O is used in place of -g in CFLAGS -# Note 2) -DDYNAMO_DESTRUCTIVE controls inclusion of destructive dynamo code. +# Note 2) -DIOMTR_SETTING_OVERRIDE_FS controls inclusion of destructive dynamo code. # Note 3) -D_DETAILS=1 -D_DEBUG=1 enables maximum debug information CFLAGS= -O3 \ -Wall \ @@ -98,8 +101,6 @@ -DIOMTR_OSFAMILY_UNIX -DIOMTR_OS_LINUX \ -DIOMTR_CPU_I386 \ -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 \ - -DDYNAMO_DESTRUCTIVE \ - -DNO_DYNAMO_VI \ -D_REENTRANT # -ggdb --- Makefile-Solaris.Sparc Sun Dec 21 21:17:50 2003 +++ Makefile-Solaris.Sparc.mod Sun Dec 21 21:14:20 2003 @@ -45,7 +45,10 @@ ## ## ## ------------------------------------------------------------------------- ## ## ## -## Changes ...: 2003-07-27 (daniel.scheibli@edelbyte.org) ## +## Changes ...: 2003-12-21 (daniel.scheibli@edelbyte.org) ## +## - Changed DYNAMO_DESTRUCTIVE to IOMTR_SETTING_OVERRIDE_FS ## +## - Changed NO_DYNAMO_VI to IOMTR_SETTING_VI_SUPPORT ## +## 2003-07-27 (daniel.scheibli@edelbyte.org) ## ## - Removed the [BIG|LITTLE]_ENDIAN_ARCH defines, because ## ## they have been replaced by IsBigEndian() function calls. ## ## 2003-07-18 (daniel.scheibli@edelbyte.org) ## @@ -81,7 +84,7 @@ # Some common definitions used. # Note 1) -DWORKAROUND_MOD_BUG can be dropped if -O is used in place of -g in CFLAGS -# Note 2) -DDYNAMO_DESTRUCTIVE controls inclusion of destructive dynamo code. +# Note 2) -DIOMTR_SETTING_OVERRIDE_FS controls inclusion of destructive dynamo code. # Note 3) -D_DETAILS=1 -D_DEBUG=1 enables maximum debug information # # Always enable CCFLAGS=-compat=4 on Sparc till the transition from compile @@ -92,8 +95,6 @@ -DIOMTR_OSFAMILY_UNIX -DIOMTR_OS_SOLARIS \ -DIOMTR_CPU_SPARC \ -D_LARGEFILE64_SOURCE \ - -DDYNAMO_DESTRUCTIVE \ - -DNO_DYNAMO_VI \ -D_REENTRANT #-I/opt/SUNWspro/include/CC \ # CFLAGS=-compat=4 --- Makefile-Solaris.i386 Sun Dec 21 21:17:54 2003 +++ Makefile-Solaris.i386.mod Sun Dec 21 21:14:24 2003 @@ -45,7 +45,10 @@ ## ## ## ------------------------------------------------------------------------- ## ## ## -## Changes ...: 2003-07-27 (daniel.scheibli@edelbyte.org) ## +## Changes ...: 2003-12-21 (daniel.scheibli@edelbyte.org) ## +## - Changed DYNAMO_DESTRUCTIVE to IOMTR_SETTING_OVERRIDE_FS ## +## - Changed NO_DYNAMO_VI to IOMTR_SETTING_VI_SUPPORT ## +## 2003-07-27 (daniel.scheibli@edelbyte.org) ## ## - Removed the [BIG|LITTLE]_ENDIAN_ARCH defines, because ## ## they have been replaced by IsBigEndian() function calls. ## ## ## @@ -70,7 +73,7 @@ # Some common definitions used. # Note 1) -DWORKAROUND_MOD_BUG can be dropped if -O is used in place of -g in CFLAGS -# Note 2) -DDYNAMO_DESTRUCTIVE controls inclusion of destructive dynamo code. +# Note 2) -DIOMTR_SETTING_OVERRIDE_FS controls inclusion of destructive dynamo code. # Note 3) -D_DETAILS=1 -D_DEBUG=1 enables maximum debug information # # Always enable CCFLAGS=-compat=4 on Sparc till the transition from compile @@ -81,8 +84,6 @@ -DIOMTR_OSFAMILY_UNIX -DIOMTR_OS_SOLARIS \ -DIOMTR_CPU_I386 \ -D_LARGEFILE64_SOURCE \ - -DDYNAMO_DESTRUCTIVE \ - -DNO_DYNAMO_VI \ -D_REENTRANT #-I/opt/SUNWspro/include/CC \ # CFLAGS=-compat=4 --- Pulsar.cpp Sun Dec 21 21:17:57 2003 +++ Pulsar.cpp.mod Sun Dec 21 21:14:32 2003 @@ -51,6 +51,8 @@ /* ## ------------------------------------------------------------------- ## */ /* ## ## */ /* ## Changes ...: 2003-12-21 (daniel.scheibli@edelbyte.org) ## */ +/* ## - Changed DYNAMO_DESTRUCTIVE to ## */ +/* ## IOMTR_SETTING_OVERRIDE_FS ## */ /* ## - Consolidated the ParseParam() method. ## */ /* ## - Disabled accepting parameters without switch. ## */ /* ## 2003-08-02 (daniel.scheibli@edelbyte.org) ## */ @@ -232,16 +234,17 @@ cout << " Cannot get TCP statistics from the kernel " << endl; } -#ifdef DYNAMO_DESTRUCTIVE +#ifdef IOMTR_SETTING_OVERRIDE_FS // No command line args specifies destructive testing. Check to see if there // are any environment variables specifying the same. We need to warn the user. - if (getenv("DYNAMO_DESTRUCTIVE") != NULL) + if (getenv("IOMTR_SETTING_OVERRIDE_FS") != NULL) { cout << " ************ WARNING **************" << endl; cout << " dynamo running in Destructive mode." << endl; + cout << " (overriding the not mounted fs)" << endl; cout << " ************ WARNING **************" << endl; } -#endif // DYNAMO_DESTRUCTIVE +#endif // IOMTR_SETTING_OVERRIDE_FS #endif // IOMTR_OSFAMILY_UNIX // Ensure, that the endian type of the CPU is detectable