Skip to content

Commit 4673923

Browse files
Gwillhevake
Gwill
authored and
hevake
committed
fix typo
1 parent 36e9b99 commit 4673923

File tree

12 files changed

+125
-125
lines changed

12 files changed

+125
-125
lines changed

‎modules/event/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ set(TBOX_EVENT_SOURCES
4848
signal_event_impl.cpp
4949
misc.cpp
5050
stat.cpp
51-
engins/epoll/loop.cpp
52-
engins/epoll/fd_event.cpp)
51+
engines/epoll/loop.cpp
52+
engines/epoll/fd_event.cpp)
5353

5454
set(TBOX_EVENT_TEST_SOURCES
5555
common_loop_test.cpp

‎modules/event/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ CPP_SRC_FILES = \
4343
signal_event_impl.cpp \
4444
misc.cpp \
4545
stat.cpp \
46-
engins/epoll/loop.cpp \
47-
engins/epoll/fd_event.cpp \
46+
engines/epoll/loop.cpp \
47+
engines/epoll/fd_event.cpp \
4848

4949
TEST_CPP_SRC_FILES = \
5050
$(CPP_SRC_FILES) \

‎modules/event/common_loop_test.cpp‎

Lines changed: 54 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ using namespace std::chrono;
3535

3636
TEST(CommonLoop, isRunning)
3737
{
38-
auto engins = Loop::Engines();
39-
for (auto e : engins) {
40-
cout << "engin: " << e << endl;
38+
auto engines = Loop::Engines();
39+
for (auto e : engines) {
40+
cout << "engine: " << e << endl;
4141
Loop *sp_loop = event::Loop::New(e);
4242
TimerEvent *sp_timer = sp_loop->newTimerEvent();
4343
SetScopeExitAction([sp_loop, sp_timer]{ delete sp_timer; delete sp_loop; });
@@ -64,9 +64,9 @@ TEST(CommonLoop, isRunning)
6464

6565
TEST(CommonLoop, isInLoopThread)
6666
{
67-
auto engins = Loop::Engines();
68-
for (auto e : engins) {
69-
cout << "engin: " << e << endl;
67+
auto engines = Loop::Engines();
68+
for (auto e : engines) {
69+
cout << "engine: " << e << endl;
7070
Loop *sp_loop = event::Loop::New(e);
7171
TimerEvent *sp_timer = sp_loop->newTimerEvent();
7272
SetScopeExitAction([sp_loop, sp_timer]{ delete sp_timer; delete sp_loop; });
@@ -102,9 +102,9 @@ TEST(CommonLoop, isInLoopThread)
102102

103103
TEST(CommonLoop, runNextInsideLoop)
104104
{
105-
auto engins = Loop::Engines();
106-
for (auto e : engins) {
107-
cout << "engin: " << e << endl;
105+
auto engines = Loop::Engines();
106+
for (auto e : engines) {
107+
cout << "engine: " << e << endl;
108108
Loop *sp_loop = event::Loop::New(e);
109109
TimerEvent *sp_timer1 = sp_loop->newTimerEvent();
110110
TimerEvent *sp_timer2 = sp_loop->newTimerEvent();
@@ -145,9 +145,9 @@ TEST(CommonLoop, runNextInsideLoop)
145145
//! runNext() 支持在Loop之前操作
146146
TEST(CommonLoop, runNextBeforeLoop)
147147
{
148-
auto engins = Loop::Engines();
149-
for (auto e : engins) {
150-
cout << "engin: " << e << endl;
148+
auto engines = Loop::Engines();
149+
for (auto e : engines) {
150+
cout << "engine: " << e << endl;
151151
Loop *sp_loop = event::Loop::New(e);
152152
TimerEvent *sp_timer = sp_loop->newTimerEvent();
153153
SetScopeExitAction([sp_loop, sp_timer]{ delete sp_timer; delete sp_loop; });
@@ -174,9 +174,9 @@ TEST(CommonLoop, runNextBeforeLoop)
174174

175175
TEST(CommonLoop, runNextForever)
176176
{
177-
auto engins = Loop::Engines();
178-
for (auto e : engins) {
179-
cout << "engin: " << e << endl;
177+
auto engines = Loop::Engines();
178+
for (auto e : engines) {
179+
cout << "engine: " << e << endl;
180180
Loop *sp_loop = event::Loop::New(e);
181181

182182
int count = 0;
@@ -200,9 +200,9 @@ TEST(CommonLoop, runNextForever)
200200

201201
TEST(CommonLoop, runInLoopInsideLoop)
202202
{
203-
auto engins = Loop::Engines();
204-
for (auto e : engins) {
205-
cout << "engin: " << e << endl;
203+
auto engines = Loop::Engines();
204+
for (auto e : engines) {
205+
cout << "engine: " << e << endl;
206206
Loop *sp_loop = event::Loop::New(e);
207207
TimerEvent *sp_timer1 = sp_loop->newTimerEvent();
208208
TimerEvent *sp_timer2 = sp_loop->newTimerEvent();
@@ -242,9 +242,9 @@ TEST(CommonLoop, runInLoopInsideLoop)
242242

243243
TEST(CommonLoop, runInLoopBeforeLoop)
244244
{
245-
auto engins = Loop::Engines();
246-
for (auto e : engins) {
247-
cout << "engin: " << e << endl;
245+
auto engines = Loop::Engines();
246+
for (auto e : engines) {
247+
cout << "engine: " << e << endl;
248248
Loop *sp_loop = event::Loop::New(e);
249249
TimerEvent *sp_timer = sp_loop->newTimerEvent();
250250
SetScopeExitAction([sp_loop, sp_timer]{ delete sp_timer; delete sp_loop; });
@@ -271,9 +271,9 @@ TEST(CommonLoop, runInLoopBeforeLoop)
271271

272272
TEST(CommonLoop, runInLoopCrossThread)
273273
{
274-
auto engins = Loop::Engines();
275-
for (auto e : engins) {
276-
cout << "engin: " << e << endl;
274+
auto engines = Loop::Engines();
275+
for (auto e : engines) {
276+
cout << "engine: " << e << endl;
277277
Loop *sp_loop = event::Loop::New(e);
278278
TimerEvent *sp_timer = sp_loop->newTimerEvent();
279279
SetScopeExitAction([sp_loop, sp_timer]{ delete sp_timer; delete sp_loop; });
@@ -310,9 +310,9 @@ TEST(CommonLoop, runInLoopCrossThread)
310310

311311
TEST(CommonLoop, runInsideLoop)
312312
{
313-
auto engins = Loop::Engines();
314-
for (auto e : engins) {
315-
cout << "engin: " << e << endl;
313+
auto engines = Loop::Engines();
314+
for (auto e : engines) {
315+
cout << "engine: " << e << endl;
316316
Loop *sp_loop = event::Loop::New(e);
317317
TimerEvent *sp_timer1 = sp_loop->newTimerEvent();
318318
TimerEvent *sp_timer2 = sp_loop->newTimerEvent();
@@ -352,9 +352,9 @@ TEST(CommonLoop, runInsideLoop)
352352

353353
TEST(CommonLoop, runBeforeLoop)
354354
{
355-
auto engins = Loop::Engines();
356-
for (auto e : engins) {
357-
cout << "engin: " << e << endl;
355+
auto engines = Loop::Engines();
356+
for (auto e : engines) {
357+
cout << "engine: " << e << endl;
358358
Loop *sp_loop = event::Loop::New(e);
359359
TimerEvent *sp_timer = sp_loop->newTimerEvent();
360360
SetScopeExitAction([sp_loop, sp_timer]{ delete sp_timer; delete sp_loop; });
@@ -381,9 +381,9 @@ TEST(CommonLoop, runBeforeLoop)
381381

382382
TEST(CommonLoop, runCrossThread)
383383
{
384-
auto engins = Loop::Engines();
385-
for (auto e : engins) {
386-
cout << "engin: " << e << endl;
384+
auto engines = Loop::Engines();
385+
for (auto e : engines) {
386+
cout << "engine: " << e << endl;
387387
Loop *sp_loop = event::Loop::New(e);
388388
TimerEvent *sp_timer = sp_loop->newTimerEvent();
389389
SetScopeExitAction([sp_loop, sp_timer]{ delete sp_timer; delete sp_loop; });
@@ -420,9 +420,9 @@ TEST(CommonLoop, runCrossThread)
420420

421421
TEST(CommonLoop, runForever)
422422
{
423-
auto engins = Loop::Engines();
424-
for (auto e : engins) {
425-
cout << "engin: " << e << endl;
423+
auto engines = Loop::Engines();
424+
for (auto e : engines) {
425+
cout << "engine: " << e << endl;
426426
Loop *sp_loop = event::Loop::New(e);
427427

428428
int count = 0;
@@ -445,9 +445,9 @@ TEST(CommonLoop, runForever)
445445

446446
TEST(CommonLoop, cleanupDeferedTask)
447447
{
448-
auto engins = Loop::Engines();
449-
for (auto e : engins) {
450-
cout << "engin: " << e << endl;
448+
auto engines = Loop::Engines();
449+
for (auto e : engines) {
450+
cout << "engine: " << e << endl;
451451
Loop *sp_loop = event::Loop::New(e);
452452
TimerEvent *sp_timer1 = sp_loop->newTimerEvent();
453453
SetScopeExitAction(
@@ -481,9 +481,9 @@ TEST(CommonLoop, cleanupDeferedTask)
481481

482482
TEST(CommonLoop, cleanupDeferedTask1)
483483
{
484-
auto engins = Loop::Engines();
485-
for (auto e : engins) {
486-
cout << "engin: " << e << endl;
484+
auto engines = Loop::Engines();
485+
for (auto e : engines) {
486+
cout << "engine: " << e << endl;
487487
Loop *sp_loop = event::Loop::New(e);
488488
SetScopeExitAction( [&]{ delete sp_loop; });
489489

@@ -501,9 +501,9 @@ TEST(CommonLoop, cleanupDeferedTask1)
501501

502502
TEST(CommonLoop, RunInLoopBenchmark)
503503
{
504-
auto engins = Loop::Engines();
505-
for (auto e : engins) {
506-
cout << "engin: " << e << endl;
504+
auto engines = Loop::Engines();
505+
for (auto e : engines) {
506+
cout << "engine: " << e << endl;
507507
Loop *sp_loop = event::Loop::New(e);
508508

509509
int counter = 0;
@@ -523,9 +523,9 @@ TEST(CommonLoop, RunInLoopBenchmark)
523523

524524
TEST(CommonLoop, RunNextBenchmark)
525525
{
526-
auto engins = Loop::Engines();
527-
for (auto e : engins) {
528-
cout << "engin: " << e << endl;
526+
auto engines = Loop::Engines();
527+
for (auto e : engines) {
528+
cout << "engine: " << e << endl;
529529
Loop *sp_loop = event::Loop::New(e);
530530

531531
int counter = 0;
@@ -545,9 +545,9 @@ TEST(CommonLoop, RunNextBenchmark)
545545

546546
TEST(CommonLoop, RunBenchmark)
547547
{
548-
auto engins = Loop::Engines();
549-
for (auto e : engins) {
550-
cout << "engin: " << e << endl;
548+
auto engines = Loop::Engines();
549+
for (auto e : engines) {
550+
cout << "engine: " << e << endl;
551551
Loop *sp_loop = event::Loop::New(e);
552552

553553
int counter = 0;
@@ -567,9 +567,9 @@ TEST(CommonLoop, RunBenchmark)
567567

568568
TEST(CommonLoop, ExitLoopMultiTimes)
569569
{
570-
auto engins = Loop::Engines();
571-
for (auto e : engins) {
572-
cout << "engin: " << e << endl;
570+
auto engines = Loop::Engines();
571+
for (auto e : engines) {
572+
cout << "engine: " << e << endl;
573573
Loop *sp_loop = event::Loop::New(e);
574574

575575
sp_loop->runInLoop([sp_loop] { sp_loop->exitLoop(); });

modules/event/engins/epoll/fd_event.cpp renamed to modules/event/engines/epoll/fd_event.cpp

File renamed without changes.

modules/event/engins/epoll/fd_event.h renamed to modules/event/engines/epoll/fd_event.h

File renamed without changes.

modules/event/engins/epoll/loop.cpp renamed to modules/event/engines/epoll/loop.cpp

File renamed without changes.

modules/event/engins/epoll/loop.h renamed to modules/event/engines/epoll/loop.h

File renamed without changes.

modules/event/engins/epoll/types.h renamed to modules/event/engines/epoll/types.h

File renamed without changes.

‎modules/event/fd_event_test.cpp‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ using namespace std;
3636

3737
TEST(FdEvent, DisableSelfInReadCallback)
3838
{
39-
auto engins = Loop::Engines();
40-
for (auto e : engins) {
41-
cout << "engin: " << e << endl;
39+
auto engines = Loop::Engines();
40+
for (auto e : engines) {
41+
cout << "engine: " << e << endl;
4242

4343
int fds[2] = { 0 };
4444
ASSERT_EQ(pipe2(fds, O_CLOEXEC | O_NONBLOCK), 0);
@@ -84,9 +84,9 @@ TEST(FdEvent, DisableSelfInReadCallback)
8484

8585
TEST(FdEvent, DisableSelfInWriteCallback)
8686
{
87-
auto engins = Loop::Engines();
88-
for (auto e : engins) {
89-
cout << "engin: " << e << endl;
87+
auto engines = Loop::Engines();
88+
for (auto e : engines) {
89+
cout << "engine: " << e << endl;
9090

9191
int fds[2] = { 0 };
9292
ASSERT_EQ(pipe2(fds, O_CLOEXEC | O_NONBLOCK), 0);
@@ -125,9 +125,9 @@ TEST(FdEvent, DisableSelfInWriteCallback)
125125

126126
TEST(FdEvent, OneWriteMultiRead)
127127
{
128-
auto engins = Loop::Engines();
129-
for (auto e : engins) {
130-
cout << "engin: " << e << endl;
128+
auto engines = Loop::Engines();
129+
for (auto e : engines) {
130+
cout << "engine: " << e << endl;
131131

132132
int fds[2] = { 0 };
133133
ASSERT_EQ(pipe2(fds, O_CLOEXEC | O_NONBLOCK), 0);
@@ -193,9 +193,9 @@ TEST(FdEvent, OneWriteMultiRead)
193193

194194
TEST(FdEvent, MultiWriteOneRead)
195195
{
196-
auto engins = Loop::Engines();
197-
for (auto e : engins) {
198-
cout << "engin: " << e << endl;
196+
auto engines = Loop::Engines();
197+
for (auto e : engines) {
198+
cout << "engine: " << e << endl;
199199

200200
int fds[2] = { 0 };
201201
ASSERT_EQ(pipe2(fds, O_CLOEXEC | O_NONBLOCK), 0);
@@ -267,9 +267,9 @@ TEST(FdEvent, MultiWriteOneRead)
267267

268268
TEST(FdEvent, DeleteLater)
269269
{
270-
auto engins = Loop::Engines();
271-
for (auto e : engins) {
272-
cout << "engin: " << e << endl;
270+
auto engines = Loop::Engines();
271+
for (auto e : engines) {
272+
cout << "engine: " << e << endl;
273273
auto sp_loop = Loop::New(e);
274274
auto sp_fd_event = sp_loop->newFdEvent();
275275
sp_fd_event->initialize(1, FdEvent::kReadEvent, Event::Mode::kPersist);
@@ -280,9 +280,9 @@ TEST(FdEvent, DeleteLater)
280280

281281
TEST(FdEvent, Benchmark)
282282
{
283-
auto engins = Loop::Engines();
284-
for (auto e : engins) {
285-
cout << "engin: " << e << endl;
283+
auto engines = Loop::Engines();
284+
for (auto e : engines) {
285+
cout << "engine: " << e << endl;
286286

287287
int fds[2] = { 0 };
288288
ASSERT_EQ(pipe2(fds, O_CLOEXEC | O_NONBLOCK), 0);
@@ -326,9 +326,9 @@ TEST(FdEvent, Benchmark)
326326
/// 检查重复initialize()时会不会出现内存泄漏问题
327327
TEST(FdEvent, Reinitialize)
328328
{
329-
auto engins = Loop::Engines();
330-
for (auto e : engins) {
331-
cout << "engin: " << e << endl;
329+
auto engines = Loop::Engines();
330+
for (auto e : engines) {
331+
cout << "engine: " << e << endl;
332332

333333
auto loop = Loop::New(e);
334334
auto fd_event = loop->newFdEvent();

‎modules/event/loop.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include "loop.h"
2121
#include <tbox/base/log.h>
2222

23-
#include "engins/epoll/loop.h"
23+
#include "engines/epoll/loop.h"
2424

2525
namespace tbox {
2626
namespace event {

0 commit comments

Comments
 (0)