Skip to content

Commit dbe131b

Browse files
author
Petr Chalupa
committed
Merge duplicate points in readme
1 parent d60da0c commit dbe131b

File tree

1 file changed

+2
-8
lines changed

1 file changed

+2
-8
lines changed

README.md

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -119,19 +119,13 @@ be obeyed though. Features developed in `concurrent-ruby-edge` are expected to m
119119
* [new Future Framework](http://ruby-concurrency.github.io/concurrent-ruby/Concurrent/Edge.html) - new
120120
unified implementation of Futures and Promises which combines Features of previous `Future`,
121121
`Promise`, `IVar`, `Event`, `Probe`, `dataflow`, `Delay`, `TimerTask` into single framework. It uses extensively
122-
new synchronization layer to make all the paths **lock-free** with exception of blocking threads on `#wait`.
123-
It offers better performance and does not block threads when not required.
122+
new synchronization layer to make all the features **non-blocking** and **lock-free** with exception of obviously blocking
123+
operations like `#wait`, `#value`. It also offers better performance.
124124
* [Agent](http://ruby-concurrency.github.io/concurrent-ruby/Concurrent/Agent.html): A single atomic value that represents an identity.
125125
* [Channel](http://ruby-concurrency.github.io/concurrent-ruby/Concurrent/Channel.html):
126126
Communicating Sequential Processes (CSP).
127127
* [Exchanger](http://ruby-concurrency.github.io/concurrent-ruby/Concurrent/Exchanger.html)
128128
* [LazyRegister](http://ruby-concurrency.github.io/concurrent-ruby/Concurrent/LazyRegister.html)
129-
* [New Future Promise Framework](http://ruby-concurrency.github.io/concurrent-ruby/Concurrent/Edge.html) - new
130-
unified implementation of Futures and Promises which combines Features of previous `Future`,
131-
`Promise`, `IVar`, `Probe`, `dataflow`, `Delay`, `TimerTask` into single framework. It uses extensively
132-
new synchronization layer to make all the paths lock-free with exception of blocking threads on `#wait`.
133-
It offers better performance and does not block threads (exception being `#wait` and similar methods where it's
134-
intended).
135129
* [Atomic Markable Reference](http://ruby-concurrency.github.io/concurrent-ruby/Concurrent/Edge/AtomicMarkableReference.html)
136130
* [Lock Free Linked Set](http://ruby-concurrency.github.io/concurrent-ruby/Concurrent/Edge/LockFreeLinkedSet.html)
137131

0 commit comments

Comments
 (0)