Index: package/src/ca/utils/ca_oprofile_controller.cpp

===================================================================

--- package/src/ca/utils/ca_oprofile_controller.cpp

+++ package/src/ca/utils/ca_oprofile_controller.cpp

@@ -44,6 +44,9 @@

 static int sigkill = 0;

 static int rmlock  = 0;

 static int reset   = 0;

+static int load    = 0;

+static int unload  = 0;

+static char* devConfig = NULL;

 enum {

 	OPT_START = 1,

@@ -51,19 +54,25 @@

 	OPT_KILL,

 	OPT_RMLOCK,

 	OPT_RESET,

+	OPT_LOAD,

+	OPT_UNLOAD,

+	OPT_DEVCONFIG,

 	OPT_VERSION,

 	OPT_HELP

 };

 static struct poptOption options[] = {

-{ "start"   , 's', POPT_ARG_STRING, &start, OPT_START , "", NULL },

-{ "term"    , 't', POPT_ARG_NONE, &sigterm, OPT_TERM  , "", NULL },

-{ "kill"    , 'k', POPT_ARG_NONE, &sigkill, OPT_KILL  , "", NULL },

-{ "rmlock"  , 'r', POPT_ARG_NONE, &rmlock , OPT_RMLOCK, "", NULL }, 

-{ "reset"   , 'e', POPT_ARG_NONE, &reset,   OPT_RESET , "", NULL },

-{ "version" , 'v', POPT_ARG_NONE, NULL, OPT_VERSION , "", NULL },

-{ "help"    , 'h', POPT_ARG_NONE, NULL, OPT_HELP    , "", NULL },

-{ NULL, 0, 0, NULL, 0, NULL, NULL },

+{ "start"      , 's', POPT_ARG_STRING, &start, OPT_START , "", NULL },

+{ "term"       , 't', POPT_ARG_NONE, &sigterm, OPT_TERM  , "", NULL },

+{ "kill"       , 'k', POPT_ARG_NONE, &sigkill, OPT_KILL  , "", NULL },

+{ "rmlock"     , 'r', POPT_ARG_NONE, &rmlock , OPT_RMLOCK, "", NULL }, 

+{ "reset"      , 'e', POPT_ARG_NONE, &reset  , OPT_RESET , "", NULL },

+{ "load-drv"   , 'l', POPT_ARG_NONE, &load   , OPT_LOAD  , "", NULL },

+{ "unload-drv" , 'u', POPT_ARG_NONE, &unload , OPT_UNLOAD, "", NULL },

+{ "dev-config" , 'd', POPT_ARG_STRING, &devConfig, OPT_DEVCONFIG , "", NULL },

+{ "version"    , 'v', POPT_ARG_NONE, NULL, OPT_VERSION , "", NULL },

+{ "help"       , 'h', POPT_ARG_NONE, NULL, OPT_HELP    , "", NULL },

+{ NULL         , 0, 0, NULL, 0, NULL, NULL },

 };

 void show_version() 

@@ -87,6 +96,10 @@

 		"    -k|--kill      Send SIGKILL to Oprofile daemon.\n"

 		"    -r|--rmlock    Remove Oprofile lock file (/var/lib/oprofile/samples/oprofiled.log).\n"

 		"    -e|--reset     Delete Oprofile sample files in /var/lib/oprofile/samples/current.\n"

+		"    -l|--load-drv  Load OProfile driver.\n"

+		"    -u|--unload-drv    Unload OProfile driver.\n"

+		"    -d|--dev_config=<file>:<value>\n"

+		"                   Configure OProfile /dev/oprofile/<file> device file.\n"

 		"    -v|--version   Show version number.\n"

 		"    -h|--help      Show this message.\n"

 		"\n"

@@ -118,6 +131,9 @@

 		case OPT_KILL:

 		case OPT_RMLOCK:

 		case OPT_RESET:

+		case OPT_LOAD:

+		case OPT_UNLOAD:

+		case OPT_DEVCONFIG:

 			break;	

 		case OPT_HELP:

 			show_usage();

@@ -179,6 +195,11 @@

         return system("rm -rf /var/lib/oprofile/samples/current/*");

 }

+int remove_var_lib_oprofile_samples_ca_oprofile_cg()

+{

+        return system("rm -rf /var/lib/oprofile/samples/ca_oprofile.cg");

+}

+

 int remove_var_lib_oprofile_jitdump_star()

 {

         return system("rm -rf /var/lib/oprofile/jitdump/*");

@@ -341,16 +362,67 @@

 	return ret;

 }

+int device_config(const char * filePath, const char * val, int size)

+{

+	int ret = -1;

+	FILE * file = NULL;

+	string devFile = ("/dev/oprofile/");

+	

+	if (!filePath || !val || !size) 

+		return ret;

+

+	devFile += filePath;

+

+	file = fopen(devFile.c_str(), "w" );

+	if (!file) {

+		perror(devFile.c_str());

+		return ret;

+	}

+

+	ret = fwrite(val, 1, size, file); 

+	

+	fclose(file);

+

+	return ret;

+}

+

+

+int device_config()

+{

+	// Parse input

+	string str(devConfig);

+	

+	int found = str.find_first_of(":"); 

+

+	if (!found)

+		return -1;

+	

+	string path = str.substr(0, found);

+	string val  = str.substr(found+1, string::npos);

+	

+	return device_config(path.c_str(), val.c_str(), val.size());

+			

+}

+

+

 int main(int argc, char const * argv[]) 

 {

 	int ret = 1;

 	// Check if root user

-	if(0 != getuid()){

-		fprintf(stderr,"ca_oprofile_controller: Error, must be root.\n");

-		goto out;

-	}

+	if(0 == getuid())

+		goto permissionOk;

+	/* 

+	 *NOTE:

+	 * In sudo approach, we check if this is a root user.

+	 * Only root can run this.

+	 */ 

+	fprintf(stderr,"ca_oprofile_controller: Error, must be root.\n");

+	goto out;

+

+permissionOk:

+

 	// Parse options

 	if (0 != (ret = do_options(argc, argv))) {

 		fprintf(stderr,"ca_oprofile_controller: Error, parsing option.\n");

@@ -367,10 +439,12 @@

 	// Handle Reset

 	if(reset) {

 	        if( remove_var_lib_oprofile_samples_current_star()  == 0

+		&&  remove_var_lib_oprofile_samples_ca_oprofile_cg() == 0

 		&&  remove_var_lib_oprofile_samples_oprofiled_log() == 0 

 		&&  remove_var_lib_oprofile_jitdump_star() == 0

-		&&  remove_var_lib_oprofile_jit_star() == 0

-		&&  remove_var_lib_oprofile_Java_star() == 0

+		// TODO: [Suravee] Clean out this directory when no jitted process running

+		//&&  remove_var_lib_oprofile_jit_star() == 0

+		//&&  remove_var_lib_oprofile_Java_star() == 0

 		&&  mkdir_var_lib_oprofile_samples_current() == 0

 		&&  mkdir_var_lib_oprofile_jitdump() == 0

 		&&  mkdir_var_lib_oprofile_jit() == 0

@@ -387,6 +461,31 @@

 		goto out;

 	}

+	// Handle driver load 

+	if(load) {

+		string cmd(OP_BINDIR);

+		cmd += "/opcontrol --init 2> /dev/null > /dev/null";

+		ret = system(cmd.c_str());

+		goto out;

+	}

+

+	// Handle driver unload

+	if(unload) {

+		string cmd(OP_BINDIR);

+		cmd += "/opcontrol --deinit 2> /dev/null > /dev/null";

+		ret = system(cmd.c_str());

+		goto out;

+	}

+

+	// Handle device file configuration

+	if (devConfig) {

+		if((ret = device_config()) <= 0) 

+			fprintf(stderr,"ca_oprofile_controller: Error, Cannot configure /dev/oprofile.\n");

+		else

+			ret = 0;

+		goto out;

+	}

+

 	// Sending SIGTERM or SIGKILL

 	ret = send_signal();

 out:

Index: package/src/ca/gui/helperAPI.h

===================================================================

--- package/src/ca/gui/helperAPI.h

+++ package/src/ca/gui/helperAPI.h

@@ -0,0 +1,49 @@

+/*

+// CodeAnalyst for Open Source

+// Copyright 2002 . 2009 Advanced Micro Devices, Inc.

+// You may redistribute this program and/or modify this program under the terms

+// of the GNU General Public License as published by the Free Software 

+// Foundation; either version 2 of the License, or (at your option) any later 

+// version.

+//

+// This program is distributed 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

+// this program; if not, write to the Free Software Foundation, Inc., 59 Temple

+// Place, Suite 330, Boston, MA 02111-1307 USA.

+*/

+

+#ifndef _HELPERAPI_H_

+#define _HELPERAPI_H_

+

+#include <qdir.h>

+

+extern bool folderRemove (const QDir & _d);

+

+extern void untar_packed_file(QString * packed_path, QString * temp_dir );

+

+extern unsigned int rename_files(QString * temp_dir, 

+			QString * op_sample_path,

+			QString * cpuinfo_path,

+			QString * dispatched_ops_path);

+

+extern int getBitness(const char * path);

+

+extern int ca_exec_command(QStringList & args, 

+			QString & stdOut,

+			QString & stdErr,

+			int & status,

+			bool isBlock = true);

+

+extern int ca_exec_sudo_command(QStringList & args, 

+			QString & stdOut,

+			QString & stdErr,

+			int & status,

+			bool isBlock = true);

+

+extern bool cssConversion(QString cgOutput);

+

+#endif //_HELPERAPI_H_

+

Index: package/src/ca/gui/Makefile.am

===================================================================

--- package/src/ca/gui/Makefile.am

+++ package/src/ca/gui/Makefile.am

@@ -134,7 +134,8 @@

 	EventMaskEncoding.cpp \

 	CpuAffinityDlg.cpp \

 	ProcessFilterDlg.cpp \

-	NewDiffSessionDlg.cpp

+	NewDiffSessionDlg.cpp \

+	helperAPI.cpp

 CodeAnalyst_generated_headers= iAboutDlg.h \

Index: package/src/ca/gui/application.cpp

===================================================================

--- package/src/ca/gui/application.cpp

+++ package/src/ca/gui/application.cpp

@@ -48,6 +48,7 @@

 #include "catranslate_gui_display.h"

 #include "opxmldata_handler.h"

 #include "config.h"

+#include "helperAPI.h"

 #define _CODEANALYST_ICONS_

 #include "xpm.h"

@@ -757,8 +758,8 @@

 				+ "This user does not have sufficient permission to run a profile.\n\n"

 				+ "Please make sure :\n"

 				+ "    - You are root or a member of \"amdca\" group.\n" 

-				+ "    - amdca group has the permission to sudo \n\n"

-				+ "      "+ CA_SBIN_DIR + "/ca_oprofile_controller\n\n"

+				+ "    - amdca group has the permission to run\n\n"

+				+ "         sudo " + CA_SBIN_DIR + "/ca_oprofile_controller\n\n"

 				+ "Please use \"ca_user_manager\" to manage CodeAnalyst users.";

 		QMessageBox::critical(this, "CodeAnalyst Error", errMsg);

 		return;	

@@ -767,14 +768,15 @@

 	/* 2. Check to make sure that CodeAnalyst service is setup and ready.

 	 * otherwise, we will try to start it.

 	 */

-	if (!m_opIf.codeanalyst_service_status() && !m_opIf.codeanalyst_service_start())

+	if (!m_opIf.checkOprofileDriverStatus() && !m_opIf.loadOprofileDriver())

 	{

 		QMessageBox::critical (this, "Error starting profile",

-			"Checking CodeAnalyst service (/etc/init.d/codeanalyst status)\n"

-			"returns failure, and an attempt to start CodeAnalyst service\n"

-			"(/etc/init.d/codeanalyst start) also failed.\n."

+			"Checking OProfile driver (/dev/oprofile) returns failure\n"

+			" and an attempt to load the driver also failed.\n."

 			"CodeAnalyst will not be able to run profile.\n\n."

-			"Please make sure to start the service as root.\n."

+			"Please make sure :\n"

+			"  - The user is a member of group amdca\n."

+			"  - OProfle driver is installed and can be started properly\n."

 		);

 		return;

 	}

@@ -896,21 +898,21 @@

 		// check if driver is ok

 		if (!m_opIf.checkMuxSupportInDriver() 

 		||   m_opIf.getNumEventCounters() == MAX_EVENTNUM) {

-			QMessageBox::warning(NULL, "CodeAnalyst Warning",QString("Warning:\n\n") +

-				+ "Current CodeAnalyst Kernel Module does not support event multiplexing.\n"

-				+ "CodeAnalyst will start profile only with events in the first group.\n\n"

-				+ "Please update the CodeAnalyst Kernel Module in order to profile more than "

-				+ "one event group.");

+			QMessageBox::warning(this, "CodeAnalyst Warning",QString("Warning:\n\n") +

+			+ "Current CodeAnalyst Kernel Module does not support event multiplexing.\n"

+			+ "CodeAnalyst will start profile only with events in the first group.\n\n"

+			+ "Please update the CodeAnalyst Kernel Module in order to profile more than "

+			+ "one event group.");

 			static_cast <EBP_OPTIONS *>(m_pSession)->countEventGroups = 1; 

 		}

 		// check if daemon is ok

 		if (!m_opIf.checkMuxSupportInDaemon()) {

-			QMessageBox::warning(NULL, "CodeAnalyst Warning",QString("Warning:\n\n") +

-				+ "Current OProfile daemon does not support event multiplexing.\n"

-				+ "CodeAnalyst will start profile only with events in the first group.\n\n"

-				+ "Please use CodeAnalyst provided OProfile in order to profile more than "

-				+ "one event group.");

+			QMessageBox::warning(this, "CodeAnalyst Warning",QString("Warning:\n\n") +

+			+ "Current OProfile daemon does not support event multiplexing.\n"

+			+ "CodeAnalyst will start profile only with events in the first group.\n\n"

+			+ "Please use CodeAnalyst provided OProfile in order to profile more than "

+			+ "one event group.");

 			static_cast <EBP_OPTIONS *>(m_pSession)->countEventGroups = 1; 

 		}

 	}       

@@ -2748,13 +2750,21 @@

 	if (oie_rt == OIE_OK) {

 		if(m_pSession->Trigger == EVENT_TRIGGER)

-			oie_rt = m_opIf.do_start_daemon (novmlinux, vmlinux_dir,

-				buffer_size, watershed_size, cpu_buf_size, 

-				ca_active_profiling, pEventSession->msMpxInterval);

+			oie_rt = m_opIf.do_start_daemon (novmlinux, 

+							vmlinux_dir,

+							buffer_size, 

+							watershed_size, 

+							cpu_buf_size, 

+							ca_active_profiling, 

+							pEventSession->msMpxInterval);

 		else

-			oie_rt = m_opIf.do_start_daemon (novmlinux, vmlinux_dir,

-				buffer_size, watershed_size, cpu_buf_size, 

-				ca_active_profiling,0);

+			oie_rt = m_opIf.do_start_daemon (novmlinux, 

+							vmlinux_dir,

+							buffer_size, 

+							watershed_size, 

+							cpu_buf_size, 

+							ca_active_profiling,

+							0);

 	}

Index: package/src/ca/gui/helperAPI.cpp

===================================================================

--- package/src/ca/gui/helperAPI.cpp

+++ package/src/ca/gui/helperAPI.cpp

@@ -0,0 +1,372 @@

+/*

+// CodeAnalyst for Open Source

+// Copyright 2002 . 2009 Advanced Micro Devices, Inc.

+// You may redistribute this program and/or modify this program under the terms

+// of the GNU General Public License as published by the Free Software 

+// Foundation; either version 2 of the License, or (at your option) any later 

+// version.

+//

+// This program is distributed 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

+// this program; if not, write to the Free Software Foundation, Inc., 59 Temple

+// Place, Suite 330, Boston, MA 02111-1307 USA.

+*/

+

+#include "config.h"

+#include "helperAPI.h"

+

+#include <stdlib.h>

+#include <qstring.h>

+#include <qstringlist.h>

+#include <qfileinfo.h>

+#include <qdir.h>

+#include <qprocess.h>

+#include <qtimer.h>

+#include <qmessagebox.h>

+

+#include <elf.h>

+

+#define PACKED_DIR_NAME "capacked"

+

+/* 

+* folderRemove:

+* Recursive contents within the folder and the folder

+* itself.

+* It is the same code from oprofile_interface.cpp

+*/

+bool folderRemove (const QDir & _d)

+{

+	QDir d = _d;

+

+	QStringList entries = d.entryList(QDir::All|QDir::Hidden);

+	QStringList::Iterator it = entries.begin();

+

+	for (; it != entries.end (); ++it)

+	{

+		if (*it == "." || *it == "..")

+			continue;

+		QFileInfo info (d, *it);

+		if (info.isDir ())

+		{

+			if (!folderRemove (QDir (info.filePath ())))

+				return false;

+		}

+		else

+		{

+			d.remove (info.filePath ());

+		}

+	}

+

+	QString name = d.dirName ();

+

+	if (!d.cdUp ())

+		return false;

+

+	d.rmdir (name);

+	return true;

+}

+

+void untar_packed_file(QString * packed_path, QString * temp_dir )

+{

+	QDir dir;

+	if (!QFile::exists(*packed_path)) {

+		return;    

+	}

+

+	srand(time(0));

+	temp_dir->sprintf("/tmp/CA%ld/", random());

+	dir.mkdir(*temp_dir);

+

+	// todo hook the output to the dialog

+	// todo use a randomly generated directory

+	QString command = "tar zxf " + *packed_path + " -C " + *temp_dir;

+	system(command.data());

+}

+

+

+void mkdir_p(QString & absPath)

+{

+	QStringList list =  QStringList::split("/", absPath);

+	QStringList::iterator it = list.begin();

+

+	QString dir_path = "/";

+	for (; it != list.end(); ++it) {

+		dir_path = dir_path + (*it) + "/";

+		QDir dir(dir_path);

+

+		if (!dir.exists())  {

+			if (!dir.mkdir(dir_path))

+				qDebug("mkdir failed");

+		}

+

+	}

+}

+

+

+void copy_files(QFileInfo & info, QString & dest_dir)

+{

+	// Copy any non-directory file to the new path

+	QDir dir = QDir(info.filePath());

+	dir.setFilter(QDir::Files);

+	QStringList file_list = dir.entryList(); 

+	QStringList::Iterator itFile = file_list.begin();

+	for (; itFile != file_list.end(); ++itFile) {

+		QFileInfo info(dir, (*itFile));

+

+		QString command = "cp \"" + info.absFilePath() + "\" \"" + dest_dir + "\"";

+

+		system(command.data());

+	}

+}

+

+

+void recurse_dirs(QString & parent_dir_str, 

+			QString & dest_dir_str, 

+			QString & subs_dir,

+			bool prev_dep)

+{

+	QDir current_dir = QDir(parent_dir_str);   

+

+	current_dir.setFilter(QDir::Dirs);

+	QStringList old_dir_list = current_dir.entryList();

+	QStringList::Iterator it = old_dir_list.begin();

+

+	for (; it != old_dir_list.end(); ++it) {

+		bool dep = false;

+		if (*it == "." || *it == "..")

+			continue;

+

+		QFileInfo info(current_dir, *it);

+		QString path = info.filePath(); 

+

+		QString temp = dest_dir_str + "/" + *it;

+

+		if ((*it).contains("{dep}"))

+			dep = true;

+		else if (((*it).contains("{root}") || (*it).contains("{kern}")) 

+		       &&  prev_dep == true)

+			temp += subs_dir;

+		else

+			dep =false;

+

+		mkdir_p(temp);

+		copy_files(info, temp);

+		recurse_dirs(path, temp, subs_dir, dep);

+	}

+}

+

+

+unsigned int rename_files(QString * temp_dir, 

+			QString * op_sample_path,

+			QString * cpuinfo_path,

+			QString * dispatched_ops_path)

+{

+	//todo capacked is hard coded right now.

+	QString top_dir = *temp_dir;

+	QString op_current_dir_str = *temp_dir + PACKED_DIR_NAME + "/current";

+	QDir op_current_dir(op_current_dir_str );

+

+	// Move the sample file to correct directory structure

+	// For example: sample files in  

+	// /tmp/CA_982/capacked/current/{root}/bin/basename 

+	// needs to be moved to 

+	// /tmp/CA_982/capacked/current/{root}/tmp/CA_982/capacked/binary/bin/basename/

+

+	// Since we will be recursing capacked/current directory tree tree

+	// the new structure is crecated at at capacked/new_current

+	QString dest_topdir_str = top_dir + "capacked/samples/current/{root}" 

+		+ *temp_dir + "capacked/binary";

+

+	*op_sample_path = top_dir + "capacked/samples/current/";

+

+	*cpuinfo_path = top_dir + "capacked/cpuinfo";

+

+	*dispatched_ops_path = top_dir + "capacked/cainfo/dispatched_ops";

+	

+	QString subs_dir = *temp_dir + "capacked/binary/{root}/";

+

+	// Loop through the original directory structure and create 

+	// correspondent directory under the new directory tree structure

+	recurse_dirs(op_current_dir_str, dest_topdir_str, subs_dir, false);

+

+	return 0;

+}

+

+

+int getBitness(const char * path)

+{ 	

+	char elf_header[EI_NIDENT];

+	FILE *fp;

+	int ret = -1;

+

+	if (!path)

+		goto out;

+

+	fp = fopen(path, "r");

+

+	/**

+	* The reporting libraries does not return correct path

+	* of kernel module under 2.6.1.  This function will not

+	* under this situation.

+	*/

+	if (NULL == fp) 

+		goto out;

+

+	fread(&elf_header, 16, 1, fp);

+	if (ferror(fp)) {

+                fclose (fp);

+                goto out;

+        }

+        fclose(fp);

+

+        if (0 != strncmp(elf_header, ELFMAG, SELFMAG))

+                goto out;

+

+        switch (elf_header[EI_CLASS]) {

+                case ELFCLASS32:

+                        ret = 32; 

+                        break;

+                case ELFCLASS64:

+                        ret = 64;

+                        break;

+        }

+out:

+	return ret; 

+

+}

+

+

+int ca_exec_command (QStringList & args, 

+			QString & stdOut,

+			QString & stdErr,

+			int & status,

+			bool isBlock)

+{

+	int rt = -1;

+

+	QProcess * proc = new QProcess();

+	if (!proc)

+		goto out;	

+

+	proc->setArguments (args);

+

+//	fprintf(stderr,"ca_exec_command = %s\n", proc->arguments().join(" ").ascii());

+

+	if(!proc->start ()) {

+		goto out;

+	}

+

+	// Since the process being launch are non-blocking daemon,

+	// sysctl, mknod, etc, just wait for the command to finish

+	while (proc->isRunning ()) { 

+		if (!isBlock)

+			break;

+	}

+

+	// Get exit status/stdOut/stdErr

+	status = proc->exitStatus();

+	stdErr = QString(proc->readStderr());

+	stdOut = QString(proc->readStdout());

+

+	// Check for normal Exit

+	if (proc->normalExit () && status == 0)

+		rt = 0;

+out:

+	if (proc)

+		delete proc;

+	return rt;

+}

+

+

+int ca_exec_sudo_command (QStringList & args, 

+			QString & stdOut,

+			QString & stdErr,

+			int & status,

+			bool isBlock)

+{

+	int rt = -1;

+

+	QStringList cmd;

+	cmd.append("sudo");

+	cmd.append("-S");

+	cmd += args;

+

+	QProcess * proc = new QProcess();

+	if (!proc)

+		goto out;	

+

+	proc->setArguments (cmd);

+

+//	fprintf(stderr,"ca_exec_command = %s\n", proc->arguments().join(" ").ascii());

+

+	if(!proc->start ()) {

+		goto out;

+	}

+

+	/* NOTE:

+	 * sudo, should never output to the stderr.

+	 * We consider this error and will just exit out.

+	 */

+	while (proc->isRunning ()) { 

+		if (!isBlock)

+			break;

+		if (proc->readStderr().size() != 0){

+			proc->tryTerminate();

+			QTimer::singleShot(1000, proc, SLOT(kill()));

+			break;

+		}

+	}

+

+	// Get exit status/stdOut/stdErr

+	status = proc->exitStatus();

+	stdErr = QString(proc->readStderr());

+	stdOut = QString(proc->readStdout());

+

+	// Check for normal Exit

+	if (proc->normalExit () && status == 0)

+		rt = 0;

+out:

+	if (proc)

+		delete proc;

+	return rt;

+}

+

+

+bool cssConversion(QString cgOutput)

+{

+	// TODO: [Suravee] Currently we directly call cgreport

+	// since we want cgprocessing code to be a standalone utility.

+	// and can eliminate the build dependency.  We might want

+	// to integrate this into the gui in the future.

+	QString cgreportPath  	= QString(CA_BIN_DIR) + "/cgreport"; 

+	QString cgFile 		= QString("/var/lib/oprofile/samples/ca_oprofile.cg");

+

+	if (!QFile::exists (cgreportPath)) {

+		QMessageBox::critical(NULL, "CSS Conversion Error",

+			QString("CodeAnalyst could not process call-stack sampling data.\n") +

+			"Please install " + cgreportPath + ".\n");

+		return false;

+	}

+

+	if (!QFile::exists (cgFile)) {

+		QMessageBox::critical(NULL, "CSS Conversion Error",

+			cgFile + " not found.\n" +

+			"Please rerun the profile with proper CSS setting.\n");

+		return false;

+	}

+

+	QStringList cmd;

+	cmd.append(cgreportPath);

+	cmd.append(QString("-i"));

+	cmd.append(cgFile);

+	cmd.append(QString("-o"));

+	cmd.append(cgOutput + "/callgrind.out");

+

+	QString stdOut, stdErr;

+	int status;

+	return (ca_exec_command(cmd, stdOut, stdErr, status) == 0

+		&& status == 0);

+}

Index: package/src/ca/gui/oprofile_interface.h

===================================================================

--- package/src/ca/gui/oprofile_interface.h

+++ package/src/ca/gui/oprofile_interface.h

@@ -63,23 +63,27 @@ class oprofile_interface:QObject {

 public:

 	oprofile_interface ();

-	int do_start_daemon (bool novmlinux, 

-		QString & vmlinux_dir,

-		unsigned int buffer_size, 

-		unsigned int buffer_watershed_size, 

-		unsigned int cpu_buf_size,

-		profiling_types active_profiling, 

-		unsigned int multiplex_interval);

+	int do_start_daemon (bool vmlinux, 

+			QString & vmlinux_dir,

+			unsigned int buffer_size, 

+			unsigned int buffer_watershed_size, 

+			unsigned int cpu_buf_size,

+			profiling_types active_profiling, 

+			unsigned int multiplex_interval);

 	void set_op_events (op_event_property * properties);

 	void set_op_ibs ( op_ibs_property * properties);

+	bool set_css(unsigned int cssDepth, 

+			unsigned int cssInterval,

+			unsigned int cssTgid,

+			unsigned int cssBitness);

 	void do_dump ();

 	void do_kill_daemon ();

 	void do_pause_daemon ();

 	void do_resume_daemon();

-	QString get_kernel_range ();

+	QString get_kernel_range (QString vmlinux_dir);

 	QString & get_std_err();

 	bool do_setup ();

@@ -90,9 +94,9 @@ public:

 	bool havePermissionToProfile();

-	bool codeanalyst_service_start();

+	bool loadOprofileDriver();

-	bool codeanalyst_service_status();

+	bool checkOprofileDriverStatus();

 	int checkIbsSupportInDaemon();

@@ -104,16 +108,32 @@ public:

 	bool checkMuxSupportInDriver();

+	bool checkCssSupportInDaemon();

+

+	bool checkCssSupportInDriver();

+

+	static bool set_param (QString field, 

+					unsigned long int value,

+					QString & stdOut,

+					QString & stdErr,

+					int & status);

+	

 private:

+

+	bool set_param (QString field, unsigned long int value);

+	

+	int exec_command (QStringList & args);

+	

+	int exec_sudo_command (QStringList & args);

+

 	int do_reset();

-	int  help_start_daemon (bool novmlinux, 

+	int  help_start_daemon (bool vmlinux, 

 			QString & vmlinux_dir, 

 			profiling_types active_profiling);

 	bool get_daemon_pid(unsigned int &pid;;

-	int exec_command (QStringList & args);

 	bool do_sysctl_setup (unsigned int buffer_size, 

 				unsigned int buffer_watershed_size, 

@@ -125,24 +145,25 @@ private:

 	void generate_op_event_arg (QString & arg);

-	void do_stop ();

+	bool set_ctr_param (int event, QString field, unsigned long int value);

-	bool set_ctr_param (int event, QString field, unsigned long long int value);

-

-	bool set_param (QString field, int value);

 	bool do_ebs_setup(profiling_types active_profiling);

 	bool do_ibs_setup(profiling_types active_profiling);

 	QString simplifyPath(QString path);

+	

+	bool is_driver_loaded();

+	

+	bool is_oprofilefs_mounted();

 private:

-	QProcess 		* m_proc;

 	op_ibs_property 	* m_pIbsProperties;

 	op_event_property 	m_EventProperties[MAX_EVENTNUM_MULTIPLEXING];

-	QString 		m_StdErr;

-	QString 		m_StdOut;

+	QString 		m_stderr;

+	QString 		m_stdout;

+	int 			m_status;

 	int 			m_numEventCountersAvailable;

 	bool 			m_isDaemonStarted;

 	unsigned int 		m_daemon_pid;

Index: package/src/ca/gui/oprofile_interface.cpp

===================================================================

--- package/src/ca/gui/oprofile_interface.cpp

+++ package/src/ca/gui/oprofile_interface.cpp

@@ -40,9 +40,9 @@

 #include "application.h"

 #include "config.h"

 #include "oprofile_interface.h"

-//#include "op_config.h"

 #include "atuneoptions.h"