PMCTrack v0.5

Author: jcsaezal

README.md

@@ -331,7 +331,7 @@ To illustrate how the TBS mode works let us consider the following example comma
 	...
 
 
-This command provides the user with the number of instructions retired, last-level cache (LLC) misses and core energy consumption (in mJ) every second. The beginning of the command output shows the event-to-counter mapping for the various hardware events and virtual counters. The "Event counts" section in the output displays a table with the raw  counts for the various events; each sample (one per second) is represented by a different row. Note that the sampling period is specified in seconds via the -T option; fractions of a second can be also specified (e.g, 0.3 for 300ms). If the user includes the -A switch in the command line, `pmctrack` will display the aggregate event count for the application's entire execution instead. At the end of the line, we specify the command to run the associated application we wish to monitor (e.g: ./mcf06).
+This command provides the user with the number of instructions retired, last-level cache (LLC) misses and core energy consumption (in uJ) every second. The beginning of the command output shows the event-to-counter mapping for the various hardware events and virtual counters. The "Event counts" section in the output displays a table with the raw  counts for the various events; each sample (one per second) is represented by a different row. Note that the sampling period is specified in seconds via the -T option; fractions of a second can be also specified (e.g, 0.3 for 300ms). If the user includes the -A switch in the command line, `pmctrack` will display the aggregate event count for the application's entire execution instead. At the end of the line, we specify the command to run the associated application we wish to monitor (e.g: ./mcf06).
 
 In case a specific processor model does not integrate enough PMCs to monitor a given set of events at once, the user can turn to PMCTrack's event-multiplexing feature. This boils down to specifying several event sets by including multiple instances of the -c switch in the command line. In this case, the various events sets will be collected in a round-robin fashion and a new `expid` field in the output will indicate the event set a particular sample belongs to. In a similar vein, time-based sampling also supports multithreaded applications. In this case, samples from each thread in the application will be identified by a different value in the pid column.
 

etc/version

@@ -1 +1 @@
-0.4
+0.5

shrc

@@ -6,6 +6,7 @@ if [ "$PMCTRACK_ROOT" == "" ]; then
         export PMCTRACK_ROOT
         export PATH=$PMCTRACK_ROOT/bin:$PATH
 	export PYTHONPATH=$PMCTRACK_ROOT/bin:$PYTHONPATH
+	export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PMCTRACK_ROOT/src/lib/libpmctrack
 fi
 
 

src/cmdtools/pmctrack/pmctrack.c

@@ -535,7 +535,7 @@ void monitoring_counters_syswide(struct options* opts,int optind,char** argv)
 		pmctrack_exit(1);
 
 	/* Configure counters if there is something to configure */
-	if (opts->strcfg[0] && pmct_config_counters((const char**)opts->strcfg,1))
+	if (opts->strcfg[0] && pmct_config_counters((const char**)opts->strcfg,PMCT_CONFIG_SYSWIDE))
 		pmctrack_exit(1);
 
 	/* Set up sampling period
@@ -544,7 +544,7 @@ void monitoring_counters_syswide(struct options* opts,int optind,char** argv)
 	if (pmct_config_timeout(opts->msecs,(!(opts->strcfg)[0] && npmcs!=0)))
 		pmctrack_exit(1);
 
-	if (opts->virtcfg && pmct_config_virtual_counters(opts->virtcfg,1))
+	if (opts->virtcfg && pmct_config_virtual_counters(opts->virtcfg,PMCT_CONFIG_SYSWIDE))
 		pmctrack_exit(1);
 
 #ifndef USE_VFORK
@@ -908,7 +908,7 @@ static void process_pmc_counts(struct options* opts, int nr_experiments,unsigned
 
 			/* Make sure not to exceed the maximum number of samples requested */
 			if (opts->max_samples!=-1 && (cont+nr_samples>opts->max_samples))
-					nr_samples=opts->max_samples-(cont-1);
+				nr_samples=opts->max_samples-(cont-1);
 
 			for (i=0; i<nr_samples; i++) {
 				pmc_sample_t* cur=&samples[i];

src/gui/backend/pmc_connect.py

@@ -2,7 +2,8 @@
 
 #
 # pmc_connect.py
-# Component for connecting to remote machines using SSH or local machine.
+# Component for connecting to remote machines using SSH, ADB-server or local
+# machine.
 #
 ##############################################################################
 #
@@ -31,44 +32,47 @@
 class PMCConnect(object):
 	def __init__(self, info_machine):
 		self.info_machine = info_machine
-		if info_machine.is_remote:
-			self.ssh_array = info_machine.GetSSHCommand().split()
+		self.conn_array = None
+		if info_machine.type_machine == "ssh":
+			self.conn_array = info_machine.GetSSHCommand().split()
+		if info_machine.type_machine == "adb":
+			self.conn_array = info_machine.GetADBCommand().split()
 
 	def CheckFileExists(self, file):
             if file != "" and file != "\n" and file.find("#") == -1:
-		if self.info_machine.is_remote:
-                    command = self.ssh_array[:]
+		if self.info_machine.type_machine == "local":
+		    ok = os.path.exists(file)
+		else:
+                    command = self.conn_array[:]
 		    command.append("ls " + file)
 		    pipe = Popen(command, stdout=PIPE, stderr=PIPE)
 		    stdout, stderr = pipe.communicate()
-		    ok = (stderr == "")
-		else:
-		    ok = os.path.exists(file)
+		    ok = (stdout.find(file) >= 0 and stdout.find("No such") < 0)
             else:
                 ok = False
 	    return ok
 
-	def CheckPkgInstalled(self, pkg, remote):
+	def CheckPkgInstalled(self, pkg, check_in_remote):
 		command = None
-                if remote: command = self.ssh_array[:]
-		else: command = []
-		command.append(pkg)
-		try:
-			pipe = Popen(command, stdout=PIPE, stderr=PIPE)
-			stdout, stderr = pipe.communicate()
-			installed = (stderr == "")
-		except:
-			installed = False
-		return installed
+		if check_in_remote:
+                	command = self.conn_array[:]
+			command.append("which " + pkg)
+		else:
+			command = ["which", pkg]
+		pipe = Popen(command, stdout=PIPE, stderr=PIPE)
+		stdout, stderr = pipe.communicate()
+		return (stdout.find(pkg) >= 0)
 
 	def CheckConnectivity(self):
-                command = self.ssh_array[:]
-		command.append("whoami")
+                command = self.conn_array[:]
+		command.append("echo hello")
 		pipe = Popen(command, stdout=PIPE, stderr=PIPE)
 		stdout, stderr = pipe.communicate()
 		msg_error = ""
-		if (stdout.find(self.info_machine.remote_user) != 0):
-			if stderr.find("publickey,password") >= 0:
+		if (stdout.find("hello") < 0):
+			if stderr.find("Cannot start server") >= 0:
+				msg_error = _("No connection with ADB server.")
+			elif stderr.find("publickey,password") >= 0:
 				msg_error = _("The SSH key provided is invalid.")
 			elif stderr.find("ermis") >= 0:
 				msg_error = _("The username or password are incorrect.")
@@ -81,13 +85,13 @@ def CheckConnectivity(self):
 		return msg_error
 
 	def ReadFile(self, file):
-		if self.info_machine.is_remote:
-                    command = self.ssh_array[:]
-		    command.append("cat " + file)
-		    pipe = Popen(command, stdout=PIPE, stderr=PIPE)
-		    result = pipe.stdout.read()
-		else:
+		if self.info_machine.type_machine == "local":
 		    descrip = open(file, 'rU')
 		    result = descrip.read()
 		    descrip.close()
+		else:
+                    command = self.conn_array[:]
+		    command.append("cat " + file)
+		    pipe = Popen(command, stdout=PIPE, stderr=PIPE)
+		    result = pipe.stdout.read()
 		return result

src/gui/backend/pmc_extract.py

@@ -96,43 +96,67 @@ def ResumeMonitoring(self):
                 else:
 		    self.__send_signal_to_application("SIGCONT")
 		self.state[self.app_running] = 'R'
-		
-	def KillMonitoring(self):
-                os.kill(self.pipe.pid, signal.SIGKILL)
+
+	def KillMonitoringRequest(self):
 		self.state[self.app_running] = 'K'
+		
+		
+	def __kill_monitoring(self):
+		if self.user_config.machine.type_machine == "local":
+                	os.kill(self.pipe.pid, signal.SIGINT)
+		else:
+			comando = None
+			if self.user_config.machine.type_machine == "ssh":
+				comando = self.user_config.machine.GetSSHCommand().split()
+			else:
+				comando = self.user_config.machine.GetADBCommand().split()
+			comando.append("kill -s SIGINT `pidof pmctrack`")
+			Popen(comando)
 
 	def __send_signal_to_application(self, str_signal):
 		if self.pid[self.app_running] != None and self.state[self.app_running] in ['R', 'S']:
-			if not self.user_config.machine.is_remote:
+			if self.user_config.machine.type_machine == "local":
 				Popen(("kill -s " + str_signal + " " + self.pid[self.app_running]).split())
 			else:
-				comando = self.user_config.machine.GetSSHCommand().split()
+				comando = None
+				if self.user_config.machine.type_machine == "ssh":
+					comando = self.user_config.machine.GetSSHCommand().split()
+				else:
+					comando = self.user_config.machine.GetADBCommand().split()
 				comando.append("kill -s " + str_signal + " " + self.pid[self.app_running])
 				Popen(comando)
 
         def __pause_resume_syswide(self, arg):
-			if not self.user_config.machine.is_remote:
-				Popen(("echo -n syswide " + arg + " > /proc/pmc/enable").split())
-			else:
+		if self.user_config.machine.type_machine == "local":
+			Popen(("echo -n syswide " + arg + " > /proc/pmc/enable").split())
+		else:
+			comando = None
+			if self.user_config.machine.type_machine == "ssh":
 				comando = self.user_config.machine.GetSSHCommand().split()
-				comando.append("echo -n syswide " + arg + " > /proc/pmc/enable")
-				Popen(comando)
+			else:
+				comando = self.user_config.machine.GetADBCommand().split()
+			comando.append("echo -n syswide " + arg + " > /proc/pmc/enable")
+			Popen(comando)
 
         def __create_pipe(self, app):
-            if not self.user_config.machine.is_remote:
+            if self.user_config.machine.type_machine == "local":
 	        self.pipe = Popen(self.__get_command(app).split(), stdout=PIPE, stderr=PIPE)
 	    else:
-		comando = self.user_config.machine.GetSSHCommand().split()
-		comando.append("-t")
+		comando = None
+		if self.user_config.machine.type_machine == "ssh":
+			comando = self.user_config.machine.GetSSHCommand().split()
+			comando.append("-t")
+		else:
+			comando = self.user_config.machine.GetADBCommand().split()
 		comando.append(self.__get_command(app) + " 2>&1")
 		#comando.append(self.__get_command(app) + " 2> /dev/null")
 		self.pipe = Popen(comando, stdout=PIPE, stderr=PIPE)
 
         def __create_log_file_descriptors(self, app, line_head):
-		if self.user_config.machine.is_remote:
-		    machine = self.user_config.machine.remote_address
-		else:
+		if self.user_config.machine.type_machine == "local":
 		    machine = _("local")
+		else:
+		    machine = self.user_config.machine.remote_address
 
                 out_header = _("Generated by PMCTrack-GUI on {0}").format(time.strftime("%c")) + "\n\n"
                 out_header += _("Command launched on '{0}':").format(machine) + "\n"
@@ -159,7 +183,7 @@ def __extract_information(self):
                 self.__create_pipe(app)
                 self.pos.clear()
 		line_head = self.pipe.stdout.readline()
-		if line_head.find("PID found") >= 0:
+		while line_head.find("PID found") >= 0:
 			line_head = self.pipe.stdout.readline()
                 # This if checks if exists pmctrack command header
 		if(line_head.find("nsample") >= 0 and line_head.find(self.pack) >= 0 and line_head.find("event") >= 0):
@@ -219,6 +243,10 @@ def __extract_information(self):
 		    	        for metric in self.user_config.experiments[ind_exp].metrics:
                                     self.out_metrics.write("-".rjust(13) + " ")
                             self.out_metrics.write("\n")
+			
+			if self.state[app] == 'K':
+			    self.__kill_monitoring()
+			    break
 
                     self.app_running = None
 		    if self.out_counters != None:
@@ -256,7 +284,7 @@ def __get_experiments_command(self, num_experiment):
 
         # Returns pmctrack command of a particular app specified from user settings
 	def __get_command(self, app):
-		str_command = "pmctrack -L -r"
+		str_command = self.user_config.pmctrack_path + " -L -r"
                 str_command += " -T " + "{0:.2f}".format(float(self.user_config.time) / 1000)
                 if self.user_config.system_wide:
                     str_command += " -S"

src/gui/backend/user_config.py

@@ -61,8 +61,8 @@ def __init__(self):
 
 class MachineConfig(object):
 
-	def __init__(self, is_remote, remote_address=None, remote_port=22, remote_user=None, remote_password=None, path_key=None):
-		self.is_remote = is_remote
+	def __init__(self, type_machine, remote_address=None, remote_port=22, remote_user=None, remote_password=None, path_key=None):
+		self.type_machine = type_machine # "local", "ssh" or "adb"
 		self.remote_address = remote_address
 		self.remote_port = remote_port
 		self.remote_user = remote_user
@@ -82,6 +82,10 @@ def GetSSHCommand(self):
 		ssh_command += " -l " + self.remote_user
 		ssh_command += " " + self.remote_address
 		return ssh_command
+
+	def GetADBCommand(self):
+		return "adb -H " + self.remote_address + " -P " + self.remote_port + " shell"
+
 
 class GraphStyleConfig(object):
 
@@ -102,6 +106,7 @@ def __init__(self):
 		self.machine = None # Information about monitoring machine
 		self.applications = []
 		self.cpu = None # CPU number where to run benchmark, or CPU mask
+		self.pmctrack_path = None # Path to pmctrack command
 		self.time = 0 # Time between samples (in miliseconds)
                 self.buffer_size = 0 # Samples buffer size (in bytes)
 		self.pid_app_running = None # Application's PID (if app to monitor is running)
@@ -113,7 +118,7 @@ def __init__(self):
 
 	def GetCopy(self):
 		copy = UserConfig()
-		copy.machine = MachineConfig(self.machine.is_remote, self.machine.remote_address, self.machine.remote_port, self.machine.remote_user, self.machine.remote_password, self.machine.path_key)
+		copy.machine = MachineConfig(self.machine.type_machine, self.machine.remote_address, self.machine.remote_port, self.machine.remote_user, self.machine.remote_password, self.machine.path_key)
 		num_exp = 0
 
 		for experiment in self.experiments:
@@ -135,6 +140,7 @@ def GetCopy(self):
                 for application in self.applications:
                     copy.applications.append(application)
 		copy.cpu = self.cpu
+		copy.pmctrack_path = self.pmctrack_path
 		copy.time = self.time
 		copy.buffer_size = self.buffer_size
 		copy.pid_app_running = self.pid_app_running