Changeset 494 for DCWoRMS/trunk/src

Timestamp:

10/09/12 15:04:11 (13 years ago)

Author:

wojtekp

Message:

 

Location:

DCWoRMS/trunk/src

Files:

• gridsim/dcworms/DCWormsTags.java (modified) (2 diffs)
• org/joda/time/VCMilisProvider.java (modified) (1 diff)
• schedframe/resources/computing/ComputingResource.java (modified) (1 diff)
• schedframe/resources/computing/profiles/energy/power/ui/ProcessorPowerInterface.java (modified) (2 diffs)
• schedframe/scheduling/Scheduler.java (modified) (3 diffs)
• simulator/DataCenterWorkloadSimulator.java (modified) (2 diffs)
• simulator/stats/implementation/DCWormsStatistics.java (modified) (2 diffs)

DCWoRMS/trunk/src/gridsim/dcworms/DCWormsTags.java

@@ -8 +8 @@
 public class DCWormsTags extends GridSimTags {
         
-        protected static final int GSSIMBASE = 600; 
+        protected static final int DCWORMSBASE = 600; 
         
-        public static final int UPDATE= GSSIMBASE - 1;
+        public static final int UPDATE= DCWORMSBASE - 1;
         
-        public static final int TIMER = GSSIMBASE + 1;
+        public static final int TIMER = DCWORMSBASE + 1;
         
-        public static final int TASK_READY_FOR_EXECUTION = GSSIMBASE + 2;
+        public static final int TASK_READY_FOR_EXECUTION = DCWORMSBASE + 2;
         
-        public static final int TASK_EXECUTION_FINISHED = GSSIMBASE + 3;
+        public static final int TASK_EXECUTION_FINISHED = DCWORMSBASE + 3;
         
 
@@ -22 +22 @@
          * Message tag: query resource about its current state in object form (load, queues, etc.)
          */ 
-        public static final int QUERY_RESOURCE_DESC = GSSIMBASE + 4; 
+        public static final int QUERY_RESOURCE_DESC = DCWORMSBASE + 4; 
 
-        public static final int QUERY_RESOURCE_DESC_RESULT = GSSIMBASE + 5; 
+        public static final int QUERY_RESOURCE_DESC_RESULT = DCWORMSBASE + 5; 
         
-        public static final int TASK_REQUESTED_TIME_EXPIRED = GSSIMBASE + 6;
+        public static final int TASK_REQUESTED_TIME_EXPIRED = DCWORMSBASE + 6;
 
         

DCWoRMS/trunk/src/org/joda/time/VCMilisProvider.java

@@ -39 +39 @@
                 long vc = Math.round(Sim_system.clock());
                 //System.out.println("SIMJAVA TIME: "+Sim_system.clock());
-                //System.out.println("CLOUD TIME: "+GSSIM.clock());
                 
                 // change virtual seconds to milliseconds

DCWoRMS/trunk/src/schedframe/resources/computing/ComputingResource.java

@@ -157 +157 @@
                 //if(scheduler != null && (parent != null && scheduler != parent.getScheduler())/*scheduler.getResources().contains(this)*/){
                 //      String src = event.getSource() != null ? event.getSource() : name;
-                //      scheduler.sendInternal(GridSimTags.SCHEDULE_NOW, GssimTags.UPDATE, src);
+                //      scheduler.sendInternal(GridSimTags.SCHEDULE_NOW, DCWormsTags.UPDATE, src);
                 //}
                 //triggerEventUp(event);

DCWoRMS/trunk/src/schedframe/resources/computing/profiles/energy/power/ui/ProcessorPowerInterface.java

@@ -1 +1 @@
 package schedframe.resources.computing.profiles.energy.power.ui;
+
+import gridsim.dcworms.DCWormsTags;
 
 import java.util.Map;
@@ -83 +85 @@
                         //new ResourceEventCommand(resource).execute(EnergyEventType.FREQUENCY_CHANGED);
                         resource.handleEvent(new EnergyEvent(EnergyEventType.FREQUENCY_CHANGED, resource.getName()));
-                        //resource.getScheduler().sendInternal(GridSimTags.SCHEDULE_NOW, GssimTags.UPDATE, resource.getName());
+                        //resource.getScheduler().sendInternal(GridSimTags.SCHEDULE_NOW, DCWormsTags.UPDATE, resource.getName());
                         return true;
                 }

DCWoRMS/trunk/src/schedframe/scheduling/Scheduler.java

@@ -133 +133 @@
                                 // managemetnSystem_.setEndSimulation();
                                 run = false;
-                                /*Sim_stat stats = get_stat();
-                                List<Object[]> measures = stats.get_measures();
-                                for (Object[] info : measures) {
-                                        String measure = (String) info[0];
-                                        if (measure
-                                                        .startsWith(GssimConstants.TASKS_QUEUE_LENGTH_MEASURE_NAME)) {
-                                                System.out.println("====="+this.get_name()+";"+stats.average(measure));
-                                        }
-                                }*/
                                 break;
                         }
@@ -155 +146 @@
 
                 case GridSimTags.GRIDLET_SUBMIT:
-                        processGSSIMJobSubmit(ev, false);
+                        processWorkloadUnitSubmit(ev, false);
                         break;
 
                 case GridSimTags.GRIDLET_SUBMIT_ACK:
-                        processGSSIMJobSubmit(ev, true);
+                        processWorkloadUnitSubmit(ev, true);
                         break;
 
                 case GridSimTags.GRIDLET_RETURN:
-                        processGSSIMJobReturn(ev);
+                        processWorkloadUnitReturn(ev);
                         break;
 
@@ -194 +185 @@
         }*/
         
-        protected void processGSSIMJobReturn(Sim_event ev) {
+        protected void processWorkloadUnitReturn(Sim_event ev) {
                 WorkloadUnit job = (WorkloadUnit) ev.get_data();
                 managementSystem.notifyReturnedWorkloadUnit(job);
         }
 
-        protected void processGSSIMJobSubmit(Sim_event ev, boolean ack) {
+        protected void processWorkloadUnitSubmit(Sim_event ev, boolean ack) {
                 WorkloadUnit job = (WorkloadUnit) ev.get_data();
                 managementSystem.notifySubmittedWorkloadUnit(job, ack);

DCWoRMS/trunk/src/simulator/DataCenterWorkloadSimulator.java

@@ -97 +97 @@
          */
         public static void main(String[] args) {
-                DataCenterWorkloadSimulator gssim = new DataCenterWorkloadSimulator();
-                gssim.run(args);
+                DataCenterWorkloadSimulator dcworms = new DataCenterWorkloadSimulator();
+                dcworms.run(args);
         }
 
@@ -197 +197 @@
         }
 
-        private void runMultiuser(String rootDirPath, DataCenterWorkloadSimulator gssim) {
+        private void runMultiuser(String rootDirPath, DataCenterWorkloadSimulator dcworms) {
                 throw new RuntimeException("not supported yet");
         }

DCWoRMS/trunk/src/simulator/stats/implementation/DCWormsStatistics.java

@@ -809 +809 @@
                 ChartRenderingInfo info = new ChartRenderingInfo();
                 File f = new File(fileName + "." + ImageFormat.PNG);
-                final String gssimSubtitle = "Created by "
+                final String dcwormsSubtitle = "Created by "
                                 + DataCenterWorkloadSimulator.SIMULATOR_NAME
                                 + " http://www.gssim.org/";
-                c.addSubtitle(new TextTitle(gssimSubtitle));
+                c.addSubtitle(new TextTitle(dcwormsSubtitle));
                 boolean encodeAlpha = false;
                 int compression = 9;// values 0-9
@@ -1264 +1264 @@
                 // info.setEntityCollection(null);
                 File f = new File(fileName + "." + ImageFormat.PNG);
-                final String gssimSubtitle = "Created by " + DataCenterWorkloadSimulator.SIMULATOR_NAME + " http://www.gssim.org/";
-                c.addSubtitle(new TextTitle(gssimSubtitle));
+                final String dcwormsSubtitle = "Created by " + DataCenterWorkloadSimulator.SIMULATOR_NAME + " http://www.gssim.org/";
+                c.addSubtitle(new TextTitle(dcwormsSubtitle));
                 boolean encodeAlpha = false;
                 int compression = 9;