Changeset 1545

Timestamp:

06/03/08 05:43:29 (5 years ago)

Author:

lmajano

Message:

Timer refactoring

Location:

coldbox/trunk/system

Files:

• controller.cfc (modified) (5 diffs)
• includes/timer.cfm (modified) (3 diffs)
• plugins/renderer.cfc (modified) (5 diffs)
• services/interceptorService.cfc (modified) (1 diff)

coldbox/trunk/system/controller.cfc

@@ -350 +350 @@
                 <cfset var Results = "">
                 <cfset var privateArgCollection = structnew()>
+                <cfset var debugMode = getDebuggerService().getDebugMode()>
                 
                 <!--- Default Event Test --->
@@ -372 +373 @@
                 <!--- PreHandler Execution --->
                 <cfif not arguments.prepostExempt and structKeyExists(oEventHandler,"preHandler")>
-                        <cfmodule template="includes/timer.cfm" timertag="invoking runEvent [preHandler] for #arguments.event#">
+                        <cfmodule template="includes/timer.cfm" timertag="invoking runEvent [preHandler] for #arguments.event#" debugmode="#debugMode#">
                         <cfset oEventHandler.preHandler(oRequestContext)>
                         </cfmodule>
@@ -384 +385 @@
                         <cfset privateArgCollection["event"] = oRequestContext>
                         <!--- Start Timer --->
-                        <cfmodule template="includes/timer.cfm" timertag="invoking PRIVATE runEvent [#arguments.event#]">
+                        <cfmodule template="includes/timer.cfm" timertag="invoking PRIVATE runEvent [#arguments.event#]" debugmode="#debugMode#">
                                 <!--- Call Private Event --->
                                 <cfinvoke component="#oEventHandler#" method="invokerMixin" returnvariable="Results">
@@ -395 +396 @@
                 <cfelse>
                         <!--- Start Timer --->
-                        <cfmodule template="includes/timer.cfm" timertag="invoking runEvent [#arguments.event#]">
+                        <cfmodule template="includes/timer.cfm" timertag="invoking runEvent [#arguments.event#]" debugmode="#debugMode#">
                                 <cfif oEventHandlerBean.getisMissingAction()>
                                         <!--- Execute the Public Event --->
@@ -413 +414 @@
                 <!--- PostHandler Execution --->
                 <cfif not arguments.prepostExempt and structKeyExists(oEventHandler,"postHandler")>
-                        <cfmodule template="includes/timer.cfm" timertag="invoking runEvent [postHandler] for #arguments.event#">
+                        <cfmodule template="includes/timer.cfm" timertag="invoking runEvent [postHandler] for #arguments.event#" debugmode="#debugMode#">
                         <cfset oEventHandler.postHandler(oRequestContext)>
                         </cfmodule>

coldbox/trunk/system/includes/timer.cfm

@@ -15 +15 @@
 06/08/2006 - Updated for coldbox.
 ----------------------------------------------------------------------->
-<cfparam name="attributes.timertag" default="NO_TIMER_TAG">
-<!--- Verify controller exists or debugger service --->
-<cfif structkeyExists(application,"cbController") AND application.cbController.getDebuggerService().getDebugMode()>
-        <cfscript>
+<cfparam name="attributes.timertag"     default="NO_TIMER_TAG">
+<cfparam name="attributes.debugmode"    default="false">
+
+<cfscript>
+if (attributes.debugmode){
+        
         //Check if DebugTimers is set
         if ( not structKeyExists(request,"DebugTimers") ){
                 request.DebugTimers = QueryNew("Id,Method,Time,Timestamp,RC");
         }
+        
         //Start Processing
         if (thisTag.executionMode is "start")
@@ -34 +37 @@
                         QuerySetCell(request.DebugTimers, "Time", getTickCount() - stime);
                         QuerySetCell(request.DebugTimers, "Timestamp", now());
+                        
                         //Request Context SnapShot
                         if ( not findnocase("rendering",attributes.timertag) ){
@@ -42 +46 @@
                                 QuerySetCell(request.DebugTimers, "RC", '');
                         }
-                }
-        }
-        </cfscript>
-</cfif>
+                        
+                }//if stime declared
+                
+        }//end if in end execution mode
+        
+}//end if not in debugmode
+</cfscript>
+
 <cfsetting enablecfoutputonly=false>

coldbox/trunk/system/plugins/renderer.cfc

@@ -87 +87 @@
                 <cfset var cbox_cacheKey = "">
                 <cfset var cbox_cacheEntry = "">
+                <cfset var debugMode = getController().getDebuggerService().getDebugMode()>
                 
                 <!--- Test Default View --->
@@ -106 +107 @@
                 <cfif getColdboxOCM().lookup(cbox_cacheKey)>
                         <!--- Render The View --->
-                        <cfmodule template="../includes/timer.cfm" timertag="rendering Cached View [#arguments.view#.cfm]">
+                        <cfmodule template="../includes/timer.cfm" timertag="rendering Cached View [#arguments.view#.cfm]" debugMode="#debugMode#">
                                 <cfset cbox_RenderedView = getColdBoxOCM().get(cbox_cacheKey)>
                         </cfmodule>
                 <cfelse>
                         <!--- Render The View --->
-                        <cfmodule template="../includes/timer.cfm" timertag="rendering View [#arguments.view#.cfm]">
+                        <cfmodule template="../includes/timer.cfm" timertag="rendering View [#arguments.view#.cfm]" debugMode="#debugMode#">
                                 <cfsavecontent variable="cbox_RenderedView"><cfoutput><cfinclude template="/#getappMapping()#/#getViewsConvention()#/#arguments.view#.cfm"></cfoutput></cfsavecontent>
                         </cfmodule>
@@ -137 +138 @@
                 <cfset var Event = controller.getRequestService().getContext()>
                 <cfset var rc = event.getCollection()>
-                
-                <cfmodule template="../includes/timer.cfm" timertag="rendering View [#arguments.view#]">
+                <cfset var debugMode = getController().getDebuggerService().getDebugMode()>
+                
+                <cfmodule template="../includes/timer.cfm" timertag="rendering View [#arguments.view#]" debugMode="#debugMode#">
                         <cftry>
                                 <!--- Render the View --->
@@ -160 +162 @@
                 <cfset var Event = controller.getRequestService().getContext()>
                 <cfset var rc = event.getCollection()>
+                <cfset var debugMode = getController().getDebuggerService().getDebugMode()>
+                
                                         
                 <!--- Check if no view has been set, if not, then set the default view --->
@@ -166 +170 @@
                 </cfif>
                 
-                <cfmodule template="../includes/timer.cfm" timertag="rendering Layout [#Event.getcurrentLayout()#]">
+                <cfmodule template="../includes/timer.cfm" timertag="rendering Layout [#Event.getcurrentLayout()#]" debugMode="#debugMode#">
                         <!--- Render With No Layout Test--->
                         <cfif Event.getcurrentLayout() eq "">

coldbox/trunk/system/services/interceptorService.cfc

@@ -74 +74 @@
                 <!--- Process The State if it exists, else just exit out. --->
                 <cfif structKeyExists(getinterceptionStates(), arguments.state) >
-                        <cfmodule template="../includes/timer.cfm" timertag="interception [#arguments.state#]">
+                        <cfmodule template="../includes/timer.cfm" timertag="interception [#arguments.state#]" debugmode="#getController().getDebuggerService().getDebugMode()#">
                                 <cfset structFind( getinterceptionStates(), arguments.state).process(event,arguments.interceptData)>
                         </cfmodule>