X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=src%2Fkernel%2Fkernel.cpp;h=72900280de4a2c02d0ad207e5452def81c26658d;hb=c53612650313e842a9de1d3e8dbbcd6e23d7d7d8;hp=dbe7359f70f52144984ead9eb6d0db03c4e99f4a;hpb=6eb8fff3207557d5944fcca17982290b16724477;p=vlp.git

diff --git a/src/kernel/kernel.cpp b/src/kernel/kernel.cpp
index dbe7359..7290028 100644
--- a/src/kernel/kernel.cpp
+++ b/src/kernel/kernel.cpp
@@ -65,16 +65,25 @@
 #include <X11/Xlib.h>
 
 #include "kernel.h"
-#include "ui/kernelwindow.h"
-#include "lock.h"
-#include "options.h"
-#include "kill_interpreter_dialog.h"
-#include "connect_dialog.h"
-
+#include "ui/KernelWindow.h"
+#include "ConnectDialog.h"
+#include "KillDialog.h"
+#include "LockDialog.h"
+#include "OptionsDialog.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"
 
 
+namespace loglan {
+namespace vlp {
+
 char CharLine[25] = "________________________";
 
 /**
@@ -119,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], "");
@@ -133,13 +136,16 @@ QKernel::QKernel(int argc, char **argv)
 		}
 	}
 
+	loglan::vlp::QtConfigurationFinder configFinder;
+	configFinder.initSearchDirs();
+
 	QDir q(getRemoteDir());
 
 	if (!q.exists()) {
 		q.mkpath(getRemoteDir());
 	}
 
-	info_messages = TRUE;
+	info_messages = actionInfo_messages->isChecked();
 	wait_for_info = FALSE;
 
 	setWindowTitle(PACKAGE_NAME);
@@ -150,11 +156,15 @@ QKernel::QKernel(int argc, char **argv)
 	freeINTid = 1;
 	ActiveConnections = 0;
 	strcpy(LockPasswd, "");
-	loadConfig(getConfigFilePath());
+
+	loadConfig(configFinder.findConfig().c_str());
+
 	RunNetModule();
 
 	Net_Notify = new QSocketNotifier(net_sock, QSocketNotifier::Read, this);
 	connect(Net_Notify, SIGNAL(activated(int)), this, SLOT(NetMessage()));
+
+	WriteMessage("\n " PACKAGE_STRING ": READY \n");
 }
 
 QString QKernel::getConfigFilePath()
@@ -192,93 +202,21 @@ void QKernel::loadConfig(const QString & fname)
  */
 void QKernel::loadConfig(const char * fname)
 {
-	config_t cfg;
-	config_setting_t *setting;
-
-	/* Hack for checking if file exists without using external libs.*/
-
-	FILE * file = fopen(fname, "rt");
-	if (!file) {
-		fprintf(stderr, "Error: Cannot load configuration file: %s!\n", 
-									fname);
-		exit(3);
-	}
-	/* File exists, so file has been locked. Release it. */
-
-	config_init(&cfg);
-
-	/* Read the file. If there is an error, report it and exit. */
-	if (!config_read(&cfg, file)) {
-		fprintf(stderr, "%s! In file %s, line %d\n", 
-			config_error_text(&cfg), 
-			config_error_file(&cfg), 
-			config_error_line(&cfg));
-		config_destroy(&cfg);
-		fclose(file);
-		exit(3);
-	}
+	loglan::vlp::Config config;
+	if(config.load(fname)) {
+		NodeNumber = config.getNodeNumber();
+		ConType = config.getConnectionType();
 
-	setting = config_lookup(&cfg, "node_number");
-	if (setting) {
-		NodeNumber = config_setting_get_int(setting);
-	} else {
-		fprintf(stderr, "%s! In file %s, '%s' was not found.\n", 
-					"Warning", fname, "node_number");
-		config_destroy(&cfg);
-		fclose(file);
-		exit(3);
-	}
 
-	setting = config_lookup(&cfg, "type");
-	if (setting) {
-		/* same as strcmp(..) == 0 */
-		if (!strcmp(config_setting_get_string(setting), "explicit")) {
-			ConType = 1;
-		} else {
-			ConType = 2;
+		std::vector<std::string> hosts = config.getHosts();
+		for (unsigned int i = 0; i < hosts.size(); i++) {
+			ConnectList.append(new ConnectEntry(hosts[i].c_str()));
 		}
-	} else {
-		fprintf(stderr, "%s! In file %s, '%s' was not found.\n", 
-						"Warning", fname, "type");
-	}
 
-	setting = config_lookup(&cfg, "host");
-	if (setting) {
-		switch(config_setting_type(setting)) {
-		/* TODO: Deprecated. Made for back compatibility. */
-		case CONFIG_TYPE_STRING:
-			ConnectList.append(new ConnectEntry((char*)
-					config_setting_get_string(setting)));
-			break;
-		case CONFIG_TYPE_ARRAY: {
-			int size = config_setting_length(setting);
-			for (int i = 0; i < size; i++) {
-				ConnectList.append(new ConnectEntry((char*)
-					config_setting_get_string_elem(setting,
-									i)));
-			}
-			break;
-		}
-		default:
-			fprintf(stderr, "%s! In file %s, bad entry type for %s."
-							" Will not be read.\n", 
-							"Error", fname, "host");
-		}
-	} else {
-		fprintf(stderr, "%s! In file %s, '%s' was not found.\n", 
-						"Warning", fname, "host");
-	}
+		strncpy(progdir, config.getProgramDir(), 256);
 
-	setting = config_lookup(&cfg, "progdir");
-	if (setting){
-		strncpy(progdir, config_setting_get_string(setting), 256);
-	} else {
-		fprintf(stderr, "%s! In file %s, '%s' was not found.\n", 
-						"Warning", fname, "progdir");
+		homeDir = QDir(QCoreApplication::applicationDirPath());
 	}
-
-	config_destroy(&cfg);
-	fclose(file);
 }
 
 /**
@@ -287,11 +225,10 @@ void QKernel::loadConfig(const char * fname)
  */
 void QKernel::on_actionExecute_triggered()
 {
-	int i;
 	QString s = QFileDialog::getOpenFileName(this, "Execute", progdir, "*.log");
 
 	if (!s.isNull()) {
-		i = s.indexOf(".log");
+		int i = s.indexOf(".log");
 
 		if (i > 0)
 			s.remove(i, 4);
@@ -309,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],
@@ -343,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],
@@ -372,15 +314,15 @@ void QKernel::on_actionHelp_triggered()
  */
 void QKernel::RunGraphModule(char *sk)
 {
-	char cmd[255];
-
 	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(),
-			program.toStdString().c_str(),
+			"loggraph",
 			sk,
 			myargs[0],
 			myargs[1],
@@ -410,6 +352,7 @@ void QKernel::RunGraphModule(char *sk)
  */
 void QKernel::RunNetModule()
 {
+
 	struct sockaddr_un svr;
 	int len;
 	int on;
@@ -418,10 +361,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],
@@ -479,8 +423,7 @@ void QKernel::on_actionConnect_triggered()
 {
 	MESSAGE m;
 
-	ConnectDialog dialog(this);
-	dialog.setWindowTitle("IP Address:");
+	dialog::ConnectDialog dialog(this);
 
 	if (dialog.exec()) {
 		m.msg_type = MSG_NET;
@@ -542,48 +485,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));
 	}
 }
@@ -595,21 +507,23 @@ void QKernel::on_actionMessage_triggered()
  */
 void QKernel::on_actionKill_triggered()
 {
-	KillInterpreterDialog dialog(this);
-	dialog.setWindowTitle("Kill interpreter");
-
-	MESSAGE m;
-	InterpEntry *interpreter;
+	dialog::KillInterpreterDialog dialog(this);
 
 	if (dialog.exec()) {
+		MESSAGE m;
 		m.msg_type = MSG_INT;
 		m.param.pword[0] = INT_KILL;
+		
+		InterpEntry *interpreter;
 		interpreter = findINTbyID(dialog.getInterpreterId());
+
 		if (interpreter != NULL) {
-			if (!(interpreter->remote))
+			if (!(interpreter->remote)) {
 				write(interpreter->sock, &m, sizeof(MESSAGE));
-			else
+			}
+			else {
 				WriteMessage("This is a remote instance of a program!");
+			}
 		}
 		else {
 			WriteMessage("Interpreter not found");
@@ -619,6 +533,8 @@ void QKernel::on_actionKill_triggered()
 
 /**
  * Sends message to the net module.
+ *
+ * \todo method needs to be refactored
  */
 void QKernel::NetMessage()
 {
@@ -626,11 +542,12 @@ void QKernel::NetMessage()
 	/* TODO: It has to be rewritten */
 	MESSAGE msg;
 	int cnt;
-	char ss[255];
 	InterpEntry *pom;
 
 	cnt = read(net_sock, &msg, sizeof(MESSAGE));
 	if ((cnt > 0) && (msg.msg_type == MSG_NET)) {
+		char ss[255];
+
 		switch(msg.param.pword[0]) {
 		case NET_CSWRITELN:
 			WriteMessage(msg.param.pstr);
@@ -648,17 +565,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:");
@@ -743,6 +660,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;
@@ -759,8 +677,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;
@@ -775,6 +691,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);
@@ -802,12 +719,12 @@ void QKernel::IntMessage(int sock)
  * Writes message to kernel logger.
  * @parame msg String with message to log
  */
-void QKernel::WriteMessage(char *msg)
+void QKernel::WriteMessage(const char *msg)
 {
 	int x;
-	int y;
+// 	int y;
 	x = desktop->textCursor().blockNumber();
-	y = desktop->textCursor().columnNumber();
+// 	y = desktop->textCursor().columnNumber();
 
 	if (x > 100) {
 		desktop->clear();
@@ -847,7 +764,7 @@ void QKernel::on_actionInfo_messages_triggered()
  */
 void QKernel::on_actionOptions_triggered()
 {
-	OptionsDialog optionsDialog(getConfigFilePath(), this);
+	dialog::OptionsDialog optionsDialog(getConfigFilePath(), this);
 	if (optionsDialog.exec()) {
 		optionsDialog.saveConfig(getConfigFilePath());
 
@@ -862,7 +779,7 @@ void QKernel::on_actionOptions_triggered()
  */
 void QKernel::on_actionLock_console_triggered()
 {
-	LockDialog lockDialog(this);
+	dialog::LockDialog lockDialog(this);
 
 	if (lockDialog.exec()) {
 		QString password = lockDialog.getPassword();
@@ -896,7 +813,7 @@ void QKernel::on_actionLock_console_triggered()
  */
 void QKernel::on_actionUnlock_console_triggered()
 {
-	LockDialog lockDialog(this);
+	dialog::LockDialog lockDialog(this);
 
 	if (lockDialog.exec()) {
 		QString password = lockDialog.getPassword();
@@ -912,14 +829,6 @@ void QKernel::on_actionUnlock_console_triggered()
 	}
 }
 
-/**
- * Writes init message in kernel
- */
-void QKernel::InitMessage()
-{
-	WriteMessage("\n " PACKAGE_STRING ": READY \n");
-}
-
 /**
  * Finds Interpreter by its socket
  * @param _id ID of the socket
@@ -929,9 +838,9 @@ InterpEntry *QKernel::findINTbySocket(int _id)
 {
 	InterpEntry *pom = NULL;
 	
-	for (int i = 0; i < Interpreters.size(); i++) {
-		if (Interpreters.at(i)->sock == _id) {
-			pom = Interpreters.at(i);
+	for (auto interpreter : Interpreters) {
+		if (interpreter->sock == _id) {
+			pom = interpreter;
 			break;
 		}
 	}
@@ -948,9 +857,9 @@ InterpEntry *QKernel::findINTbyID(int _id)
 {
 	InterpEntry *pom = NULL;
 	
-	for (int i = 0; i < Interpreters.size(); i++) {
-		if (Interpreters.at(i)->ID == _id) {
-			pom = Interpreters.at(i);
+	for (auto interpreter : Interpreters) {
+		if (interpreter->ID == _id) {
+			pom = interpreter;
 			break;
 		}
 	}
@@ -969,6 +878,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;
@@ -1015,7 +925,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,
@@ -1023,9 +933,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);
@@ -1080,7 +992,6 @@ InterpEntry *QKernel::RunIntModule(char *ss, int r)
 void QKernel::RemoteInstance(InterpEntry *interp, int on)
 {
 	MESSAGE m;
-	char s[255];
 
 	m.msg_type = MSG_NET;
 	m.param.pword[0] = NET_NODE_EXIST;
@@ -1135,6 +1046,7 @@ void QKernel::RemoteInstance(InterpEntry *interp, int on)
 		m.param.pword[1] = interp->RInstances[on];
 		write(interp->sock, &m, sizeof(MESSAGE));
 	} else { /* There is no such a node! */
+		char s[255];
 		sprintf(s, "Warning: Node number %d not found!", on); 
 		WriteMessage(s);
 		WriteMessage("Allocating O-process on the local node");
@@ -1185,6 +1097,9 @@ void QKernel::on_actionInfo_triggered()
 	wait_for_info = TRUE;
 }
 
+}
+}
+
 /**
  * Program main function
  * All program arguments but the first one (argv[0]: program name) are saved and
@@ -1197,9 +1112,8 @@ int main(int argc, char **argv)
 	XInitThreads();
 
 	QApplication * app = new QApplication(argc, argv);
-	QKernel kernel(argc, argv);
+	loglan::vlp::QKernel kernel(argc, argv);
 	kernel.show();
-	kernel.InitMessage();
 	
 	return app->exec();
-}
+}
\ No newline at end of file