#include "low-can-binding.hpp"
#include <queue>
+#include <mutex>
#include <vector>
#include <thread>
#include <fcntl.h>
#include "timer.hpp"
#include "openxc.pb.h"
-#include "can-utils.hpp"
+#include "can-bus.hpp"
#include "can-signals.hpp"
+#include "can-message.hpp"
#include "openxc-utils.hpp"
extern "C"
{
- #include <afb/afb-binding.h>
#include <afb/afb-service-itf.h>
};
*/
const struct afb_binding_interface *binder_interface;
-/*
- * CAN bus handler pointer. This is the object that will be use to
- * initialize each CAN devices specified into the configuration file
- *
- * It is used by the reading thread also because of its can_message_q_ queue
- * that store CAN messages read from the socket.
- */
can_bus_t *can_bus_handler;
-/********************************************************************************
-*
-* Event management
-*
-*********************************************************************************/
-int can_frame_received(sd_event_source *s, int fd, uint32_t revents, void *userdata)
-{
- can_bus_dev_t *can_bus_dev = (can_bus_dev_t*)userdata;
-
- /* Notify reading thread that there is something to read */
- if ((revents & EPOLLIN) != 0) {
- new_can_frame.notify_one();
- }
-
- /* check if error or hangup and reopen the socket and event_loop.
- * socket is protected by a mutex */
- if ((revents & (EPOLLERR|EPOLLRDHUP|EPOLLHUP)) != 0)
- {
- std::lock_guard<std::mutex> can_frame_lock(can_frame_mutex);
- sd_event_source_unref(s);
- can_bus_dev->close();
- can_bus_dev->open();
- can_bus_dev->start_reading(*can_bus_handler);
- can_bus_dev->event_loop_connection();
- }
-
- return 0;
-}
/********************************************************************************
*
* Subscription and unsubscription
{
int ret;
- // TODO: lock the subscribed_signals when insert/remove
+ std::lock_guard<std::mutex> subscribed_signals_lock(get_subscribed_signals_mutex());
auto ss_i = subscribed_signals.find(sig.genericName);
if (ss_i != subscribed_signals.end() && !afb_event_is_valid(ss_i->second))
{
static const struct afb_binding binding_desc {
AFB_BINDING_VERSION_1,
{
- "CAN bus service",
- "can",
+ "Low level CAN bus service",
+ "low-can",
verbs
}
};
int afbBindingV1ServiceInit(struct afb_service service)
{
int fd_conf;
- fd_conf = afb_daemon_rootdir_open_locale(binder_interface->daemon, "can_bus.json", O_RDONLY, NULL);
+ fd_conf = afb_daemon_rootdir_open_locale(binder_interface->daemon, "can_buses.json", O_RDONLY, NULL);
/* Initialize the CAN bus handler */
- can_bus_t cbh(fd_conf);
- can_bus_handler = &cbh;
+ can_bus_handler = new can_bus_t(fd_conf);
/* Open CAN socket */
if(can_bus_handler->init_can_dev() == 0)