Merge pull request #108 from skni-kod/develop

It is finally happening, release 1.2 coming soon.

.gitignore

@@ -60,4 +60,8 @@ scripts
 docs
 
 cloc.exe
-cloc.bat
+cloc.bat
+.idea/vcs.xml
+.idea/MicrOS.iml
+.idea/misc.xml
+debug.log

Makefile

@@ -0,0 +1,43 @@
+THREADS_COUNT := 1
+WORKSPACE_DIR := ${CURDIR}
+
+.PHONY: all
+all:
+	# Delete old ELF and BIN files
+	find build -iname "*.elf" -type f -delete
+	find build -iname "*.bin" -type f -delete
+
+	find environment -iname "*.elf" -type f -delete
+	find library -iname "*.elf" -type f -delete
+	find os -iname "*.elf" -type f -delete
+
+	$(MAKE) -C os/bootloader
+
+	$(MAKE) -C library
+
+	for d in $(sort $(dir $(wildcard ./environment/*/))) ; do \
+  		$(MAKE) -C $${d}; \
+  	done
+
+	$(MAKE) -C os/kernel
+
+
+.PHONY: clean
+clean:
+	# Delete old ELF and BIN files
+	find build -iname "*.elf" -type f -delete
+	find build -iname "*.bin" -type f -delete
+
+	find environment -iname "*.elf" -type f -delete
+	find library -iname "*.elf" -type f -delete
+	find os -iname "*.elf" -type f -delete
+
+	$(MAKE) -C os/bootloader clean
+
+	$(MAKE) -C library clean
+
+	for d in $(sort $(dir $(wildcard ./environment/*/))) ; do \
+      	$(MAKE) -C $${d} clean; \
+    done
+
+	$(MAKE) -C os/kernel clean

README.md

@@ -40,12 +40,12 @@ Documentation: https://tearth.github.io/MicrOS/
 * Standard library for C
 * ATA Hard disk drive support
 * CPUID
+* Multithreading
 
 ## TODO
 * Other standards of hard disk drive support
 * More advanced scheduler with priorities and IO blocking
 * Support for network cards (and protocols related to them)
-* Support for threads
 * Lock/mutex, synchronization objects, queues...
 * ...
 

environment/cat/makefile

@@ -32,12 +32,12 @@ $(OUTPUT_FILE): $(C_OBJECTS) $(ASM_OBJECTS)
 $(OBJ_DIR)/%.o: $(SRC_DIR)/%.c
 	@echo "=== Compiling C file $< into object $@ ==="
 	@mkdir -p '$(@D)'
-	@$(GCC) -c $(PWD)/$< -o $@ -MMD -MF $(@:.o=.d) $(GCC_COMPILE_FLAGS)
+	@$(GCC) -c $(CURDIR)/$< -o $@ -MMD -MF $(@:.o=.d) $(GCC_COMPILE_FLAGS)
 
 $(OBJ_DIR)/%.o: $(SRC_DIR)/%.asm
 	@echo "=== Compiling asm file $< into object $@ ==="
 	@mkdir -p '$(@D)'
-	@$(NASM) $(PWD)/$< -f elf32 -o $@
+	@$(NASM) $(CURDIR)/$< -f elf32 -o $@
 
 -include $(DEPS)
 

environment/help/makefile

@@ -32,12 +32,12 @@ $(OUTPUT_FILE): $(C_OBJECTS) $(ASM_OBJECTS)
 $(OBJ_DIR)/%.o: $(SRC_DIR)/%.c
 	@echo "=== Compiling C file $< into object $@ ==="
 	@mkdir -p '$(@D)'
-	@$(GCC) -c $(PWD)/$< -o $@ -MMD -MF $(@:.o=.d) $(GCC_COMPILE_FLAGS)
+	@$(GCC) -c $(CURDIR)/$< -o $@ -MMD -MF $(@:.o=.d) $(GCC_COMPILE_FLAGS)
 
 $(OBJ_DIR)/%.o: $(SRC_DIR)/%.asm
 	@echo "=== Compiling asm file $< into object $@ ==="
 	@mkdir -p '$(@D)'
-	@$(NASM) $(PWD)/$< -f elf32 -o $@
+	@$(NASM) $(CURDIR)/$< -f elf32 -o $@
 
 -include $(DEPS)
 

environment/ls/makefile

@@ -32,12 +32,12 @@ $(OUTPUT_FILE): $(C_OBJECTS) $(ASM_OBJECTS)
 $(OBJ_DIR)/%.o: $(SRC_DIR)/%.c
 	@echo "=== Compiling C file $< into object $@ ==="
 	@mkdir -p '$(@D)'
-	@$(GCC) -c $(PWD)/$< -o $@ -MMD -MF $(@:.o=.d) $(GCC_COMPILE_FLAGS)
+	@$(GCC) -c $(CURDIR)/$< -o $@ -MMD -MF $(@:.o=.d) $(GCC_COMPILE_FLAGS)
 
 $(OBJ_DIR)/%.o: $(SRC_DIR)/%.asm
 	@echo "=== Compiling asm file $< into object $@ ==="
 	@mkdir -p '$(@D)'
-	@$(NASM) $(PWD)/$< -f elf32 -o $@
+	@$(NASM) $(CURDIR)/$< -f elf32 -o $@
 
 -include $(DEPS)
 

environment/mkdir/makefile

@@ -32,12 +32,12 @@ $(OUTPUT_FILE): $(C_OBJECTS) $(ASM_OBJECTS)
 $(OBJ_DIR)/%.o: $(SRC_DIR)/%.c
 	@echo "=== Compiling C file $< into object $@ ==="
 	@mkdir -p '$(@D)'
-	@$(GCC) -c $(PWD)/$< -o $@ -MMD -MF $(@:.o=.d) $(GCC_COMPILE_FLAGS)
+	@$(GCC) -c $(CURDIR)/$< -o $@ -MMD -MF $(@:.o=.d) $(GCC_COMPILE_FLAGS)
 
 $(OBJ_DIR)/%.o: $(SRC_DIR)/%.asm
 	@echo "=== Compiling asm file $< into object $@ ==="
 	@mkdir -p '$(@D)'
-	@$(NASM) $(PWD)/$< -f elf32 -o $@
+	@$(NASM) $(CURDIR)/$< -f elf32 -o $@
 
 -include $(DEPS)
 

environment/reboot/makefile

@@ -32,12 +32,12 @@ $(OUTPUT_FILE): $(C_OBJECTS) $(ASM_OBJECTS)
 $(OBJ_DIR)/%.o: $(SRC_DIR)/%.c
 	@echo "=== Compiling C file $< into object $@ ==="
 	@mkdir -p '$(@D)'
-	@$(GCC) -c $(PWD)/$< -o $@ -MMD -MF $(@:.o=.d) $(GCC_COMPILE_FLAGS)
+	@$(GCC) -c $(CURDIR)/$< -o $@ -MMD -MF $(@:.o=.d) $(GCC_COMPILE_FLAGS)
 
 $(OBJ_DIR)/%.o: $(SRC_DIR)/%.asm
 	@echo "=== Compiling asm file $< into object $@ ==="
 	@mkdir -p '$(@D)'
-	@$(NASM) $(PWD)/$< -f elf32 -o $@
+	@$(NASM) $(CURDIR)/$< -f elf32 -o $@
 
 -include $(DEPS)
 

environment/rename/makefile

@@ -32,12 +32,12 @@ $(OUTPUT_FILE): $(C_OBJECTS) $(ASM_OBJECTS)
 $(OBJ_DIR)/%.o: $(SRC_DIR)/%.c
 	@echo "=== Compiling C file $< into object $@ ==="
 	@mkdir -p '$(@D)'
-	@$(GCC) -c $(PWD)/$< -o $@ -MMD -MF $(@:.o=.d) $(GCC_COMPILE_FLAGS)
+	@$(GCC) -c $(CURDIR)/$< -o $@ -MMD -MF $(@:.o=.d) $(GCC_COMPILE_FLAGS)
 
 $(OBJ_DIR)/%.o: $(SRC_DIR)/%.asm
 	@echo "=== Compiling asm file $< into object $@ ==="
 	@mkdir -p '$(@D)'
-	@$(NASM) $(PWD)/$< -f elf32 -o $@
+	@$(NASM) $(CURDIR)/$< -f elf32 -o $@
 
 -include $(DEPS)
 

environment/rm/makefile

@@ -32,12 +32,12 @@ $(OUTPUT_FILE): $(C_OBJECTS) $(ASM_OBJECTS)
 $(OBJ_DIR)/%.o: $(SRC_DIR)/%.c
 	@echo "=== Compiling C file $< into object $@ ==="
 	@mkdir -p '$(@D)'
-	@$(GCC) -c $(PWD)/$< -o $@ -MMD -MF $(@:.o=.d) $(GCC_COMPILE_FLAGS)
+	@$(GCC) -c $(CURDIR)/$< -o $@ -MMD -MF $(@:.o=.d) $(GCC_COMPILE_FLAGS)
 
 $(OBJ_DIR)/%.o: $(SRC_DIR)/%.asm
 	@echo "=== Compiling asm file $< into object $@ ==="
 	@mkdir -p '$(@D)'
-	@$(NASM) $(PWD)/$< -f elf32 -o $@
+	@$(NASM) $(CURDIR)/$< -f elf32 -o $@
 
 -include $(DEPS)
 

environment/shell/makefile

@@ -32,12 +32,12 @@ $(OUTPUT_FILE): $(C_OBJECTS) $(ASM_OBJECTS)
 $(OBJ_DIR)/%.o: $(SRC_DIR)/%.c
 	@echo "=== Compiling C file $< into object $@ ==="
 	@mkdir -p '$(@D)'
-	@$(GCC) -c $(PWD)/$< -o $@ -MMD -MF $(@:.o=.d) $(GCC_COMPILE_FLAGS)
+	@$(GCC) -c $(CURDIR)/$< -o $@ -MMD -MF $(@:.o=.d) $(GCC_COMPILE_FLAGS)
 
 $(OBJ_DIR)/%.o: $(SRC_DIR)/%.asm
 	@echo "=== Compiling asm file $< into object $@ ==="
 	@mkdir -p '$(@D)'
-	@$(NASM) $(PWD)/$< -f elf32 -o $@
+	@$(NASM) $(CURDIR)/$< -f elf32 -o $@
 
 -include $(DEPS)
 

environment/shutdown/makefile

@@ -32,12 +32,12 @@ $(OUTPUT_FILE): $(C_OBJECTS) $(ASM_OBJECTS)
 $(OBJ_DIR)/%.o: $(SRC_DIR)/%.c
 	@echo "=== Compiling C file $< into object $@ ==="
 	@mkdir -p '$(@D)'
-	@$(GCC) -c $(PWD)/$< -o $@ -MMD -MF $(@:.o=.d) $(GCC_COMPILE_FLAGS)
+	@$(GCC) -c $(CURDIR)/$< -o $@ -MMD -MF $(@:.o=.d) $(GCC_COMPILE_FLAGS)
 
 $(OBJ_DIR)/%.o: $(SRC_DIR)/%.asm
 	@echo "=== Compiling asm file $< into object $@ ==="
 	@mkdir -p '$(@D)'
-	@$(NASM) $(PWD)/$< -f elf32 -o $@
+	@$(NASM) $(CURDIR)/$< -f elf32 -o $@
 
 -include $(DEPS)
 

environment/snake/makefile

@@ -32,12 +32,12 @@ $(OUTPUT_FILE): $(C_OBJECTS) $(ASM_OBJECTS)
 $(OBJ_DIR)/%.o: $(SRC_DIR)/%.c
 	@echo "=== Compiling C file $< into object $@ ==="
 	@mkdir -p '$(@D)'
-	@$(GCC) -c $(PWD)/$< -o $@ -MMD -MF $(@:.o=.d) $(GCC_COMPILE_FLAGS)
+	@$(GCC) -c $(CURDIR)/$< -o $@ -MMD -MF $(@:.o=.d) $(GCC_COMPILE_FLAGS)
 
 $(OBJ_DIR)/%.o: $(SRC_DIR)/%.asm
 	@echo "=== Compiling asm file $< into object $@ ==="
 	@mkdir -p '$(@D)'
-	@$(NASM) $(PWD)/$< -f elf32 -o $@
+	@$(NASM) $(CURDIR)/$< -f elf32 -o $@
 
 -include $(DEPS)
 

environment/space/makefile

@@ -32,12 +32,12 @@ $(OUTPUT_FILE): $(C_OBJECTS) $(ASM_OBJECTS)
 $(OBJ_DIR)/%.o: $(SRC_DIR)/%.c
 	@echo "=== Compiling C file $< into object $@ ==="
 	@mkdir -p '$(@D)'
-	@$(GCC) -c $(PWD)/$< -o $@ -MMD -MF $(@:.o=.d) $(GCC_COMPILE_FLAGS)
+	@$(GCC) -c $(CURDIR)/$< -o $@ -MMD -MF $(@:.o=.d) $(GCC_COMPILE_FLAGS)
 
 $(OBJ_DIR)/%.o: $(SRC_DIR)/%.asm
 	@echo "=== Compiling asm file $< into object $@ ==="
 	@mkdir -p '$(@D)'
-	@$(NASM) $(PWD)/$< -f elf32 -o $@
+	@$(NASM) $(CURDIR)/$< -f elf32 -o $@
 
 -include $(DEPS)
 

environment/tasks/makefile

@@ -32,12 +32,12 @@ $(OUTPUT_FILE): $(C_OBJECTS) $(ASM_OBJECTS)
 $(OBJ_DIR)/%.o: $(SRC_DIR)/%.c
 	@echo "=== Compiling C file $< into object $@ ==="
 	@mkdir -p '$(@D)'
-	@$(GCC) -c $(PWD)/$< -o $@ -MMD -MF $(@:.o=.d) $(GCC_COMPILE_FLAGS)
+	@$(GCC) -c $(CURDIR)/$< -o $@ -MMD -MF $(@:.o=.d) $(GCC_COMPILE_FLAGS)
 
 $(OBJ_DIR)/%.o: $(SRC_DIR)/%.asm
 	@echo "=== Compiling asm file $< into object $@ ==="
 	@mkdir -p '$(@D)'
-	@$(NASM) $(PWD)/$< -f elf32 -o $@
+	@$(NASM) $(CURDIR)/$< -f elf32 -o $@
 
 -include $(DEPS)
 

environment/tasks/src/main.c

@@ -2,6 +2,8 @@
 #include <stdlib.h>
 #include <stdio.h>
 
+bool show_threads;
+
 void draw_process_tree(micros_process_user_info *processes, uint32_t root_id, uint32_t level, uint32_t count);
 void print_total_process_count(int process_count);
 void draw_bar(uint32_t filled_entries, uint32_t total_entries);
@@ -20,7 +22,7 @@ int main(int argc, char *argv[])
     {
         micros_console_clear();
 
-        printf("TASKS v1.1 @ MicrOS\n");
+        printf("TASKS v1.2 @ MicrOS\n");
         printf("\n");
 
         uint32_t processes_count = micros_process_get_processes_count();
@@ -33,8 +35,12 @@ int main(int argc, char *argv[])
         for (uint32_t i = 0; i < processes_count; i++)
         {
             micros_process_user_info *process = &processes[i];
-            total_cpu_usage += process->cpu_usage;
-            total_memory_usage += process->memory_usage;
+
+            if (!process->is_thread)
+            {
+                total_cpu_usage += process->cpu_usage;
+                total_memory_usage += process->memory_usage;
+            }
         }
 
         micros_physical_memory_stats memory_stats;
@@ -60,7 +66,8 @@ int main(int argc, char *argv[])
         print_memory_stats(&memory_stats);
 
         printf("\n\n\n\n");
-        printf("                               Press ESC to exit");
+        printf("                          Press T to show/hide threads\n");
+        printf("                               Press ESC to exit\n");
 
         free(processes);
         micros_process_current_process_sleep(1500);
@@ -74,6 +81,10 @@ int main(int argc, char *argv[])
             {
                 break;
             }
+            else if(pressed_key.scancode == key_t)
+            {
+                show_threads = !show_threads;
+            }
         }
     }
 
@@ -82,7 +93,7 @@ int main(int argc, char *argv[])
 }
 
 void draw_process_tree(micros_process_user_info *processes, uint32_t root_id, uint32_t level, uint32_t count)
-{
+{    
     micros_process_user_info *root_process = NULL;
     for (uint32_t i = 0; i < count; i++)
     {
@@ -92,6 +103,11 @@ void draw_process_tree(micros_process_user_info *processes, uint32_t root_id, ui
             root_process = &processes[i];
         }
     }
+
+    if (!show_threads && root_process->is_thread)
+    {
+        return;
+    }
 
     if (level != 0)
     {
@@ -160,7 +176,14 @@ void draw_memory_usage_bar(micros_physical_memory_stats *memory_stats, uint32_t
 
 void print_process_info(micros_process_user_info *process_info)
 {
-    printf("%s - ID: %d", process_info->name, process_info->id);
+    if (show_threads)
+    {
+        printf("[%s] %s - ID: %d", process_info->is_thread ? "T" : "P", process_info->name, process_info->id);
+    }
+    else
+    {
+        printf("%s - ID: %d", process_info->name, process_info->id);
+    }
 
     if (process_info->id != process_info->parent_id)
     {

environment/time/makefile

@@ -32,12 +32,12 @@ $(OUTPUT_FILE): $(C_OBJECTS) $(ASM_OBJECTS)
 $(OBJ_DIR)/%.o: $(SRC_DIR)/%.c
 	@echo "=== Compiling C file $< into object $@ ==="
 	@mkdir -p '$(@D)'
-	@$(GCC) -c $(PWD)/$< -o $@ -MMD -MF $(@:.o=.d) $(GCC_COMPILE_FLAGS)
+	@$(GCC) -c $(CURDIR)/$< -o $@ -MMD -MF $(@:.o=.d) $(GCC_COMPILE_FLAGS)
 
 $(OBJ_DIR)/%.o: $(SRC_DIR)/%.asm
 	@echo "=== Compiling asm file $< into object $@ ==="
 	@mkdir -p '$(@D)'
-	@$(NASM) $(PWD)/$< -f elf32 -o $@
+	@$(NASM) $(CURDIR)/$< -f elf32 -o $@
 
 -include $(DEPS)
 

environment/touch/makefile

@@ -32,12 +32,12 @@ $(OUTPUT_FILE): $(C_OBJECTS) $(ASM_OBJECTS)
 $(OBJ_DIR)/%.o: $(SRC_DIR)/%.c
 	@echo "=== Compiling C file $< into object $@ ==="
 	@mkdir -p '$(@D)'
-	@$(GCC) -c $(PWD)/$< -o $@ -MMD -MF $(@:.o=.d) $(GCC_COMPILE_FLAGS)
+	@$(GCC) -c $(CURDIR)/$< -o $@ -MMD -MF $(@:.o=.d) $(GCC_COMPILE_FLAGS)
 
 $(OBJ_DIR)/%.o: $(SRC_DIR)/%.asm
 	@echo "=== Compiling asm file $< into object $@ ==="
 	@mkdir -p '$(@D)'
-	@$(NASM) $(PWD)/$< -f elf32 -o $@
+	@$(NASM) $(CURDIR)/$< -f elf32 -o $@
 
 -include $(DEPS)
 

library/makefile

@@ -33,12 +33,12 @@ $(OUTPUT_FILE): $(C_OBJECTS) $(ASM_OBJECTS)
 $(OBJ_DIR)/%.o: $(SRC_DIR)/%.c
 	@echo "=== Compiling C file $< into object $@ ==="
 	@mkdir -p '$(@D)'
-	@$(GCC) -c $(PWD)/$< -o $@ -MMD -MF $(@:.o=.d) $(GCC_COMPILE_FLAGS)
+	@$(GCC) -c $(CURDIR)/$< -o $@ -MMD -MF $(@:.o=.d) $(GCC_COMPILE_FLAGS)
 
 $(OBJ_DIR)/%.o: $(SRC_DIR)/%.asm
 	@echo "=== Compiling asm file $< into object $@ ==="
 	@mkdir -p '$(@D)'
-	@$(NASM) $(PWD)/$< -f elf32 -o $@
+	@$(NASM) $(CURDIR)/$< -f elf32 -o $@
 
 -include $(DEPS)