allow timers to be created with arbitrary intervals

Author: braindigitalis

include/taskswitch.h

@@ -114,6 +114,8 @@ typedef void (*proc_idle_timer_t)(void);
 typedef struct idle_timer {
 	proc_idle_timer_t func;       /**< Function pointer for callback */
 	struct idle_timer* next;      /**< Next idle timer in list */
+	uint64_t next_tick;           /**< Next tick time in get_ticks() */
+	uint64_t frequency;           /**< Tick frequency in ms */
 } idle_timer_t;
 
 /**
@@ -217,8 +219,9 @@ pid_t proc_id(int64_t index);
  *
  * @param handler Function pointer, void(void)
  * @param type Foreground or background idle type
+ * @param frequency_ms Frequency of tick in milliseconds
  */
-void proc_register_idle(proc_idle_timer_t handler, idle_type_t type);
+void proc_register_idle(proc_idle_timer_t handler, idle_type_t type, uint64_t frequency_ms);
 
 /**
  * @brief Change the CSD (current selected directory) of a process.
@@ -248,4 +251,4 @@ void init_process();
  * @param callback Function to poll for resumption readiness, or NULL to resume immediately
  * @param opaque For use by developer
  */
-void proc_set_idle(process_t* proc, activity_callback_t callback, void* opaque);
+void proc_set_idle(process_t* proc, activity_callback_t callback, void* opaque);

src/fs/devfs/devfs.c

@@ -85,5 +85,5 @@ void init_devfs(void) {
 	init_debuglog();
 
 	/* Periodically update sizes */
-	proc_register_idle(devfs_update_sizes, IDLE_FOREGROUND);
+	proc_register_idle(devfs_update_sizes, IDLE_FOREGROUND, 100);
 }

src/keyboard.c

@@ -212,7 +212,7 @@ void init_keyboard() {
 	buffer_read_ptr = 0;
 	make_unique_device_name("kb", devname, sizeof(devname));
 	register_interrupt_handler(IRQ1, keyboard_handler, dev_zero, NULL);
-	proc_register_idle(keyboard_repeat_tick, IDLE_BACKGROUND);
+	proc_register_idle(keyboard_repeat_tick, IDLE_BACKGROUND, 1);
 }
 
 

src/net/dhcp.c

@@ -445,7 +445,7 @@ void dhcp_init(void) {
 	udp_register_daemon(DHCP_DST_PORT, &dhcp_handle_packet, NULL);
 
 	/* Background task is called every 1 ms in interrupt context */
-	proc_register_idle(&dhcp_background, IDLE_BACKGROUND);
+	proc_register_idle(&dhcp_background, IDLE_BACKGROUND, 1);
 
 	/* Kick off initial discovery */
 	dhcp_discover();

src/net/ip.c

@@ -590,6 +590,6 @@ void ip_init()
 {
 	ethernet_register_iee802_number(ETHERNET_TYPE_IP, (ethernet_protocol_t)ip_handle_packet);
 	ethernet_register_iee802_number(ETHERNET_TYPE_IP6, (ethernet_protocol_t)ip6_handle_packet);
-	proc_register_idle(ip_idle, IDLE_BACKGROUND);
-	proc_register_idle(ip_foreground, IDLE_FOREGROUND);
-}
+	proc_register_idle(ip_idle, IDLE_BACKGROUND, 1);
+	proc_register_idle(ip_foreground, IDLE_FOREGROUND, 1);
+}

src/net/tcp.c

@@ -1044,7 +1044,7 @@ void tcp_idle()
 void tcp_init()
 {
 	tcb = hashmap_new(sizeof(tcp_conn_t), 0, 6, 28, tcp_conn_hash, tcp_conn_compare, NULL, NULL);
-	proc_register_idle(tcp_idle, IDLE_FOREGROUND);
+	proc_register_idle(tcp_idle, IDLE_FOREGROUND, 1);
 }
 
 /**

src/rtl8139.c

@@ -144,23 +144,6 @@ void rtl8139_handler([[maybe_unused]] uint8_t isr, [[maybe_unused]] uint64_t err
 	in_interrupt = false;
 }
 
-void rtl8139_timer()
-{
-	/* For packet timeouts, unused at present */
-	//rtl8139_handler(rtl8139_device.irq + 32, 0, rtl8139_device.irq, &rtl8139_device);
-
-	static bool last_bufe = false;
-	bool bufe_now = rtl_inb(ChipCmd) & CR_BUFE;
-
-	if (bufe_now && !last_bufe) {
-		kprintf("RX buffer became empty\n");
-	}
-	if (!bufe_now && last_bufe) {
-		kprintf("RX buffer no longer empty\n");
-	}
-	last_bufe = bufe_now;
-}
-
 char* read_mac_addr() {
 	uint32_t mac_part1 = rtl_inl(MAC0);
 	uint16_t mac_part2 = rtl_inw(MAC1);
@@ -332,8 +315,6 @@ void init_rtl8139() {
 	char* mac_address = read_mac_addr();
 	kprintf("RTL8139: MAC=%s IO=%04x MMIO=%08x IRQ=%d (PIN#%c)\n", mac_address, rtl8139_device.io_base, rtl8139_device.mem_base, irq_num, irq_pin + 'A' - 1);
 
-	proc_register_idle(rtl8139_timer, IDLE_FOREGROUND);
-
 	rtl8139_device.active = true;
 
 	make_unique_device_name("net", rtl8139_device.name, sizeof(rtl8139_device.name));

src/taskswitch.c

@@ -425,7 +425,10 @@ void proc_loop()
 		if (cpu == 0 && task_idles) {
 			/* Idle foreground tasks only run on BSP */
 			for (idle_timer_t *i = task_idles; i; i = i->next) {
-				i->func();
+				if (i->next_tick > get_ticks()) {
+					i->func();
+					i->next_tick = i->frequency + get_ticks();
+				}
 			}
 		}
 	}
@@ -454,14 +457,16 @@ int proc_ended(process_t* proc)
 	return basic_finished(proc->code);
 }
 
-void proc_register_idle(proc_idle_timer_t handler, idle_type_t type)
+void proc_register_idle(proc_idle_timer_t handler, idle_type_t type, uint64_t frequency_ms)
 {
 	dprintf("Register idler: %d\n", type);
 	idle_timer_t* newidle = kmalloc(sizeof(idle_timer_t));
 	if (!newidle) {
 		return;
 	}
 	newidle->func = handler;
+	newidle->next_tick = get_ticks() + frequency_ms;
+	newidle->frequency = frequency_ms;
 	if (type == IDLE_FOREGROUND) {	
 		newidle->next = task_idles;
 		task_idles = newidle;

src/timer.c

@@ -64,7 +64,10 @@ void timer_callback(uint8_t isr, uint64_t errorcode, uint64_t irq, void* opaque)
 	ticks++;
 
 	for (idle_timer_t* i = timer_idles; i; i = i->next) {
-		i->func();
+		if (i->next_tick > get_ticks()) {
+			i->func();
+			i->next_tick = i->frequency + get_ticks();
+		}
 	}
 
 	if (beep_end != 0 && ticks > beep_end) {