Skip to content

Commit a1a8caf

Browse files
EDBCREPOEDBCREPO
committed
📌 Nodepp | Update | V1.3.1 📌
1 parent ebccd85 commit a1a8caf

File tree

14 files changed

+516
-165
lines changed

14 files changed

+516
-165
lines changed

‎examples/51-Worker.cpp‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,37 +6,36 @@ using namespace nodepp;
66

77
void onMain(){
88

9-
ptr_t<int> x = new int(100);
10-
mutex_t mut;
9+
ptr_t<int> x = new int(100); mutex_t mut;
1110

12-
worker::add( coroutine::add( COROUTINE(){
11+
worker::add( mutex::add( mut, coroutine::add( COROUTINE(){
1312
coBegin
1413

15-
while( *x > 0 ){ mut.emit([&](){
14+
while( *x > 0 ){
1615
console::log( "wrk2>> Hello World", *x );
17-
*x-=1; }); coDelay(100); }
16+
*x-=1; coDelay(100); }
1817

1918
coFinish
20-
}));
19+
}) ));
2120

22-
worker::add( coroutine::add( COROUTINE(){
21+
worker::add( mutex::add( mut, coroutine::add( COROUTINE(){
2322
coBegin
2423

25-
while( *x > 0 ){ mut.emit([&](){
24+
while( *x > 0 ){
2625
console::log( "wrk1>> Hello World", *x );
27-
*x-=1; }); coDelay(100); }
26+
*x-=1; coDelay(100); }
2827

2928
coFinish
30-
}));
29+
}) ));
3130

32-
process::add( coroutine::add( COROUTINE(){
31+
worker::add( mutex::add( mut, coroutine::add( COROUTINE(){
3332
coBegin
3433

35-
while( *x > 0 ){ mut.emit([&](){
36-
console::log( "task>> Hello World", *x );
37-
*x-=1; }); coDelay(100); }
34+
while( *x > 0 ){
35+
console::log( "wrk0>> Hello World", *x );
36+
*x-=1; coDelay(100); }
3837

3938
coFinish
40-
}));
39+
}) ));
4140

4241
}

‎examples/52-Semaphore.cpp‎

Lines changed: 0 additions & 49 deletions
This file was deleted.

‎include/nodepp/atomic.h‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
/*
2+
* Copyright 2023 The Nodepp Project Authors. All Rights Reserved.
3+
*
4+
* Licensed under the MIT (the "License"). You may not use
5+
* this file except in compliance with the License. You can obtain a copy
6+
* in the file LICENSE in the source distribution or at
7+
* https://github.com/NodeppOfficial/nodepp/blob/main/LICENSE
8+
*/
9+
10+
/*────────────────────────────────────────────────────────────────────────────*/
11+
12+
#ifndef NODEPP_ATOMIC
13+
#define NODEPP_ATOMIC
14+
15+
/*────────────────────────────────────────────────────────────────────────────*/
16+
17+
#if _KERNEL_ == NODEPP_KERNEL_WINDOWS
18+
#include "windows/atomic.h"
19+
#elif _KERNEL_ == NODEPP_KERNEL_POSIX
20+
#include "posix/atomic.h"
21+
#else
22+
#error "This OS Does not support atomic.h"
23+
#endif
24+
25+
/*────────────────────────────────────────────────────────────────────────────*/
26+
27+
#endif

‎include/nodepp/mutex.h‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,15 @@
2424

2525
/*────────────────────────────────────────────────────────────────────────────*/
2626

27+
namespace nodepp { namespace mutex {
28+
29+
template< class T, class... V >
30+
function_t<int,V...> add( mutex_t mut, T cb, const V&... args ){
31+
return [=](){ return mut.emit( cb, args... ); };
32+
}
33+
34+
}}
35+
36+
/*────────────────────────────────────────────────────────────────────────────*/
37+
2738
#endif

‎include/nodepp/posix/atomic.h‎

Lines changed: 165 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,165 @@
1+
/*
2+
* Copyright 2023 The Nodepp Project Authors. All Rights Reserved.
3+
*
4+
* Licensed under the MIT (the "License"). You may not use
5+
* this file except in compliance with the License. You can obtain a copy
6+
* in the file LICENSE in the source distribution or at
7+
* https://github.com/NodeppOfficial/nodepp/blob/main/LICENSE
8+
*/
9+
10+
/*────────────────────────────────────────────────────────────────────────────*/
11+
12+
#ifndef NODEPP_POSIX_ATOMIC
13+
#define NODEPP_POSIX_ATOMIC
14+
15+
/*────────────────────────────────────────────────────────────────────────────*/
16+
17+
#include <stdbool.h>
18+
19+
/*────────────────────────────────────────────────────────────────────────────*/
20+
21+
namespace nodepp { namespace atomic {
22+
23+
template< class T > struct is_atomic : type::false_type{};
24+
25+
template<> struct is_atomic<int> : type::true_type {};
26+
template<> struct is_atomic<uint> : type::true_type {};
27+
template<> struct is_atomic<bool> : type::true_type {};
28+
template<> struct is_atomic<char> : type::true_type {};
29+
template<> struct is_atomic<long> : type::true_type {};
30+
template<> struct is_atomic<short> : type::true_type {};
31+
template<> struct is_atomic<uchar> : type::true_type {};
32+
template<> struct is_atomic<llong> : type::true_type {};
33+
template<> struct is_atomic<ulong> : type::true_type {};
34+
template<> struct is_atomic<ushort> : type::true_type {};
35+
template<> struct is_atomic<ullong> : type::true_type {};
36+
37+
// template<> struct is_atomic<float> : type::true_type {};
38+
// template<> struct is_atomic<double> : type::true_type {};
39+
40+
template<> struct is_atomic<wchar_t> : type::true_type {};
41+
template<> struct is_atomic<char16_t> : type::true_type {};
42+
template<> struct is_atomic<char32_t> : type::true_type {};
43+
44+
template< class T > struct is_atomic<T*> : type::true_type{};
45+
46+
}}
47+
48+
/*────────────────────────────────────────────────────────────────────────────*/
49+
50+
namespace nodepp {
51+
template< class T, class = typename type::enable_if<atomic::is_atomic<T>::value,T>::type >
52+
class atomic_t { private: T value; protected:
53+
54+
void cpy( const atomic_t& other ) noexcept {
55+
memcpy( &value, &other.value, sizeof( T ) );
56+
}
57+
58+
void mve( atomic_t&& other ) noexcept {
59+
memmove( &value, &other.value, sizeof( T ) );
60+
}
61+
62+
public:
63+
64+
atomic_t( atomic_t&& other ) noexcept { mve(type::move(other)); }
65+
66+
atomic_t( const atomic_t& other ) noexcept { cpy(other); }
67+
68+
atomic_t( T _val_ ) noexcept : value( _val_ ) {}
69+
70+
atomic_t() noexcept : value( T{} ) {}
71+
72+
public:
73+
74+
T get() const noexcept {
75+
return __atomic_load_n( &value, __ATOMIC_ACQUIRE );
76+
}
77+
78+
void set( T new_val ) noexcept {
79+
__atomic_store_n( &value, new_val, __ATOMIC_RELEASE );
80+
}
81+
82+
T sub( T new_val ) noexcept {
83+
return __atomic_fetch_sub( &value, new_val, __ATOMIC_SEQ_CST );
84+
}
85+
86+
T _and( T new_val ) noexcept {
87+
return __atomic_fetch_and( &value, new_val, __ATOMIC_SEQ_CST );
88+
}
89+
90+
T _xor( T new_val ) noexcept {
91+
return __atomic_fetch_xor( &value, new_val, __ATOMIC_SEQ_CST );
92+
}
93+
94+
T _or( T new_val ) noexcept {
95+
return __atomic_fetch_or( &value, new_val, __ATOMIC_SEQ_CST );
96+
}
97+
98+
T add( T new_val ) noexcept {
99+
return __atomic_fetch_add( &value, new_val, __ATOMIC_SEQ_CST );
100+
}
101+
102+
T swap( T new_val ) noexcept {
103+
return __atomic_exchange_n( &value, new_val, __ATOMIC_SEQ_CST );
104+
}
105+
106+
bool compare( T& expected, T desired ) const noexcept {
107+
return __atomic_compare_exchange_n( &value, &expected, desired, false, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST );
108+
}
109+
110+
public:
111+
112+
template< typename U = T >
113+
typename type::enable_if< !type::is_pointer<U>::value, atomic_t& >::type
114+
operator&=( T value ) noexcept { _and(value); return *this; }
115+
116+
template< typename U = T >
117+
typename type::enable_if< !type::is_pointer<U>::value, atomic_t& >::type
118+
operator|=( T value ) noexcept { _or (value); return *this; }
119+
120+
template< typename U = T >
121+
typename type::enable_if< !type::is_pointer<U>::value, atomic_t& >::type
122+
operator^=( T value ) noexcept { _xor(value); return *this; }
123+
124+
template< typename U = T >
125+
typename type::enable_if< !type::is_pointer<U>::value, atomic_t& >::type
126+
operator-=( T value ) noexcept { sub(value); return *this; }
127+
128+
template< typename U = T >
129+
typename type::enable_if< !type::is_pointer<U>::value, atomic_t& >::type
130+
operator+=( T value ) noexcept { add(value); return *this; }
131+
132+
template< typename U = T >
133+
typename type::enable_if< !type::is_pointer<U>::value, T >::type
134+
operator--() /*-------------*/ noexcept { return sub(1) - 1; }
135+
136+
template< typename U = T >
137+
typename type::enable_if< !type::is_pointer<U>::value, T >::type
138+
operator++() /*-------------*/ noexcept { return add(1) + 1; }
139+
140+
template< typename U = T >
141+
typename type::enable_if< !type::is_pointer<U>::value, T >::type
142+
operator--(int) /*----------*/ noexcept { return sub(1); }
143+
144+
template< typename U = T >
145+
typename type::enable_if< !type::is_pointer<U>::value, T >::type
146+
operator++(int) /*----------*/ noexcept { return add(1); }
147+
148+
atomic_t& operator =( T value ) noexcept { set(value); return *this; }
149+
150+
bool operator==( T value ) const noexcept { return get() == value; }
151+
bool operator>=( T value ) const noexcept { return get() >= value; }
152+
bool operator<=( T value ) const noexcept { return get() <= value; }
153+
bool operator> ( T value ) const noexcept { return get() > value; }
154+
bool operator< ( T value ) const noexcept { return get() < value; }
155+
bool operator!=( T value ) const noexcept { return get() != value; }
156+
157+
explicit operator T() /**/ const noexcept { return get(); }
158+
159+
}; }
160+
161+
/*────────────────────────────────────────────────────────────────────────────*/
162+
163+
#endif
164+
165+
/*────────────────────────────────────────────────────────────────────────────*/

‎include/nodepp/posix/mutex.h‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ namespace nodepp { class mutex_t {
3333
protected:
3434

3535
struct NODE {
36-
bool /*-*/ state=0;
36+
bool /*-*/ alive=1;
3737
pthread_mutex_t fd;
3838
}; ptr_t<NODE> obj;
3939

@@ -42,27 +42,34 @@ namespace nodepp { class mutex_t {
4242
mutex_t() : obj( new NODE() ) {
4343
if( pthread_mutex_init(&obj->fd,NULL)!=0 )
4444
{ throw except_t("Cant Start Mutex"); }
45-
/*-----------------*/ obj->state=1;
45+
/*-----------------*/ obj->alive=1;
4646
}
4747

4848
virtual ~mutex_t() noexcept {
49-
if( obj->state == 0 ){ return; }
49+
if( obj->alive == 0 ){ return; }
5050
if( obj.count() > 1 ){ return; }
5151
free(); }
5252

5353
/*─······································································─*/
5454

5555
void free() const noexcept {
56-
if( obj->state == 0 ){ return; }
57-
/*----------*/ obj->state = 0;
56+
if( obj->alive == 0 ){ return; }
57+
/*----------*/ obj->alive = 0;
5858
pthread_mutex_destroy(&obj->fd);
5959
}
6060

6161
/*─······································································─*/
6262

6363
template< class T, class... V >
64-
void emit( T callback, const V&... args ) const noexcept {
65-
lock(); callback( args... ); unlock();
64+
int operator() ( T callback, const V&... args ) const noexcept {
65+
return emit( callback, args... );
66+
}
67+
68+
template< class T, class... V >
69+
inline int emit( T callback, const V&... args ) const noexcept {
70+
if( obj->alive == 0 ){ return -1; }
71+
lock (); int c=callback( args... );
72+
unlock(); /*------------*/ return c;
6673
}
6774

6875
/*─······································································─*/

‎include/nodepp/posix/worker.h‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@
1414

1515
/*────────────────────────────────────────────────────────────────────────────*/
1616

17-
#include "mutex.h"
18-
19-
/*────────────────────────────────────────────────────────────────────────────*/
20-
2117
namespace nodepp { class worker_t {
2218
private:
2319

@@ -34,9 +30,9 @@ namespace nodepp { class worker_t {
3430

3531
static void* callback( void* arg ){
3632
auto self = type::cast<worker_t>(arg);
37-
self->obj->mtx.emit([=](){ self->obj->state=1; });
38-
while( self->obj->cb.emit()>=0 ){ worker::yield(); }
39-
self->obj->mtx.emit([=](){ self->free(); });
33+
self->obj->mtx.emit([=](){ self->obj->state=1; return -1; });
34+
while( self->obj->cb.emit() >= 0 ){ worker::yield(); }
35+
self->obj->mtx.emit([=](){ self->free(); return -1; });
4036
/*-------*/ delete self; worker::exit();
4137
return nullptr; }
4238

0 commit comments

Comments
 (0)