[jboss-cvs] jboss-profiler/java/webapp/lzx ...

Takuro Okada t2-okada at nri.co.jp
Mon Nov 6 02:39:47 EST 2006


  User: tokada  
  Date: 06/11/06 02:39:47

  Modified:    java/webapp/lzx    Tag: JBossProfiler_Expansion
                        jbossprofiler.lzx settingdialog.lzx appinfo.js
  Log:
  Added some functions for initial setting.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.2   +1 -1      jboss-profiler/java/webapp/lzx/Attic/jbossprofiler.lzx
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: jbossprofiler.lzx
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-profiler/java/webapp/lzx/Attic/jbossprofiler.lzx,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -b -r1.1.2.1 -r1.1.2.2
  --- jbossprofiler.lzx	26 Oct 2006 09:02:25 -0000	1.1.2.1
  +++ jbossprofiler.lzx	6 Nov 2006 07:39:47 -0000	1.1.2.2
  @@ -80,7 +80,7 @@
         </view>
         <settingdialog name="settingDialog"
                        y="${parent.height/2-this.height/2}"
  -                     width="600" height="400"/>
  +                     width="520" height="460"/>
         <handler name="onloadcontents">
           settingDialog.open();
         </handler>
  
  
  
  1.1.2.2   +196 -71   jboss-profiler/java/webapp/lzx/Attic/settingdialog.lzx
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: settingdialog.lzx
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-profiler/java/webapp/lzx/Attic/settingdialog.lzx,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -b -r1.1.2.1 -r1.1.2.2
  --- settingdialog.lzx	26 Oct 2006 09:02:25 -0000	1.1.2.1
  +++ settingdialog.lzx	6 Nov 2006 07:39:47 -0000	1.1.2.2
  @@ -31,52 +31,42 @@
   
     <include href="borderedpane.lzx"/>
     
  -  <dataset name="filterDs">
  -    <filter/>
  -  </dataset>
  +  <dataset name="initializeData"
  +           request="false" timeout="5000" type="http" querytype="POST"
  +           src="../Initializer"/>
     
     <class name="settingdialog" extends="modaldialog" title="Settings">
       <tabs width="${parent.width-50}" height="${parent.height-100}">
         <!-- ##### General Tab ##### -->
         <tabpane text="Genelral" fontsize="10">
           <simplelayout axis="y" spacing="4"/>
  -        <text>Target Server</text>
  +        <text>Execution Statistics</text>
           <borderedpane x="${this.x+4}">
  -          <view placement="contents">
  +          <view id="executionStatisticsSettings" placement="contents">
               <simplelayout axis="y" spacing="4"/>
               <view>
  -              <simplelayout axis="x" spacing="8"/>
  -              <text valign="middle">Host Name</text>
  -              <edittext width="200" height="22">localhost</edittext>
  -            </view>
  -            <view>
  -              <simplelayout axis="x" spacing="8"/>
  -              <text valign="middle">Port</text>
  -              <edittext width="80" height="22" x="${this.x+34}">1099</edittext>
  +              <simplelayout axis="x" spacing="4"/>
  +              <text valign="middle">Metric Type</text>
  +              <combobox name="metricName" width="200" editable="false">
  +                <textlistitem text="Real time" value="0"/>
  +                <textlistitem text="CPU time" value="1"/>
  +                <textlistitem text="CPU time (user process only)" value="2" selected="true"/>
  +              </combobox>
               </view>
             </view>
           </borderedpane>
           <view height="4"/>
  -        <text>Unit of Statistics</text>
  +        <text>Web Application Analyzer</text>
           <borderedpane x="${this.x+4}">
  -          <view placement="contents">
  +          <view id="webappAnalyzerSettings" placement="contents">
               <simplelayout axis="y" spacing="4"/>
               <view>
  -              <simplelayout axis="x" spacing="8"/>
  -              <text valign="middle">Unit of Time</text>
  -              <combobox width="130" editable="false">
  -                <textlistitem text="second"/>
  -                <textlistitem text="milli second"/>
  -                <textlistitem text="nano secoud" selected="true"/>
  -              </combobox>
  -            </view>
  -            <view>
  -              <simplelayout axis="x" spacing="8"/>
  -              <text valign="middle">Unit of Byte</text>
  -              <combobox width="130" editable="false" x="${this.x+1}">
  -                <textlistitem text="mega byte"/>
  -                <textlistitem text="kilo byte"/>
  -                <textlistitem text="byte" selected="true"/>
  +              <simplelayout axis="x" spacing="4"/>
  +              <text valign="middle">Metric Type</text>
  +              <combobox name="metricName" width="200" editable="false">
  +                <textlistitem text="Real time" value="0" selected="true"/>
  +                <textlistitem text="CPU time" value="1"/>
  +                <textlistitem text="CPU time (user process only)" value="2"/>
                 </combobox>
               </view>
             </view>
  @@ -85,11 +75,14 @@
         <!-- ##### Filter Tab ##### -->
         <tabpane text="Filter" fontsize="10">
           <simplelayout axis="y" spacing="4"/>
  -        <text>Signature</text>
  +        <text>Signature of Profiling Operation</text>
           <borderedpane x="${this.x+4}">
             <borderedpane placement="contents" padding="0">
  -            <view placement="contents">
  -              <grid name="signatureGrid" datapath="filterDs:/filter" showhlines="true"
  +            <view id="filterSetting" placement="contents">
  +              <dataset name="filterDs">
  +                <filter/>
  +              </dataset>
  +              <grid name="signatureGrid" datapath="local:parent.filterDs:/filter" showhlines="true"
                       y="${this.y-12}"
                       width="400" height="160"
                       rowheight="22">
  @@ -104,9 +97,10 @@
                   this.initialhelp.apply();
                 </handler>
                 <handler name="ondblclick">
  -                var filterDp = filterDs.getPointer();
  +                var filterDp = this.filterDs.getPointer();
                   filterDp.selectChild();
                   filterDp.addNode("signature", null, {pattern:""});
  +                
                   this.initialhelp.remove();
                   
                   var rowLength = this.signatureGrid.getNumItems();
  @@ -119,20 +113,23 @@
           <view height="4"/>
           <text>Profiling Period</text>
           <borderedpane x="${this.x+4}">
  -          <view placement="contents">
  +          <view id="profilingPeriodSetting" placement="contents">
               <simplelayout axis="x"/>
  -            <checkbox y="4">
  +            <checkbox name="enabled" y="4">
                 <handler name="onclick">
                   var currentDayStr = "";
                   var currentDate = new Date();
  -                currentDayStr += currentDate.getFullYear();
  -                currentDayStr += "/"+(currentDate.getMonth()+1);
  +                currentDayStr += currentDate.getMonth()+1;
                   currentDayStr += "/"+currentDate.getDate();
  -                parent.period.fromDate.setText(currentDayStr);
  -                parent.period.toDate.setText(currentDayStr);
  +                currentDayStr += "/"+currentDate.getFullYear();
  +                parent.values.fromDate.setText(currentDayStr);
  +                parent.values.toDate.setText(currentDayStr);
  +                parent.values.fromTime.setText("0:0:0");
  +                parent.values.toTime.setText("0:0:0");
  +                LzFocus.setFocus(parent.values.fromDate);
                 </handler>
               </checkbox>
  -            <view name="period" placement="contents">
  +            <view name="values" placement="contents">
                 <simplelayout axis="x" spacing="2"/>
                 <edittext name="fromDate" width="60" height="22"/>
                 <edittext name="fromTime" width="60" height="22"/>
  @@ -146,58 +143,186 @@
         <!-- ##### Warning Tab ##### -->
         <tabpane text="Warning" fontsize="10">
           <simplelayout axis="y" spacing="4"/>
  -        <text>Threshold</text>
  +        <text>Execution Statistics</text>
           <borderedpane x="${this.x+4}">
  -          <view placement="contents">
  +          <view id="executionStatisticsWarningSettings" placement="contents">
               <simplelayout axis="y" spacing="4"/>
               <view>
  -              <simplelayout axis="x" spacing="8"/>
  -              <checkbox text="Execution Time" valign="middle"/>
  -              <edittext width="60" height="22" x="${this.x+3}"/>
  -              <combobox width="130" editable="false">
  -                <textlistitem text="second"/>
  -                <textlistitem text="milli second"/>
  -                <textlistitem text="nano secoud" selected="true"/>
  +              <simplelayout axis="x" spacing="4"/>
  +              <checkbox name="enabled" text="Execution Time" valign="middle"/>
  +              <view width="4"/>
  +              <text valign="middle">Threshold</text>
  +              <edittext name="threshold" width="100" height="22"/>
  +              <text valign="middle">Color</text>
  +              <combobox name="color" width="60" editable="false">
  +                <textlistitem text="red" selected="true"/>
  +                <textlistitem text="green"/>
  +                <textlistitem text="blue"/>
                 </combobox>
               </view>
               <view>
  -              <simplelayout axis="x" spacing="8"/>
  -              <checkbox text="Coverage Count" valign="middle"/>
  -              <edittext width="60" height="22"/>
  +              <simplelayout axis="x" spacing="4"/>
  +              <checkbox name="enabled" text="Coverage Count" valign="middle"/>
  +              <view width="1"/>
  +              <text valign="middle">Threshold</text>
  +              <edittext name="threshold" width="100" height="22"/>
  +              <text valign="middle">Color</text>
  +              <combobox name="color" width="60" editable="false">
  +                <textlistitem text="red" selected="true"/>
  +                <textlistitem text="green"/>
  +                <textlistitem text="blue"/>
  +              </combobox>
               </view>
  +          </view>
  +        </borderedpane>
  +        <view height="4"/>
  +        <text>Concurrency Statistics</text>
  +        <borderedpane x="${this.x+4}">
  +          <view id="concurrencyStatisticsWarningSettings" placement="contents">
  +            <simplelayout axis="y" spacing="4"/>
  +            <view>
  +              <simplelayout axis="x" spacing="4"/>
  +              <checkbox name="enabled" text="Coverage Count" valign="middle"/>
  +              <view width="1"/>
  +              <text valign="middle">Threshold</text>
  +              <edittext name="threshold" width="100" height="22"/>
  +              <text valign="middle">Color</text>
  +              <combobox name="color" width="60" editable="false">
  +                <textlistitem text="red" selected="true"/>
  +                <textlistitem text="green"/>
  +                <textlistitem text="blue"/>
  +              </combobox>
  +            </view>
  +          </view>
  +        </borderedpane>
  +        <view height="4"/>
  +        <text>Memory Statistics</text>
  +        <borderedpane x="${this.x+4}">
  +          <view id="memoryStatisticsWarningSettings" placement="contents">
  +            <simplelayout axis="y" spacing="4"/>
               <view>
  -              <simplelayout axis="x" spacing="8"/>
  -              <checkbox text="Memory Usage" valign="middle"/>
  -              <edittext width="60" height="22" x="${this.x+6}"/>
  -              <combobox width="130" editable="false">
  -                <textlistitem text="mega byte"/>
  -                <textlistitem text="kilo byte"/>
  -                <textlistitem text="byte" selected="true"/>
  +              <simplelayout axis="x" spacing="4"/>
  +              <checkbox name="enabled" text="Memory Usage" valign="middle"/>
  +              <view width="6"/>
  +              <text valign="middle">Threshold</text>
  +              <edittext name="threshold" width="100" height="22"/>
  +              <text valign="middle">Color</text>
  +              <combobox name="color" width="60" editable="false">
  +                <textlistitem text="red" selected="true"/>
  +                <textlistitem text="green"/>
  +                <textlistitem text="blue"/>
                 </combobox>
               </view>
             </view>
           </borderedpane>
           <view height="4"/>
  -        <text>Style</text>
  +        <text>Web Application Analyzer</text>
           <borderedpane x="${this.x+4}">
  -          <view placement="contents">
  +          <view id="webappAnalyzerWarningSettings" placement="contents">
  +            <simplelayout axis="y" spacing="4"/>
  +            <view>
               <simplelayout axis="x" spacing="4"/>
  -            <text valign="middle">Warning Color</text>
  -            <combobox width="80" editable="false">
  +              <checkbox name="enabled" text="Execution Time" valign="middle"/>
  +              <view width="3"/>
  +              <text valign="middle">Threshold</text>
  +              <edittext name="threshold" width="100" height="22"/>
  +              <text valign="middle">Color</text>
  +              <combobox name="color" width="60" editable="false">
                 <textlistitem text="red" selected="true"/>
                 <textlistitem text="green"/>
                 <textlistitem text="blue"/>
               </combobox>
             </view>
  +          </view>
           </borderedpane>
         </tabpane>
       </tabs>
       <button y="${parent.height-90}" align="center">Profile
         <handler name="onclick">
  -        parent.close();
  -        parent.parent.mainContents.profilable.apply();
  +      <![CDATA[
  +        var esMetricName = executionStatisticsSettings.subviews[0].metricName.getValue();
  +        switch(esMetricName) {
  +          // See the enum value of org.jboss.profiler.exp.agent.collector.model.MetricName
  +          case 0: esMetricName="REAL_TIME"; break;
  +          case 1: esMetricName="CPU_TIME"; break;
  +          case 2: esMetricName="USER_CPU_TIME"; break;
  +        }
  +        canvas.initializeData.setQueryParam(AppInfo.RPK_ES_METRIC_NAME, esMetricName);
  +        
  +        var waMetricName = webappAnalyzerSettings.subviews[0].metricName.getValue();
  +        switch(waMetricName) {
  +          // See the enum value of org.jboss.profiler.exp.agent.collector.model.MetricName
  +          case 0: waMetricName="CPU_TIME_PASSAGE_DETAIL"; break;
  +          case 1: waMetricName="USER_CPU_TIME_PASSAGE_DETAIL"; break;
  +          case 2: waMetricName="REAL_TIME_PASSAGE_DETAIL"; break;
  +        }
  +        canvas.initializeData.setQueryParam(AppInfo.RPK_WA_METRIC_NAME, waMetricName);
  +        
  +        var filterStrings = new Array();
  +        var filterDp = filterSetting.filterDs.getPointer();
  +        filterDp.selectChild();
  +        if(filterDp.selectChild()) {
  +          do {
  +            var pattern = filterDp.getNodeAttribute("pattern");
  +            if(pattern!="") filterStrings.push(filterDp.getNodeAttribute("pattern"));
  +          }while(filterDp.selectNext());
  +        }
  +        if(filterStrings.length>0) {
  +          canvas.initializeData.setQueryParam(AppInfo.RPK_FILTER, filterStrings.join());
  +        }
  +        
  +        var fromDate = null;
  +        var toDate = null;
  +        if(profilingPeriodSetting.enabled) {
  +          var fromDateString = profilingPeriodSetting.values.fromDate.getValue();
  +          if(fromDateString!="") {
  +            var fromDateArray = fromDateString.split('/');
  +            fromDate = new Date(new Number(fromDateArray[2]), new Number(fromDateArray[0])-1, new Number(fromDateArray[1]));
  +          }
  +          var fromTimeString = profilingPeriodSetting.values.fromTime.getValue();
  +          if(fromTimeString!="") {
  +            var fromTimeArray = fromTimeString.split(':');
  +            if(fromTimeArray.length>2) {
  +              fromDate.setSeconds(new Number(fromTimeArray[2]));
  +            }
  +            if(fromTimeArray.length>1) {
  +              fromDate.setMinutes(new Number(fromTimeArray[1]));
  +            }
  +            if(fromTimeArray.length>0) {
  +              fromDate.setHours(new Number(fromTimeArray[0]));
  +            }
  +          }
  +          var toDateString = profilingPeriodSetting.values.toDate.getValue();
  +          if(toDateString!="") {
  +            var toDateArray = toDateString.split('/');
  +            toDate = new Date(new Number(toDateArray[2]), new Number(toDateArray[0])-1, new Number(toDateArray[1]));
  +          }
  +          var toTimeString = profilingPeriodSetting.values.toTime.getValue();
  +          if(toTimeString!="") {
  +            var toTimeArray = toTimeString.split(':');
  +            if(toTimeArray.length>2) {
  +              toDate.setSeconds(new Number(toTimeArray[2]));
  +            }
  +            if(toTimeArray.length>1) {
  +              toDate.setMinutes(new Number(toTimeArray[1]));
  +            }
  +            if(toTimeArray.length>0) {
  +              toDate.setHours(new Number(toTimeArray[0]));
  +            }
  +          }
  +        }
  +        if(fromDate!=null) canvas.initializeData.setQueryParam(AppInfo.RPK_FROM_DATE, fromDate.getTime());
  +        if(toDate!=null) canvas.initializeData.setQueryParam(AppInfo.RPK_TO_DATE, toDate.getTime());
  +        
  +        canvas.initializeData.doRequest();
  +        new LzDelegate(parent, "startProfile", canvas.initializeData, "ondata");
  +      ]]>
         </handler>
       </button>
  +    <method name="startProfile">
  +      this.close();
  +      parent.mainContents.profilable.apply();
  +    </method>
     </class>
     
   </library>
  
  
  
  1.1.2.2   +6 -1      jboss-profiler/java/webapp/lzx/Attic/appinfo.js
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: appinfo.js
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-profiler/java/webapp/lzx/Attic/appinfo.js,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -b -r1.1.2.1 -r1.1.2.2
  --- appinfo.js	26 Oct 2006 09:02:59 -0000	1.1.2.1
  +++ appinfo.js	6 Nov 2006 07:39:47 -0000	1.1.2.2
  @@ -31,7 +31,12 @@
   }
   
   // ##### Class Member Definition #####
  -AppInfo.RPK_METRIC_NAME = "org.jboss.profiler.exp.view.setting.MetricName";
  +AppInfo.RPK_ES_METRIC_NAME = "org.jboss.profiler.exp.view.setting.EsMetricName";
  +AppInfo.RPK_WA_METRIC_NAME = "org.jboss.profiler.exp.view.setting.WaMetricName";
  +AppInfo.RPK_FROM_DATE = "org.jboss.profiler.exp.view.setting.FromDate";
  +AppInfo.RPK_TO_DATE = "org.jboss.profiler.exp.view.setting.ToDate";
  +AppInfo.RPK_FILTER = "org.jboss.profiler.exp.view.setting.Filter";
  +
   AppInfo.RPK_CATEGORIES = "org.jboss.profiler.exp.view.request.Categories";
   AppInfo.RPK_THREAD_ID = "org.jboss.profiler.exp.view.request.ThreadId";
   AppInfo.RPK_CALLER = "org.jboss.profiler.exp.view.request.Caller";
  
  
  



More information about the jboss-cvs-commits mailing list