[all] another winapi nuke, QueryPerformanceCounter/QueryPerformanceFrequency replaced with CurrentHostCounter/CurrentHostFrequency, uses int64_t instead of LARGE_INTEGER. Need Linux/Win build testing.

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@23569 568bbfeb-2a22-0410-94d2-cc84cf5bfa90

4 files changed, 393 insertions, 394 deletions

diff --git a/guilib/GUIControlProfiler.cpp b/guilib/GUIControlProfiler.cpp
index 4435189d4f..121e5be566 100644
--- a/guilib/GUIControlProfiler.cpp
+++ b/guilib/GUIControlProfiler.cpp
@@ -1,368 +1,363 @@
-/*

- *      Copyright (C) 2005-2009 Team XBMC

- *      http://www.xbmc.org

- *

- *  This Program is free software; you can redistribute it and/or modify

- *  it under the terms of the GNU General Public License as published by

- *  the Free Software Foundation; either version 2, or (at your option)

- *  any later version.

- *

- *  This Program is distributed in the hope that it will be useful,

- *  but WITHOUT ANY WARRANTY; without even the implied warranty of

- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

- *  GNU General Public License for more details.

- *

- *  You should have received a copy of the GNU General Public License

- *  along with XBMC; see the file COPYING.  If not, write to

- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.

- *  http://www.gnu.org/copyleft/gpl.html

- *

- */

-

-#include "GUIControlProfiler.h"

-#include "tinyXML/tinyxml.h"

-

-bool CGUIControlProfiler::m_bIsRunning = false;

-

-CGUIControlProfilerItem::CGUIControlProfilerItem(CGUIControlProfiler *pProfiler, CGUIControlProfilerItem *pParent, CGUIControl *pControl)

-: m_pProfiler(pProfiler), m_pParent(pParent), m_pControl(pControl), m_visTime(0), m_renderTime(0)

-{

-  if (m_pControl)

-  {

-    m_controlID = m_pControl->GetID();

-    m_ControlType = m_pControl->GetControlType();

-    m_strDescription = m_pControl->GetDescription();

-  }

-  else 

-  {

-    m_controlID = 0;

-    m_ControlType = CGUIControl::GUICONTROL_UNKNOWN;

-  }

-}

-

-CGUIControlProfilerItem::~CGUIControlProfilerItem(void)

-{

-  Reset(NULL);

-}

-

-void CGUIControlProfilerItem::Reset(CGUIControlProfiler *pProfiler)

-{

-  m_controlID = 0;

-  m_ControlType = CGUIControl::GUICONTROL_UNKNOWN;

-  m_pControl = NULL;

-

-  m_visTime = 0;

-  m_renderTime = 0;

-  const unsigned int dwSize = m_vecChildren.size();

-  for (unsigned int i=0; i<dwSize; ++i)

-    delete m_vecChildren[i];

-  m_vecChildren.clear();

-

-  m_pProfiler = pProfiler;

-}

-

-void CGUIControlProfilerItem::BeginVisibility(void)

-{

-  QueryPerformanceCounter(&m_i64VisStart);

-}

-

-void CGUIControlProfilerItem::EndVisibility(void)

-{

-  LARGE_INTEGER t2;

-  QueryPerformanceCounter(&t2);

-  m_visTime += (unsigned int)(m_pProfiler->m_fPerfScale * (t2.QuadPart - m_i64VisStart.QuadPart));

-}

-

-void CGUIControlProfilerItem::BeginRender(void)

-{ 

-  QueryPerformanceCounter(&m_i64RenderStart); 

-}

-

-void CGUIControlProfilerItem::EndRender(void)

-{

-  LARGE_INTEGER t2;

-  QueryPerformanceCounter(&t2);

-  m_renderTime += (unsigned int)(m_pProfiler->m_fPerfScale * (t2.QuadPart - m_i64RenderStart.QuadPart));

-}

-

-void CGUIControlProfilerItem::SaveToXML(TiXmlElement *parent)

-{

-  TiXmlElement *xmlControl = new TiXmlElement("control");

-  parent->LinkEndChild(xmlControl);

-  

-  const char *lpszType = NULL;

-  switch (m_ControlType)

-  {

-  case CGUIControl::GUICONTROL_BUTTON: 

-    lpszType = "button"; break;

-  case CGUIControl::GUICONTROL_CHECKMARK: 

-    lpszType = "checkmark"; break;

-  case CGUIControl::GUICONTROL_FADELABEL: 

-    lpszType = "fadelabel"; break;

-  case CGUIControl::GUICONTROL_IMAGE: 

-  case CGUIControl::GUICONTROL_BORDEREDIMAGE: 

-    lpszType = "image"; break;

-  case CGUIControl::GUICONTROL_LARGE_IMAGE: 

-    lpszType = "largeimage"; break;

-  case CGUIControl::GUICONTROL_LABEL: 

-    lpszType = "label"; break;

-  case CGUIControl::GUICONTROL_LISTGROUP: 

-    lpszType = "group"; break;

-  case CGUIControl::GUICONTROL_PROGRESS: 

-    lpszType = "progress"; break;

-  case CGUIControl::GUICONTROL_RADIO: 

-    lpszType = "radiobutton"; break;

-  case CGUIControl::GUICONTROL_RSS: 

-    lpszType = "rss"; break;

-  case CGUIControl::GUICONTROL_SELECTBUTTON: 

-    lpszType = "selectbutton"; break;

-  case CGUIControl::GUICONTROL_SLIDER: 

-    lpszType = "slider"; break;

-  case CGUIControl::GUICONTROL_SETTINGS_SLIDER: 

-    lpszType = "sliderex"; break;

-  case CGUIControl::GUICONTROL_SPIN: 

-    lpszType = "spincontrol"; break;

-  case CGUIControl::GUICONTROL_SPINEX: 

-    lpszType = "spincontrolex"; break;

-  case CGUIControl::GUICONTROL_TEXTBOX: 

-    lpszType = "textbox"; break;

-  case CGUIControl::GUICONTROL_TOGGLEBUTTON:

-    lpszType = "togglebutton"; break;

-  case CGUIControl::GUICONTROL_VIDEO:

-    lpszType = "videowindow"; break;

-  case CGUIControl::GUICONTROL_MOVER:

-    lpszType = "mover"; break;

-  case CGUIControl::GUICONTROL_RESIZE:

-    lpszType = "resize"; break;

-  case CGUIControl::GUICONTROL_BUTTONBAR:

-    lpszType = "buttonscroller"; break;

-  case CGUIControl::GUICONTROL_EDIT:

-    lpszType = "edit"; break;

-  case CGUIControl::GUICONTROL_VISUALISATION:

-    lpszType = "visualisation"; break;

-  case CGUIControl::GUICONTROL_MULTI_IMAGE:

-    lpszType = "multiimage"; break;

-  case CGUIControl::GUICONTROL_GROUP:

-    lpszType = "group"; break;

-  case CGUIControl::GUICONTROL_GROUPLIST:

-    lpszType = "grouplist"; break;

-  case CGUIControl::GUICONTROL_SCROLLBAR:

-    lpszType = "scrollbar"; break;

-  case CGUIControl::GUICONTROL_LISTLABEL:

-    lpszType = "label"; break;

-  case CGUIControl::GUICONTROL_MULTISELECT:

-    lpszType = "multiselect"; break;

-  case CGUIControl::GUICONTAINER_LIST:

-    lpszType = "list"; break;

-  case CGUIControl::GUICONTAINER_WRAPLIST:

-    lpszType = "wraplist"; break;

-  case CGUIControl::GUICONTAINER_FIXEDLIST:

-    lpszType = "fixedlist"; break;

-  case CGUIControl::GUICONTAINER_PANEL:

-    lpszType = "panel"; break;

-  //case CGUIControl::GUICONTROL_LIST: 

-  //case CGUIControl::GUICONTROL_UNKNOWN: 

-  //case CGUIControl::GUICONTROL_LISTEX: 

-  //case CGUIControl::GUICONTROL_SPINBUTTON: 

-  //case CGUIControl::GUICONTROL_THUMBNAIL: 

-  //case CGUIControl::GUICONTROL_CONSOLE:

-  default:

-    break;

-  }

-

-  if (lpszType)

-    xmlControl->SetAttribute("type", lpszType);

-  if (m_controlID != 0)  

-  {

-    CStdString str;

-    str.Format("%u", m_controlID);

-    xmlControl->SetAttribute("id", str.c_str());

-  }

-

-  float pct = (float)GetTotalTime() / (float)m_pProfiler->GetTotalTime();

-  if (pct > 0.01f)

-  {

-    CStdString str;

-    str.Format("%.0f", pct * 100.0f);

-    xmlControl->SetAttribute("percent", str.c_str());

-  }

-

-  if (!m_strDescription.IsEmpty())

-  {

-    TiXmlElement *elem = new TiXmlElement("description");

-    xmlControl->LinkEndChild(elem);

-    TiXmlText *text = new TiXmlText(m_strDescription.c_str());  

-    elem->LinkEndChild(text);

-  }

-

-  // Note time is stored in 1/100 milliseconds but reported in ms

-  unsigned int vis = m_visTime / 100;

-  unsigned int rend = m_renderTime / 100;

-  if (vis || rend)

-  {

-    CStdString val;

-    TiXmlElement *elem = new TiXmlElement("rendertime");

-    xmlControl->LinkEndChild(elem);

-    val.Format("%u", rend);

-    TiXmlText *text = new TiXmlText(val.c_str());

-    elem->LinkEndChild(text);

-    

-    elem = new TiXmlElement("visibletime");

-    xmlControl->LinkEndChild(elem);

-    val.Format("%u", vis);

-    text = new TiXmlText(val.c_str());

-    elem->LinkEndChild(text);

-  }

-

-  if (m_vecChildren.size())

-  {

-    TiXmlElement *xmlChilds = new TiXmlElement("children");

-    xmlControl->LinkEndChild(xmlChilds);

-    const unsigned int dwSize = m_vecChildren.size();

-    for (unsigned int i=0; i<dwSize; ++i)

-      m_vecChildren[i]->SaveToXML(xmlChilds);

-  }

-}

-

-CGUIControlProfilerItem *CGUIControlProfilerItem::AddControl(CGUIControl *pControl)

-{

-  m_vecChildren.push_back(new CGUIControlProfilerItem(m_pProfiler, this, pControl));

-  return m_vecChildren.back();

-}

-

-CGUIControlProfilerItem *CGUIControlProfilerItem::FindOrAddControl(CGUIControl *pControl, bool recurse)

-{

-  const unsigned int dwSize = m_vecChildren.size();

-  for (unsigned int i=0; i<dwSize; ++i)

-  {

-    CGUIControlProfilerItem *p = m_vecChildren[i];

-    if (p->m_pControl == pControl)

-      return p;

-    if (recurse && (p = p->FindOrAddControl(pControl, true)))

-      return p;

-  }

-

-  if (pControl->GetParentControl() == m_pControl)

-    return AddControl(pControl); 

-

-  return NULL;

-}

-

-CGUIControlProfiler::CGUIControlProfiler(void)

-: m_ItemHead(NULL, NULL, NULL), m_pLastItem(NULL), m_iMaxFrameCount(200)

-// m_bIsRunning(false), no isRunning because it is static

-{

-  LARGE_INTEGER i64PerfFreq;

-  QueryPerformanceFrequency(&i64PerfFreq);

-  m_fPerfScale = 100000.0f / i64PerfFreq.QuadPart;

-}

-

-CGUIControlProfiler &CGUIControlProfiler::Instance(void)

-{

-  static CGUIControlProfiler _instance;

-  return _instance;

-}

-

-bool CGUIControlProfiler::IsRunning(void) 

-{ 

-  return m_bIsRunning;

-}

-

-void CGUIControlProfiler::Start(void)

-{

-  m_iFrameCount = 0;

-  m_bIsRunning = true;

-  m_pLastItem = NULL;

-  m_ItemHead.Reset(this);

-}

-

-void CGUIControlProfiler::BeginVisibility(CGUIControl *pControl)

-{

-  CGUIControlProfilerItem *item = FindOrAddControl(pControl);

-  item->BeginVisibility();

-}

-

-void CGUIControlProfiler::EndVisibility(CGUIControl *pControl)

-{

-  CGUIControlProfilerItem *item = FindOrAddControl(pControl);

-  item->EndVisibility();

-}

-

-void CGUIControlProfiler::BeginRender(CGUIControl *pControl)

-{

-  CGUIControlProfilerItem *item = FindOrAddControl(pControl);

-  item->BeginRender();

-}

-

-void CGUIControlProfiler::EndRender(CGUIControl *pControl)

-{

-  CGUIControlProfilerItem *item = FindOrAddControl(pControl);

-  item->EndRender();

-}

-

-CGUIControlProfilerItem *CGUIControlProfiler::FindOrAddControl(CGUIControl *pControl)

-{

-  if (m_pLastItem)

-  {

-    // Typically calls come in pairs so the last control we found is probably

-    // the one we want again next time

-    if (m_pLastItem->m_pControl == pControl)

-      return m_pLastItem;

-    // If that control is not a match, usually the one we want is the next 

-    // sibling of that control, or the parent of that control so check

-    // the parent first as it is more convenient

-    m_pLastItem = m_pLastItem->m_pParent;

-    if (m_pLastItem && m_pLastItem->m_pControl == pControl)

-      return m_pLastItem;

-    // continued from above, this searches the original control's siblings

-    if (m_pLastItem)

-      m_pLastItem = m_pLastItem->FindOrAddControl(pControl, false);

-    if (m_pLastItem)

-      return m_pLastItem;

-  }

-

-  m_pLastItem = m_ItemHead.FindOrAddControl(pControl, true);

-  if (!m_pLastItem)

-    m_pLastItem = m_ItemHead.AddControl(pControl);

-

-  return m_pLastItem;

-}

-

-void CGUIControlProfiler::EndFrame(void)

-{

-  m_iFrameCount++;

-  if (m_iFrameCount >= m_iMaxFrameCount)

-  {

-    const unsigned int dwSize = m_ItemHead.m_vecChildren.size();

-    for (unsigned int i=0; i<dwSize; ++i)

-    {

-      CGUIControlProfilerItem *p = m_ItemHead.m_vecChildren[i];

-      m_ItemHead.m_visTime += p->m_visTime;

-      m_ItemHead.m_renderTime += p->m_renderTime;

-    }

-

-    m_bIsRunning = false;

-    if (SaveResults())

-      m_ItemHead.Reset(this);

-  }

-}

-

-bool CGUIControlProfiler::SaveResults(void)

-{

-  if (m_strOutputFile.IsEmpty())

-    return false;

-

-  TiXmlDocument doc;

-  TiXmlDeclaration decl("1.0", "", "yes");

-  doc.InsertEndChild(decl);

-

-  TiXmlElement *root = new TiXmlElement("guicontrolprofiler");

-  CStdString str;

-  str.Format("%d", m_iFrameCount);

-  root->SetAttribute("framecount", str.c_str());

-  root->SetAttribute("timeunit", "ms");

-  doc.LinkEndChild(root);

-

-  m_ItemHead.SaveToXML(root);

-  return doc.SaveFile(m_strOutputFile);

-}

+/*
+ *      Copyright (C) 2005-2009 Team XBMC
+ *      http://www.xbmc.org
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with XBMC; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
+#include "GUIControlProfiler.h"
+#include "tinyXML/tinyxml.h"
+#include "utils/TimeUtils.h"
+
+bool CGUIControlProfiler::m_bIsRunning = false;
+
+CGUIControlProfilerItem::CGUIControlProfilerItem(CGUIControlProfiler *pProfiler, CGUIControlProfilerItem *pParent, CGUIControl *pControl)
+: m_pProfiler(pProfiler), m_pParent(pParent), m_pControl(pControl), m_visTime(0), m_renderTime(0)
+{
+  if (m_pControl)
+  {
+    m_controlID = m_pControl->GetID();
+    m_ControlType = m_pControl->GetControlType();
+    m_strDescription = m_pControl->GetDescription();
+  }
+  else 
+  {
+    m_controlID = 0;
+    m_ControlType = CGUIControl::GUICONTROL_UNKNOWN;
+  }
+}
+
+CGUIControlProfilerItem::~CGUIControlProfilerItem(void)
+{
+  Reset(NULL);
+}
+
+void CGUIControlProfilerItem::Reset(CGUIControlProfiler *pProfiler)
+{
+  m_controlID = 0;
+  m_ControlType = CGUIControl::GUICONTROL_UNKNOWN;
+  m_pControl = NULL;
+
+  m_visTime = 0;
+  m_renderTime = 0;
+  const unsigned int dwSize = m_vecChildren.size();
+  for (unsigned int i=0; i<dwSize; ++i)
+    delete m_vecChildren[i];
+  m_vecChildren.clear();
+
+  m_pProfiler = pProfiler;
+}
+
+void CGUIControlProfilerItem::BeginVisibility(void)
+{
+  m_i64VisStart = CurrentHostCounter();
+}
+
+void CGUIControlProfilerItem::EndVisibility(void)
+{
+  m_visTime += (unsigned int)(m_pProfiler->m_fPerfScale * (CurrentHostCounter() - m_i64VisStart));
+}
+
+void CGUIControlProfilerItem::BeginRender(void)
+{ 
+  m_i64RenderStart = CurrentHostCounter();
+}
+
+void CGUIControlProfilerItem::EndRender(void)
+{
+  m_renderTime += (unsigned int)(m_pProfiler->m_fPerfScale * (CurrentHostCounter() - m_i64RenderStart));
+}
+
+void CGUIControlProfilerItem::SaveToXML(TiXmlElement *parent)
+{
+  TiXmlElement *xmlControl = new TiXmlElement("control");
+  parent->LinkEndChild(xmlControl);
+  
+  const char *lpszType = NULL;
+  switch (m_ControlType)
+  {
+  case CGUIControl::GUICONTROL_BUTTON: 
+    lpszType = "button"; break;
+  case CGUIControl::GUICONTROL_CHECKMARK: 
+    lpszType = "checkmark"; break;
+  case CGUIControl::GUICONTROL_FADELABEL: 
+    lpszType = "fadelabel"; break;
+  case CGUIControl::GUICONTROL_IMAGE: 
+  case CGUIControl::GUICONTROL_BORDEREDIMAGE: 
+    lpszType = "image"; break;
+  case CGUIControl::GUICONTROL_LARGE_IMAGE: 
+    lpszType = "largeimage"; break;
+  case CGUIControl::GUICONTROL_LABEL: 
+    lpszType = "label"; break;
+  case CGUIControl::GUICONTROL_LISTGROUP: 
+    lpszType = "group"; break;
+  case CGUIControl::GUICONTROL_PROGRESS: 
+    lpszType = "progress"; break;
+  case CGUIControl::GUICONTROL_RADIO: 
+    lpszType = "radiobutton"; break;
+  case CGUIControl::GUICONTROL_RSS: 
+    lpszType = "rss"; break;
+  case CGUIControl::GUICONTROL_SELECTBUTTON: 
+    lpszType = "selectbutton"; break;
+  case CGUIControl::GUICONTROL_SLIDER: 
+    lpszType = "slider"; break;
+  case CGUIControl::GUICONTROL_SETTINGS_SLIDER: 
+    lpszType = "sliderex"; break;
+  case CGUIControl::GUICONTROL_SPIN: 
+    lpszType = "spincontrol"; break;
+  case CGUIControl::GUICONTROL_SPINEX: 
+    lpszType = "spincontrolex"; break;
+  case CGUIControl::GUICONTROL_TEXTBOX: 
+    lpszType = "textbox"; break;
+  case CGUIControl::GUICONTROL_TOGGLEBUTTON:
+    lpszType = "togglebutton"; break;
+  case CGUIControl::GUICONTROL_VIDEO:
+    lpszType = "videowindow"; break;
+  case CGUIControl::GUICONTROL_MOVER:
+    lpszType = "mover"; break;
+  case CGUIControl::GUICONTROL_RESIZE:
+    lpszType = "resize"; break;
+  case CGUIControl::GUICONTROL_BUTTONBAR:
+    lpszType = "buttonscroller"; break;
+  case CGUIControl::GUICONTROL_EDIT:
+    lpszType = "edit"; break;
+  case CGUIControl::GUICONTROL_VISUALISATION:
+    lpszType = "visualisation"; break;
+  case CGUIControl::GUICONTROL_MULTI_IMAGE:
+    lpszType = "multiimage"; break;
+  case CGUIControl::GUICONTROL_GROUP:
+    lpszType = "group"; break;
+  case CGUIControl::GUICONTROL_GROUPLIST:
+    lpszType = "grouplist"; break;
+  case CGUIControl::GUICONTROL_SCROLLBAR:
+    lpszType = "scrollbar"; break;
+  case CGUIControl::GUICONTROL_LISTLABEL:
+    lpszType = "label"; break;
+  case CGUIControl::GUICONTROL_MULTISELECT:
+    lpszType = "multiselect"; break;
+  case CGUIControl::GUICONTAINER_LIST:
+    lpszType = "list"; break;
+  case CGUIControl::GUICONTAINER_WRAPLIST:
+    lpszType = "wraplist"; break;
+  case CGUIControl::GUICONTAINER_FIXEDLIST:
+    lpszType = "fixedlist"; break;
+  case CGUIControl::GUICONTAINER_PANEL:
+    lpszType = "panel"; break;
+  //case CGUIControl::GUICONTROL_LIST: 
+  //case CGUIControl::GUICONTROL_UNKNOWN: 
+  //case CGUIControl::GUICONTROL_LISTEX: 
+  //case CGUIControl::GUICONTROL_SPINBUTTON: 
+  //case CGUIControl::GUICONTROL_THUMBNAIL: 
+  //case CGUIControl::GUICONTROL_CONSOLE:
+  default:
+    break;
+  }
+
+  if (lpszType)
+    xmlControl->SetAttribute("type", lpszType);
+  if (m_controlID != 0)  
+  {
+    CStdString str;
+    str.Format("%u", m_controlID);
+    xmlControl->SetAttribute("id", str.c_str());
+  }
+
+  float pct = (float)GetTotalTime() / (float)m_pProfiler->GetTotalTime();
+  if (pct > 0.01f)
+  {
+    CStdString str;
+    str.Format("%.0f", pct * 100.0f);
+    xmlControl->SetAttribute("percent", str.c_str());
+  }
+
+  if (!m_strDescription.IsEmpty())
+  {
+    TiXmlElement *elem = new TiXmlElement("description");
+    xmlControl->LinkEndChild(elem);
+    TiXmlText *text = new TiXmlText(m_strDescription.c_str());  
+    elem->LinkEndChild(text);
+  }
+
+  // Note time is stored in 1/100 milliseconds but reported in ms
+  unsigned int vis = m_visTime / 100;
+  unsigned int rend = m_renderTime / 100;
+  if (vis || rend)
+  {
+    CStdString val;
+    TiXmlElement *elem = new TiXmlElement("rendertime");
+    xmlControl->LinkEndChild(elem);
+    val.Format("%u", rend);
+    TiXmlText *text = new TiXmlText(val.c_str());
+    elem->LinkEndChild(text);
+    
+    elem = new TiXmlElement("visibletime");
+    xmlControl->LinkEndChild(elem);
+    val.Format("%u", vis);
+    text = new TiXmlText(val.c_str());
+    elem->LinkEndChild(text);
+  }
+
+  if (m_vecChildren.size())
+  {
+    TiXmlElement *xmlChilds = new TiXmlElement("children");
+    xmlControl->LinkEndChild(xmlChilds);
+    const unsigned int dwSize = m_vecChildren.size();
+    for (unsigned int i=0; i<dwSize; ++i)
+      m_vecChildren[i]->SaveToXML(xmlChilds);
+  }
+}
+
+CGUIControlProfilerItem *CGUIControlProfilerItem::AddControl(CGUIControl *pControl)
+{
+  m_vecChildren.push_back(new CGUIControlProfilerItem(m_pProfiler, this, pControl));
+  return m_vecChildren.back();
+}
+
+CGUIControlProfilerItem *CGUIControlProfilerItem::FindOrAddControl(CGUIControl *pControl, bool recurse)
+{
+  const unsigned int dwSize = m_vecChildren.size();
+  for (unsigned int i=0; i<dwSize; ++i)
+  {
+    CGUIControlProfilerItem *p = m_vecChildren[i];
+    if (p->m_pControl == pControl)
+      return p;
+    if (recurse && (p = p->FindOrAddControl(pControl, true)))
+      return p;
+  }
+
+  if (pControl->GetParentControl() == m_pControl)
+    return AddControl(pControl); 
+
+  return NULL;
+}
+
+CGUIControlProfiler::CGUIControlProfiler(void)
+: m_ItemHead(NULL, NULL, NULL), m_pLastItem(NULL), m_iMaxFrameCount(200)
+// m_bIsRunning(false), no isRunning because it is static
+{
+  m_fPerfScale = 100000.0f / CurrentHostFrequency();
+}
+
+CGUIControlProfiler &CGUIControlProfiler::Instance(void)
+{
+  static CGUIControlProfiler _instance;
+  return _instance;
+}
+
+bool CGUIControlProfiler::IsRunning(void) 
+{ 
+  return m_bIsRunning;
+}
+
+void CGUIControlProfiler::Start(void)
+{
+  m_iFrameCount = 0;
+  m_bIsRunning = true;
+  m_pLastItem = NULL;
+  m_ItemHead.Reset(this);
+}
+
+void CGUIControlProfiler::BeginVisibility(CGUIControl *pControl)
+{
+  CGUIControlProfilerItem *item = FindOrAddControl(pControl);
+  item->BeginVisibility();
+}
+
+void CGUIControlProfiler::EndVisibility(CGUIControl *pControl)
+{
+  CGUIControlProfilerItem *item = FindOrAddControl(pControl);
+  item->EndVisibility();
+}
+
+void CGUIControlProfiler::BeginRender(CGUIControl *pControl)
+{
+  CGUIControlProfilerItem *item = FindOrAddControl(pControl);
+  item->BeginRender();
+}
+
+void CGUIControlProfiler::EndRender(CGUIControl *pControl)
+{
+  CGUIControlProfilerItem *item = FindOrAddControl(pControl);
+  item->EndRender();
+}
+
+CGUIControlProfilerItem *CGUIControlProfiler::FindOrAddControl(CGUIControl *pControl)
+{
+  if (m_pLastItem)
+  {
+    // Typically calls come in pairs so the last control we found is probably
+    // the one we want again next time
+    if (m_pLastItem->m_pControl == pControl)
+      return m_pLastItem;
+    // If that control is not a match, usually the one we want is the next 
+    // sibling of that control, or the parent of that control so check
+    // the parent first as it is more convenient
+    m_pLastItem = m_pLastItem->m_pParent;
+    if (m_pLastItem && m_pLastItem->m_pControl == pControl)
+      return m_pLastItem;
+    // continued from above, this searches the original control's siblings
+    if (m_pLastItem)
+      m_pLastItem = m_pLastItem->FindOrAddControl(pControl, false);
+    if (m_pLastItem)
+      return m_pLastItem;
+  }
+
+  m_pLastItem = m_ItemHead.FindOrAddControl(pControl, true);
+  if (!m_pLastItem)
+    m_pLastItem = m_ItemHead.AddControl(pControl);
+
+  return m_pLastItem;
+}
+
+void CGUIControlProfiler::EndFrame(void)
+{
+  m_iFrameCount++;
+  if (m_iFrameCount >= m_iMaxFrameCount)
+  {
+    const unsigned int dwSize = m_ItemHead.m_vecChildren.size();
+    for (unsigned int i=0; i<dwSize; ++i)
+    {
+      CGUIControlProfilerItem *p = m_ItemHead.m_vecChildren[i];
+      m_ItemHead.m_visTime += p->m_visTime;
+      m_ItemHead.m_renderTime += p->m_renderTime;
+    }
+
+    m_bIsRunning = false;
+    if (SaveResults())
+      m_ItemHead.Reset(this);
+  }
+}
+
+bool CGUIControlProfiler::SaveResults(void)
+{
+  if (m_strOutputFile.IsEmpty())
+    return false;
+
+  TiXmlDocument doc;
+  TiXmlDeclaration decl("1.0", "", "yes");
+  doc.InsertEndChild(decl);
+
+  TiXmlElement *root = new TiXmlElement("guicontrolprofiler");
+  CStdString str;
+  str.Format("%d", m_iFrameCount);
+  root->SetAttribute("framecount", str.c_str());
+  root->SetAttribute("timeunit", "ms");
+  doc.LinkEndChild(root);
+
+  m_ItemHead.SaveToXML(root);
+  return doc.SaveFile(m_strOutputFile);
+}
diff --git a/guilib/GUIControlProfiler.h b/guilib/GUIControlProfiler.h
index 34953ba6ec..7443c795ec 100644
--- a/guilib/GUIControlProfiler.h
+++ b/guilib/GUIControlProfiler.h
@@ -40,8 +40,8 @@ public:
   CGUIControl::GUICONTROLTYPES m_ControlType;
   unsigned int m_visTime;
   unsigned int m_renderTime;
-  LARGE_INTEGER m_i64VisStart;
-  LARGE_INTEGER m_i64RenderStart;
+  int64_t m_i64VisStart;
+  int64_t m_i64RenderStart;
 
   CGUIControlProfilerItem(CGUIControlProfiler *pProfiler, CGUIControlProfilerItem *pParent, CGUIControl *pControl);
   ~CGUIControlProfilerItem(void); 
diff --git a/guilib/GUIWindow.cpp b/guilib/GUIWindow.cpp
index 2d78e95dcb..e685fa2853 100644
--- a/guilib/GUIWindow.cpp
+++ b/guilib/GUIWindow.cpp
@@ -79,8 +79,8 @@ bool CGUIWindow::Load(const CStdString& strFileName, bool bContainsPath)
   if (m_windowLoaded)
     return true;      // no point loading if it's already there
 
-  LARGE_INTEGER start;
-  QueryPerformanceCounter(&start);
+  int64_t start;
+  start = CurrentHostCounter();
 
   RESOLUTION resToUse = RES_INVALID;
   CLog::Log(LOGINFO, "Loading skin file: %s", strFileName.c_str());
@@ -102,10 +102,10 @@ bool CGUIWindow::Load(const CStdString& strFileName, bool bContainsPath)
 
   bool ret = LoadXML(strPath.c_str(), strLowerPath.c_str());
 
-  LARGE_INTEGER end, freq;
-  QueryPerformanceCounter(&end);
-  QueryPerformanceFrequency(&freq);
-  CLog::Log(LOGDEBUG,"Load %s: %.2fms", m_xmlFile.c_str(), 1000.f * (end.QuadPart - start.QuadPart) / freq.QuadPart);
+  int64_t end, freq;
+  end = CurrentHostCounter();
+  freq = CurrentHostFrequency();
+  CLog::Log(LOGDEBUG,"Load %s: %.2fms", m_xmlFile.c_str(), 1000.f * (end - start) / freq);
 
   return ret;
 }
@@ -666,8 +666,8 @@ void CGUIWindow::AllocResources(bool forceLoad /*= FALSE */)
 {
   CSingleLock lock(g_graphicsContext);
 
-  LARGE_INTEGER start;
-  QueryPerformanceCounter(&start);
+  int64_t start;
+  start = CurrentHostCounter();
 
   // load skin xml file
   bool bHasPath=false;
@@ -676,16 +676,16 @@ void CGUIWindow::AllocResources(bool forceLoad /*= FALSE */)
   if (m_xmlFile.size() && (forceLoad || m_loadOnDemand || !m_windowLoaded))
     Load(m_xmlFile,bHasPath);
 
-  LARGE_INTEGER slend;
-  QueryPerformanceCounter(&slend);
+  int64_t slend;
+  slend = CurrentHostCounter();
 
   // and now allocate resources
   CGUIControlGroup::AllocResources();
 
-  LARGE_INTEGER end, freq;
-  QueryPerformanceCounter(&end);
-  QueryPerformanceFrequency(&freq);
-  CLog::Log(LOGDEBUG,"Alloc resources: %.2fms (%.2f ms skin load)", 1000.f * (end.QuadPart - start.QuadPart) / freq.QuadPart, 1000.f * (slend.QuadPart - start.QuadPart) / freq.QuadPart);
+  int64_t end, freq;
+  end = CurrentHostCounter();
+  freq = CurrentHostFrequency();
+  CLog::Log(LOGDEBUG,"Alloc resources: %.2fms (%.2f ms skin load)", 1000.f * (end - start) / freq, 1000.f * (slend - start) / freq);
 
   m_bAllocated = true;
 }
diff --git a/guilib/TextureManager.cpp b/guilib/TextureManager.cpp
index 3f18601ad9..d41ec38d8c 100644
--- a/guilib/TextureManager.cpp
+++ b/guilib/TextureManager.cpp
@@ -26,6 +26,10 @@
 #include "utils/SingleLock.h"
 #include "utils/CharsetConverter.h"
 #include "utils/log.h"
+#include "utils/log.h"
+#ifdef _DEBUG
+#include "utils/TimeUtils.h"
+#endif
 #include "../xbmc/Util.h"
 #include "../xbmc/FileSystem/File.h"
 #include "../xbmc/FileSystem/Directory.h"
@@ -306,8 +310,8 @@ int CGUITextureManager::Load(const CStdString& strTextureName, bool checkBundleO
   CSingleLock lock(g_graphicsContext);
 
 #ifdef _DEBUG
-  LARGE_INTEGER start;
-  QueryPerformanceCounter(&start);
+  int64_t start;
+  start = CurrentHostCounter();
 #endif
 
   if (strPath.Right(4).ToLower() == ".gif")
@@ -372,11 +376,11 @@ int CGUITextureManager::Load(const CStdString& strTextureName, bool checkBundleO
     }
 
 #ifdef _DEBUG
-    LARGE_INTEGER end, freq;
-    QueryPerformanceCounter(&end);
-    QueryPerformanceFrequency(&freq);
+    int64_t end, freq;
+    end = CurrentHostCounter();
+    freq = CurrentHostFrequency();
     char temp[200];
-    sprintf(temp, "Load %s: %.1fms%s\n", strPath.c_str(), 1000.f * (end.QuadPart - start.QuadPart) / freq.QuadPart, (bundle >= 0) ? " (bundled)" : "");
+    sprintf(temp, "Load %s: %.1fms%s\n", strPath.c_str(), 1000.f * (end - start) / freq, (bundle >= 0) ? " (bundled)" : "");
     OutputDebugString(temp);
 #endif
 
@@ -415,11 +419,11 @@ int CGUITextureManager::Load(const CStdString& strTextureName, bool checkBundleO
   m_vecTextures.push_back(pMap);
 
 #ifdef _DEBUG_TEXTURES
-  LARGE_INTEGER end, freq;
-  QueryPerformanceCounter(&end);
-  QueryPerformanceFrequency(&freq);
+  int64_t end, freq;
+  end = CurrentHostCounter();
+  freq = CurrentHostFrequency();
   char temp[200];
-  sprintf(temp, "Load %s: %.1fms%s\n", strPath.c_str(), 1000.f * (end.QuadPart - start.QuadPart) / freq.QuadPart, (bundle >= 0) ? " (bundled)" : "");
+  sprintf(temp, "Load %s: %.1fms%s\n", strPath.c_str(), 1000.f * (end - start) / freq, (bundle >= 0) ? " (bundled)" : "");
   OutputDebugString(temp);
 #endif