Skip to content

Commit 8743775

committed

更新基本概念中的 mermaid 图

1 parent 0b7e481 commit 8743775Copy full SHA for 8743775

File tree

2 files changed

+7

-5

lines changed

md
- 01基本概念.md
- 04同步操作.md

2 files changed

+7

-5

lines changed

`‎md/01基本概念.md`

Lines changed: 6 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -47,11 +47,13 @@ graph TD;`
`47`	`47`	`subgraph "单核机器的任务切换"`
`48`	`48`	`SingleCore[单核机器]`
`49`	`49`	`SingleCore --> OS[操作系统调度]`
`50`		`- OS --> TaskSwitching[任务切换]`
`51`		`- TaskSwitching --> Task1[任务1执行片段]`
`52`		`- TaskSwitching --> Task2[任务2执行片段]`
`53`		`- TaskSwitching --> Task3[任务3执行片段]`
	`50`	`+ OS --> Task1[任务1执行片段]`
	`51`	`+ Task1 --> OS2[操作系统调度]`
	`52`	`+ OS2 --> Task2[任务2执行片段]`
	`53`	`+ Task2 --> OS3[操作系统调度]`
	`54`	`+ OS3 --> Task3[任务3执行片段]`
`54`	`55`	`end`
	`56`	`+`
`55`	`57`	```
`56`	`58`
`57`	`59`	`## 并发与并行`

`‎md/04同步操作.md`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -500,7 +500,7 @@ std::cout << future.get() << '\n'; // 不阻塞,此处获取返回值`
`500`	`500`	`std::packaged_task<double(int, int)> task([](int a, int b){`
`501`	`501`	`return std::pow(a, b);`
`502`	`502`	`});`
`503`		`-std::future<double>future = task.get_future();`
	`503`	`+std::future<double>future = task.get_future();`
`504`	`504`	`std::thread t{ std::move(task),10,2 }; // 任务在线程中执行`
`505`	`505`	`// todo.. 幻想还有许多耗时的代码`
`506`	`506`	`t.join();`

0 commit comments

Comments

(0)