StarMirror/CS-Notes
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "auto commit"

Browse Source 
This reverts commit b64ecc6dbe.
This commit is contained in:
CyC2018 2018-03-03 20:57:11 +08:00
parent 9b77c6d035
commit 5108f48253
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
notes/计算机操作系统.md
View File

@ -455,9 +455,17 @@ down 和 up 操作需要被设计成原语，不可分割，通常的做法是
```c
<<<<<<< HEAD
typedef int semaphore;
=======
<<<<<<< HEAD
typedef int semaphore ;
=======
typedef int semaphore;
>>>>>>> bedf25d3f0312d8e38953d742d42dbf87585980e
>>>>>>> parent of b64ecc6... auto commit
semaphore mutex = 1;
void P1() {
@ -501,9 +509,17 @@ void P2() {
```c
#define N 100
<<<<<<< HEAD
typedef int semaphore;
=======
<<<<<<< HEAD
typedef int semaphore ;
=======
typedef int semaphore;
>>>>>>> bedf25d3f0312d8e38953d742d42dbf87585980e
>>>>>>> parent of b64ecc6... auto commit
semaphore mutex = 1;
semaphore empty = N;