fixed even more bugs

galek · Dec 13, 2009 · 90430aa · 90430aa
1 parent 16c8689
commit 90430aa
Show file tree

Hide file tree

Showing 6 changed files with 218 additions and 6 deletions.
diff --git a/Samples/Recursion/Demo_Recursion.vcproj b/Samples/Recursion/Demo_Recursion.vcproj
@@ -0,0 +1,199 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9,00"
+ Name="Demo_Recursion"
+ ProjectGUID="{D0EB96F2-10EC-4DCC-AC4F-93E20D2717AC}"
+ RootNamespace="Demo_Simple"
+ Keyword="Win32Proj"
+ TargetFrameworkVersion="196613"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="../../bin/$(ConfigurationName)"
+ IntermediateDirectory="../../obj/$(ConfigurationName)"
+ ConfigurationType="1"
+ CharacterSet="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="../../include"
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ DebugInformationFormat="4"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="Shiny.lib"
+ LinkIncremental="2"
+ AdditionalLibraryDirectories="../../lib/$(ConfigurationName)"
+ GenerateDebugInformation="true"
+ SubSystem="1"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="../../bin/$(ConfigurationName)"
+ IntermediateDirectory="../../obj/$(ConfigurationName)"
+ ConfigurationType="1"
+ CharacterSet="1"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ EnableIntrinsicFunctions="true"
+ AdditionalIncludeDirectories="../../include"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="Shiny.lib"
+ LinkIncremental="1"
+ AdditionalLibraryDirectories="../../lib/$(ConfigurationName)"
+ GenerateDebugInformation="true"
+ SubSystem="1"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+ >
+ <File
+ RelativePath=".\Recursion.cpp"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+ >
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+ >
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/Samples/Recursion/Recursion.cpp b/Samples/Recursion/Recursion.cpp
@@ -59,8 +59,11 @@ int main() {
 
  Recursion(12);
 
- PROFILER_UPDATE(); // update all profiles
- PROFILER_OUTPUT(); // print to cout
+ PROFILE_UPDATE(); // update all profiles
+ PROFILE_OUTPUT(stdout); // print to cout
 
+#ifdef _WIN32
+ system("pause");
+#endif
  return 0;
 }
diff --git a/Samples/Simple/Simple.cpp b/Samples/Simple/Simple.cpp
@@ -62,7 +62,8 @@ int main() {
  PROFILE_UPDATE(); // update all profiles
  PROFILE_OUTPUT(stdout); // print to cout
 
+#ifdef _WIN32
  system("pause");
-
+#endif
  return 0;
 }
diff --git a/Shiny.sln b/Shiny.sln
@@ -8,6 +8,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Demo_Simple", "Samples\Simp
  {D44CCFEB-7FC2-46E6-8290-E0B00D06A636} = {D44CCFEB-7FC2-46E6-8290-E0B00D06A636}
  EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Demo_Recursion", "Samples\Recursion\Demo_Recursion.vcproj", "{D0EB96F2-10EC-4DCC-AC4F-93E20D2717AC}"
+ ProjectSection(ProjectDependencies) = postProject
+ {D44CCFEB-7FC2-46E6-8290-E0B00D06A636} = {D44CCFEB-7FC2-46E6-8290-E0B00D06A636}
+ EndProjectSection
+EndProject
 Global
  GlobalSection(SolutionConfigurationPlatforms) = preSolution
  Debug|Win32 = Debug|Win32
@@ -22,6 +27,10 @@ Global
  {CE0B3567-5D70-4AA4-8F7C-29FE8E9CA7A3}.Debug|Win32.Build.0 = Debug|Win32
  {CE0B3567-5D70-4AA4-8F7C-29FE8E9CA7A3}.Release|Win32.ActiveCfg = Release|Win32
  {CE0B3567-5D70-4AA4-8F7C-29FE8E9CA7A3}.Release|Win32.Build.0 = Release|Win32
+ {D0EB96F2-10EC-4DCC-AC4F-93E20D2717AC}.Debug|Win32.ActiveCfg = Debug|Win32
+ {D0EB96F2-10EC-4DCC-AC4F-93E20D2717AC}.Debug|Win32.Build.0 = Debug|Win32
+ {D0EB96F2-10EC-4DCC-AC4F-93E20D2717AC}.Release|Win32.ActiveCfg = Release|Win32
+ {D0EB96F2-10EC-4DCC-AC4F-93E20D2717AC}.Release|Win32.Build.0 = Release|Win32
  EndGlobalSection
  GlobalSection(SolutionProperties) = preSolution
  HideSolutionNode = FALSE

diff --git a/src/ShinyManager.c b/src/ShinyManager.c
@@ -386,7 +386,7 @@ void ShinyManager_outputToStream(ShinyManager *self, FILE *a_stream) {
 
 #if SHINY_OUTPUT_MODE & SHINY_OUTPUT_MODE_TREE
  {
- int size = ShinyPrintNodesSize(self->zoneCount);
+ int size = ShinyPrintNodesSize(self->nodeCount);
  char *buffer = (char*) malloc(size);
  ShinyPrintNodes(buffer, &self->rootNode);
  fwrite(buffer, 1, size - 1, a_stream);

diff --git a/src/ShinyNodeState.c b/src/ShinyNodeState.c
@@ -44,15 +44,15 @@ ShinyNodeState* ShinyNodeState_push(ShinyNodeState *a_top, ShinyNode *a_node) {
  zone->data.selfTicks.cur += a_node->_last.selfTicks;
  zone->data.entryCount.cur += a_node->_last.entryCount;
 
- zone->data.childTicks.cur = 0;
+ a_node->data.childTicks.cur = 0;
  a_node->_last.selfTicks = 0;
  a_node->_last.entryCount = 0;
 
  self->zoneUpdating = zone->_state != SHINY_ZONE_STATE_UPDATING;
  if (self->zoneUpdating) {
  zone->_state = SHINY_ZONE_STATE_UPDATING;
  } else {
- zone->data.childTicks.cur -= zone->data.selfTicks.cur;
+ zone->data.childTicks.cur -= a_node->data.selfTicks.cur;
  }
 
  return self;