use the term concurrent instead of parallel

mojolicious · Feb 5, 2014 · 7d579de · 7d579de
1 parent db81e0b
commit 7d579de
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 18 deletions.
diff --git a/lib/Mojo/IOLoop.pm b/lib/Mojo/IOLoop.pm
@@ -463,7 +463,7 @@ a chain for L<Mojo::IOLoop::Delay/"steps">.
       say 'Second step in 2 seconds.';
     },
 
-    # Second step (parallel timers)
+    # Second step (concurrent timers)
     sub {
       my $delay = shift;
       Mojo::IOLoop->timer(1 => $delay->begin);

diff --git a/lib/Mojo/IOLoop/Delay.pm b/lib/Mojo/IOLoop/Delay.pm
@@ -84,7 +84,7 @@ Mojo::IOLoop::Delay - Manage callbacks and control the flow of events
       say 'Second step in 2 seconds.';
     },
 
-    # Second step (parallel timers)
+    # Second step (concurrent timers)
     sub {
       my ($delay, @args) = @_;
       Mojo::IOLoop->timer(1 => $delay->begin);

diff --git a/lib/Mojo/UserAgent.pm b/lib/Mojo/UserAgent.pm
@@ -422,7 +422,7 @@ Mojo::UserAgent - Non-blocking I/O HTTP and WebSocket user agent
   my $tx = $ua->cert('tls.crt')->key('tls.key')
     ->post('https://example.com' => json => {top => 'secret'});
 
-  # Blocking parallel requests (does not work inside a running event loop)
+  # Blocking concurrent requests (does not work inside a running event loop)
   my $delay = Mojo::IOLoop->delay;
   for my $url ('mojolicio.us', 'cpan.org') {
     my $end = $delay->begin(0);
@@ -433,7 +433,7 @@ Mojo::UserAgent - Non-blocking I/O HTTP and WebSocket user agent
   }
   my @titles = $delay->wait;
 
-  # Non-blocking parallel requests (does work inside a running event loop)
+  # Non-blocking concurrent requests (does work inside a running event loop)
   my $delay = Mojo::IOLoop->delay(sub {
     my ($delay, @titles) = @_;
     ...

diff --git a/lib/Mojolicious/Guides/Cookbook.pod b/lib/Mojolicious/Guides/Cookbook.pod
@@ -377,7 +377,7 @@ latency backend web services.
     </body>
   </html>
 
-Multiple events such as parallel requests can be easily synchronized with
+Multiple events such as concurrent requests can be easily synchronized with
 L<Mojo::IOLoop/"delay">, which can help you avoid deep nested closures that
 often result from continuation-passing style.
 
@@ -392,7 +392,7 @@ often result from continuation-passing style.
     # Prepare response in two steps
     Mojo::IOLoop->delay(
 
-      # Parallel requests
+      # Concurrent requests
       sub {
         my $delay = shift;
         my $url   = Mojo::URL->new('api.metacpan.org/v0/module/_search');
@@ -419,7 +419,7 @@ often result from continuation-passing style.
 Another primary feature of the event loop are timers, which are created with
 L<Mojo::IOLoop/"timer"> and can for example be used to delay rendering of a
 response, and unlike C<sleep>, won't block any other requests that might be
-processed in parallel.
+processed concurrently.
 
   use Mojolicious::Lite;
   use Mojo::IOLoop;
@@ -998,7 +998,7 @@ can keep many concurrent connections active at the same time.
   use Mojo::UserAgent;
   use Mojo::IOLoop;
 
-  # Parallel non-blocking requests
+  # Concurrent non-blocking requests
   my $ua = Mojo::UserAgent->new;
   $ua->get('http://metacpan.org/search?q=mojo' => sub {
     my ($ua, $mojo) = @_;
@@ -1014,7 +1014,7 @@ can keep many concurrent connections active at the same time.
 
 You can take full control of the L<Mojo::IOLoop> event loop.
 
-=head2 Parallel blocking requests
+=head2 Concurrent blocking requests
 
 You can emulate blocking behavior by using L<Mojo::IOLoop/"delay"> to
 synchronize multiple non-blocking requests.

diff --git a/lib/Mojolicious/Lite.pm b/lib/Mojolicious/Lite.pm
@@ -867,7 +867,7 @@ L<Mojo::JSON> and L<Mojo::DOM> this can be a very powerful tool.
     });
   };
 
-  # Parallel non-blocking
+  # Concurrent non-blocking
   get '/titles' => sub {
     my $self = shift;
     my $delay = Mojo::IOLoop->delay(sub {

diff --git a/t/mojo/daemon.t b/t/mojo/daemon.t
@@ -142,12 +142,12 @@ ok defined $tx->connection, 'has connection id';
 is $tx->res->code, 200,         'right status';
 is $tx->res->body, 'Whatever!', 'right content';
 
-# Parallel requests
+# Concurrent requests
 my $delay = Mojo::IOLoop->delay;
-$ua->get('/parallel1/' => $delay->begin);
-$ua->post(
-  '/parallel2/' => {Expect => 'fun'} => 'bar baz foo' x 128 => $delay->begin);
-$ua->get('/parallel3/' => $delay->begin);
+$ua->get('/concurrent1/' => $delay->begin);
+$ua->post('/concurrent2/' => {Expect => 'fun'} => 'bar baz foo' x 128 =>
+    $delay->begin);
+$ua->get('/concurrent3/' => $delay->begin);
 ($tx, my $tx2, my $tx3) = $delay->wait;
 ok $tx->is_finished, 'transaction is finished';
 is $tx->res->body, 'Whatever!', 'right content';

diff --git a/t/mojo/reactor_ev.t b/t/mojo/reactor_ev.t
@@ -153,7 +153,7 @@ ok !$writable, 'io event was not triggered again';
 my $reactor2 = Mojo::Reactor::EV->new;
 is ref $reactor2, 'Mojo::Reactor::Poll', 'right object';
 
-# Parallel reactors
+# Concurrent reactors
 $timer = 0;
 $reactor->recurring(0 => sub { $timer++ });
 my $timer2;

diff --git a/t/mojo/reactor_poll.t b/t/mojo/reactor_poll.t
@@ -151,7 +151,7 @@ ok !$writable, 'io event was not triggered again';
 my $reactor2 = Mojo::Reactor::Poll->new;
 is ref $reactor2, 'Mojo::Reactor::Poll', 'right object';
 
-# Parallel reactors
+# Concurrent reactors
 $timer = 0;
 $reactor->recurring(0 => sub { $timer++ });
 my $timer2;

diff --git a/t/mojo/websocket.t b/t/mojo/websocket.t
@@ -269,7 +269,7 @@ is $stash->{finished}, 1, 'finish event has been emitted once';
 is $code,   101,          'right status';
 is $result, 'test0test1', 'right result';
 
-# Parallel subrequests
+# Concurrent subrequests
 my $delay = Mojo::IOLoop->delay;
 ($code, $result) = ();
 my ($code2, $result2);