lib/ip: make logger a class member of IpCore

Logging is used everywhere and there's no justification of the clutter
and runtime overhead of `aut logger = getLogger();` everywhere.

fpga/include/villas/fpga/ip.hpp

@@ -183,10 +183,6 @@ protected:
 	uintptr_t
 	getLocalAddr(const std::string& block, uintptr_t address) const;
 
-	SpdLogger
-	getLogger() const
-	{ return loggerGetOrCreate(getInstanceName()); }
-
 	InterruptController*
 	getInterruptController(const std::string& interruptName) const;
 
@@ -197,6 +193,9 @@ protected:
 		std::string description;
 	};
 
+	/// Specialized logger instance with the IPs name set as category
+	SpdLogger logger;
+
 	/// FPGA card this IP is instantiated on (populated by FpgaIpFactory)
 	PCIeCard* card;
 

fpga/lib/ip.cpp

@@ -142,6 +142,7 @@ IpCoreFactory::make(PCIeCard* card, json_t *json_ips)
 		// setup generic IP type properties
 		ip->card = card;
 		ip->id = id;
+		ip->logger = loggerGetOrCreate(id.getName());
 
 		json_t* json_ip = json_object_get(json_ips, id.getName().c_str());
 
@@ -313,9 +314,8 @@ IpCoreFactory::make(PCIeCard* card, json_t *json_ips)
 
 
 void
-IpCore::dump() {
-	auto logger = getLogger();
-
+IpCore::dump()
+{
 	logger->info("IP: {}", *this);
 	for(auto& [num, irq] : irqs) {
 		logger->info("IRQ {}: {}:{}",

fpga/lib/ip_node.cpp

@@ -97,8 +97,6 @@ IpNode::loopbackPossible() const
 bool
 IpNode::connectLoopback()
 {
-	auto logger = getLogger();
-
 	auto ports = getLoopbackPorts();
 	const auto& portMaster = portsMaster[ports.first];
 	const auto& portSlave = portsSlave[ports.second];

fpga/lib/ips/fifo.cpp

@@ -50,8 +50,6 @@ FifoFactory::FifoFactory() :
 
 bool Fifo::init()
 {
-	auto logger = getLogger();
-
 	XLlFifo_Config fifo_cfg;
 
 	try {

fpga/lib/ips/intc.cpp

@@ -50,7 +50,6 @@ bool
 InterruptController::init()
 {
 	const uintptr_t base = getBaseAddr(registerMemory);
-	auto logger = getLogger();
 
 	num_irqs = vfio_pci_msi_init(&card->vfio_device, efds);
 	if (num_irqs < 0)
@@ -97,7 +96,6 @@ InterruptController::init()
 bool
 InterruptController::enableInterrupt(InterruptController::IrqMaskType mask, bool polling)
 {
-	auto logger = getLogger();
 	const uintptr_t base = getBaseAddr(registerMemory);
 
 	/* Current state of INTC */

fpga/lib/ips/switch.cpp

@@ -38,8 +38,6 @@ static AxiStreamSwitchFactory factory;
 bool
 AxiStreamSwitch::init()
 {	
-	auto logger = getLogger();
-
 	/* Setup AXI-stream switch */
 	XAxis_Switch_Config sw_cfg;
 	sw_cfg.MaxNumMI = num_ports;
@@ -66,8 +64,6 @@ AxiStreamSwitch::init()
 bool
 AxiStreamSwitch::connect(int portSlave, int portMaster)
 {
-	auto logger = getLogger();
-
 	if(portMapping[portMaster] == portSlave) {
 		logger->debug("Ports already connected");
 		return true;
@@ -98,8 +94,6 @@ AxiStreamSwitch::connect(int portSlave, int portMaster)
 bool
 AxiStreamSwitch::disconnectMaster(int port)
 {
-	auto logger = getLogger();
-
 	logger->debug("Disconnect slave {} from master {}",
 	              portMapping[port], port);
 
@@ -111,8 +105,6 @@ AxiStreamSwitch::disconnectMaster(int port)
 bool
 AxiStreamSwitch::disconnectSlave(int port)
 {
-	auto logger = getLogger();
-
 	for(auto [master, slave] : portMapping) {
 		if(slave == port) {
 			logger->debug("Disconnect slave {} from master {}", slave, master);

fpga/lib/ips/timer.cpp

@@ -39,8 +39,6 @@ static TimerFactory factory;
 
 bool Timer::init()
 {
-	auto logger = getLogger();
-
 	XTmrCtr_Config xtmr_cfg;
 	xtmr_cfg.SysClockFreqHz = getFrequency();