fixed a showq -r segv when user only request for node property

git-svn-id: svn://opensvn.adaptivecomputing.com/maui/trunk@155 3f5042e3-fb1d-0410-be18-d6ca2573e517
applied client socket patch from Jonathan Barber
2013-09-11 08:57:08 +00:00 · 2012-10-11 13:33:54 +00:00 · 2012-10-04 08:36:35 +00:00 · 2011-04-12 09:14:51 +00:00 · 2011-03-04 16:24:58 +00:00 · 2011-03-04 16:00:09 +00:00
51 changed files with 1207 additions and 239 deletions
@@ -0,0 +1,595 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?fileVersion 4.0.0?>
+
+<cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
+	<storageModule moduleId="org.eclipse.cdt.core.settings">
+		<cconfiguration id="cdt.managedbuild.config.gnu.exe.debug.299556713">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.exe.debug.299556713" moduleId="org.eclipse.cdt.core.settings" name="Debug">
+				<externalSettings/>
+				<extensions>
+					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+				</extensions>
+			</storageModule>
+			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+				<configuration artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.exe.debug.299556713" name="Debug" parent="cdt.managedbuild.config.gnu.exe.debug">
+					<folderInfo id="cdt.managedbuild.config.gnu.exe.debug.299556713." name="/" resourcePath="">
+						<toolChain id="cdt.managedbuild.toolchain.gnu.exe.debug.401029269" name="Linux GCC" superClass="cdt.managedbuild.toolchain.gnu.exe.debug">
+							<targetPlatform id="cdt.managedbuild.target.gnu.platform.exe.debug.594361211" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.exe.debug"/>
+							<builder buildPath="${workspace_loc:/maui/Debug}" id="cdt.managedbuild.target.gnu.builder.exe.debug.382827758" managedBuildOn="true" name="Gnu Make Builder.Debug" superClass="cdt.managedbuild.target.gnu.builder.exe.debug"/>
+							<tool id="cdt.managedbuild.tool.gnu.archiver.base.564221972" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>
+							<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.458789041" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug">
+								<option id="gnu.cpp.compiler.exe.debug.option.optimization.level.1578234847" superClass="gnu.cpp.compiler.exe.debug.option.optimization.level" value="gnu.cpp.compiler.optimization.level.none" valueType="enumerated"/>
+								<option id="gnu.cpp.compiler.exe.debug.option.debugging.level.118082022" superClass="gnu.cpp.compiler.exe.debug.option.debugging.level" value="gnu.cpp.compiler.debugging.level.max" valueType="enumerated"/>
+							</tool>
+							<tool id="cdt.managedbuild.tool.gnu.c.compiler.exe.debug.1944655974" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.exe.debug">
+								<option defaultValue="gnu.c.optimization.level.none" id="gnu.c.compiler.exe.debug.option.optimization.level.35492209" superClass="gnu.c.compiler.exe.debug.option.optimization.level" valueType="enumerated"/>
+								<option id="gnu.c.compiler.exe.debug.option.debugging.level.892007709" superClass="gnu.c.compiler.exe.debug.option.debugging.level" value="gnu.c.debugging.level.max" valueType="enumerated"/>
+								<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1111724644" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
+							</tool>
+							<tool id="cdt.managedbuild.tool.gnu.c.linker.exe.debug.1772104617" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.exe.debug">
+								<inputType id="cdt.managedbuild.tool.gnu.c.linker.input.1866769425" superClass="cdt.managedbuild.tool.gnu.c.linker.input">
+									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
+									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
+								</inputType>
+							</tool>
+							<tool id="cdt.managedbuild.tool.gnu.cpp.linker.exe.debug.1962554265" name="GCC C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.exe.debug"/>
+							<tool id="cdt.managedbuild.tool.gnu.assembler.exe.debug.1435208245" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.exe.debug">
+								<inputType id="cdt.managedbuild.tool.gnu.assembler.input.605460294" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
+							</tool>
+						</toolChain>
+					</folderInfo>
+				</configuration>
+			</storageModule>
+			<storageModule moduleId="scannerConfiguration">
+				<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+				<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
+					<buildOutputProvider>
+						<openAction enabled="true" filePath=""/>
+						<parser enabled="true"/>
+					</buildOutputProvider>
+					<scannerInfoProvider id="specsFile">
+						<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+						<parser enabled="true"/>
+					</scannerInfoProvider>
+				</profile>
+				<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
+					<buildOutputProvider>
+						<openAction enabled="true" filePath=""/>
+						<parser enabled="true"/>
+					</buildOutputProvider>
+					<scannerInfoProvider id="makefileGenerator">
+						<runAction arguments="-E -P -v -dD" command="" useDefault="true"/>
+						<parser enabled="true"/>
+					</scannerInfoProvider>
+				</profile>
+				<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
+					<buildOutputProvider>
+						<openAction enabled="true" filePath=""/>
+						<parser enabled="true"/>
+					</buildOutputProvider>
+					<scannerInfoProvider id="specsFile">
+						<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+						<parser enabled="true"/>
+					</scannerInfoProvider>
+				</profile>
+				<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
+					<buildOutputProvider>
+						<openAction enabled="true" filePath=""/>
+						<parser enabled="true"/>
+					</buildOutputProvider>
+					<scannerInfoProvider id="specsFile">
+						<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+						<parser enabled="true"/>
+					</scannerInfoProvider>
+				</profile>
+				<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
+					<buildOutputProvider>
+						<openAction enabled="true" filePath=""/>
+						<parser enabled="true"/>
+					</buildOutputProvider>
+					<scannerInfoProvider id="specsFile">
+						<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+						<parser enabled="true"/>
+					</scannerInfoProvider>
+				</profile>
+				<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
+					<buildOutputProvider>
+						<openAction enabled="true" filePath=""/>
+						<parser enabled="true"/>
+					</buildOutputProvider>
+					<scannerInfoProvider id="specsFile">
+						<runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/${specs_file}&quot;'" command="sh" useDefault="true"/>
+						<parser enabled="true"/>
+					</scannerInfoProvider>
+				</profile>
+				<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
+					<buildOutputProvider>
+						<openAction enabled="true" filePath=""/>
+						<parser enabled="true"/>
+					</buildOutputProvider>
+					<scannerInfoProvider id="specsFile">
+						<runAction arguments="-c 'g++ -E -P -v -dD &quot;${plugin_state_location}/specs.cpp&quot;'" command="sh" useDefault="true"/>
+						<parser enabled="true"/>
+					</scannerInfoProvider>
+				</profile>
+				<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
+					<buildOutputProvider>
+						<openAction enabled="true" filePath=""/>
+						<parser enabled="true"/>
+					</buildOutputProvider>
+					<scannerInfoProvider id="specsFile">
+						<runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/specs.c&quot;'" command="sh" useDefault="true"/>
+						<parser enabled="true"/>
+					</scannerInfoProvider>
+				</profile>
+				<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.release.1054591848;cdt.managedbuild.config.gnu.exe.release.1054591848.;cdt.managedbuild.tool.gnu.c.compiler.exe.release.1897461423;cdt.managedbuild.tool.gnu.c.compiler.input.1306211526">
+					<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
+					<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
+						<buildOutputProvider>
+							<openAction enabled="true" filePath=""/>
+							<parser enabled="true"/>
+						</buildOutputProvider>
+						<scannerInfoProvider id="specsFile">
+							<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+							<parser enabled="true"/>
+						</scannerInfoProvider>
+					</profile>
+					<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
+						<buildOutputProvider>
+							<openAction enabled="true" filePath=""/>
+							<parser enabled="true"/>
+						</buildOutputProvider>
+						<scannerInfoProvider id="makefileGenerator">
+							<runAction arguments="-E -P -v -dD" command="" useDefault="true"/>
+							<parser enabled="true"/>
+						</scannerInfoProvider>
+					</profile>
+					<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
+						<buildOutputProvider>
+							<openAction enabled="true" filePath=""/>
+							<parser enabled="true"/>
+						</buildOutputProvider>
+						<scannerInfoProvider id="specsFile">
+							<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+							<parser enabled="true"/>
+						</scannerInfoProvider>
+					</profile>
+					<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
+						<buildOutputProvider>
+							<openAction enabled="true" filePath=""/>
+							<parser enabled="true"/>
+						</buildOutputProvider>
+						<scannerInfoProvider id="specsFile">
+							<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+							<parser enabled="true"/>
+						</scannerInfoProvider>
+					</profile>
+					<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
+						<buildOutputProvider>
+							<openAction enabled="true" filePath=""/>
+							<parser enabled="true"/>
+						</buildOutputProvider>
+						<scannerInfoProvider id="specsFile">
+							<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+							<parser enabled="true"/>
+						</scannerInfoProvider>
+					</profile>
+					<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
+						<buildOutputProvider>
+							<openAction enabled="true" filePath=""/>
+							<parser enabled="true"/>
+						</buildOutputProvider>
+						<scannerInfoProvider id="specsFile">
+							<runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/${specs_file}&quot;'" command="sh" useDefault="true"/>
+							<parser enabled="true"/>
+						</scannerInfoProvider>
+					</profile>
+					<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
+						<buildOutputProvider>
+							<openAction enabled="true" filePath=""/>
+							<parser enabled="true"/>
+						</buildOutputProvider>
+						<scannerInfoProvider id="specsFile">
+							<runAction arguments="-c 'g++ -E -P -v -dD &quot;${plugin_state_location}/specs.cpp&quot;'" command="sh" useDefault="true"/>
+							<parser enabled="true"/>
+						</scannerInfoProvider>
+					</profile>
+					<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
+						<buildOutputProvider>
+							<openAction enabled="true" filePath=""/>
+							<parser enabled="true"/>
+						</buildOutputProvider>
+						<scannerInfoProvider id="specsFile">
+							<runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/specs.c&quot;'" command="sh" useDefault="true"/>
+							<parser enabled="true"/>
+						</scannerInfoProvider>
+					</profile>
+				</scannerConfigBuildInfo>
+				<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.debug.299556713;cdt.managedbuild.config.gnu.exe.debug.299556713.;cdt.managedbuild.tool.gnu.c.compiler.exe.debug.1944655974;cdt.managedbuild.tool.gnu.c.compiler.input.1111724644">
+					<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
+					<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
+						<buildOutputProvider>
+							<openAction enabled="true" filePath=""/>
+							<parser enabled="true"/>
+						</buildOutputProvider>
+						<scannerInfoProvider id="specsFile">
+							<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+							<parser enabled="true"/>
+						</scannerInfoProvider>
+					</profile>
+					<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
+						<buildOutputProvider>
+							<openAction enabled="true" filePath=""/>
+							<parser enabled="true"/>
+						</buildOutputProvider>
+						<scannerInfoProvider id="makefileGenerator">
+							<runAction arguments="-E -P -v -dD" command="" useDefault="true"/>
+							<parser enabled="true"/>
+						</scannerInfoProvider>
+					</profile>
+					<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
+						<buildOutputProvider>
+							<openAction enabled="true" filePath=""/>
+							<parser enabled="true"/>
+						</buildOutputProvider>
+						<scannerInfoProvider id="specsFile">
+							<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+							<parser enabled="true"/>
+						</scannerInfoProvider>
+					</profile>
+					<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
+						<buildOutputProvider>
+							<openAction enabled="true" filePath=""/>
+							<parser enabled="true"/>
+						</buildOutputProvider>
+						<scannerInfoProvider id="specsFile">
+							<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+							<parser enabled="true"/>
+						</scannerInfoProvider>
+					</profile>
+					<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
+						<buildOutputProvider>
+							<openAction enabled="true" filePath=""/>
+							<parser enabled="true"/>
+						</buildOutputProvider>
+						<scannerInfoProvider id="specsFile">
+							<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+							<parser enabled="true"/>
+						</scannerInfoProvider>
+					</profile>
+					<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
+						<buildOutputProvider>
+							<openAction enabled="true" filePath=""/>
+							<parser enabled="true"/>
+						</buildOutputProvider>
+						<scannerInfoProvider id="specsFile">
+							<runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/${specs_file}&quot;'" command="sh" useDefault="true"/>
+							<parser enabled="true"/>
+						</scannerInfoProvider>
+					</profile>
+					<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
+						<buildOutputProvider>
+							<openAction enabled="true" filePath=""/>
+							<parser enabled="true"/>
+						</buildOutputProvider>
+						<scannerInfoProvider id="specsFile">
+							<runAction arguments="-c 'g++ -E -P -v -dD &quot;${plugin_state_location}/specs.cpp&quot;'" command="sh" useDefault="true"/>
+							<parser enabled="true"/>
+						</scannerInfoProvider>
+					</profile>
+					<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
+						<buildOutputProvider>
+							<openAction enabled="true" filePath=""/>
+							<parser enabled="true"/>
+						</buildOutputProvider>
+						<scannerInfoProvider id="specsFile">
+							<runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/specs.c&quot;'" command="sh" useDefault="true"/>
+							<parser enabled="true"/>
+						</scannerInfoProvider>
+					</profile>
+				</scannerConfigBuildInfo>
+			</storageModule>
+			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+		</cconfiguration>
+		<cconfiguration id="cdt.managedbuild.config.gnu.exe.release.1054591848">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.exe.release.1054591848" moduleId="org.eclipse.cdt.core.settings" name="Release">
+				<externalSettings/>
+				<extensions>
+					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+				</extensions>
+			</storageModule>
+			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+				<configuration artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.exe.release.1054591848" name="Release" parent="cdt.managedbuild.config.gnu.exe.release">
+					<folderInfo id="cdt.managedbuild.config.gnu.exe.release.1054591848." name="/" resourcePath="">
+						<toolChain id="cdt.managedbuild.toolchain.gnu.exe.release.1641667346" name="Linux GCC" superClass="cdt.managedbuild.toolchain.gnu.exe.release">
+							<targetPlatform id="cdt.managedbuild.target.gnu.platform.exe.release.336649030" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.exe.release"/>
+							<builder buildPath="${workspace_loc:/maui/Release}" id="cdt.managedbuild.target.gnu.builder.exe.release.1564745497" managedBuildOn="true" name="Gnu Make Builder.Release" superClass="cdt.managedbuild.target.gnu.builder.exe.release"/>
+							<tool id="cdt.managedbuild.tool.gnu.archiver.base.1438565122" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>
+							<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.exe.release.4256546" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.exe.release">
+								<option id="gnu.cpp.compiler.exe.release.option.optimization.level.400350956" superClass="gnu.cpp.compiler.exe.release.option.optimization.level" value="gnu.cpp.compiler.optimization.level.most" valueType="enumerated"/>
+								<option id="gnu.cpp.compiler.exe.release.option.debugging.level.1306933396" superClass="gnu.cpp.compiler.exe.release.option.debugging.level" value="gnu.cpp.compiler.debugging.level.none" valueType="enumerated"/>
+							</tool>
+							<tool id="cdt.managedbuild.tool.gnu.c.compiler.exe.release.1897461423" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.exe.release">
+								<option defaultValue="gnu.c.optimization.level.most" id="gnu.c.compiler.exe.release.option.optimization.level.1290695235" superClass="gnu.c.compiler.exe.release.option.optimization.level" valueType="enumerated"/>
+								<option id="gnu.c.compiler.exe.release.option.debugging.level.1600799370" superClass="gnu.c.compiler.exe.release.option.debugging.level" value="gnu.c.debugging.level.none" valueType="enumerated"/>
+								<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1306211526" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
+							</tool>
+							<tool id="cdt.managedbuild.tool.gnu.c.linker.exe.release.938481580" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.exe.release">
+								<inputType id="cdt.managedbuild.tool.gnu.c.linker.input.302149400" superClass="cdt.managedbuild.tool.gnu.c.linker.input">
+									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
+									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
+								</inputType>
+							</tool>
+							<tool id="cdt.managedbuild.tool.gnu.cpp.linker.exe.release.25141800" name="GCC C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.exe.release"/>
+							<tool id="cdt.managedbuild.tool.gnu.assembler.exe.release.247380559" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.exe.release">
+								<inputType id="cdt.managedbuild.tool.gnu.assembler.input.2057443732" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
+							</tool>
+						</toolChain>
+					</folderInfo>
+				</configuration>
+			</storageModule>
+			<storageModule moduleId="scannerConfiguration">
+				<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+				<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
+					<buildOutputProvider>
+						<openAction enabled="true" filePath=""/>
+						<parser enabled="true"/>
+					</buildOutputProvider>
+					<scannerInfoProvider id="specsFile">
+						<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+						<parser enabled="true"/>
+					</scannerInfoProvider>
+				</profile>
+				<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
+					<buildOutputProvider>
+						<openAction enabled="true" filePath=""/>
+						<parser enabled="true"/>
+					</buildOutputProvider>
+					<scannerInfoProvider id="makefileGenerator">
+						<runAction arguments="-E -P -v -dD" command="" useDefault="true"/>
+						<parser enabled="true"/>
+					</scannerInfoProvider>
+				</profile>
+				<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
+					<buildOutputProvider>
+						<openAction enabled="true" filePath=""/>
+						<parser enabled="true"/>
+					</buildOutputProvider>
+					<scannerInfoProvider id="specsFile">
+						<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+						<parser enabled="true"/>
+					</scannerInfoProvider>
+				</profile>
+				<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
+					<buildOutputProvider>
+						<openAction enabled="true" filePath=""/>
+						<parser enabled="true"/>
+					</buildOutputProvider>
+					<scannerInfoProvider id="specsFile">
+						<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+						<parser enabled="true"/>
+					</scannerInfoProvider>
+				</profile>
+				<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
+					<buildOutputProvider>
+						<openAction enabled="true" filePath=""/>
+						<parser enabled="true"/>
+					</buildOutputProvider>
+					<scannerInfoProvider id="specsFile">
+						<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+						<parser enabled="true"/>
+					</scannerInfoProvider>
+				</profile>
+				<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
+					<buildOutputProvider>
+						<openAction enabled="true" filePath=""/>
+						<parser enabled="true"/>
+					</buildOutputProvider>
+					<scannerInfoProvider id="specsFile">
+						<runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/${specs_file}&quot;'" command="sh" useDefault="true"/>
+						<parser enabled="true"/>
+					</scannerInfoProvider>
+				</profile>
+				<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
+					<buildOutputProvider>
+						<openAction enabled="true" filePath=""/>
+						<parser enabled="true"/>
+					</buildOutputProvider>
+					<scannerInfoProvider id="specsFile">
+						<runAction arguments="-c 'g++ -E -P -v -dD &quot;${plugin_state_location}/specs.cpp&quot;'" command="sh" useDefault="true"/>
+						<parser enabled="true"/>
+					</scannerInfoProvider>
+				</profile>
+				<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
+					<buildOutputProvider>
+						<openAction enabled="true" filePath=""/>
+						<parser enabled="true"/>
+					</buildOutputProvider>
+					<scannerInfoProvider id="specsFile">
+						<runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/specs.c&quot;'" command="sh" useDefault="true"/>
+						<parser enabled="true"/>
+					</scannerInfoProvider>
+				</profile>
+				<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.release.1054591848;cdt.managedbuild.config.gnu.exe.release.1054591848.;cdt.managedbuild.tool.gnu.c.compiler.exe.release.1897461423;cdt.managedbuild.tool.gnu.c.compiler.input.1306211526">
+					<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
+					<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
+						<buildOutputProvider>
+							<openAction enabled="true" filePath=""/>
+							<parser enabled="true"/>
+						</buildOutputProvider>
+						<scannerInfoProvider id="specsFile">
+							<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+							<parser enabled="true"/>
+						</scannerInfoProvider>
+					</profile>
+					<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
+						<buildOutputProvider>
+							<openAction enabled="true" filePath=""/>
+							<parser enabled="true"/>
+						</buildOutputProvider>
+						<scannerInfoProvider id="makefileGenerator">
+							<runAction arguments="-E -P -v -dD" command="" useDefault="true"/>
+							<parser enabled="true"/>
+						</scannerInfoProvider>
+					</profile>
+					<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
+						<buildOutputProvider>
+							<openAction enabled="true" filePath=""/>
+							<parser enabled="true"/>
+						</buildOutputProvider>
+						<scannerInfoProvider id="specsFile">
+							<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+							<parser enabled="true"/>
+						</scannerInfoProvider>
+					</profile>
+					<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
+						<buildOutputProvider>
+							<openAction enabled="true" filePath=""/>
+							<parser enabled="true"/>
+						</buildOutputProvider>
+						<scannerInfoProvider id="specsFile">
+							<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+							<parser enabled="true"/>
+						</scannerInfoProvider>
+					</profile>
+					<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
+						<buildOutputProvider>
+							<openAction enabled="true" filePath=""/>
+							<parser enabled="true"/>
+						</buildOutputProvider>
+						<scannerInfoProvider id="specsFile">
+							<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+							<parser enabled="true"/>
+						</scannerInfoProvider>
+					</profile>
+					<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
+						<buildOutputProvider>
+							<openAction enabled="true" filePath=""/>
+							<parser enabled="true"/>
+						</buildOutputProvider>
+						<scannerInfoProvider id="specsFile">
+							<runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/${specs_file}&quot;'" command="sh" useDefault="true"/>
+							<parser enabled="true"/>
+						</scannerInfoProvider>
+					</profile>
+					<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
+						<buildOutputProvider>
+							<openAction enabled="true" filePath=""/>
+							<parser enabled="true"/>
+						</buildOutputProvider>
+						<scannerInfoProvider id="specsFile">
+							<runAction arguments="-c 'g++ -E -P -v -dD &quot;${plugin_state_location}/specs.cpp&quot;'" command="sh" useDefault="true"/>
+							<parser enabled="true"/>
+						</scannerInfoProvider>
+					</profile>
+					<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
+						<buildOutputProvider>
+							<openAction enabled="true" filePath=""/>
+							<parser enabled="true"/>
+						</buildOutputProvider>
+						<scannerInfoProvider id="specsFile">
+							<runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/specs.c&quot;'" command="sh" useDefault="true"/>
+							<parser enabled="true"/>
+						</scannerInfoProvider>
+					</profile>
+				</scannerConfigBuildInfo>
+				<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.debug.299556713;cdt.managedbuild.config.gnu.exe.debug.299556713.;cdt.managedbuild.tool.gnu.c.compiler.exe.debug.1944655974;cdt.managedbuild.tool.gnu.c.compiler.input.1111724644">
+					<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
+					<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
+						<buildOutputProvider>
+							<openAction enabled="true" filePath=""/>
+							<parser enabled="true"/>
+						</buildOutputProvider>
+						<scannerInfoProvider id="specsFile">
+							<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+							<parser enabled="true"/>
+						</scannerInfoProvider>
+					</profile>
+					<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
+						<buildOutputProvider>
+							<openAction enabled="true" filePath=""/>
+							<parser enabled="true"/>
+						</buildOutputProvider>
+						<scannerInfoProvider id="makefileGenerator">
+							<runAction arguments="-E -P -v -dD" command="" useDefault="true"/>
+							<parser enabled="true"/>
+						</scannerInfoProvider>
+					</profile>
+					<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
+						<buildOutputProvider>
+							<openAction enabled="true" filePath=""/>
+							<parser enabled="true"/>
+						</buildOutputProvider>
+						<scannerInfoProvider id="specsFile">
+							<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+							<parser enabled="true"/>
+						</scannerInfoProvider>
+					</profile>
+					<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
+						<buildOutputProvider>
+							<openAction enabled="true" filePath=""/>
+							<parser enabled="true"/>
+						</buildOutputProvider>
+						<scannerInfoProvider id="specsFile">
+							<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+							<parser enabled="true"/>
+						</scannerInfoProvider>
+					</profile>
+					<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
+						<buildOutputProvider>
+							<openAction enabled="true" filePath=""/>
+							<parser enabled="true"/>
+						</buildOutputProvider>
+						<scannerInfoProvider id="specsFile">
+							<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+							<parser enabled="true"/>
+						</scannerInfoProvider>
+					</profile>
+					<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
+						<buildOutputProvider>
+							<openAction enabled="true" filePath=""/>
+							<parser enabled="true"/>
+						</buildOutputProvider>
+						<scannerInfoProvider id="specsFile">
+							<runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/${specs_file}&quot;'" command="sh" useDefault="true"/>
+							<parser enabled="true"/>
+						</scannerInfoProvider>
+					</profile>
+					<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
+						<buildOutputProvider>
+							<openAction enabled="true" filePath=""/>
+							<parser enabled="true"/>
+						</buildOutputProvider>
+						<scannerInfoProvider id="specsFile">
+							<runAction arguments="-c 'g++ -E -P -v -dD &quot;${plugin_state_location}/specs.cpp&quot;'" command="sh" useDefault="true"/>
+							<parser enabled="true"/>
+						</scannerInfoProvider>
+					</profile>
+					<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
+						<buildOutputProvider>
+							<openAction enabled="true" filePath=""/>
+							<parser enabled="true"/>
+						</buildOutputProvider>
+						<scannerInfoProvider id="specsFile">
+							<runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/specs.c&quot;'" command="sh" useDefault="true"/>
+							<parser enabled="true"/>
+						</scannerInfoProvider>
+					</profile>
+				</scannerConfigBuildInfo>
+			</storageModule>
+		</cconfiguration>
+	</storageModule>
+	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+		<project id="maui.cdt.managedbuild.target.gnu.exe.387611182" name="Executable" projectType="cdt.managedbuild.target.gnu.exe"/>
+	</storageModule>
+</cproject>
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>maui</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
+			<triggers>clean,full,incremental,</triggers>
+			<arguments>
+				<dictionary>
+					<key>?name?</key>
+					<value></value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.append_environment</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.autoBuildTarget</key>
+					<value>all</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.buildArguments</key>
+					<value></value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.buildCommand</key>
+					<value>make</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.buildLocation</key>
+					<value>${workspace_loc:/maui/Debug}</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.cleanBuildTarget</key>
+					<value>clean</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.contents</key>
+					<value>org.eclipse.cdt.make.core.activeConfigSettings</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.enableAutoBuild</key>
+					<value>false</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.enableCleanBuild</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.enableFullBuild</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.fullBuildTarget</key>
+					<value>all</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.stopOnError</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.useDefaultBuildCmd</key>
+					<value>true</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
+			<triggers>full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.cdt.core.cnature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
+	</natures>
+</projectDescription>
@@ -1,3 +1,44 @@
+Maui 3.3.2
+  - Patch for 'diagnose -f'. Allow to specify what section of fairshare you want to see, default is 
+    everything (-f [user|group|acct|class|qos]). To show fairshare for a group, use:
+     * diagnose -f group (Author: Dennis Stam and applied by Bas van der Vlies)
+  - Showstats segfaults when using compiler optimization (Author: Andrew Savchenko, applied by Bas van der Vlies)
+  - catch socket errors for MSUAcceptClient. So no errors in the log file (Author: Jonathan Barber, applied 
+    by Bas van der Vlies): 
+     * accept call failed, errno: 11 (Resource temporarily unavailable)
+  - Fixed an segv for showq -r, when user submit a job without specifying how many nodes, just a node property, eg:
+     * qsub -lnodes=infiniband -Ii (Authors: Bas van der Vlies/Dennis Stam, SURFsara)
+    
+Maui 3.3.1
+  - Fixed issue where hostlist was being overwritten resulting in broken $PBS_NODEFILE. (Alexis Cousein)
+  - Fixed issue where users could set system priority on their own jobs. (Bas van der Vlies)
+  - Made showgrid's, and other's, arguments case-insensitive. (David Chin)
+  - Added build system changes to support Cygwin (Yauheni Charniauski, UIIP Minsk)
+  - Added the --with-cygrunsrv configure option for start maui as Windows service (doesn't use a background daemon).
+    Cygwin utility cygrunsrv.exe goes it into background independently (Igor Ilyenko, UIIP Minsk)
+  - changed all remaining mallocs to callocs which zeros memory on allocation.  Fixes a crash due 
+    to the way some whiel loops in MResAdjustDRes() expect things to be. (Jason Williams)
+  - Added proper memory allocation checks to accompany the callocs in MRes.c to avoid
+    missing memory errors. (Jason Williams)
+  - Added debug print messages to MUSNPrintF() and added a proper check of the return
+    code to vsnprintf to be in accordance with glibc >=2.1, if installed. (Jason Williams)
+  - Changed top-level Makefile BUILDROOT assignment to allow RPM builds (Jason Williams)
+  - Minor changes to fix a few valgrind errors about uninitialized values (Jason Williams)
+  - Patch to fix SYSTEMMAXJOBWALLTIME, SYSTEMMAXPROCPERJOB, and SYSTEMMAXPROCSECONDPERJOB
+    which previously no-op'ed (Jason Williams)
+  - Patch for 'showq -r' to show the correct values between 0 - 100 percent if NODEALLOCMAXPS is set
+    to TRUE (Bas van der Vlies)
+  - Added UseMachineSpeedForFS patch. (Robin Roth)
+    "When using Fairshare it weights the Fairshareusage with the speed of 
+    the nodes used by the job. Up to now the nodespeed is only used to allow 
+    jobs to run longer, but with fairshare users on slower nodes are punished, 
+    as their fs-usage is higher than on fast nodes. Additionally this allows 
+    single nodes to be taken out of the fairshare-system by setting their speed 
+    to very low numbers."
+
+Maui 3.3
+  - Fixed configure script. Was putting RMCFG[name] TYPE=PBS@RMNMHOST@.
+
 Maui 3.2.6p21
  - Added RMCFG[] ASYNCJOBSTART=TRUE for asynchronous job starts in pbs. (Thanks to Bas van der Vlies and the community)
  - Added StartTime and CompletionTime to Gold Charge.
@@ -3,7 +3,7 @@ Moab Scheduling System - End User Open Source License
 This software is based on the Moab Scheduling System which was created by 
 Cluster Resources, Inc.  

-Copyright (C) 1999-2007 Cluster Resources, Inc., all rights reserved.
+Copyright (C) 1999-2010 Cluster Resources, Inc., all rights reserved.

 Moab Scheduling System is a trademark of Cluster Resources, Inc.

@@ -1,11 +1,12 @@
 # Makefile  @PACKAGE_NAME@ v @PACKAGE_VERSION@
-# Copyright:    (C) 2002-2006  Cluster Resources, Inc, All Rights Reserved      
+# Copyright:    (C) 2002-2010  Cluster Resources, Inc, All Rights Reserved      
 #
 # Generated by configure

-BUILDROOT=
+BUILDROOT ?=
 export MSCHED_HOME=${BUILDROOT}@SPOOLDIR@
 export INST_DIR=${BUILDROOT}@prefix@
+export DAEMONDEF=@DAEMONDEF@
 export OPSYS=@OPSYS@
 export OS=@OS@
 export CC=@CC@
@@ -1,4 +1,4 @@
-                 Maui Scheduler, Release 3.2.6 (patch 21)
+                 Maui Scheduler, Release 3.3.2

 This package contains the Maui Scheduler, an advance reservation based HPC 
 batch scheduler with extensive job management and resource optimization
@@ -0,0 +1,87 @@
+
+Checked against the Cygwin PBS Torque 2.5 realization.
+Maui 3.3.1 tested with the stable release Cygwin 1.5.25 on 
+Windows XP Pro and on Windows Server 2003 SE (both 32-bit).
+Tested with the stable release Cygwin 1.7.5 on 64-bit Windows 7 Ultimate.
+
+Windows file system must be NTFS!!!
+Maui needs two Windows users on each host:
+<UserAdmin> with Computer administrator privileges and 
+<SimpleUser> with Limited account.
+Both users must be password protected.
+Maui scheduler can run as Cygwin daemon or as Windows service.
+Run as administrator (right-click) on Windows 7 and similar.
+
+
+
+###########################
+###   Install  Cygwin   ###
+###########################
+
+Enter into Windows as user <UserAdmin>.
+To install Cygwin 1.5.25 browse to http://cygwin.com/win-9x.html and click the "setup-legacy.exe" link.
+Download and run setup-legacy.exe.
+To install Cygwin 1.7.5 (or later) browse to http://cygwin.com and click the "Install Cygwin now" link.
+Download and run setup.exe.
+Click through the defaults and under the package selection 
+to select the following packages:
+
+   autoconf;
+   automake;
+   cygrunsrv;
+   gcc or gcc4;
+   make;
+   vim or mc is desirable.
+
+Download and install the default's and selected Cygwin packages.
+
+
+
+###################################################
+###   Start Maui under Cygwin with PBS Torque   ###
+###################################################
+
+Enter into working directory as <UserAdmin> and execute the following commands:
+
+   #./configure --with-pbs[=DIR] --with-spooldir=/var/spool/maui/
+where DIR - target directory, location of PBS Torque lib dir (as default - /usr/local)
+   #make
+   #make install
+
+Open the ports for Maui scheduler in your firewall.
+
+Start the Maui:
+
+   #maui
+
+Submit jobs as <SimpleUser> with Limited account.
+
+See jobs information via the Maui showq command
+and via the Torque qstat command.
+
+See more the Maui Documentations.
+
+
+
+######################################################
+###   Start Maui under Cygwin as Windows service   ###
+######################################################
+
+Enter into working directory as <UserAdmin> and execute the following commands:
+
+   #./configure --with-cygrunsrv --with-pbs[=DIR] --with-spooldir=/var/spool/maui/
+   #make
+   #make install
+
+Set additional privilege in order that user can log on as a service:
+   #editrights -a SeServiceLogonRight -u <UserAdmin>
+
+Use cygrunsrv.exe for install, start, stop and remove services.
+See more cygrunsrv.exe --help.
+
+For example:
+
+   #cygrunsrv.exe -I maui -p /usr/sbin/maui.exe –u <UserAdmin> -w <password>
+ 
+Services and privileges are managed via the Windows Control Panel or command line.
+
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.57 for maui 3.2.6p20.
+# Generated by GNU Autoconf 2.57 for maui 3.3.2.
 #
 # Report bugs to <help@supercluster.org>.
 #
@@ -268,8 +268,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='maui'
 PACKAGE_TARNAME='maui'
-PACKAGE_VERSION='3.2.6p20'
-PACKAGE_STRING='maui 3.2.6p20'
+PACKAGE_VERSION='3.3.2'
+PACKAGE_STRING='maui 3.3.2'
 PACKAGE_BUGREPORT='help@supercluster.org'

 ac_unique_file="src/mcom/MConst.c"
@@ -311,7 +311,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"

-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT LN_S SPOOLDIR MACHINE SEED OPSYS OS HOSTNAME USER BUILDDATE BUILDDIR RMTYPE LLDIR LLDEF PBSTARGETDIR SGEBUILDDIR SGEOSDIR LSFDIR LSFLIBS LSFDEFS PBSCFLAGS PBSLDFLAGS RMPORT RMHOST RMSOCKETPROTOCOL RMWIREPROTOCOL RMVERSION RMNMPORT RMNMSERVER AMTYPE AMHOST AMPORT AMSOCKETPROTOCOL AMWIREPROTOCOL AMOTHER PCREDIR CPP EGREP LIBOBJS POW_LIB LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT LN_S SPOOLDIR MACHINE SEED DAEMONDEF OPSYS OS HOSTNAME USER BUILDDATE BUILDDIR RMTYPE LLDIR LLDEF PBSTARGETDIR SGEBUILDDIR SGEOSDIR LSFDIR LSFLIBS LSFDEFS PBSCFLAGS PBSLDFLAGS RMPORT RMHOST RMSOCKETPROTOCOL RMWIREPROTOCOL RMVERSION RMNMPORT RMNMHOST AMTYPE AMHOST AMPORT AMSOCKETPROTOCOL AMWIREPROTOCOL AMOTHER PCREDIR CPP EGREP LIBOBJS POW_LIB LTLIBOBJS'
 ac_subst_files='rm_config ll_definitions sdr_definitions pbs_definitions sge_definitions lsf_definitions mx_definitions pcre_definitions'

 # Initialize some variables set by options.
@@ -780,7 +780,7 @@ if test "$ac_init_help" = "long"; then
  # Omit some internal or obsolete options to make the list less imposing.
  # This message is too long to be a string in the A/UX 3.1 sh.
  cat <<_ACEOF
-\`configure' configures maui 3.2.6p20 to adapt to many kinds of systems.
+\`configure' configures maui 3.3.2 to adapt to many kinds of systems.

 Usage: $0 [OPTION]... [VAR=VALUE]...

@@ -837,7 +837,7 @@ fi

 if test -n "$ac_init_help"; then
  case $ac_init_help in
-     short | recursive ) echo "Configuration of maui 3.2.6p20:";;
+     short | recursive ) echo "Configuration of maui 3.3.2:";;
   esac
  cat <<\_ACEOF

@@ -862,6 +862,7 @@ Optional Packages:
  --with-sss-am[=PORT]    use SSS Allocation Manager (default port [8865])
  --with-mx               use MX
  --with-pcre[=DIR]       use PCRE (pcre dir (location of PCRE include and lib directories) [/path/to/pcre]
+  --with-cygrunsrv        run as Windows service for Cygwin (do not use a background daemon)

 Some influential environment variables:
  CC          C compiler command
@@ -938,7 +939,7 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
  cat <<\_ACEOF
-maui configure 3.2.6p20
+maui configure 3.3.2
 generated by GNU Autoconf 2.57

 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
@@ -953,7 +954,7 @@ cat >&5 <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.

-It was created by maui $as_me 3.2.6p20, which was
+It was created by maui $as_me 3.3.2, which was
 generated by GNU Autoconf 2.57.  Invocation command line was

  $ $0 $@
@@ -2234,6 +2235,8 @@ echo "$as_me: WARNING: Unexpected OS release 'AIX4$RELEASE', attempting build wi
    { echo "$as_me:$LINENO: WARNING: Unexpected AIX level: $OSLEVEL, attempting build with OPSYS=$OPSYS" >&5
 echo "$as_me: WARNING: Unexpected AIX level: $OSLEVEL, attempting build with OPSYS=$OPSYS" >&2;}
  fi
+elif echo "$OS" | grep -q "CYGWIN"; then
+  OPSYS="__CYGWIN"
 elif test "$OS" = "Linux"; then
  OPSYS="__LINUX"
 elif test "$OS" = "HP-UX"; then
@@ -2601,7 +2604,7 @@ fi;
 if test "$USEWAREHOUSE" != 'FALSE'; then
  if test "$NMTYPE" = ''; then
    RMNMPORT=" NMPORT=12321"
-    RMNMSERVER=" NMSERVER=$HOSTNAME"
+    RMNMHOST=" NMHOST=$HOSTNAME"
  fi
 fi

@@ -2743,6 +2746,17 @@ if test "$PCREDIR" != 'FALSE'; then
 	pcre_definitions=include/Makefile.inc.pcre
 fi

+# CYGRUNSRV
+
+# Check whether --with-cygrunsrv or --without-cygrunsrv was given.
+if test "${with_cygrunsrv+set}" = set; then
+  withval="$with_cygrunsrv"
+  DAEMONDEF="-D__CYGRUNSRV"
+else
+  DAEMONDEF=""
+fi;
+
+
 # Make sure one RM was specified
 if test "$RMTYPE" = ''; then
  { { echo "$as_me:$LINENO: error: At least one Resource Manager must be specified" >&5
@@ -6935,7 +6949,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF

-This file was extended by maui $as_me 3.2.6p20, which was
+This file was extended by maui $as_me 3.3.2, which was
 generated by GNU Autoconf 2.57.  Invocation command line was

  CONFIG_FILES    = $CONFIG_FILES
@@ -6990,7 +7004,7 @@ _ACEOF

 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-maui config.status 3.2.6p20
+maui config.status 3.3.2
 configured by $0, generated by GNU Autoconf 2.57,
  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"

@@ -7201,6 +7215,7 @@ s,@LN_S@,$LN_S,;t t
 s,@SPOOLDIR@,$SPOOLDIR,;t t
 s,@MACHINE@,$MACHINE,;t t
 s,@SEED@,$SEED,;t t
+s,@DAEMONDEF@,$DAEMONDEF,;t t
 s,@OPSYS@,$OPSYS,;t t
 s,@OS@,$OS,;t t
 s,@HOSTNAME@,$HOSTNAME,;t t
@@ -7224,7 +7239,7 @@ s,@RMSOCKETPROTOCOL@,$RMSOCKETPROTOCOL,;t t
 s,@RMWIREPROTOCOL@,$RMWIREPROTOCOL,;t t
 s,@RMVERSION@,$RMVERSION,;t t
 s,@RMNMPORT@,$RMNMPORT,;t t
-s,@RMNMSERVER@,$RMNMSERVER,;t t
+s,@RMNMHOST@,$RMNMHOST,;t t
 s,@AMTYPE@,$AMTYPE,;t t
 s,@AMHOST@,$AMHOST,;t t
 s,@AMPORT@,$AMPORT,;t t
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.

 AC_PREREQ(2.57)
-AC_INIT(maui, 3.2.6p21, help@supercluster.org)
+AC_INIT(maui, 3.3.2, help@supercluster.org)
 AC_CONFIG_SRCDIR([src/mcom/MConst.c])
 #AC_CONFIG_HEADER([config.h])

@@ -53,6 +53,8 @@ if test "$OS" = "AIX"; then
    OSLEVEL=`oslevel`
    AC_MSG_WARN([Unexpected AIX level: $OSLEVEL, attempting build with OPSYS=$OPSYS])
  fi
+elif echo "$OS" | grep -q "CYGWIN"; then
+  OPSYS="__CYGWIN"
 elif test "$OS" = "Linux"; then
  OPSYS="__LINUX"
 elif test "$OS" = "HP-UX"; then
@@ -350,7 +352,7 @@ AC_ARG_WITH(warehouse,
 if test "$USEWAREHOUSE" != 'FALSE'; then
  if test "$NMTYPE" = ''; then
    RMNMPORT=" NMPORT=12321"
-    RMNMSERVER=" NMSERVER=$HOSTNAME"
+    RMNMHOST=" NMHOST=$HOSTNAME"
  fi
 fi

@@ -361,7 +363,7 @@ AC_SUBST(RMSOCKETPROTOCOL)
 AC_SUBST(RMWIREPROTOCOL)
 AC_SUBST(RMVERSION)
 AC_SUBST(RMNMPORT)
-AC_SUBST(RMNMSERVER)
+AC_SUBST(RMNMHOST)

 # END RM CONFIG --------------------------------------

@@ -466,6 +468,15 @@ if test "$PCREDIR" != 'FALSE'; then
 	pcre_definitions=include/Makefile.inc.pcre
 fi

+
+# CYGRUNSRV
+AC_ARG_WITH(cygrunsrv,
+	[  --with-cygrunsrv        run as Windows service for Cygwin (do not use a background daemon)],
+	[DAEMONDEF="-D__CYGRUNSRV"],
+	[DAEMONDEF=""])
+AC_SUBST(DAEMONDEF)
+
+
 # Make sure one RM was specified
 if test "$RMTYPE" = ''; then
  AC_MSG_ERROR([At least one Resource Manager must be specified])
@@ -1,10 +1,10 @@
-VERSION 3.2.6p21
+VERSION 3.3.2
 PACKAGE moab
 AUTHOR Cluster Resources, Inc

 FILETYPE Module

-COPYRIGHT Copyright (C) 1999-2007 Cluster Resources, Inc
+COPYRIGHT Copyright (C) 1999-2010 Cluster Resources, Inc

 DISCLAIMER 
 -----------------------------------------------------------------------------
@@ -13,7 +13,7 @@ Moab Scheduling System - End User Open Source License
 This software is based on the Moab Scheduling System which was created by
 Cluster Resources, Inc.

-Copyright (C) 1999-2007 Cluster Resources, Inc., all rights reserved.
+Copyright (C) 1999-2010 Cluster Resources, Inc., all rights reserved.

 Moab Scheduling System is a trademark of Cluster Resources, Inc.

@@ -13,7 +13,7 @@ Moab Workload Manager - End User License
 This product was created by Cluster Resources, Inc. and is protected by
 copyright and patent law.

-Copyright (C) 1999-2006 Cluster Resources, Inc., all rights reserved.
+Copyright (C) 1999-2010 Cluster Resources, Inc., all rights reserved.
 Moab Workload Manager, Moab Cluster Scheduler and Moab Scheduler
 are trademarks of Cluster Resources, Inc.

@@ -485,7 +485,8 @@ int MFSInitialize(mfsc_t *);
 double MFSCalcFactor(mfsc_t *,double *);
 char *MFSTargetToString(double,int);
 int MFSShutdown(mfsc_t *);
-int MFSShow(char *,int,int);
+/* Added the DiagOpt, of type char */
+int MFSShow(char *,int,char *,int);



@@ -7,7 +7,7 @@
 #include "moab-local.h"
 #include "mcom.h"

-#define MOAB_VERSION "3.2.6p20"
+#define MOAB_VERSION "3.3.2"

 /* elemental objects */

@@ -495,6 +495,7 @@ enum {
  pSimJobSubmissionPolicy,
  pSimNCPolicy,
  pUseMachineSpeed,
+  pUseMachineSpeedForFS,
  pUseSystemQueueTime,
  pNodeAvailPolicy,
  mcoResourceLimitPolicy,
@@ -1 +1 @@
-#define MSCHED_VERSION "maui-3.2.6p21"
+#define MSCHED_VERSION "3.3.2"
@@ -205,6 +205,7 @@
 #define DEFAULT_SRPERIOD                       mpDay

 #define DEFAULT_USEMACHINESPEED                FALSE
+#define DEFAULT_USEMACHINESPEEDFORFS           FALSE
 #define DEFAULT_USESYSTEMQUEUETIME             ptOFF
 #define DEFAULT_JOBPRIOACCRUALPOLICY           jpapQueuePolicy
 #define DEFAULT_RESOURCEAVAILPOLICY            mrapCombined
@@ -1356,6 +1357,7 @@ typedef struct {
  /* booleans */
  
  int UseMachineSpeed;
+  int UseMachineSpeedForFS;
  int UseSystemQueueTime;
  int UseCPUTime;
  int RejectNegPrioJobs;
@@ -285,8 +285,9 @@ int __MGSSGetToken(
  len |= ((size_t) buffer[1]) << 16;
  len |= ((size_t) buffer[2]) <<  8;
  len |= ((size_t) buffer[3]);
-                                                                                
-  tok = malloc(len);
+
+
+  tok = calloc(len, 1);
                                                                                
  if (!tok)
    {
@@ -809,6 +809,11 @@ int MSUAcceptClient(

  if ((sd = accept(S->sd,(struct sockaddr *)&c_sockaddr,&addrlen)) == -1)
    { 
+    if (errno == EAGAIN || errno == EWOULDBLOCK)
+      {
+      return(FAILURE);
+      }
+
    MDB(9,fSOCK) MLog("INFO:     accept call failed, errno: %d (%s)\n",
      errno,
      strerror(errno));
@@ -956,6 +961,9 @@ int MSUSendData(
 #endif /* !__MPROD */

  /* initialize */
+  TSLine[0]='\0';
+  CKLine[0]='\0';
+  SHeader[0]='\0';

  tmpSBuf[0] = '\0';  /* tmpSBuf is global (not threadsafe) */

@@ -1757,8 +1765,7 @@ int MSURecvData(

        return(FAILURE);
        }
-
-      if ((S->RBuffer = (char *)malloc(S->RBufSize + 1)) == NULL)
+      if ((S->RBuffer = (char *)calloc(S->RBufSize + 1, 1)) == NULL)
        {
        MDB(1,fSOCK) MLog("ERROR:    cannot allocate buffer space (%ld bytes requested)  errno: %d (%s)\n",
          S->RBufSize,
@@ -1809,8 +1816,7 @@ int MSURecvData(
        /* allocate large receive space */

        S->RBufSize = MMAX_BUFFER << 4;
-
-        if ((S->RBuffer = (char *)malloc(S->RBufSize + 1)) == NULL)
+        if ((S->RBuffer = (char *)calloc(S->RBufSize + 1, 1)) == NULL)
          {
          MDB(1,fSOCK) MLog("ERROR:    cannot allocate buffer space (%ld bytes requested)  errno: %d (%s)\n",
            S->RBufSize,
@@ -1966,8 +1972,7 @@ int MSURecvData(
      if (S->RBuffer == NULL) 
        {
        /* allocate receive space */
-
-        if ((S->RBuffer = (char *)malloc(S->RBufSize + 1)) == NULL)
+        if ((S->RBuffer = (char *)calloc(S->RBufSize + 1, 1)) == NULL)
          {
          MDB(1,fSOCK) MLog("ERROR:    cannot allocate buffer space (%ld bytes requested)  errno: %d (%s)\n",
            S->RBufSize,
@@ -2120,8 +2125,7 @@ int MSURecvData(

        return(FAILURE);
        }
-
-      if ((S->RBuffer = (char *)malloc(S->RBufSize + 1)) == NULL)
+      if ((S->RBuffer = (char *)calloc(S->RBufSize + 1, 1)) == NULL)
        {
        MDB(1,fSOCK) MLog("ERROR:    cannot allocate buffer space (%ld bytes requested)  errno: %d (%s)\n",
          S->RBufSize,
@@ -3916,7 +3920,7 @@ int MSUAdjustSBuffer(

  if (S->SBIsDynamic == FALSE)
    {
-    ptr = (char *)malloc(NewSize);
+    ptr = (char *)calloc(NewSize, 1);

    memcpy(ptr,S->SBuffer,S->SBufSize);
    }
@@ -4052,8 +4056,7 @@ int MSUDup(
    }

  /* do shallow memcpy first */
-
-  S = (msocket_t *)malloc(sizeof(msocket_t));
+  S = (msocket_t *)calloc(1,sizeof(msocket_t));

  memcpy(S,Src,sizeof(msocket_t));

@@ -350,7 +350,7 @@ int MSecGetChecksum2(

      /* NOTE:  merge header and data */

-      ptr = (char *)malloc(BufSize1 + BufSize2);
+      ptr = (char *)calloc(BufSize1 + BufSize2, 1);

      strcpy(ptr,Buf1);
      strcpy(ptr + BufSize1,Buf2);
@@ -378,7 +378,8 @@ int MSecGetChecksum2(

      /* NOTE:  merge header and data */

-      ptr = (char *)malloc(BufSize1 + BufSize2);
+
+      ptr = (char *)calloc(BufSize1 + BufSize2, 1);

      strcpy(ptr,Buf1);
      strcpy(ptr + BufSize1,Buf2);
@@ -406,7 +407,8 @@ int MSecGetChecksum2(

      /* NOTE:  merge header and data */

-      ptr = (char *)malloc(BufSize1 + BufSize2);
+
+      ptr = (char *)calloc(BufSize1 + BufSize2, 1);

      strcpy(ptr,Buf1);
      strcpy(ptr + BufSize1,Buf2);
@@ -1628,7 +1630,7 @@ int MSecCompress(

    if (LocalDstString == NULL)
      {
-      LocalDstString = (char *)malloc(NewLength);
+      LocalDstString = (char *)calloc(NewLength, 1);

      LocalDstSize   = NewLength;
      }
@@ -1789,7 +1791,7 @@ int MSecDecompress(
  else if (DDstBuf != NULL)
    {
    if ((OutBuf == NULL) && 
-       ((OutBuf = (unsigned char *)malloc(MMAX_BUFFER)) == NULL))
+       ((OutBuf = (unsigned char *)calloc(MMAX_BUFFER, 1)) == NULL))
      {
      return(FAILURE);
      }
@@ -1814,7 +1816,7 @@ int MSecDecompress(

  if (tmpBuf == NULL)
    {
-    if ((tmpBuf = (unsigned char *)malloc(NewLength)) == NULL)
+    if ((tmpBuf = (unsigned char *)calloc(NewLength, 1)) == NULL)
      {
      return(FAILURE);
      }
@@ -43,8 +43,7 @@ comm_thread_t* comm_thread_new(

  {
  comm_thread_t* thread;
-
-  if ((thread = (comm_thread_t *)malloc(sizeof(comm_thread_t))) == NULL)
+  if ((thread = (comm_thread_t *)calloc(1,sizeof(comm_thread_t))) == NULL)
    {
    return(NULL);
    }
@@ -53,8 +52,7 @@ comm_thread_t* comm_thread_new(
  thread->read_handler = NULL;
  thread->close_handler = NULL;
  thread->error_handler = NULL;
-
-  thread->connection = (communication_t **)malloc(max_connections * sizeof(void*));
+  thread->connection = (communication_t **)calloc(max_connections, sizeof(void*));

  thread->connections = 0;
  thread->max_connections = max_connections;
@@ -244,8 +242,7 @@ communication_t *communication_new(
  
  {
  communication_t *comm;
-
-  if ((comm = (communication_t *)malloc(sizeof(communication_t))) == NULL)
+  if ((comm = (communication_t *)calloc(1, sizeof(communication_t))) == NULL)
    {
    return(NULL);
    }
@@ -632,8 +632,7 @@ int MXMLToXString(
  if (*Buf == NULL)
    {
    NewSize = MMAX_BUFFER;
-
-    if ((*Buf = (char *)malloc(NewSize)) == NULL)
+    if ((*Buf = (char *)calloc(NewSize, 1)) == NULL)
      {
      /* cannot allocate buffer */

@@ -1,5 +1,5 @@
 # Makefile for libmcom 
-# Copyright 1999 - 2006  Cluster Resources, Inc, All Rights Reserved
+# Copyright 1999 - 2010  Cluster Resources, Inc, All Rights Reserved

   TOP =../..
   BIN =$(TOP)/bin/
@@ -13,7 +13,7 @@ SHELL  =/bin/sh
  LP   =-L$(LIB) $(SCHEDLP) $(MXLP) $(REGEXLP)
  IP   =$(SCHEDIP) $(REGEXIP) $(MXIP)
  INCS =$(INC)moab.h $(INC)moab-proto.h 
-  DEFS =-D$(OPSYS) $(OSDEF) $(MXDEF) $(REGEXDEF) $(SECDEF)
+  DEFS =-D$(OPSYS) $(OSDEF) $(MXDEF) $(REGEXDEF) $(SECDEF) $(DAEMONDEF)

 LIBMCOM  =libmcom.a
 LOBJECTS =MSU.o MSec.o MS3I.o MXML.o MConst.o MTComm.o MComm.o
@@ -1,53 +0,0 @@
-# Makefile for GridSuite: MCom 4.2.2
-# Copyright 1999 - 2006  Cluster Resources, Inc, All Rights Reserved
-
-prefix=$(ROOT)@prefix@
-exec_prefix=@exec_prefix@
-bindir=@bindir@
-sbindir=@sbindir@
-sysconfdir=@sysconfdir@
-localstatedir=@localstatedir@
-libdir=@libdir@
-includedir=@includedir@
-mandir=@mandir@
-
-CC=@CC@
-CFLAGS=@CFLAGS@
-SEED=@seed@
-moab_defs=@moab_defs@ -D__MGRIDENABLE
-moab_ip=@moab_ip@
-moab_lp=@moab_lp@
-moab_libs=@moab_libs@
-
-LD=$(CC)
-CP=cp
-RM=rm -f
-AR=ar rcs
-
-
-TOP  =../..
-BIN  =$(TOP)/bin
-INC  =$(TOP)/include
-LIB  =$(TOP)/lib
-
-LP   =-L$(LIB) $(moab_lp)
-IP   =-I$(INC) $(moab_ip)
-DEFS =$(moab_defs)
-LIBS = $(moab_libs)
-
-LIBMCOM  =$(LIB)/libmcom.a
-
-OBJS =MSU.o MSec.o MXML.o MSSSI.o MConst.o MComm.o MTComm.o
-
-DEPS =$(INC)/moab.h $(INC)/moab-proto.h $(INC)/mcom.h $(INC)/mg2.h
-
-all: $(LIBMCOM)
-
-.c.o:   $(DEPS)
-	$(CC) $(CFLAGS) $(IP) $(DEFS) -c $<
-
-$(LIBMCOM): $(OBJS)
-	$(AR) $(LIBMCOM) $(OBJS)
-
-clean:
-	$(RM) *.o $(LIBMCOM)
@@ -1,10 +1,10 @@
-VERSION 3.2.6p21
+VERSION 3.3.2
 PACKAGE moab
 AUTHOR Cluster Resources, Inc

 FILETYPE Module

-COPYRIGHT Copyright (C) 1999-2006 Cluster Resources, Inc
+COPYRIGHT Copyright (C) 1999-2010 Cluster Resources, Inc

 DISCLAIMER 
 -----------------------------------------------------------------------------
@@ -13,7 +13,7 @@ Moab Scheduling System - End User Open Source License
 This software is based on the Moab Scheduling System which was created by
 Cluster Resources, Inc.

-Copyright (C) 1999-2006 Cluster Resources, Inc., all rights reserved.
+Copyright (C) 1999-2010 Cluster Resources, Inc., all rights reserved.

 Moab Scheduling System is a trademark of Cluster Resources, Inc.

@@ -13,7 +13,7 @@ Moab Workload Manager - End User License
 This product was created by Cluster Resources, Inc. and is protected by
 copyright and patent law.

-Copyright (C) 1999-2005 Cluster Resources, Inc., all rights reserved.
+Copyright (C) 1999-2010 Cluster Resources, Inc., all rights reserved.
 Moab Workload Manager, Moab Cluster Scheduler and Moab Scheduler
 are trademarks of Cluster Resources, Inc.

@@ -1697,6 +1697,7 @@ int MCfgSetVal(
    case pJobSizePolicy:
    case pJobNodeMatch:
    case pUseMachineSpeed:
+    case pUseMachineSpeedForFS:
    case pNodeAllocationPolicy:
    case pBFMetric:
    case mcoAdminMinSTime:
@@ -1601,9 +1601,9 @@ const mcfg_t MCfg[] = {
  { "STEPCOUNT",                pSchedStepCount,              mdfInt,     mxoSched, NULL },
  { "SWAPCAP",                  pRSwapCap,                    mdfInt,     mxoPar,   NULL },
  { "SWAPWEIGHT",               pRSwapWeight,                 mdfInt,     mxoPar,   NULL },
-  { "SYSTEMMAXJOBWALLTIME",     pSystemMaxJobTime,            mdfString,  mxoSched, NULL },
-  { "SYSTEMMAXPROCPERJOB",      pSystemMaxJobProc,            mdfInt,     mxoSched, NULL },
-  { "SYSTEMMAXPROCSECONDPERJOB", pSystemMaxJobPS,             mdfInt,     mxoSched, NULL },
+  { "SYSTEMMAXJOBWALLTIME",     pSystemMaxJobTime,            mdfString,  mxoPar,   NULL },
+  { "SYSTEMMAXPROCPERJOB",      pSystemMaxJobProc,            mdfInt,     mxoPar,   NULL },
+  { "SYSTEMMAXPROCSECONDPERJOB", pSystemMaxJobPS,             mdfInt,     mxoPar,   NULL },
  { "TARGETCAP",                pTargCap,                     mdfInt,     mxoPar,   NULL },
  { "TARGETQUEUETIMECAP",       pTQTCap,                      mdfInt,     mxoPar,   NULL },
  { "TARGETQUEUETIMEWEIGHT",    pTQTWeight,                   mdfInt,     mxoPar,   NULL },
@@ -1627,6 +1627,7 @@ const mcfg_t MCfg[] = {
  { "USEJOBREGEX",              mcoUseJobRegEx,               mdfString,  mxoSched, NULL },
  { "USELOCALMACHINEPRIORITY",  pUseLocalMachinePriority,     mdfString,  mxoSched, NULL },
  { "USEMACHINESPEED",          pUseMachineSpeed,             mdfString,  mxoSched, NULL },
+  { "USEMACHINESPEEDFORFS",     pUseMachineSpeedForFS,        mdfString,  mxoSched, NULL },
  { "USERCAP",                  pCUCap,                       mdfInt,     mxoPar,   NULL },
  { "USERWEIGHT",               pCUWeight,                    mdfInt,     mxoPar,   NULL },
  { "USESYSLOG",                mcoUseSyslog,                 mdfString,  mxoSched, NULL },
@@ -1038,6 +1038,8 @@ int MFSShow(

  char *Buf,      /* O */
  int   BufSize,  /* I */
+  /* Added this so we can asked what we want to see */
+  char *Opts,
  int   Mode)     /* I */

  {
@@ -1076,6 +1078,34 @@ int MFSShow(
    BufSize,
    Mode);

+  /** DsT Show the given option in the logfile **/
+  DBG(3,fFS) DPrint("%s(Opts,%s)\n",
+    FName,
+    Opts);
+
+  /** DsT Begin check if given option is supported, else just skip and show all  **/
+  int LIMITOUTPUT = FALSE;
+
+  if ( strcmp( Opts, "user" ) == 0 ) {
+    LIMITOUTPUT = TRUE;
+  } else if( strcmp( Opts, "group" ) == 0 ) {
+	LIMITOUTPUT = TRUE;
+  } else if( strcmp( Opts, "acct" ) == 0 ) {
+	LIMITOUTPUT = TRUE;
+  } else if( strcmp( Opts, "class" ) == 0 ) {
+	LIMITOUTPUT = TRUE;
+  } else if( strcmp( Opts, "qos" ) == 0 ) {
+	LIMITOUTPUT = TRUE;
+  }
+
+  /** DsT Always show if we are going to LIMIT the output **/
+  DBG(3,fFS) DPrint("%s(LIMIT,%d),(WHAT,%s)\n",
+	FName,
+	LIMITOUTPUT,
+	Opts);
+
+  /** Dst End check options **/
+
  if (Buf == NULL)
    {
    return(FAILURE);
@@ -1184,6 +1214,10 @@ int MFSShow(
        {
        case mxoUser:

+		  /** DsT if limit is true but Opts does not compare to users, skip **/
+          if (LIMITOUTPUT == TRUE && strcmp( Opts, "user" ) != 0 )
+			continue;
+
          if (MSched.DefaultU != NULL)
            DF = &MSched.DefaultU->F;

@@ -1191,6 +1225,10 @@ int MFSShow(

        case mxoGroup:

+		  /** DsT if limit is true but Opts does not compare to group, skip **/
+          if (LIMITOUTPUT == TRUE && strcmp( Opts, "group" ) != 0 )
+			continue;
+
          if (MSched.DefaultG != NULL)
            DF = &MSched.DefaultG->F;

@@ -1198,6 +1236,10 @@ int MFSShow(

        case mxoAcct:

+		  /** DsT if limit is true but Opts does not compare to acct, skip **/
+          if (LIMITOUTPUT == TRUE && strcmp( Opts, "acct" ) != 0 )
+			continue;
+
          if (MSched.DefaultA != NULL)
            DF = &MSched.DefaultA->F;

@@ -1205,6 +1247,10 @@ int MFSShow(

        case mxoClass:

+		  /** DsT if limit is true but Opts does not compare to class, skip **/
+          if (LIMITOUTPUT == TRUE && strcmp( Opts, "class" ) != 0 )
+			continue;
+
          if (MSched.DefaultC != NULL)
            DF = &MSched.DefaultC->F;

@@ -1212,6 +1258,10 @@ int MFSShow(

        case mxoQOS:

+		  /** DsT if limit is true but Opts does not compare to qos, skip **/
+          if (LIMITOUTPUT == TRUE && strcmp( Opts, "qos" ) != 0 )
+			continue;
+
          if (MSched.DefaultQ != NULL)
            DF = &MSched.DefaultQ->F;

@@ -107,15 +107,14 @@ char *MFULoad(
    else
      {
      /* copy cached data */
-
-      if ((ptr = (char *)malloc(BufSize + 1)) == NULL)
+      if ((ptr = (char *)calloc(BufSize + 1, 1)) == NULL)
        {
-        MOSSyslog(LOG_ERR,"cannot malloc buffer for file '%s', errno: %d (%s)",
+        MOSSyslog(LOG_ERR,"cannot calloc buffer for file '%s', errno: %d (%s)",
          FileName,
          errno,
          strerror(errno));

-        DBG(2,fCORE) DPrint("ERROR:    cannot malloc file buffer for file '%s', errno: %d (%s)\n",
+        DBG(2,fCORE) DPrint("ERROR:    cannot calloc file buffer for file '%s', errno: %d (%s)\n",
          FileName,
          errno,
          strerror(errno));
@@ -127,7 +126,7 @@ char *MFULoad(
        }
      else
        {
-        /* fill malloc'd buffer */
+        /* fill calloc'd buffer */

        memcpy(ptr,buf,BufSize + 1);

@@ -190,16 +189,15 @@ char *MFULoad(
    FileName,
    BufSize,
    ReadCount);
-
-  if ((ptr = (char *)malloc(BufSize + 1)) == NULL)
+  if ((ptr = (char *)calloc(BufSize + 1,1)) == NULL)
    {
-    MOSSyslog(LOG_ERR,"cannot malloc %d byte buffer for file '%s', errno: %d (%s)",
+    MOSSyslog(LOG_ERR,"cannot calloc %d byte buffer for file '%s', errno: %d (%s)",
      BufSize,
      FileName,
      errno,
      strerror(errno));

-    DBG(2,fCORE) DPrint("ERROR:    cannot malloc file buffer for file '%s', errno: %d (%s)\n",
+    DBG(2,fCORE) DPrint("ERROR:    cannot calloc file buffer for file '%s', errno: %d (%s)\n",
      FileName,
      errno,
      strerror(errno));
@@ -405,15 +403,14 @@ int __MFUCacheFile(

      MFileCache[index].Buffer = NULL;
      }
-
-    if ((MFileCache[index].Buffer = (char *)malloc(BufSize + 1)) == NULL)
+    if ((MFileCache[index].Buffer = (char *)calloc(BufSize + 1, 1)) == NULL)
      {
-      MOSSyslog(LOG_ERR,"cannot malloc cache buffer for file '%s', errno: %d (%s)",
+      MOSSyslog(LOG_ERR,"cannot calloc cache buffer for file '%s', errno: %d (%s)",
        FileName,
        errno,
        strerror(errno));

-      DBG(2,fSTRUCT) DPrint("ERROR:    cannot malloc file buffer for file '%s', errno: %d (%s)\n",
+      DBG(2,fSTRUCT) DPrint("ERROR:    cannot calloc file buffer for file '%s', errno: %d (%s)\n",
        FileName,
        errno,
        strerror(errno));
@@ -447,16 +444,16 @@ int __MFUCacheFile(
    {
    if (MFileCache[index].FileName[0] == '\0')
      {
-      /* malloc space for buffer */
+      /* calloc space for buffer */

-      if ((MFileCache[index].Buffer = (char *)malloc(BufSize + 1)) == NULL)
+      if ((MFileCache[index].Buffer = (char *)calloc(BufSize + 1, 1)) == NULL)
        {
-        MOSSyslog(LOG_ERR,"cannot malloc cache buffer for file '%s', errno: %d (%s)",
+        MOSSyslog(LOG_ERR,"cannot calloc cache buffer for file '%s', errno: %d (%s)",
          FileName,
          errno,
          strerror(errno));

-        DBG(2,fSTRUCT) DPrint("ERROR:    cannot malloc cache buffer for file '%s', errno: %d (%s)\n",
+        DBG(2,fSTRUCT) DPrint("ERROR:    cannot calloc cache buffer for file '%s', errno: %d (%s)\n",
          FileName,
          errno,
          strerror(errno));
@@ -752,14 +749,14 @@ int MFUGetRecord(
      }
    else if (!strcmp(Index[index].Key,Key))
      {
-      if ((*Buffer = (char *)malloc(RecSize)) == NULL)
+      if ((*Buffer = (char *)calloc(RecSize, 1)) == NULL)
        {
-        MOSSyslog(LOG_ERR,"cannot malloc buffer for record '%s', errno: %d (%s)",
+        MOSSyslog(LOG_ERR,"cannot calloc buffer for record '%s', errno: %d (%s)",
          Key,
          errno,
          strerror(errno));

-        DBG(2,fCORE) DPrint("ERROR:    cannot malloc %d buffer for record '%s', errno: %d (%s)\n",
+        DBG(2,fCORE) DPrint("ERROR:    cannot calloc %d buffer for record '%s', errno: %d (%s)\n",
          RecSize,
          Key,
          errno,
@@ -790,13 +787,13 @@ int MFUGetRecord(
    return(SUCCESS);
    }

-  if ((*Buffer = (char *)malloc(rcount * RecSize)) == NULL)
+  if ((*Buffer = (char *)calloc(rcount, RecSize)) == NULL)
    {
-    MOSSyslog(LOG_ERR,"cannot malloc buffer for all records, errno: %d (%s)",
+    MOSSyslog(LOG_ERR,"cannot calloc buffer for all records, errno: %d (%s)",
      errno,
      strerror(errno));

-    DBG(2,fCORE) DPrint("ERROR:    cannot malloc %d byte buffer for all records, errno: %d (%s)\n",
+    DBG(2,fCORE) DPrint("ERROR:    cannot calloc %d byte buffer for all records, errno: %d (%s)\n",
      rcount * RecSize,
      errno,
      strerror(errno));
@@ -1184,7 +1181,7 @@ int MFULock(
  char *LockFile)   /* I */

  {
-#if !defined(__LINUX) && !defined(__HPUX) && !defined(__NT)
+#if !defined(__LINUX) && !defined(__CYGWIN) && !defined(__HPUX) && !defined(__NT)
  int          fd;
  struct flock lock;
  char         Name[MAX_MLINE];
@@ -1197,7 +1194,7 @@ int MFULock(
    Directory,
    LockFile);

-#if !defined(__LINUX) && !defined(__HPUX) && !defined(__NT)
+#if !defined(__LINUX) && !defined(__CYGWIN) && !defined(__HPUX) && !defined(__NT)

  if (!strstr(LockFile,Directory))
    {
@@ -7702,7 +7702,7 @@ int MJobWriteStats(
 
  if (MJobToTString(J,DEFAULT_WORKLOAD_TRACE_VERSION,Buf,sizeof(Buf)) == SUCCESS)
    {
-    fprintf(MSched.statfp,Buf);
+    fprintf(MSched.statfp,"%s",Buf);
 
    fflush(MSched.statfp);
 
@@ -82,7 +82,7 @@ int MLogInitialize(

  if (SigSet == 0)
    {
-#   if defined(__AIX41) || defined(__AIX42) || defined(__AIX43) || defined(__IRIX) || defined(__LINUX) || defined(__HPUX) || defined(__SOLARIS)
+#   if defined(__AIX41) || defined(__AIX42) || defined(__AIX43) || defined(__IRIX) || defined(__LINUX) || defined(__CYGWIN) || defined(__HPUX) || defined(__SOLARIS)
      signal(SIGUSR1,(void(*)(int))MLogLevelAdjust);
      signal(SIGUSR2,(void(*)(int))MLogLevelAdjust);
 #   else 
@@ -414,7 +414,7 @@ void MLogLevelAdjust(
        mlog.Threshold);
      }

-#if defined(__AIX41) || defined(__AIX42) || defined(__AIX43) || defined(__IRIX) || defined(__LINUX) || defined(__HPUX) || defined(__SOLARIS)
+#if defined(__AIX41) || defined(__AIX42) || defined(__AIX43) || defined(__IRIX) || defined(__LINUX) || defined(__CYGWIN) || defined(__HPUX) || defined(__SOLARIS)

    signal(SIGUSR1,(void(*)(int))MLogLevelAdjust);

@@ -441,7 +441,7 @@ void MLogLevelAdjust(
        mlog.Threshold);
      }

-#if defined(__AIX41) || defined(__AIX42) || defined(__AIX43) || defined(__IRIX) || defined(__LINUX) || defined(__HPUX) || defined(__SOLARIS) || defined(__OSF)
+#if defined(__AIX41) || defined(__AIX42) || defined(__AIX43) || defined(__IRIX) || defined(__LINUX) || defined(__CYGWIN) || defined(__HPUX) || defined(__SOLARIS) || defined(__OSF)

    signal(SIGUSR2,(void(*)(int))MLogLevelAdjust);

@@ -86,7 +86,7 @@ int MNodeCreate(

  if (*NP == NULL)
    {
-    *NP = (mnode_t *)malloc(sizeof(mnode_t));
+    *NP = (mnode_t *)calloc(1, sizeof(mnode_t));

    N = *NP;      

@@ -5746,10 +5746,11 @@ int MNodeGetLocation(
  int   nindex;
 
  char  tmpName[MAX_MNAME];
+  tmpName[0]='\0';
 
  char *ptr;
 
-  long  Address;
+  long  Address=0;

  mhost_t *S;
 
@@ -2657,7 +2657,7 @@ int MPBSQueryMOM(
    "arch",               /* the architecture of the machine */
    "physmem",            /* the amount of physical memory */
    "loadave",            /* the current load average */
-#if defined(__AIX43) || defined(__AIX51) || defined(__LINUX) || defined(__IRIX)
+#if defined(__AIX43) || defined(__AIX51) || defined(__LINUX)  || defined(__CYGWIN) || defined(__IRIX)
    "availmem",
    "totmem",
 #endif /* AIX43 || LINUX || IRIX */
@@ -6250,6 +6250,7 @@ int __MPBSNLToTaskString(
  int tindex;

  char tmpHostName[MAX_MLINE];
+  char tmpTaskList[MAX_MLINE+10];

  mnode_t *N;

@@ -6302,10 +6303,11 @@ int __MPBSNLToTaskString(
      }
    else
      {
-      sprintf(TSBuf,"%s%s:ppn=%d",
-        TSBuf,
+      snprintf(tmpTaskList,sizeof(tmpTaskList),"%s:ppn=%d",
        tmpHostName,
        NL[tindex].TC);
+
+      MUStrCat(TSBuf,tmpTaskList,BufSize);
      }
    }  /* END for (tindex) */

@@ -602,6 +602,7 @@ int MParSetDefaults(
  P->BFProcFactor         = DEFAULT_BACKFILLNODEFACTOR;
  P->BFMaxSchedules       = DEFAULT_MAXBACKFILLSCHEDULES;
 
+  P->UseMachineSpeedForFS = DEFAULT_USEMACHINESPEEDFORFS;
  P->UseMachineSpeed      = DEFAULT_USEMACHINESPEED;
  P->UseSystemQueueTime   = DEFAULT_USESYSTEMQUEUETIME;
  P->JobPrioAccrualPolicy = DEFAULT_JOBPRIOACCRUALPOLICY;
@@ -1667,6 +1668,12 @@ int MParProcessOConfig(

      break;

+    case pUseMachineSpeedForFS:
+
+      P->UseMachineSpeedForFS = MUBoolFromString(SVal,FALSE);
+
+      break;
+
    case pUseMachineSpeed:

      P->UseMachineSpeed = MUBoolFromString(SVal,FALSE);
@@ -2070,6 +2077,15 @@ int MParConfigShow(

  if (P->Index == 0)
    {
+    if ((P->UseMachineSpeedForFS == TRUE) || 
+        (VFlag || (PIndex == -1) || (PIndex == pUseMachineSpeedForFS)))
+      {
+      sprintf(Buffer,"%s%-30s  %s\n",
+        Buffer,
+        MParam[pUseMachineSpeedForFS],
+        (P->UseMachineSpeedForFS == TRUE) ? "TRUE" : "FALSE");
+      }
+
    if ((P->UseMachineSpeed == TRUE) || 
        (VFlag || (PIndex == -1) || (PIndex == pUseMachineSpeed)))
      {
@@ -232,7 +232,7 @@ int MJobSelectPJobList(

    if (PreempteeTaskList != NULL)
      {
-      pJ[index].TL = (nodelist_t *)malloc(sizeof(nodelist_t));
+      pJ[index].TL = (nodelist_t *)calloc(1, sizeof(nodelist_t));

      memcpy(pJ[index].TL,&tmpTaskList,sizeof(mnalloc_t) * (tindex + 1));
      }
@@ -2900,11 +2900,19 @@ int MNodeBuildRE(

  memset(&ZRes,0,sizeof(ZRes));
 
-  CRE = (mre_t *)malloc(sizeof(mre_t) * ((MAX_MRES_DEPTH << 1) + 1));
-  ORE = (mre_t *)malloc(sizeof(mre_t) * ((MAX_MRES_DEPTH << 1) + 1));
-  NRE = (mre_t *)malloc(sizeof(mre_t) * ((MAX_MRES_DEPTH << 1) + 1));
-  JRE = (mre_t *)malloc(sizeof(mre_t) * ((MAX_MRES_DEPTH << 1) + 1));
+  CRE = (mre_t *)calloc(((MAX_MRES_DEPTH << 1) + 1), sizeof(mre_t));
+  ORE = (mre_t *)calloc(((MAX_MRES_DEPTH << 1) + 1), sizeof(mre_t));
+  NRE = (mre_t *)calloc(((MAX_MRES_DEPTH << 1) + 1), sizeof(mre_t));
+  JRE = (mre_t *)calloc(((MAX_MRES_DEPTH << 1) + 1), sizeof(mre_t));
 
+  if (CRE == NULL || ORE == NULL || NRE == NULL || JRE == NULL )
+    {
+    DBG(4,fCORE) DPrint("ALERT:    cannot allocate memory in %s\n",
+      FName);
+
+    return(FAILURE);
+  }
+
  CRI[0] = -1;
 
  ResFound = FALSE;
@@ -7133,19 +7141,29 @@ int MResAdjustDRes(
  /* where possible using memcmp.  Insert all container reservation  */
  /* events at BRes calculation completion                           */

-  if (CRE == NULL)
+  if (CRE == NULL || ORE == NULL || NRE == NULL || JRE == NULL )
    {
    memset(&ZRes,0,sizeof(ZRes));

-    CRE = (mre_t *)malloc(sizeof(mre_t) * (MSched.ResDepth << 1));
-    ORE = (mre_t *)malloc(sizeof(mre_t) * (MSched.ResDepth << 1));
-    NRE = (mre_t *)malloc(sizeof(mre_t) * (MSched.ResDepth << 1));
-    JRE = (mre_t *)malloc(sizeof(mre_t) * (MSched.ResDepth << 1));
+    /* changed the mallocs to callocs because there is code below */
+    /* that requires things to be zero'ed                         */
+    if (CRE == NULL ) {
+    	CRE = (mre_t *)calloc((MSched.ResDepth << 1),sizeof(mre_t));
+    }
+    if (ORE == NULL ){
+    	ORE = (mre_t *)calloc((MSched.ResDepth << 1),sizeof(mre_t));
+    }
+    if (NRE == NULL ){
+    	NRE = (mre_t *)calloc((MSched.ResDepth << 1),sizeof(mre_t));
+  	}
+    if (JRE == NULL ){
+    	JRE = (mre_t *)calloc((MSched.ResDepth << 1),sizeof(mre_t));
+    }

    DRSize = sizeof(mcres_t);
    }  /* END if (CRE == NULL) */

-  if (CRE == NULL)
+  if (CRE == NULL || ORE == NULL || NRE == NULL || JRE == NULL )
    {
    DBG(4,fCORE) DPrint("ALERT:    cannot allocate memory in %s\n",
      FName);
@@ -2706,7 +2706,7 @@ int MSRProcessOConfig(
      char *TokPtr;

      int index;
-      int FMap[MAX_MATTR >> 5];
+      int FMap[(MAX_MATTR >> 5) + 1];

      MUBMClear(FMap,MAX_MATTR);

@@ -3981,9 +3981,6 @@ int MSchedStatToString(

      /* build stat buffer */

-      sprintf(Buf,"%ld\n",
-        S->Time);
-
      /* set up scheduler run time */

      RunTime = MStat.SchedRunTime;
@@ -3991,10 +3988,10 @@ int MSchedStatToString(
      GP = &MPar[0];
      T  = &GP->S;

-      /*            STM ITM RTM IJ EJ AJ UN UP UM IN IP IM CT SJ TPA TPB SPH TMA TMD QP AQP NJA JAC PSX IT RPI WEF WI MXF ABP MBP AQT MQT PSR PSD PSU MSA MSD JE */
+      /*            CTM STM ITM RTM IJ EJ AJ UN UP UM IN IP IM CT SJ TPA TPB SPH TMA TMD QP AQP NJA JAC PSX IT RPI WEF WI MXF ABP MBP AQT MQT PSR PSD PSU MSA MSD JE */

-      sprintf(Buf,"%s%ld %ld %ld %d %d %d %d %d %d %d %d %d %d %d %lf %lf %lf %lf %lf %d %lu %lf %lf %lf %d %ld %lf %d %lf %lf %d %lf %lu %lf %lf %lf %lf %lf %d %d %lf\n",
-        Buf,
+      sprintf(Buf,"%ld\n%ld %ld %ld %d %d %d %d %d %d %d %d %d %d %d %lf %lf %lf %lf %lf %d %lu %lf %lf %lf %d %ld %lf %d %lf %lf %d %lf %lu %lf %lf %lf %lf %lf %d %d %lf\n",
+        S->Time,
        S->StartTime,
        MStat.InitTime,
        RunTime,
@@ -844,6 +844,10 @@ int MStatUpdateActiveJobUsage(
  double   psdedicated;
  double   psutilized;

+  /* HvB */
+  double   psutilized_cpu; 
+  double   psutilized_load;
+
  double   msdedicated;
  double   msutilized;

@@ -877,6 +881,10 @@ int MStatUpdateActiveJobUsage(

  mreq_t  *RQ;
  mpar_t  *P;
+  
+  double   averagenodespeed = 0.0;
+  double   totalnodespeed = 0.0;
+  int      speedcounter = 0;

  const char *FName = "MStatUpdateActiveJobUsage";

@@ -936,13 +944,21 @@ int MStatUpdateActiveJobUsage(

  for (rqindex = 0;J->Req[rqindex] != NULL;rqindex++)
    { 
+
    RQ = J->Req[rqindex];

    P  = &MPar[RQ->PtIndex];

+    totalnodespeed = 0.0;
+    speedcounter   = 0;
+
    psdedicated = 0.0;
    psutilized  = 0.0;

+    /* HvB */
+    psutilized_cpu  = 0.0;
+    psutilized_load  = 0.0;
+
    msdedicated = 0.0;
    msutilized  = 0.0;

@@ -964,34 +980,74 @@ int MStatUpdateActiveJobUsage(
          {
          break;
          }
+	
+        speedcounter++;
+        totalnodespeed += N->Speed;

        msdedicated += (double)(interval * TC * RQ->DRes.Mem);

-        if (RQ->URes.Procs > 0)
+	/*
+	 *  HvB: There is a difference between shared nodes and NodeAllocMaxPS (exclusive)
+	 *    exclusive : nodes * interval
+	 *     shared   : total cores * interval
+	 *
+	 *  Load and cpu time is calculated for all cores in a node. So we have to normalize
+	 *  for psutilized. if singlejob per node is set
+	*/
+	if ( (J->Req[0]->NAccessPolicy == mnacSingleJob) && 
+	    (MSched.NodeAllocMaxPS == TRUE))	
          {
-          psutilized      += interval * TC * RQ->URes.Procs / 100.0;
-          RQ->MURes.Procs  = MAX(RQ->MURes.Procs,RQ->URes.Procs);
-          }
-        else if (N->CRes.Procs > 1)
-          {
-          /* cannot properly determine efficiency with available information */
-          /* make job 100% efficient                                         */
-
-          psutilized += (interval * TC * RQ->DRes.Procs);
-          }
-        else
-          { 
-          if (N->Load >= 1.0)
-            {
-            psutilized += (interval * 1.0);
+	  psutilized_cpu      += interval * RQ->URes.Procs / (100.0 * TotalProcs * N->CRes.Procs) ;
+	  psutilized_load     += interval * (double)N->Load / N->CRes.Procs;
+	  }
+	else
+	  /* Old calculation */
+	  {
+          if (RQ->URes.Procs > 0)
+	    {
+	    psutilized      += interval * TC * RQ->URes.Procs / 100.0;
+	    RQ->MURes.Procs  = MAX(RQ->MURes.Procs,RQ->URes.Procs);
+	    }
+          else if (N->CRes.Procs > 1)
+	    {
+            /* cannot properly determine efficiency with available information */
+	    /* make job 100% efficient                                         */ 
+	    psutilized += (interval * TC * RQ->DRes.Procs);
            }
          else
-            {
-            psutilized += (interval * (double)N->Load);
-            }
-          }
+	    { 
+            if (N->Load >= 1.0)
+	      {
+	      psutilized += (interval * 1.0);
+              }
+	    else
+              {
+	      psutilized += (interval * (double)N->Load);
+              }
+             }
+	   }
        }     /* END for (nindex) */

+      /* HvB 
+       * Some Jobs do not update the cputime properly , but the load is high. Then use this factor
+       * for jobs that uses a single node exclusive
+      */
+      if ( (J->Req[0]->NAccessPolicy == mnacSingleJob) && 
+	  (MSched.NodeAllocMaxPS == TRUE))	
+        {
+	DBG(8,fSTAT) DPrint("INFO:     psutilized_cpu = %f, psutilized_load = %f\n",
+		psutilized_cpu, psutilized_load);
+
+	if ( (psutilized_cpu * 10) < psutilized_load)
+	  {
+	  psutilized = psutilized_load;
+	  }
+	else
+	  {
+	  psutilized = psutilized_cpu;
+	  }
+	}
+
      if (RQ->URes.Mem > 0)
        {
        msutilized = interval * RQ->URes.Mem;
@@ -1104,6 +1160,23 @@ int MStatUpdateActiveJobUsage(

    MPolicyAdjustUsage(NULL,J,NULL,mlActive,NULL,-1,1,NULL);

+    if (speedcounter == 0)
+	    averagenodespeed = 1.0;
+    else
+      averagenodespeed = totalnodespeed / speedcounter;
+
+    if (P->UseMachineSpeedForFS == TRUE) 
+      {
+      fsusage *= averagenodespeed;
+      psdedicated *= averagenodespeed;
+      psutilized *= averagenodespeed;
+      msdedicated *= averagenodespeed;
+      msutilized *= averagenodespeed;
+      }
+    
+    if ((J != NULL) && (J->Cred.C != NULL))
+    	DBG(1,fSTAT) DPrint("INFO: Average nodespeed for Job %s is  %f, %f, %i  \n",J->Name,averagenodespeed,totalnodespeed,speedcounter);
+	  
    U = J->Cred.U;

    if (U != NULL)
@@ -3923,9 +3923,9 @@ int MUDStatInitialize(
  D->DSize = DSize;
  D->Count = 0;

-  if ((D->Data = (char *)malloc(DSize * DSTAT_STEPSIZE)) == NULL)
+  if ((D->Data = (char *)calloc(DSTAT_STEPSIZE, DSize)) == NULL)
    {
-    DBG(0,fCORE) DPrint("ALERT:    cannot malloc memory for dstat\n");
+    DBG(0,fCORE) DPrint("ALERT:    cannot calloc memory for dstat\n");

    return(FAILURE);
    }
@@ -4902,7 +4902,7 @@ int MUShowCopy()
  fprintf(stderr,"This software utilizes the Moab Scheduling Library, version %s\n",
    MOAB_VERSION);

-  fprintf(stderr,"Copyright 2000-2006 Cluster Resources, Inc, All Rights Reserved\n");
+  fprintf(stderr,"Copyright 2000-2010 Cluster Resources, Inc, All Rights Reserved\n");

  return(SUCCESS);
  }  /* END MUShowCopy() */
@@ -5089,7 +5089,7 @@ int MUSNPrintF(

  {
  int len;
-
+  const char *FName = "MUSNPrintF";
  va_list Args;

  if ((BPtr == NULL) || 
@@ -5097,6 +5097,8 @@ int MUSNPrintF(
      (Format == NULL) || 
      (*BSpace <= 0))
    {
+	DBG(4,fCORE) DPrint("ALERT:    Memory Error in %s\n",
+	        FName);
    return(FAILURE);
    }

@@ -5108,9 +5110,23 @@ int MUSNPrintF(

  if (len <= 0)
    {
+	DBG(4,fCORE) DPrint("ALERT:    vsnprintf Error in %s\n",
+	        FName);
    return(FAILURE);
    }

+#if __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1
+  /* XXX: The following is true for glibc > 2.1 */
+
+  /* if vsnprintf returns the same value as size or greater */
+  /* then the output is truncated. see man vsnprintf. */
+  if (len == *BSpace || len > *BSpace) {
+	  DBG(1,fCORE) DPrint("ALERT:    Possible vsnprintf truncation in %s\n",
+	  	        FName);
+	  return(FAILURE);
+  }
+#endif
+
  *BPtr += len;
  *BSpace -= len;

@@ -5269,7 +5285,7 @@ char *MUURLCreate(
    BPtr   = Buf;
    BSpace = BufSize;
    }
-  else if ((BPtr = malloc(MAX_MLINE)) != NULL)
+  else if ((BPtr = calloc(MAX_MLINE, 1)) != NULL)
    {
    BSpace = BufSize;
    }
@@ -1,5 +1,5 @@
 # Makefile for Moab 2.2.3
-# Copyright 1999 - 2006  Cluster Resources Inc, All Rights Reserved
+# Copyright 1999 - 2010  Cluster Resources Inc, All Rights Reserved

   TOP =../..
   BIN =$(TOP)/bin/
@@ -18,7 +18,7 @@ SHELL  =/bin/sh
  IP   =$(SCHEDIP) $(LLIP) $(REGEXIP) $(MXIP) $(PBSCFLAGS)
  INCS =$(INC)moab.h $(INC)msched.h
  DEFS =-D$(OPSYS) $(LLDEF) $(SDRDEF) $(PBSDEF) $(OSDEF) $(MXDEF) $(REGEXDEF) \
-        $(SECDEF) $(RMSDEF) $(THREADDEF)
+        $(SECDEF) $(RMSDEF) $(THREADDEF) $(DAEMONDEF)

 MOAB     =libmoab.a
 LOBJECTS =MFile.o MConfig.o MQOS.o MLog.o MCred.o MSched.o MAM.o MSR.o MRes.o \
@@ -1,10 +1,10 @@
-VERSION 3.2.6p21
+VERSION 3.3.2
 PACKAGE moab
 AUTHOR Cluster Resources, Inc

 FILETYPE Module

-COPYRIGHT Copyright (C) 1999-2006 Cluster Resources, Inc
+COPYRIGHT Copyright (C) 1999-2010 Cluster Resources, Inc

 DISCLAIMER 
 -----------------------------------------------------------------------------
@@ -13,7 +13,7 @@ Moab Scheduling System - End User Open Source License
 This software is based on the Moab Scheduling System which was created by
 Cluster Resources, Inc.

-Copyright (C) 1999-2006 Cluster Resources, Inc., all rights reserved.
+Copyright (C) 1999-2010 Cluster Resources, Inc., all rights reserved.

 Moab Scheduling System is a trademark of Cluster Resources, Inc.

@@ -13,7 +13,7 @@ Moab Workload Manager - End User License
 This product was created by Cluster Resources, Inc. and is protected by
 copyright and patent law.

-Copyright (C) 1999-2006 Cluster Resources, Inc., all rights reserved.
+Copyright (C) 1999-2010 Cluster Resources, Inc., all rights reserved.
 Moab Workload Manager, Moab Cluster Scheduler and Moab Scheduler
 are trademarks of Cluster Resources, Inc.

@@ -1,5 +1,5 @@
-# Makefile for Maui v3.2.6
-# Copyright 1999 - 2006  Cluster Resources, Inc, All Rights Reserved
+# Makefile for Maui 3.3.2
+# Copyright 1999 - 2010  Cluster Resources, Inc, All Rights Reserved

   TOP =../..
   BIN =$(TOP)/bin
@@ -18,7 +18,7 @@ SHELL  =/bin/sh
  IP   =$(SCHEDIP) $(LLIP) $(SGEIP) $(REGEXIP) $(MXIP) $(PBSCFLAGS)
  INCS =$(INC)moab.h $(INC)msched-proto.h $(INC)msched-common.h
  DEFS =-D$(OPSYS) $(LLDEF) $(SDRDEF) $(PBSDEF) $(OSDEF) $(MXDEF) \
-        $(REGEXDEF) $(RMSDEF) $(SECDEF) $(THREADDEF)
+        $(REGEXDEF) $(RMSDEF) $(SECDEF) $(THREADDEF) $(DAEMONDEF)

 SERVER   =maui
 SCHEDLIB =moab
@@ -47,8 +47,8 @@ CFLAGS = $(OSCCFLAGS)
 all:    $(MBINS)

 install: all
-	mkdir -p $(INST_DIR)/{bin,sbin,include,lib}
-	mkdir -p $(MSCHED_HOME)/{log,traces,stats,spool,tools}
+	mkdir -p $(INST_DIR)/bin $(INST_DIR)/sbin $(INST_DIR)/include $(INST_DIR)/lib
+	mkdir -p $(MSCHED_HOME)/log $(MSCHED_HOME)/traces $(MSCHED_HOME)/stats $(MSCHED_HOME)/spool $(MSCHED_HOME)/tools

 	chmod 1777 $(MSCHED_HOME)/spool

@@ -74,7 +74,7 @@ install: all
          then cp $(TOP)/maui-private.cfg.dist $(MSCHED_HOME)/maui-private.cfg; \
        fi

-	(cd ../..;ln -sf etc/maui.cfg;ln -sf etc/maui-private.cfg)
+#	(cd ../..;ln -sf etc/maui.cfg;ln -sf etc/maui-private.cfg)

 uninstall:
 	rm -f $(INST_DIR)/include/moab.h
@@ -5,7 +5,7 @@ int ServerSetSignalHandlers()
  {
  /* trap TERM(15) QUIT(3) INT(2) HUP(1) */
 
-#if defined(__AIX41) || defined(__AIX42) || defined(__AIX43) || defined(__AIX51) || defined(__IRIX) || defined(__LINUX) || defined(__HPUX) || defined(__SOLARIS) || defined(__OSF) || defined(__FREEBSD)
+#if defined(__AIX41) || defined(__AIX42) || defined(__AIX43) || defined(__AIX51) || defined(__IRIX) || defined(__LINUX) || defined(__CYGWIN) || defined(__HPUX) || defined(__SOLARIS) || defined(__OSF) || defined(__FREEBSD)
 
  signal(SIGINT,   SIG_IGN);
  signal(SIGTERM,  (void(*)(int))MSysShutdown);
@@ -57,15 +57,15 @@ int ServerSetSignalHandlers()
    {
    act.sa_handler = (void(*)(int))SIG_DFL;
    }
-  else if (!strcmp(ptr,"TRAP") || !strcmp(ptr,"trap"))
+  else if (!strcasecmp(ptr,"trap"))
    {
    act.sa_handler = (void(*)(int))CrashMode;
    }
-  else if (!strcmp(ptr,"IGNORE") || !strcmp(ptr,"ignore"))
+  else if (!strcasecmp(ptr,"ignore"))
    {
    act.sa_handler = (void(*)(int))SIG_IGN;
    }
-  else if (!strcmp(ptr,"DIE") || !strcmp(ptr,"die"))
+  else if (!strcasecmp(ptr,"die"))
    {
    act.sa_handler = (void(*)(int))SIG_DFL;
    }
@@ -93,15 +93,15 @@ int ServerSetSignalHandlers()
    {
    act.sa_handler = (void(*)(int))SIG_DFL;
    }
-  else if (!strcmp(ptr,"TRAP") || !strcmp(ptr,"trap"))
+  else if (!strcasecmp(ptr,"trap"))
    {
    act.sa_handler = (void(*)(int))CrashMode;
    }
-  else if (!strcmp(ptr,"IGNORE") || !strcmp(ptr,"ignore"))
+  else if (!strcasecmp(ptr,"ignore"))
    {
    act.sa_handler = (void(*)(int))SIG_IGN;
    }
-  else if (!strcmp(ptr,"DIE") || !strcmp(ptr,"die"))
+  else if (!strcasecmp(ptr,"die"))
    {
    act.sa_handler = (void(*)(int))SIG_DFL;
    }
@@ -120,7 +120,7 @@ int ServerSetSignalHandlers()
    }
  }    /* END BLOCK */ 

-#elif defined(__LINUX) || defined(__IRIX) || defined(__HPUX) || defined(__SOLARIS) || defined(__OSF)
+#elif defined(__LINUX) || defined(__CYGWIN) || defined(__IRIX) || defined(__HPUX) || defined(__SOLARIS) || defined(__OSF)

  ServerLoadSignalConfig();
 
@@ -143,8 +143,9 @@ int ServerSetSignalHandlers()


 int ServerDemonize()
+{
+#ifndef __CYGRUNSRV

-  {
 #ifndef __NT
  int   pid;
 #endif /* __NT */
@@ -235,6 +236,7 @@ int ServerDemonize()
      }
    }    /* END if (MSched.Mode != msmSim) */

+#endif /* __CYGRUNSRV */
  return(SUCCESS);
  }  /* END ServerDemonize() */

@@ -305,7 +307,7 @@ int CrashMode(

  if (signo == SIGSEGV)
    {
-#if defined(__AIX41) || defined(__AIX42) || defined(__AIX43) || defined(__AIX51) || defined(__LINUX) || defined(__HPUX) || defined(__IRIX) || defined(__SOLARIS) || defined(__OSF) || defined(__FREEBSD)
+#if defined(__AIX41) || defined(__AIX42) || defined(__AIX43) || defined(__AIX51) || defined(__LINUX) || defined(__CYGWIN) || defined(__CYGWIN) || defined(__HPUX) || defined(__IRIX) || defined(__SOLARIS) || defined(__OSF) || defined(__FREEBSD)

    signal(SIGSEGV,(void(*)(int))CrashMode);

@@ -317,7 +319,7 @@ int CrashMode(
    }
  else if (signo == SIGILL)
    {
-#if defined(__AIX41) || defined(__AIX42) || defined(__AIX43) || defined(__AIX51) || defined(__LINUX) || defined(__HPUX) || defined(__IRIX) || defined(__SOLARIS) || defined(__OSF) || defined(__FREEBSD)
+#if defined(__AIX41) || defined(__AIX42) || defined(__AIX43) || defined(__AIX51) || defined(__LINUX) || defined(__CYGWIN) || defined(__HPUX) || defined(__IRIX) || defined(__SOLARIS) || defined(__OSF) || defined(__FREEBSD)

    signal(SIGILL,(void(*)(int))CrashMode);

@@ -378,7 +380,7 @@ int ReloadConfig(

  MSched.Reload = TRUE;

-#if defined(__AIX41) || defined(__AIX42) || defined(__AIX43) || defined(__AIX51) || defined(__LINUX) || defined(__HPUX) || defined(__IRIX) || defined(__SOLARIS) || defined(__OSF) || defined(__FREEBSD)
+#if defined(__AIX41) || defined(__AIX42) || defined(__AIX43) || defined(__AIX51) || defined(__LINUX) || defined(__CYGWIN) || defined(__HPUX) || defined(__IRIX) || defined(__SOLARIS) || defined(__OSF) || defined(__FREEBSD)

  signal(SIGHUP,(void(*)(int))ReloadConfig);

@@ -291,14 +291,14 @@ int UIProcessCommand(
        if (MSched.AdminHost[index][0] == '\0')
          break;

-        if (!strcmp(MSched.AdminHost[index],S->Host))
+        if (!strcasecmp(MSched.AdminHost[index],S->Host))
          {
          hostcheck = TRUE;

          break;
          }

-        if (!strcmp(MSched.AdminHost[index],"ALL"))
+        if (!strcasecmp(MSched.AdminHost[index],"ALL"))
          {
          hostcheck = TRUE;

@@ -565,7 +565,7 @@ int SetJobUserPrio(

  if (!(FLAGS & ((1 << fAdmin1) | (1 << fAdmin2))))
    {
-    if (strcmp(J->Cred.U->Name,Auth) != 0)
+    if (strcasecmp(J->Cred.U->Name,Auth) != 0)
      {
      DBG(2,fUI) DPrint("INFO:     user %s is not authorized to set user priority on job %s\n",
        Auth,
@@ -618,7 +618,7 @@ int UIShowGrid(

  for (sindex = 0;MStatType[sindex] != 0;sindex++)
    {
-    if (!strcmp(MStatType[sindex],GStat))
+    if (!strcasecmp(MStatType[sindex],GStat))
      break;
    }  /* END for (sindex) */

@@ -777,7 +777,7 @@ int ShowBackfillWindow(
      {
      for (mindex = 0;MComp[mindex] != NULL;mindex++)
        {
-        if (!strcmp(MComp[mindex],MemCmp))
+        if (!strcasecmp(MComp[mindex],MemCmp))
          break;
        }

@@ -858,9 +858,9 @@ int ShowBackfillWindow(
            (BFNodeCount >= RequiredNodes) && 
            (BFProcCount >= RequiredProcs))
          {
-          if (strcmp(P->Name,CurrentPName) != 0)
+          if (strcasecmp(P->Name,CurrentPName) != 0)
            {
-            if ((strcmp(CurrentPName,GLOBAL_MPARNAME)) && (index == 0))
+            if ((strcasecmp(CurrentPName,GLOBAL_MPARNAME)) && (index == 0))
              {
              sprintf(Buffer,"%sno %s available\n",
                Buffer,
@@ -1062,7 +1062,7 @@ int ServerProcessArgs(
 int ServerShowCopy()

  {
-  fprintf(stderr,"Copyright 2000-2006 Cluster Resources, Inc, All Rights Reserved\n");
+  fprintf(stderr,"Copyright 2000-2010 Cluster Resources, Inc, All Rights Reserved\n");
  fprintf(stderr,"  for the latest release, see http://clusterresources.com/maui\n");

  fprintf(stderr,"This software includes the Maui Server Module, Copyright 1996 MHPCC, All Rights Reserved\n");
@@ -5521,7 +5521,14 @@ int MUIJobSetAttr(
      {
      long tmpPrio;

-      tmpPrio = strtol(Val,NULL,0);
+      if (!(CFlags & ((1 << fAdmin1) | (1 << fAdmin2))))
+        {
+        sprintf(Msg,"ERROR:  not authorized to run this command");
+
+        return(FAILURE);
+        }
+
+      tmpPrio = strtol(Val,NULL,0); 

      if ((tmpPrio < 0) || (tmpPrio > 1000))
        {
@@ -5557,7 +5564,7 @@ int MUIJobSetAttr(
      {
      mqos_t *Q;

-      int QAL[MAX_MQOS >> 5];
+      int QAL[(MAX_MQOS >> 5) + 1];

      if (!(CFlags & ((1 << fAdmin1) | (1 << fAdmin2))) &&
         (JobOwner == FALSE))
@@ -6150,7 +6157,8 @@ int UIDiagnose(
      {
      int BufSize = MAX_MBUFFER;

-      MFSShow(SBuffer,BufSize,IFlags);
+      /* DsT Added DiagOpt, so we can limit the output */
+      MFSShow(SBuffer,BufSize,DiagOpt,IFlags);

      *SBufSize = strlen(SBuffer);
      }  /* END BLOCK */
@@ -10131,7 +10139,7 @@ int UIQueueShowAJobs(
      J->PSUtilized,
      P->Name,
      RQ->TaskCount * RQ->DRes.Mem,
-      ((J->NodeList != NULL) && (J->NodeList[0].N->Name[0] != '\0')) ?
+      ((J->NodeList != NULL) && (J->NodeList[0].N != NULL) && (J->NodeList[0].N->Name[0] != '\0')) ?
        MNodeAdjustName(J->NodeList[0].N->Name,0) : NONE,
      J->Flags,
      J->AWallTime,
@@ -1,10 +1,10 @@
-VERSION 3.2.6p21
+VERSION 3.3.2
 PACKAGE maui
 AUTHOR Cluster Resources, Inc

 FILETYPE Module

-COPYRIGHT Copyright (C) 1999-2006 Cluster Resources, Inc
+COPYRIGHT Copyright (C) 1999-2010 Cluster Resources, Inc

 DISCLAIMER 
 ------------------------------------------------------------------------------
@@ -2598,7 +2598,7 @@ int MCShowCStats(
      case mxoUser:

        if (OCount == 0)     
-          tmpU = (mgcred_t *)malloc(sizeof(mgcred_t) * MAX_MUSER);
+          tmpU = (mgcred_t *)calloc(MAX_MUSER, sizeof(mgcred_t));
 
        O = &tmpU[OCount + 1];

@@ -2609,7 +2609,7 @@ int MCShowCStats(
      case mxoGroup:

        if (OCount == 0)
-          tmpG = (mgcred_t *)malloc(sizeof(mgcred_t) * MAX_MGROUP);
+          tmpG = (mgcred_t *)calloc(MAX_MGROUP,sizeof(mgcred_t));

        O = &tmpG[OCount + 1];               

@@ -2618,7 +2618,7 @@ int MCShowCStats(
      case mxoAcct:

        if (OCount == 0)
-          tmpA = (mgcred_t *)malloc(sizeof(mgcred_t) * MAX_MACCT);
+          tmpA = (mgcred_t *)calloc(MAX_MACCT, sizeof(mgcred_t));

        O = &tmpA[OCount + 1];
 
@@ -2627,7 +2627,7 @@ int MCShowCStats(
      case mxoClass:

        if (OCount == 0)
-          tmpC = (mclass_t *)malloc(sizeof(mclass_t) * MAX_MCLASS);
+          tmpC = (mclass_t *)calloc(MAX_MCLASS, sizeof(mclass_t));

        O = &tmpC[OCount + 1];
 
@@ -2636,7 +2636,7 @@ int MCShowCStats(
      case mxoQOS:

        if (OCount == 0)
-          tmpQ = (mqos_t *)malloc(sizeof(mqos_t) * MAX_MQOS);
+          tmpQ = (mqos_t *)calloc(MAX_MQOS, sizeof(mqos_t));

        O = &tmpQ[OCount + 1];
 
@@ -4236,7 +4236,8 @@ int MCShowUsage(
 
      fprintf(stderr,"  -a [ACCOUNTID]\n");
      fprintf(stderr,"  -c [CLASSID]\n");
-      fprintf(stderr,"  -f // fairshare\n");
+	  /** DsT added the possible options for f **/
+      fprintf(stderr,"  -f [user|group|acct|class|qos] // fairshare\n");
      fprintf(stderr,"  -g [GROUPID]\n");
      fprintf(stderr,"  -j [JOBID]\n");
      fprintf(stderr,"  -m // frame\n");
@@ -1501,7 +1501,7 @@ int Mode)
        }
      else
        {
-        fprintf(stdout,
+        fprintf(stdout,"%s",
          (Mode & (1 << mMatrix)) ? MNull : Null);
        }
      }
@@ -1517,7 +1517,7 @@ int Mode)
      }
    else
      {
-      fprintf(stdout,
+      fprintf(stdout,"%s",
        (Mode & (1 << mMatrix)) ? MNull : Null);

      fprintf(stdout,"\n");
@@ -1541,7 +1541,7 @@ int Mode)
      }
    else
      {
-      fprintf(stdout,
+      fprintf(stdout,"%s",
        (Mode & (1 << mMatrix)) ? MNull : Null);
      }
    }
Author	SHA1	Message	Date
bas	6888fcd7f3	fixed a showq -r segv when user only request for node property git-svn-id: svn://opensvn.adaptivecomputing.com/maui/trunk@155 3f5042e3-fb1d-0410-be18-d6ca2573e517	2013-09-11 08:57:08 +00:00
bas	d2f4f78302	applied client socket patch from Jonathan Barber git-svn-id: svn://opensvn.adaptivecomputing.com/maui/trunk@154 3f5042e3-fb1d-0410-be18-d6ca2573e517	2012-10-11 13:33:54 +00:00
bas	db939c837c	Showstats segfaults when using compiler optimization git-svn-id: svn://opensvn.adaptivecomputing.com/maui/trunk@153 3f5042e3-fb1d-0410-be18-d6ca2573e517	2012-10-04 08:36:35 +00:00
bas	bb6c2dd88a	added a patch for diagnose -f to allow an argument: * -f [user\|group\|acct\|class\|qos] git-svn-id: svn://opensvn.adaptivecomputing.com/maui/trunk@151 3f5042e3-fb1d-0410-be18-d6ca2573e517	2011-04-12 09:14:51 +00:00
bchristiansen	0efe0c2f0e	Changed version to 3.3.2 git-svn-id: svn://opensvn.adaptivecomputing.com/maui/trunk@150 3f5042e3-fb1d-0410-be18-d6ca2573e517	2011-03-04 16:24:58 +00:00
bchristiansen	e0baa93dc8	Changed version to 3.3.1 git-svn-id: svn://opensvn.adaptivecomputing.com/maui/trunk@148 3f5042e3-fb1d-0410-be18-d6ca2573e517	2011-03-04 16:00:09 +00:00
bchristiansen	aa37fa7509	Added UseMachineSpeedForFS patch from Robin Roth git-svn-id: svn://opensvn.adaptivecomputing.com/maui/trunk@147 3f5042e3-fb1d-0410-be18-d6ca2573e517	2011-03-03 05:02:54 +00:00
bas	1c4f2e31ce	Fixed 'showq -r' to show the correct values when NODEALLOCMAXPS is set to TRUE git-svn-id: svn://opensvn.adaptivecomputing.com/maui/trunk@146 3f5042e3-fb1d-0410-be18-d6ca2573e517	2010-08-10 12:56:35 +00:00
jasonw	6d593e6dff	- Patch to fix SYSTEMMAXJOBWALLTIME, SYSTEMMAXPROCPERJOB, and SYSTEMMAXPROCSECONDPERJOB which previously no-op'ed git-svn-id: svn://opensvn.adaptivecomputing.com/maui/trunk@145 3f5042e3-fb1d-0410-be18-d6ca2573e517	2010-08-06 17:36:19 +00:00
jasonw	dd3243e79f	- update CHANGELOG - added debug messages and a check for glibc return codes from vsnprintf to MUSNPrintF() git-svn-id: svn://opensvn.adaptivecomputing.com/maui/trunk@144 3f5042e3-fb1d-0410-be18-d6ca2573e517	2010-08-06 15:47:47 +00:00
jasonw	2c93b33b5f	Changed all remaining mallocs to callocs. git-svn-id: svn://opensvn.adaptivecomputing.com/maui/trunk@143 3f5042e3-fb1d-0410-be18-d6ca2573e517	2010-08-06 13:36:50 +00:00
jasonw	8ed8a5727c	- MAJOR FIX: MRes.c: replaced mallocs with callocs in MResAdjustDRes() to scrub the {C\|J\|O\|N}RE variables. Code in that function depends on it, and breaks badly with glic memory corruption errors when RESERVATIONDEPTH is > 1. Further auditing of malloc vs. calloc is probably needed across the entire codebase. - MSU.c: Fix for valgrind error about uninitialized value - MNode.c: Fix for valgrind error about uninitialized value git-svn-id: svn://opensvn.adaptivecomputing.com/maui/trunk@142 3f5042e3-fb1d-0410-be18-d6ca2573e517	2010-08-03 21:21:42 +00:00
jasonw	992e0a16af	- slight modification to the toplevel Makefile to allow BUILD_ROOT to be set by rpm when building RPMS and to be set to EMPTY if not set. git-svn-id: svn://opensvn.adaptivecomputing.com/maui/trunk@141 3f5042e3-fb1d-0410-be18-d6ca2573e517	2010-08-03 14:32:11 +00:00
jasonw	bf8743a61a	- all the mallocs in the MResAdjustDRes() function should really be checked independently for success or failure instead of just the CRE malloc git-svn-id: svn://opensvn.adaptivecomputing.com/maui/trunk@140 3f5042e3-fb1d-0410-be18-d6ca2573e517	2010-08-02 18:24:51 +00:00
jasonw	5eaf1487c6	git-svn-id: svn://opensvn.adaptivecomputing.com/maui/trunk@139 3f5042e3-fb1d-0410-be18-d6ca2573e517	2010-07-27 15:43:24 +00:00
jasonw	6489c74bf0	Patch to fix SYSTEMMAXJOBWALLTIME, SYSTEMMAXPROCPERJOB, and SYSTEMMAXPROCSECONDPERJOB which previously no-op'ed git-svn-id: svn://opensvn.adaptivecomputing.com/maui/trunk@138 3f5042e3-fb1d-0410-be18-d6ca2573e517	2010-07-22 21:04:11 +00:00
bchristiansen	90b28d2858	cygwin readme git-svn-id: svn://opensvn.adaptivecomputing.com/maui/trunk@137 3f5042e3-fb1d-0410-be18-d6ca2573e517	2010-07-21 21:34:53 +00:00
bchristiansen	fe6e2752b3	cygwin porting git-svn-id: svn://opensvn.adaptivecomputing.com/maui/trunk@136 3f5042e3-fb1d-0410-be18-d6ca2573e517	2010-07-21 21:33:42 +00:00
bchristiansen	2547abcf21	Made showgrid's, and other's, arguments case-insensitive. (David Chin) git-svn-id: svn://opensvn.adaptivecomputing.com/maui/trunk@135 3f5042e3-fb1d-0410-be18-d6ca2573e517	2010-07-21 21:27:06 +00:00
bchristiansen	06a80120b0	fix for preventing users from setting system priority on their own jobs (Bas van der Vlies) git-svn-id: svn://opensvn.adaptivecomputing.com/maui/trunk@134 3f5042e3-fb1d-0410-be18-d6ca2573e517	2010-07-21 14:35:56 +00:00
bchristiansen	0b1168a162	updated CHANGELOG git-svn-id: svn://opensvn.adaptivecomputing.com/maui/trunk@133 3f5042e3-fb1d-0410-be18-d6ca2573e517	2010-04-30 15:14:38 +00:00
bchristiansen	b0f4f7e712	Fix for broken - Alexis Cousein git-svn-id: svn://opensvn.adaptivecomputing.com/maui/trunk@132 3f5042e3-fb1d-0410-be18-d6ca2573e517	2010-04-30 14:59:45 +00:00
bchristiansen	2267640e03	Fixed fprintf comipler warnings git-svn-id: svn://opensvn.adaptivecomputing.com/maui/trunk@131 3f5042e3-fb1d-0410-be18-d6ca2573e517	2010-02-23 17:48:41 +00:00
bchristiansen	0921a1ef39	Fixed memset_chk compiler errors. (Denis Pynkin) git-svn-id: svn://opensvn.adaptivecomputing.com/maui/trunk@130 3f5042e3-fb1d-0410-be18-d6ca2573e517	2010-02-23 17:46:36 +00:00
bchristiansen	eb911536f1	changelog update git-svn-id: svn://opensvn.adaptivecomputing.com/maui/trunk@126 3f5042e3-fb1d-0410-be18-d6ca2573e517	2010-02-19 19:59:45 +00:00
bchristiansen	1d14d34e1e	updated configure.ac because RMNMHOST didn't exist. Fixed mkdirs and commented out links in src/server/Makefile git-svn-id: svn://opensvn.adaptivecomputing.com/maui/trunk@125 3f5042e3-fb1d-0410-be18-d6ca2573e517	2010-02-19 19:48:13 +00:00
bchristiansen	1cc6864e13	updated version information to 3.3 git-svn-id: svn://opensvn.adaptivecomputing.com/maui/trunk@124 3f5042e3-fb1d-0410-be18-d6ca2573e517	2010-02-19 18:54:21 +00:00
bchristiansen	346bf319ab	removed unreferenced src/mcom/Makefile.in git-svn-id: svn://opensvn.adaptivecomputing.com/maui/trunk@120 3f5042e3-fb1d-0410-be18-d6ca2573e517	2009-10-13 22:24:06 +00:00
bchristiansen	41e429a5f1	INCR: updated version information git-svn-id: svn://opensvn.adaptivecomputing.com/maui/trunk@119 3f5042e3-fb1d-0410-be18-d6ca2573e517	2009-10-12 20:02:27 +00:00