Merge pull request #849 from AnnikaH/dev

Delegates: Updated to new delegate initialization

Author: fwsGonzo

api/hw/serial.hpp

@@ -24,7 +24,7 @@
 #include <hw/ioport.hpp>
 #include <cstdio>
 
-namespace hw{
+namespace hw {
 
   class Serial {
   public:
@@ -33,16 +33,14 @@ namespace hw{
     using on_data_handler = delegate<void(char c)>;
     using on_string_handler = delegate<void(const std::string& s)>;
 
-    using irq_delg = delegate<void()>;
-
     template <uint16_t PORT>
     static Serial& port(){
       static Serial s{PORT};
       return s;
     }
 
     OS::print_func get_print_handler() {
-      return OS::print_func::from(this, &Serial::print_handler);
+      return {this, &Serial::print_handler};
     }
 
     void on_data(on_data_handler del);

api/kernel/vga.hpp

@@ -47,7 +47,7 @@ class ConsoleVGA {
   explicit ConsoleVGA() noexcept;
 
   OS::print_func get_print_handler() {
-    return OS::print_func::from(this, &ConsoleVGA::write);
+    return {this, &ConsoleVGA::write};
   }
 
   constexpr static uint8_t make_color(const vga_color fg, const vga_color bg) noexcept

api/net/ip4/arp.hpp

@@ -97,10 +97,10 @@ namespace net {
       // @TODO: Add HÅREK-mapping here
       switch (nm) {
       case HH_MAP:
-        arp_resolver_ = Arp_resolver::from<Arp, &Arp::hh_map>(*this);
+        arp_resolver_ = {this, &Arp::hh_map};
         break;
       default:
-        arp_resolver_ = Arp_resolver::from<Arp, &Arp::arp_resolve>(*this);
+        arp_resolver_ = {this, &Arp::arp_resolve};
       }
     }
 
@@ -145,7 +145,7 @@ namespace net {
     void arp_resolve(Packet_ptr);
     void hh_map(Packet_ptr);
 
-    Arp_resolver arp_resolver_ = Arp_resolver::from<Arp, &Arp::arp_resolve>(*this);
+    Arp_resolver arp_resolver_ = {this, &Arp::arp_resolve};
 
     PacketQueue waiting_packets_;
 

api/net/tcp/connection.inc

@@ -44,15 +44,15 @@ inline Connection& Connection::_on_cleanup(CleanupCallback cb) {
 }
 
 inline void Connection::write(const void* buf, size_t n) {
-  write(buf, n, WriteCallback::from<Connection,&Connection::default_on_write>(this), true);
+  write(buf, n, {this, &Connection::default_on_write}, true);
 }
 
 inline void Connection::write(const void* buf, size_t n, WriteCallback callback) {
   write(buf, n, callback, true);
 }
 
 inline void Connection::write(buffer_t buffer, size_t n) {
-  write({buffer, n, true}, WriteCallback::from<Connection,&Connection::default_on_write>(this));
+  write({buffer, n, true}, {this, &Connection::default_on_write});
 }
 
 inline void Connection::write(buffer_t buffer, size_t n, WriteCallback callback) {

api/net/tcp/read_request.hpp

@@ -32,7 +32,7 @@ struct ReadRequest {
 
   /*ReadRequest()
     : buffer(nullptr, 0),
-      callback(ReadCallback::from<ReadRequest, &ReadRequest::default_read_callback>(this))
+      callback({this, &ReadRequest::default_read_callback})
   {}*/
 
   ReadRequest(ReadBuffer buf, ReadCallback cb)
@@ -42,7 +42,7 @@ struct ReadRequest {
 
   ReadRequest(size_t n = 0)
     : buffer(buffer_t(new uint8_t[n], std::default_delete<uint8_t[]>()), n),
-      callback(ReadCallback::from<ReadRequest, &ReadRequest::default_read_callback>(this))
+      callback({this, &ReadRequest::default_read_callback})
   {}
 
   void clean_up() {
@@ -55,4 +55,4 @@ struct ReadRequest {
 } // < namespace tcp
 } // < namespace net
 
-#endif // < NET_TCP_READ_REQUEST_HPP
+#endif // < NET_TCP_READ_REQUEST_HPP

src/drivers/virtioblk.cpp

@@ -34,7 +34,7 @@ void null_deleter(uint8_t*) {};
 #include <statman>
 
 VirtioBlk::VirtioBlk(hw::PCI_Device& d)
-  : Virtio(d), hw::Drive(), req(queue_size(0), 0, iobase())
+  : Virtio(d), hw::Drive(), req(queue_size(0), 0, iobase()), inflight(0)
 {
   INFO("VirtioBlk", "Driver initializing");
   {
@@ -93,16 +93,16 @@ VirtioBlk::VirtioBlk(hw::PCI_Device& d)
   // Hook up IRQ handler (inherited from Virtio)
   if (is_msix())
   {
-    auto conf_del(delegate<void()>::from<VirtioBlk, &VirtioBlk::msix_conf_handler>(this));
-    auto req_del(delegate<void()>::from<VirtioBlk, &VirtioBlk::service_RX>(this));
+    auto conf_del(delegate<void()>{this, &VirtioBlk::msix_conf_handler});
+    auto req_del(delegate<void()>{this, &VirtioBlk::service_RX});
     // update IRQ subscriptions
     IRQ_manager::get().subscribe(irq() + 0, req_del);
     IRQ_manager::get().subscribe(irq() + 1, conf_del);
   }
   else
   {
-    auto del(delegate<void()>::from<VirtioBlk, &VirtioBlk::irq_handler>(this));
-    IRQ_manager::get().subscribe(irq(),del);
+    auto del(delegate<void()>{this, &VirtioBlk::irq_handler});
+    IRQ_manager::get().subscribe(irq(), del);
   }
 
   // Done

src/drivers/virtionet.cpp

@@ -152,9 +152,10 @@ VirtioNet::VirtioNet(hw::PCI_Device& d)
   if (is_msix())
   {
     // for now use service queues, otherwise stress test fails
-    auto recv_del(delegate<void()>::from<VirtioNet,&VirtioNet::msix_recv_handler>(this));
-    auto xmit_del(delegate<void()>::from<VirtioNet,&VirtioNet::msix_xmit_handler>(this));
-    auto conf_del(delegate<void()>::from<VirtioNet,&VirtioNet::msix_conf_handler>(this));
+    auto recv_del(delegate<void()>{this, &VirtioNet::msix_recv_handler});
+    auto xmit_del(delegate<void()>{this, &VirtioNet::msix_xmit_handler});
+    auto conf_del(delegate<void()>{this, &VirtioNet::msix_conf_handler});
+
     // update BSP IDT
     IRQ_manager::get().subscribe(irq() + 0, recv_del);
     IRQ_manager::get().subscribe(irq() + 1, xmit_del);
@@ -163,7 +164,7 @@ VirtioNet::VirtioNet(hw::PCI_Device& d)
   else
   {
     // legacy PCI interrupt
-    auto del(delegate<void()>::from<VirtioNet,&VirtioNet::irq_handler>(this));
+    auto del(delegate<void()>{this, &VirtioNet::irq_handler});
     IRQ_manager::get().subscribe(irq(),del);
   }
 
@@ -301,8 +302,7 @@ std::shared_ptr<Packet>
 VirtioNet::recv_packet(uint8_t* data, uint16_t size)
 {
   auto* ptr = (Packet*) (data + sizeof(VirtioNet::virtio_net_hdr) - sizeof(Packet));
-  new (ptr) Packet(bufsize(), size,
-      delegate<void(void*)>::from<BufferStore, &BufferStore::release> (&bufstore()));
+  new (ptr) Packet(bufsize(), size, {&bufstore(), &BufferStore::release});
 
   return std::shared_ptr<Packet> (ptr);
 }
@@ -367,7 +367,7 @@ void VirtioNet::service_queues(){
       auto buf = transmit_queue_;
       transmit_queue_ = 0;
       transmit(buf);
-    }else{
+    } else {
       debug("<VirtioNet> Transmit queue is empty \n");
     }
 
@@ -400,7 +400,7 @@ void VirtioNet::add_to_tx_buffer(net::Packet_ptr pckt){
   debug("Buffering, %i packets chained \n", chain_length);
 }
 #include <cstdlib>
-void VirtioNet::transmit(net::Packet_ptr pckt){
+void VirtioNet::transmit(net::Packet_ptr pckt) {
   /** @note We have to send a virtio header first, then the packet.
 
       From Virtio std. §5.1.6.6:

src/drivers/virtionet.hpp

@@ -128,8 +128,7 @@ class VirtioNet : Virtio, public hw::Nic {
   { return 1500; }
 
   net::downstream get_physical_out() override {
-    using downstream = net::downstream;
-    return downstream::from<VirtioNet, &VirtioNet::transmit>(this);
+    return {this, &VirtioNet::transmit};
   }
 
   /** Linklayer input. Hooks into IP-stack bottom, w.DOWNSTREAM data.*/

src/hw/ide.cpp

@@ -272,7 +272,7 @@ namespace hw {
   }
 
   void IDE::enable_irq_handler() {
-    auto del(delegate<void()>::from<IDE, &IDE::callback_wrapper>(this));
+    auto del(delegate<void()>{this, &IDE::callback_wrapper});
     IRQ_manager::get().subscribe(IDE_IRQN, del);
     //IRQ_manager::cpu(0).set_irq_handler(IDE_IRQN + 32, ide_irq_entry);
   }

src/hw/pit.cpp

@@ -284,7 +284,7 @@ namespace hw {
     // must be done to program IOAPIC to redirect to BSP LAPIC
     IRQ_manager::get().enable_irq(0);
     // register irq handler
-    auto handler(IRQ_manager::irq_delegate::from<PIT,&PIT::irq_handler>(&instance()));
+    auto handler(IRQ_manager::irq_delegate{&instance(), &PIT::irq_handler});
     IRQ_manager::get().subscribe(0, handler);
   }