mirror of
https://github.com/CyC2018/CS-Notes.git
synced 2025-07-10 13:37:35 +08:00
Revert "auto commit"
This reverts commit b64ecc6dbea1d11af647853e83531e6d3affbefc.
This commit is contained in:
@ -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;
|
||||
|
Reference in New Issue
Block a user