Skip to content

Commit bf7b323

Browse files
committed
Merge the fork
2 parents a2f5ff5 + 6b89f1a commit bf7b323

File tree

3 files changed

+8
-1
lines changed

3 files changed

+8
-1
lines changed

LICENSE

+4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
MIT License
22

3+
<<<<<<< HEAD
34
Copyright (c) 2021 Mohamed Hassanin Omran
5+
=======
6+
Copyright (c) 2021 Ahmed Ashraf
7+
>>>>>>> 6b89f1abc71228de62a8da4ab9d3f939fc4f0725
48

59
Permission is hereby granted, free of charge, to any person obtaining a copy
610
of this software and associated documentation files (the "Software"), to deal

README.md

+4-1
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,13 @@ We used the concept of the “tick” in the real OSes. So, we make the schedule
1818
- Shortest Remaining Time Next (SRTN): The scheduler at any tick chooses the process with the shortest remaining time from the priority queue. This operation has complexity of O(1). At any tick, if a new process arrived with a run time shorter than the running time, it will preempt the running process.
1919

2020
We represented the buddy system by a binary tree and its leaves represent the allocated parts of the memory.
21+
<<<<<<< HEAD
2122

23+
=======
24+
>>>>>>> 6b89f1abc71228de62a8da4ab9d3f939fc4f0725
2225
<p align="center">
2326
<a href="" rel="noopener">
24-
<img src="https://github.com/mhomran/mars-OS/blob/master/demo/buddy.png" alt="Buddy Visualization"></a>
27+
<img src="https://github.com/mhomran/mars-OS/raw/master/demo/buddy.png" alt="Buddy Visualization"></a>
2528
</p>
2629
2730
## Install <a name = "install"></a>

demo/system.png

-9.87 KB
Loading

0 commit comments

Comments
 (0)