Skip to content

Commit 07ca6a3

Browse files
committed
Format codes.
1 parent f3aa571 commit 07ca6a3

16 files changed

+315
-303
lines changed

README.md

Lines changed: 236 additions & 222 deletions
Large diffs are not rendered by default.

cpp/include/fiber/fiber_cond.hpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ class fiber_mutex;
1212
*/
1313
class FIBER_CPP_API fiber_cond {
1414
public:
15-
fiber_cond(void);
16-
~fiber_cond(void);
15+
fiber_cond();
16+
~fiber_cond();
1717

1818
/**
1919
* 等待条件变量事件被触发
@@ -28,14 +28,14 @@ class FIBER_CPP_API fiber_cond {
2828
* 线程条件变量类似
2929
* @return {bool} 成功返回 true,否则返回 false 表示失败
3030
*/
31-
bool notify(void);
31+
bool notify();
3232

3333
public:
3434
/**
3535
* 返回 C 版本的条件变量对象
3636
* @return {ACL_FIBER_COND*}
3737
*/
38-
ACL_FIBER_COND* get_cond(void) const {
38+
ACL_FIBER_COND* get_cond() const {
3939
return cond_;
4040
}
4141

cpp/include/fiber/fiber_event.hpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,32 +23,32 @@ class FIBER_CPP_API fiber_event {
2323
* 人员进行错误调试
2424
*/
2525
fiber_event(bool use_mutex = true, bool fatal_on_error = true);
26-
~fiber_event(void);
26+
~fiber_event();
2727

2828
/**
2929
* 等待事件锁
3030
* @return {bool} 返回 true 表示加锁成功,否则表示内部出错
3131
*/
32-
bool wait(void);
32+
bool wait();
3333

3434
/**
3535
* 尝试等待事件锁
3636
* @return {bool} 返回 true 表示加锁成功,否则表示锁正在被占用
3737
*/
38-
bool trywait(void);
38+
bool trywait();
3939

4040
/**
4141
* 事件锁拥有者释放事件锁并通知等待者
4242
* @return {bool} 返回 true 表示通知成功,否则表示内部出错
4343
*/
44-
bool notify(void);
44+
bool notify();
4545

4646
public:
4747
/**
4848
* 返回 C 版本的事件对象
4949
* @return {ACL_FIBER_EVENT*}
5050
*/
51-
ACL_FIBER_EVENT* get_event(void) const {
51+
ACL_FIBER_EVENT* get_event() const {
5252
return event_;
5353
}
5454

cpp/include/fiber/fiber_lock.hpp

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,26 +11,26 @@ namespace acl {
1111
*/
1212
class FIBER_CPP_API fiber_lock {
1313
public:
14-
fiber_lock(void);
15-
~fiber_lock(void);
14+
fiber_lock();
15+
~fiber_lock();
1616

1717
/**
1818
* 等待互斥锁
1919
* @return {bool} 返回 true 表示加锁成功,否则表示内部出错
2020
*/
21-
bool lock(void);
21+
bool lock();
2222

2323
/**
2424
* 尝试等待互斥锁
2525
* @return {bool} 返回 true 表示加锁成功,否则表示锁正在被占用
2626
*/
27-
bool trylock(void);
27+
bool trylock();
2828

2929
/**
3030
* 互斥锁拥有者释放锁并通知等待者
3131
* @return {bool} 返回 true 表示通知成功,否则表示内部出错
3232
*/
33-
bool unlock(void);
33+
bool unlock();
3434

3535
private:
3636
ACL_FIBER_LOCK* lock_;
@@ -44,40 +44,40 @@ class FIBER_CPP_API fiber_lock {
4444
*/
4545
class FIBER_CPP_API fiber_rwlock {
4646
public:
47-
fiber_rwlock(void);
48-
~fiber_rwlock(void);
47+
fiber_rwlock();
48+
~fiber_rwlock();
4949

5050
/**
5151
* 加读锁
5252
*/
53-
void rlock(void);
53+
void rlock();
5454

5555
/**
5656
* 尝试加读锁
5757
* @return {bool} 返回 true 表示加锁成功,否则表示锁正在被占用
5858
*/
59-
bool tryrlock(void);
59+
bool tryrlock();
6060

6161
/**
6262
* 解读锁
6363
*/
64-
void runlock(void);
64+
void runlock();
6565

6666
/**
6767
* 加写锁
6868
*/
69-
void wlock(void);
69+
void wlock();
7070

7171
/**
7272
* 尝试加写锁
7373
* @return {bool} 返回 true 表示加锁成功,否则表示锁正在被占用
7474
*/
75-
bool trywlock(void);
75+
bool trywlock();
7676

7777
/**
7878
* 解写锁
7979
*/
80-
void wunlock(void);
80+
void wunlock();
8181

8282
private:
8383
ACL_FIBER_RWLOCK* rwlk_;

cpp/include/fiber/fiber_mutex.hpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,32 +20,32 @@ class FIBER_CPP_API fiber_mutex {
2020
* C 锁对象需由应用层自行释放.
2121
*/
2222
fiber_mutex(ACL_FIBER_MUTEX* mutex = NULL);
23-
~fiber_mutex(void);
23+
~fiber_mutex();
2424

2525
/**
2626
* 等待互斥锁
2727
* @return {bool} 返回 true 表示加锁成功,否则表示内部出错
2828
*/
29-
bool lock(void);
29+
bool lock();
3030

3131
/**
3232
* 尝试等待互斥锁
3333
* @return {bool} 返回 true 表示加锁成功,否则表示锁正在被占用
3434
*/
35-
bool trylock(void);
35+
bool trylock();
3636

3737
/**
3838
* 互斥锁拥有者释放锁并通知等待者
3939
* @return {bool} 返回 true 表示通知成功,否则表示内部出错
4040
*/
41-
bool unlock(void);
41+
bool unlock();
4242

4343
public:
4444
/**
4545
* 返回 C 版本的互斥锁对象
4646
* @return {ACL_FIBER_MUTEX*}
4747
*/
48-
ACL_FIBER_MUTEX* get_mutex(void) const {
48+
ACL_FIBER_MUTEX* get_mutex() const {
4949
return mutex_;
5050
}
5151

@@ -59,7 +59,7 @@ class FIBER_CPP_API fiber_mutex {
5959
/**
6060
* 检测死锁, 并将所有进入死锁状态的协程栈打印至标准输出
6161
*/
62-
static void deadlock_show(void);
62+
static void deadlock_show();
6363

6464
private:
6565
ACL_FIBER_MUTEX* mutex_;
@@ -75,7 +75,7 @@ class FIBER_CPP_API fiber_mutex_guard {
7575
mutex_.lock();
7676
}
7777

78-
~fiber_mutex_guard(void) {
78+
~fiber_mutex_guard() {
7979
mutex_.unlock();
8080
}
8181

cpp/include/fiber/fiber_mutex_stat.hpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@ namespace acl {
77
class fiber;
88

99
struct FIBER_CPP_API fiber_mutex_stat {
10-
fiber_mutex_stat(void) : fb(NULL), waiting(NULL) {}
11-
~fiber_mutex_stat(void) {}
10+
fiber_mutex_stat() : fb(NULL), waiting(NULL) {}
11+
~fiber_mutex_stat() {}
1212

1313
fiber *fb;
1414
ACL_FIBER_MUTEX *waiting;
1515
std::vector<ACL_FIBER_MUTEX*> holding;
1616
};
1717

1818
struct FIBER_CPP_API fiber_mutex_stats {
19-
fiber_mutex_stats(void) {}
20-
~fiber_mutex_stats(void);
19+
fiber_mutex_stats() {}
20+
~fiber_mutex_stats();
2121

2222
std::vector<fiber_mutex_stat> stats;
2323
};

cpp/include/fiber/fiber_sem.hpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ typedef enum {
1515
class FIBER_CPP_API fiber_sem {
1616
public:
1717
fiber_sem(int max, fiber_sem_attr_t attr = fiber_sem_t_async);
18-
~fiber_sem(void);
18+
~fiber_sem();
1919

20-
int wait(void);
21-
int trywait(void);
22-
int post(void);
20+
int wait();
21+
int trywait();
22+
int post();
2323

24-
size_t num(void) const;
24+
size_t num() const;
2525

2626
private:
2727
ACL_FIBER_SEM* sem_;
@@ -35,7 +35,7 @@ class FIBER_CPP_API fiber_sem_guard {
3535
(void) sem_.wait();
3636
}
3737

38-
~fiber_sem_guard(void) {
38+
~fiber_sem_guard() {
3939
sem_.post();
4040
}
4141

@@ -53,7 +53,7 @@ class fiber_sbox {
5353
: sem_(0, async ? fiber_sem_t_async : fiber_sem_t_sync)
5454
, free_obj_(free_obj) {}
5555

56-
~fiber_sbox(void) { clear(free_obj_); }
56+
~fiber_sbox() { clear(free_obj_); }
5757

5858
void push(T* t) {
5959
sbox_.push_back(t);
@@ -76,7 +76,7 @@ class fiber_sbox {
7676
return t;
7777
}
7878

79-
size_t size(void) const {
79+
size_t size() const {
8080
return sem_.num();
8181
}
8282

@@ -106,7 +106,7 @@ class fiber_sbox2 {
106106
fiber_sbox2(bool async = true)
107107
: sem_(0, async ? fiber_sem_t_async : fiber_sem_t_sync) {}
108108

109-
~fiber_sbox2(void) {}
109+
~fiber_sbox2() {}
110110

111111
#if __cplusplus >= 201103L // Support c++11 ?
112112

@@ -144,7 +144,7 @@ class fiber_sbox2 {
144144

145145
#endif
146146

147-
size_t size(void) const {
147+
size_t size() const {
148148
return sem_.num();
149149
}
150150

cpp/include/fiber/fiber_tbox.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ namespace acl {
1616
* class myobj {
1717
* public:
1818
* myobj() {}
19-
* ~myobj(void) {}
19+
* ~myobj() {}
2020
*
2121
* void test() { printf("hello world\r\n"); }
2222
* };

cpp/include/fiber/go_fiber.hpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class fiber_ctx {
3939

4040
class go_fiber {
4141
public:
42-
go_fiber(void) {}
42+
go_fiber() {}
4343
go_fiber(size_t stack_size, bool on) : stack_size_(stack_size), stack_share_(on) {}
4444

4545
ACL_FIBER* operator > (std::function<void()> fn) {
@@ -87,7 +87,7 @@ class go_fiber {
8787
#endif // __cplusplus >= 201103L
8888

8989
/**
90-
* static void fiber1(void) {
90+
* static void fiber1() {
9191
* printf("fiber: %d\r\n", acl::fiber::self());
9292
* }
9393
*
@@ -104,7 +104,7 @@ class go_fiber {
104104
* n++;
105105
* }
106106
*
107-
* static void waiter(void) {
107+
* static void waiter() {
108108
* int n = 100;
109109
*
110110
* // run in thread and wait for result
@@ -118,7 +118,7 @@ class go_fiber {
118118
* // here: n should be 201
119119
* }
120120
*
121-
* static test(void) {
121+
* static test() {
122122
* go fiber1;
123123
*
124124
* acl::string buf("hello");

cpp/src/fiber_cond.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44

55
namespace acl {
66

7-
fiber_cond::fiber_cond(void)
7+
fiber_cond::fiber_cond()
88
{
99
cond_ = acl_fiber_cond_create(0);
1010
}
1111

12-
fiber_cond::~fiber_cond(void)
12+
fiber_cond::~fiber_cond()
1313
{
1414
acl_fiber_cond_free(cond_);
1515
}
@@ -29,7 +29,7 @@ bool fiber_cond::wait(fiber_mutex& mutex, int timeout /* = -1 */)
2929
}
3030
}
3131

32-
bool fiber_cond::notify(void)
32+
bool fiber_cond::notify()
3333
{
3434
return acl_fiber_cond_signal(cond_) == 0;
3535
}

0 commit comments

Comments
 (0)