补充装机硬件笔记

whitestarrain · Nov 10, 2024 · 44e9b3e · 44e9b3e
1 parent 88c2c46
commit 44e9b3e
Show file tree

Hide file tree

Showing 31 changed files with 538 additions and 27 deletions.
diff --git a/base/linux_basic.md b/base/linux_basic.md
@@ -1821,6 +1821,12 @@ echo "user1:password1" | chpasswd
 - 资源同步：保证多个进程之间的操作按照一定的顺序进行，如利用信号量来实现互斥、同步等操作。
 - 资源回收：在进程退出后，回收由该进程所持有的IPC资源，以免造成系统资源浪费或者安全隐患。
 
+### 9.2.1. ipcmk
+
+### 9.2.2. ipcrm
+
+### 9.2.3. ipcs
+
 ## 9.3. CGroup
 
 # 10. 磁盘管理进阶

diff --git a/others/hardware_info.md b/others/hardware_info.md
diff --git a/others/image/hardware_info-20241110113014-250906.png b/others/image/hardware_info-20241110113014-250906.png
diff --git a/others/image/hardware_info-20241110113014-252772.png b/others/image/hardware_info-20241110113014-252772.png
diff --git a/others/image/hardware_info-20241110113014-254352.png b/others/image/hardware_info-20241110113014-254352.png
diff --git a/others/image/hardware_info-20241110113014-256101.png b/others/image/hardware_info-20241110113014-256101.png
diff --git a/others/image/hardware_info-20241110113014-258170.png b/others/image/hardware_info-20241110113014-258170.png
diff --git a/others/image/hardware_info-20241110113014-260541.png b/others/image/hardware_info-20241110113014-260541.png
diff --git a/others/image/hardware_info-20241110113014-262641.png b/others/image/hardware_info-20241110113014-262641.png
diff --git a/others/image/hardware_info-20241110113014-265034.png b/others/image/hardware_info-20241110113014-265034.png
diff --git a/others/image/hardware_info-20241110113014-267119.png b/others/image/hardware_info-20241110113014-267119.png
diff --git a/others/image/hardware_info-20241110113014-268983.png b/others/image/hardware_info-20241110113014-268983.png
diff --git a/others/image/hardware_info-20241110113014-270797.png b/others/image/hardware_info-20241110113014-270797.png
diff --git a/others/image/hardware_info-20241110113014-272915.png b/others/image/hardware_info-20241110113014-272915.png
diff --git a/others/image/hardware_info-20241110113014-274718.png b/others/image/hardware_info-20241110113014-274718.png
diff --git a/others/image/hardware_info-20241110113014-276669.png b/others/image/hardware_info-20241110113014-276669.png
diff --git a/others/image/hardware_info-20241110113014-278518.png b/others/image/hardware_info-20241110113014-278518.png
diff --git a/others/image/hardware_info-20241110113014-280379.png b/others/image/hardware_info-20241110113014-280379.png
diff --git a/others/image/hardware_info-20241110113014-282309.png b/others/image/hardware_info-20241110113014-282309.png
diff --git a/others/image/hardware_info-20241110113014-284112.png b/others/image/hardware_info-20241110113014-284112.png
diff --git a/others/image/hardware_info-20241110113014-285940.png b/others/image/hardware_info-20241110113014-285940.png
diff --git a/others/image/hardware_info-20241110113014-288073.png b/others/image/hardware_info-20241110113014-288073.png
diff --git a/others/image/hardware_info-20241110113014-290115.png b/others/image/hardware_info-20241110113014-290115.png
diff --git a/others/image/hardware_info-20241110113014-291976.png b/others/image/hardware_info-20241110113014-291976.png
diff --git a/others/image/hardware_info-20241110113014-294042.png b/others/image/hardware_info-20241110113014-294042.png
diff --git a/others/image/hardware_info-20241110113014-295880.png b/others/image/hardware_info-20241110113014-295880.png
diff --git a/others/image/hardware_info-20241110113014-297967.png b/others/image/hardware_info-20241110113014-297967.png
diff --git a/others/image/hardware_info-20241110113014-300318.png b/others/image/hardware_info-20241110113014-300318.png
diff --git a/others/image/hardware_info-20241110113014-302747.png b/others/image/hardware_info-20241110113014-302747.png
diff --git a/todo.md b/todo.md
@@ -100,6 +100,7 @@
   - 计算机图形学，下面可以找到公开课
   - [Spinning Cube](https://www.youtube.com/watch?v=p09i_hoFdd0)
   - [旋转矩阵](https://zh.wikipedia.org/wiki/旋转矩阵)
+- [ ] [hash可视化](https://superuser.com/questions/22535/what-is-randomart-produced-by-ssh-keygen)
 
 # 首选资料、公开课
 
@@ -412,8 +413,7 @@ cookie和session攻击
   - 作为编辑器，inbox的功能，我个人还是更喜欢vim了。
 - [Emacs 插件开发手册](https://manateelazycat.github.io/2022/11/18/write-emacs-plugin/)
   - 配置emacs前必须要看一下，插件加载的流程
-- 未解决问题
-  - [ ] `emacs -q sqlite.c` 内存没有快速增加，但把 `-q` 去掉就不行
+- [ ] [专业emacs入门](https://pavinberg.github.io/emacs-book/zh/)
 
 ### vscode
 
@@ -931,4 +931,6 @@ cookie和session攻击
 - [所有人都能懂的正规方程](https://blog.csdn.net/weixin_41075215/article/details/104880912)
   - 线性代数，有时间可以复习下
 - [网易云音乐ncm格式分析以及ncm与mp3格式转换](https://www.cnblogs.com/cyx-b/p/13443003.html)
+- [CloudFlare Tunnel 免费内网穿透的简明教程](https://sspai.com/post/79278)
+
 
diff --git a/tool/git.md b/tool/git.md
@@ -334,8 +334,9 @@
 
 - `git revert [commit]` 新建一个commit，用来撤销指定commit,后者的所有变化都将被前者抵消，并且应用到当前分支
 - `git revert -m 1/2 [merge_commit]` revert 一个merge
-  - Adding the option -m 1 to the git revert command tells Git that you want to keep the parent side of the merge (the branch you merged into).
-  - If you want to keep the side of the branch merged, you change the 1 to a 2 instead.
+  - 可以使用 `git show merge_commit` 来查看 1 和 2 对应的两个 merge 的 commit_id
+  > Adding the option -m 1 to the git revert command tells Git that you want to keep the parent side of the merge (the branch you merged into).
+  > If you want to keep the side of the branch merged, you change the 1 to a 2 instead.
 
 ## 1.13. 变基