Skip to content

Commit

Permalink
修改错误
Browse files Browse the repository at this point in the history
  • Loading branch information
xyygudu committed Jun 3, 2023
1 parent 06fa2bf commit 4ee71fe
Show file tree
Hide file tree
Showing 10 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ cd ..


# 告诉系统libmymuduo.so的目录(记得更改为自己项目的根目录/lib)
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/home/acer/projects/mymuduo/lib
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/home/acer/projects/cplusplus/mymuduo/lib

# # 把头文件拷贝到 /usr/include/mymuduo .so库拷贝到 /usr/lib
# if [ ! -d /usr/include/mymuduo ]; then
Expand Down
2 changes: 1 addition & 1 deletion example/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# 更改成自己项目的根目录
PROJECT_PATH=/home/acer/projects/mymuduo
PROJECT_PATH=/home/acer/projects/cplusplus/mymuduo
HEADER_PATH=-I ${PROJECT_PATH}/src/base \
-I ${PROJECT_PATH}/src/net \
-I ${PROJECT_PATH}/src/logger \
Expand Down
Empty file modified muduo讲解/Muduo概述.md
100644 → 100755
Empty file.
Empty file modified muduo讲解/第一部分:从最基本例子开始.md
100644 → 100755
Empty file.
Empty file modified muduo讲解/第三部分:从EchoServer开始.md
100644 → 100755
Empty file.
Empty file modified muduo讲解/第二部分(1):Muduo的主要类.md
100644 → 100755
Empty file.
Empty file modified muduo讲解/第二部分(2):Muduo的Buffer.md
100644 → 100755
Empty file.
Empty file modified muduo讲解/第二部分(3):Muduo日志库.md
100644 → 100755
Empty file.
Empty file modified muduo讲解/第二部分(4):Muduo时间轮.md
100644 → 100755
Empty file.
2 changes: 1 addition & 1 deletion src/net/EventLoop.h
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ class EventLoop : noncopyable

std::atomic_bool looping_; // 是否正在事件循环中
std::atomic_bool quit_; // 是否退出事件循环
std::atomic_bool callingPen nndingFunctors_;// 是否正在调用待执行的函数
std::atomic_bool callingPendingFunctors_; // 是否正在调用待执行的函数
const pid_t threadId_; // 当前loop所属线程的id
Timestamp epollReturnTime_; // EPoller管理的fd有事件发生时的时间(也就是epoll_wait返回的时间)
std::unique_ptr<EPollPoller> epoller_; //
Expand Down

0 comments on commit 4ee71fe

Please sign in to comment.