From 633e013f919b43b542f1f5b06970782e4eb58156 Mon Sep 17 00:00:00 2001 From: xking Date: Mon, 21 Jul 2025 20:59:36 +0800 Subject: [PATCH] update --- debian 11 安装 编译nginx.md | 12 ++++++ java/线程.md | 70 +++++++++++++++++++++++++++++++++ linux/fdisk磁盘分区.md | 26 ------------ linux/linux使用lvm.md | 28 ++++++++++++- 4 files changed, 109 insertions(+), 27 deletions(-) create mode 100644 java/线程.md diff --git a/debian 11 安装 编译nginx.md b/debian 11 安装 编译nginx.md index 71c0b73..6766671 100644 --- a/debian 11 安装 编译nginx.md +++ b/debian 11 安装 编译nginx.md @@ -113,8 +113,20 @@ https://nginx.org/download/nginx-1.22.0.tar.gz make install ``` +##### make 常用命令 +``` + make #编译 + + make install #安装 + + make clean #清除上一次make命令生成的文件 + + make distclean #清除上一次make以及configure命令生成的文件 + +``` + ##### 静态编译 diff --git a/java/线程.md b/java/线程.md new file mode 100644 index 0000000..f2266ea --- /dev/null +++ b/java/线程.md @@ -0,0 +1,70 @@ +``` + +import java.util.concurrent.atomic.AtomicInteger; + +public class AlternatePrint { + // 使用原子整数作为共享变量，初始值为1表示轮到线程1打印第一个数字 + private static AtomicInteger turn = new AtomicInteger(1); + // 当前要打印的数字 + private static int currentNumber = 1; + // 定义终止条件 + private static final int MAX_NUMBER = 100; + + public static void main(String[] args) { + // 创建两个线程 + Thread thread1 = new Thread(() -> { + while (currentNumber <= MAX_NUMBER) { + // 线程1检查是否轮到自己 + if (turn.get() == 1) { + System.out.println("线程1: " + currentNumber); + // 切换到线程2 + turn.set(2); + } + // 短暂休眠以避免CPU过度使用 + try { + Thread.sleep(10); + } catch (InterruptedException e) { + Thread.currentThread().interrupt(); + return; + } + } + }); + + Thread thread2 = new Thread(() -> { + while (currentNumber <= MAX_NUMBER) { + // 线程2检查是否轮到自己 + if (turn.get() == 2) { + System.out.println("线程2: " + currentNumber); + // 增加当前数字 + currentNumber++; + // 切换回线程1 + turn.set(1); + } + // 短暂休眠 + try { + Thread.sleep(10); + } catch (InterruptedException e) { + Thread.currentThread().interrupt(); + return; + } + } + }); + + // 启动线程 + thread1.start(); + thread2.start(); + + // 等待线程结束 + try { + thread1.join(); + thread2.join(); + } catch (InterruptedException e) { + Thread.currentThread().interrupt(); + } + + System.out.println("所有数字打印完毕"); + } +} + + +``` \ No newline at end of file diff --git a/linux/fdisk磁盘分区.md b/linux/fdisk磁盘分区.md index 4c61890..93fa834 100644 --- a/linux/fdisk磁盘分区.md +++ b/linux/fdisk磁盘分区.md @@ -129,30 +129,4 @@ mount /dev/sdb1 /Public2 -### lsblk 命令 - -查看硬盘信息 -``` -lsblk -``` -``` -lsblk -f -``` -``` -[root@worker ~]# lsblk -NAME MAJ:MIN RM SIZE RO TYPE MOUNTPOINT -sda 8:0 0 30G 0 disk -├─sda1 8:1 0 200M 0 part /boot/efi -├─sda2 8:2 0 1G 0 part /boot -└─sda3 8:3 0 28.8G 0 part - ├─centos-root 253:0 0 27G 0 lvm / - └─centos-swap 253:1 0 1.8G 0 lvm [SWAP] -sdb 8:16 0 1T 0 disk -└─sdb1 8:17 0 1024G 0 part /opt -sr0 11:0 1 1024M 0 rom -``` - - - - diff --git a/linux/linux使用lvm.md b/linux/linux使用lvm.md index 44620b0..f7cf924 100644 --- a/linux/linux使用lvm.md +++ b/linux/linux使用lvm.md @@ -145,7 +145,33 @@ lvresize -L +20G /dev/vg_demo/lv_demo #### 调整分区大小 ```sh -resize2fs /dev/vg_demo/lv_demo +# 扩展文件系统（根据实际文件系统类型选择命令） +resize2fs /dev/mapper/ubuntu--vg-ubuntu--lv # ext4 +# 或 +xfs_growfs /dev/mapper/ubuntu--vg-ubuntu--lv # XFS +``` + +### lsblk 命令 + +查看硬盘信息 +``` +lsblk +``` +``` +lsblk -f +``` +``` +[root@worker ~]# lsblk +NAME MAJ:MIN RM SIZE RO TYPE MOUNTPOINT +sda 8:0 0 30G 0 disk +├─sda1 8:1 0 200M 0 part /boot/efi +├─sda2 8:2 0 1G 0 part /boot +└─sda3 8:3 0 28.8G 0 part + ├─centos-root 253:0 0 27G 0 lvm / + └─centos-swap 253:1 0 1.8G 0 lvm [SWAP] +sdb 8:16 0 1T 0 disk +└─sdb1 8:17 0 1024G 0 part /opt +sr0 11:0 1 1024M 0 rom ```