X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=src%2Fkernel%2Fkernel.cpp;h=1c0b7921b96806dd5accaecddd8398e0973090b9;hb=1c031379a5928fe8a268f4b54bbef4b898a1ee20;hp=31cb74d1a3277635f1b2a51fa1e02c7e5477540d;hpb=6f5a535e6308169b0383083846f1aed5fecc4209;p=vlp.git

diff --git a/src/kernel/kernel.cpp b/src/kernel/kernel.cpp
index 31cb74d..1c0b792 100644
--- a/src/kernel/kernel.cpp
+++ b/src/kernel/kernel.cpp
@@ -66,13 +66,17 @@
 
 #include "kernel.h"
 #include "ui/KernelWindow.h"
+#include "ConnectDialog.h"
+#include "KillDialog.h"
 #include "LockDialog.h"
 #include "OptionsDialog.h"
-#include "KillDialog.h"
-#include "ConnectDialog.h"
+#include "MessageDialog.h"
 
 #include "vlp/config.h"
+#include "vlp/QtConfigurationFinder.h"
+#include "vlp/exception/ConfigFileNotFound.h"
 
+#include <sys/prctl.h>
 /* File resides in top directory (where are Makefiles)*/
 #include "../../config.h"
 
@@ -124,12 +128,6 @@ QKernel::QKernel(int argc, char **argv)
 {
 	setupUi(this);
 
-	QString arg0(argv[0]);
-	arg0 += "/";
-	homeDir = QDir(arg0);
-	homeDir.cdUp();
-
-	
 	int i;
 	for(i = 0; (i < 5) && (i < argc-1); i++) {
 		strcpy(myargs[i], "");
@@ -138,6 +136,9 @@ QKernel::QKernel(int argc, char **argv)
 		}
 	}
 
+	loglan::vlp::QtConfigurationFinder configFinder;
+	configFinder.initSearchDirs();
+
 	QDir q(getRemoteDir());
 
 	if (!q.exists()) {
@@ -156,7 +157,7 @@ QKernel::QKernel(int argc, char **argv)
 	ActiveConnections = 0;
 	strcpy(LockPasswd, "");
 
-	loadConfig(getConfigFilePath());
+	loadConfig(configFinder.findConfig().c_str());
 
 	RunNetModule();
 
@@ -213,6 +214,8 @@ void QKernel::loadConfig(const char * fname)
 		}
 
 		strncpy(progdir, config.getProgramDir(), 256);
+
+		homeDir = QDir(QCoreApplication::applicationDirPath());
 	}
 }
 
@@ -243,9 +246,11 @@ void QKernel::on_actionEditor_triggered()
 	QString program = getHomeDir();
 	program += "/modules/logedit";
 
+	fprintf(stderr, "Run EDIT Module: %s, %s\n", program.toStdString().c_str(), getHomeDir());
 	pid_t pid = fork();
 	if (pid == 0) {
 		if (execl(program.toStdString().c_str(),
+			"logedit",
 			getHomeDir(),
 			myargs[0],
 			myargs[1],
@@ -277,9 +282,12 @@ void QKernel::on_actionHelp_triggered()
 	QString docDir = getHomeDir();
 	docDir += "/doc";
 
+	fprintf(stderr, "Run HELP Module: %s, %s\n", program.toStdString().c_str(), docDir.toStdString().c_str());
+
 	pid_t pid = fork();
 	if (pid == 0) {
 		if (execl(program.toStdString().c_str(),
+			"loghelp",
 			docDir.toStdString().c_str(),
 			myargs[0],
 			myargs[1],
@@ -309,9 +317,12 @@ void QKernel::RunGraphModule(char *sk)
 	QString program = getHomeDir();
 	program += "/modules/loggraph";
 
+	fprintf(stderr, "Run GRAPH Module: %s, %s\n", program.toStdString().c_str(), sk);
+
 	pid_t pid = fork();
 	if (pid == 0) {
 		if (execl(program.toStdString().c_str(),
+			"loggraph",
 			program.toStdString().c_str(),
 			sk,
 			myargs[0],
@@ -342,6 +353,7 @@ void QKernel::RunGraphModule(char *sk)
  */
 void QKernel::RunNetModule()
 {
+
 	struct sockaddr_un svr;
 	int len;
 	int on;
@@ -350,10 +362,11 @@ void QKernel::RunNetModule()
 	QString program = getHomeDir();
 	program += "/modules/lognet";
 
+	fprintf(stderr, "Run NET Module: %s, %s %s\n", program.toStdString().c_str(), getNetModuleSocket(), getConfigFilePath().toStdString().c_str());
 	pid_t pid = fork();
 	if (pid == 0) {
 		if (execl(program.toStdString().c_str(),
-			program.toStdString().c_str(),
+			"lognet",
 			getNetModuleSocket(),
 			getConfigFilePath().toStdString().c_str(),
 			myargs[0],
@@ -412,7 +425,6 @@ void QKernel::on_actionConnect_triggered()
 	MESSAGE m;
 
 	dialog::ConnectDialog dialog(this);
-	dialog.setWindowTitle("IP Address:");
 
 	if (dialog.exec()) {
 		m.msg_type = MSG_NET;
@@ -474,48 +486,17 @@ void QKernel::on_actionQuit_triggered()
  */
 void QKernel::on_actionMessage_triggered()
 {
-	QDialog *dlg;
-	QLineEdit *nodenr;
+	dialog::MessageDialog dialog(this);
 	MESSAGE m;
 
-	dlg = new QDialog(this, Qt::Dialog);
-	dlg->setWindowTitle("Send message to node");
-
-	nodenr = new QLineEdit("number", dlg);
-	nodenr->setGeometry(90, 10, 50, 30);
-	nodenr->setText("");
-
-	QLabel *tmpQLabel;
-	tmpQLabel = new QLabel("Node number:", dlg);
-	tmpQLabel->setGeometry(10, 10, 77, 30);
-
-	tmpQLabel = new QLabel("Message:", dlg);
-	tmpQLabel->setGeometry(10, 50, 70, 30);
-
-	QLineEdit *msg;
-	msg = new QLineEdit("", dlg);
-	msg->setGeometry(80, 60, 330, 30);
-
-	QPushButton *ob;
-	ob = new QPushButton("Send", dlg);
-	ob->setGeometry(230, 10, 80, 30);
-	ob->setDefault(TRUE);
-	
-	QPushButton *cb;
-	cb = new QPushButton("Cancel", dlg);
-	cb->setGeometry(330, 10, 80, 30);
-	dlg->resize(430, 110);
-	connect(ob, SIGNAL(clicked()), dlg, SLOT(accept()));
-	connect(cb, SIGNAL(clicked()), dlg, SLOT(reject()));
-
-	if (dlg->exec()) {
+	if (dialog.exec()) {
 		m.msg_type = MSG_NET;
 		m.param.pword[0] = NET_PROPAGATE;
 		m.param.pword[1] = MSG_VLP;
 		m.param.pword[2] = NodeNumber;
-		m.param.pword[4] = atoi(nodenr->text().toAscii().data());
+		m.param.pword[4] = dialog.getNodeNumber();
 		m.param.pword[6] = VLP_WRITE;
-		strcpy(m.param.pstr, msg->text().toAscii().data());
+		strcpy(m.param.pstr, dialog.getMessage().toStdString().c_str());
 		write(net_sock, &m, sizeof(MESSAGE));
 	}
 }
@@ -528,7 +509,6 @@ void QKernel::on_actionMessage_triggered()
 void QKernel::on_actionKill_triggered()
 {
 	dialog::KillInterpreterDialog dialog(this);
-	dialog.setWindowTitle("Kill interpreter");
 
 	if (dialog.exec()) {
 		MESSAGE m;
@@ -554,6 +534,8 @@ void QKernel::on_actionKill_triggered()
 
 /**
  * Sends message to the net module.
+ *
+ * \todo method needs to be refactored
  */
 void QKernel::NetMessage()
 {
@@ -584,17 +566,17 @@ void QKernel::NetMessage()
 				case VLP_WRITE:
 					QApplication::beep();
 					WriteMessage(CharLine);
-					WriteMessage(
-						"### Incoming Messsage ###");
-					sprintf(ss, "Mesg from Node %d: %s",
-							msg.param.pword[2],
-							msg.param.pstr);
+					WriteMessage("### Incoming Messsage ###");
+					sprintf(ss,
+						"Mesg from Node %d: %s",
+						msg.param.pword[2],
+						msg.param.pstr
+					);
 					WriteMessage(ss);
 					WriteMessage(CharLine);
 					break;
 				case VLP_REMOTE_INSTANCE:
-					sprintf(ss, "%s/%s", getRemoteDir(),
-								msg.param.pstr);
+					sprintf(ss, "%s/%s", getRemoteDir(), msg.param.pstr);
 
 					if (info_messages) { 
 						WriteMessage("Running program:");
@@ -679,6 +661,7 @@ void QKernel::IntMessage(int sock)
 		switch (msg.msg_type) { 
 		case MSG_GRAPH:
 			if (msg.param.pword[0] == GRAPH_ALLOCATE) {
+				fprintf(stderr, "Running graph module with arg: %s\n", msg.param.pstr);
 				RunGraphModule(msg.param.pstr);
 			}
 			break;
@@ -695,8 +678,6 @@ void QKernel::IntMessage(int sock)
 		case MSG_INT:
 			switch(msg.param.pword[0]) {
 			case INT_EXITING:
-				char ss[255];
-
 				MESSAGE m;
 				m.msg_type = MSG_VLP;
 				m.param.pword[0] = VLP_INTERPRETER_DOWN;
@@ -711,6 +692,7 @@ void QKernel::IntMessage(int sock)
 				delete e;
 
 				if (info_messages) {
+					char ss[255];
 					sprintf(ss, "%s : End of program "
 						"execution", msg.param.pstr);
 					WriteMessage(ss);
@@ -897,6 +879,7 @@ InterpEntry *QKernel::findINTbyID(int _id)
  */
 InterpEntry *QKernel::RunIntModule(char *ss, int r)
 {
+	fprintf(stderr, "Run INT Module: %s, %d\n", ss, r);
 	char a[256], b[255];
 	struct sockaddr_un svr;
 	int len, sock, on;
@@ -943,7 +926,7 @@ InterpEntry *QKernel::RunIntModule(char *ss, int r)
 	strcpy(newINT->shortname, b);
 	strcpy(newINT->fullname, ss);
 
-	sprintf(a, "%s%d", IPATH, newint);
+	sprintf(a, "%s%d", homeDir.absoluteFilePath(IPATH).toStdString().c_str(), newint);
 	sprintf(cmd, "%s/modules/logint %s %s",
 		getHomeDir(),
 		a,
@@ -951,9 +934,11 @@ InterpEntry *QKernel::RunIntModule(char *ss, int r)
 	if (r) {
 		strcat(cmd, " r");
 	}
-	sprintf(b, " %s %s %s %s %s",
-		myargs[0], myargs[1], myargs[2], myargs[3], myargs[4]);
-	strcat(cmd, b);
+// 	sprintf(b, " %s %s %s %s %s",
+// 		myargs[0], myargs[1], myargs[2], myargs[3], myargs[4]);
+// 	sprintf(cmd, "%s %s", cmd, b);
+// 	strcat(cmd, b);
+	fprintf(stderr, "%s\n", cmd);
 	strcat(cmd, " &");
 
 	sock = socket(AF_UNIX, SOCK_STREAM, 0);