NEW: ebus-daemon merged into ebusd.

2014-05-20 22:12:02 +02:00
parent 8be273c9ad 6513227cf5
commit 09c0229060
84 changed files with 2922 additions and 6226 deletions
@@ -0,0 +1,126 @@
+/*
+ * Copyright (C) Roland Jax 2012-2014 <roland.jax@liwest.at>
+ *
+ * This file is part of ebusd.
+ *
+ * ebusd is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * ebusd is distributed in the hope that it will be useful,
+ * but 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 ebusd. If not, see http://www.gnu.org/licenses/.
+ */
+
+#include "ebusloop.h"
+#include "logger.h"
+#include "appl.h"
+#include <iostream>
+
+extern LogInstance& L;
+extern Appl& A;
+
+EBusLoop::EBusLoop() : m_stop(false)
+{
+	m_deviceName = A.getParam<const char*>("p_device");
+
+	m_bus = new Bus(m_deviceName,
+			A.getParam<bool>("p_nodevicecheck"),
+			A.getParam<const char*>("p_dumpfile"),
+		        A.getParam<long>("p_dumpsize"),
+		        A.getParam<bool>("p_dump"));
+
+	m_retries = A.getParam<int>("p_retries");
+
+	m_bus->connect();
+
+	if (m_bus->isConnected() == false)
+		L.log(bus, error, "can't open %s", m_deviceName.c_str());
+}
+
+EBusLoop::~EBusLoop()
+{
+	m_bus->disconnect();
+
+	if (m_bus->isConnected() == true)
+		L.log(bus, error, "error during disconnect.");
+
+	delete m_bus;
+}
+
+void* EBusLoop::run()
+{
+	int busResult;
+	int retries = 0;
+	bool busCommandActive = false;
+
+	for (;;) {
+		if (m_bus->isConnected() == true) {
+
+			// work on bus
+			busResult = m_bus->proceed();
+
+			// new cyc message arrived
+			if (busResult == 2) {
+				std::string data = m_bus->getCycData();
+				L.log(bus, debug, "%s", data.c_str());
+				m_cycBuffer.add(data);
+			}
+
+			// add new bus command to send
+			if (busResult == 4 && busCommandActive == false && m_sendBuffer.size() != 0) {
+				BusCommand* busCommand = m_sendBuffer.remove();
+				L.log(bus, debug, " type: %s msg: %s",
+				      busCommand->getType().c_str(), busCommand->getCommand().c_str());
+				m_bus->addCommand(busCommand);
+				L.log(bus, debug, " addCommand success");
+				busCommandActive = true;
+			}
+
+			// send bus command
+			if (busResult == 1 && busCommandActive == true) {
+				L.log(bus, trace, " getBus success");
+				m_bus->sendCommand();
+				BusCommand* busCommand = m_bus->recvCommand();
+				L.log(bus, trace, " %s", busCommand->getResult().c_str());
+
+				if (busCommand->getResult().c_str()[0] == '-' && retries < m_retries) {
+					retries++;
+					L.log(bus, trace, " retry number: %d", retries);
+					busCommand->setResult(std::string());
+					m_bus->addCommand(busCommand);
+				} else {
+					retries = 0;
+					m_recvBuffer.add(busCommand);
+					busCommandActive = false;
+				}
+			}
+
+			if (busResult == 0)
+				L.log(bus, trace, " getBus failure");
+
+			if (busResult == -1)
+				L.log(bus, event, " getBus error");
+
+		} else {
+			sleep(10);
+			m_bus->connect();
+
+			if (m_bus->isConnected() == false)
+				L.log(bus, error, "can't open %s", m_deviceName.c_str());
+		}
+
+		if (m_stop == true) {
+			m_bus->disconnect();
+			return NULL;
+		}
+	}
+
+	return NULL;
+}
+