… | |
… | |
8 | use Storable; |
8 | use Storable; |
9 | use Opcode; |
9 | use Opcode; |
10 | use Safe; |
10 | use Safe; |
11 | use Safe::Hole; |
11 | use Safe::Hole; |
12 | |
12 | |
13 | use Coro 3.3; |
13 | use Coro 3.3 (); |
14 | use Coro::Event; |
14 | use Coro::Event; |
15 | use Coro::Timer; |
15 | use Coro::Timer; |
16 | use Coro::Signal; |
16 | use Coro::Signal; |
17 | use Coro::Semaphore; |
17 | use Coro::Semaphore; |
18 | use Coro::AIO; |
18 | use Coro::AIO; |
… | |
… | |
245 | # wake up all waiters, to be on the safe side |
245 | # wake up all waiters, to be on the safe side |
246 | $_->ready for @{ delete $LOCK{$key} }; |
246 | $_->ready for @{ delete $LOCK{$key} }; |
247 | } |
247 | } |
248 | } |
248 | } |
249 | |
249 | |
|
|
250 | =item cf::async { BLOCK } |
|
|
251 | |
|
|
252 | Like C<Coro::async>, but runs the given BLOCK in an eval and only logs the |
|
|
253 | error instead of exiting the server in case of a problem. |
|
|
254 | |
|
|
255 | =cut |
|
|
256 | |
|
|
257 | sub async(&) { |
|
|
258 | my ($cb) = @_; |
|
|
259 | |
|
|
260 | Coro::async { |
|
|
261 | eval { $cb->() }; |
|
|
262 | warn $@ if $@; |
|
|
263 | } |
|
|
264 | } |
|
|
265 | |
250 | =item cf::sync_job { BLOCK } |
266 | =item cf::sync_job { BLOCK } |
251 | |
267 | |
252 | The design of crossfire+ requires that the main coro ($Coro::main) is |
268 | The design of crossfire+ requires that the main coro ($Coro::main) is |
253 | always able to handle events or runnable, as crossfire+ is only partly |
269 | always able to handle events or runnable, as crossfire+ is only partly |
254 | reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. |
270 | reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. |
… | |
… | |
301 | =cut |
317 | =cut |
302 | |
318 | |
303 | sub coro(&) { |
319 | sub coro(&) { |
304 | my $cb = shift; |
320 | my $cb = shift; |
305 | |
321 | |
306 | my $coro; $coro = async { |
322 | my $coro = &cf::async ($cb); |
307 | eval { |
|
|
308 | $cb->(); |
|
|
309 | }; |
|
|
310 | warn $@ if $@; |
|
|
311 | }; |
|
|
312 | |
323 | |
313 | $coro->on_destroy (sub { |
324 | $coro->on_destroy (sub { |
314 | delete $EXT_CORO{$coro+0}; |
325 | delete $EXT_CORO{$coro+0}; |
315 | }); |
326 | }); |
316 | $EXT_CORO{$coro+0} = $coro; |
327 | $EXT_CORO{$coro+0} = $coro; |
… | |
… | |
1175 | $map->{load_path} = $path; |
1186 | $map->{load_path} = $path; |
1176 | |
1187 | |
1177 | $map |
1188 | $map |
1178 | } |
1189 | } |
1179 | |
1190 | |
|
|
1191 | sub find_map; |
1180 | sub find_map { |
1192 | sub find_map { |
1181 | my ($path, $origin) = @_; |
1193 | my ($path, $origin) = @_; |
1182 | |
1194 | |
1183 | #warn "find_map<$path,$origin>\n";#d# |
1195 | #warn "find_map<$path,$origin>\n";#d# |
1184 | |
1196 | |
… | |
… | |
1220 | $map->last_access ($cf::RUNTIME); |
1232 | $map->last_access ($cf::RUNTIME); |
1221 | |
1233 | |
1222 | if ($map->should_reset) { |
1234 | if ($map->should_reset) { |
1223 | $map->reset; |
1235 | $map->reset; |
1224 | undef $guard; |
1236 | undef $guard; |
1225 | $map = find_map $path; |
1237 | $map = find_map $path |
|
|
1238 | or return; |
1226 | } |
1239 | } |
1227 | |
1240 | |
1228 | $cf::MAP{$key} = $map |
1241 | $cf::MAP{$key} = $map |
1229 | } |
1242 | } |
1230 | } |
1243 | } |
… | |
… | |
1536 | |
1549 | |
1537 | # try to abort aborted map switching on player login :) |
1550 | # try to abort aborted map switching on player login :) |
1538 | # should happen only on crashes |
1551 | # should happen only on crashes |
1539 | if ($pl->ob->{_link_pos}) { |
1552 | if ($pl->ob->{_link_pos}) { |
1540 | $pl->ob->enter_link; |
1553 | $pl->ob->enter_link; |
1541 | Coro::async { |
1554 | cf::async { |
1542 | # we need this sleep as the login has a concurrent enter_exit running |
1555 | # we need this sleep as the login has a concurrent enter_exit running |
1543 | # and this sleep increases chances of the player not ending up in scorn |
1556 | # and this sleep increases chances of the player not ending up in scorn |
1544 | Coro::Timer::sleep 1; |
1557 | Coro::Timer::sleep 1; |
1545 | $pl->ob->leave_link; |
1558 | $pl->ob->leave_link; |
1546 | }; |
1559 | }; |
… | |
… | |
1555 | sub cf::object::player::goto_map { |
1568 | sub cf::object::player::goto_map { |
1556 | my ($self, $path, $x, $y) = @_; |
1569 | my ($self, $path, $x, $y) = @_; |
1557 | |
1570 | |
1558 | $self->enter_link; |
1571 | $self->enter_link; |
1559 | |
1572 | |
1560 | (Coro::async { |
1573 | (cf::async { |
1561 | $path = new cf::path $path; |
1574 | $path = new cf::path $path; |
1562 | |
1575 | |
1563 | my $map = cf::map::find_map $path->as_string; |
1576 | my $map = cf::map::find_map $path->as_string; |
1564 | $map = $map->customise_for ($self) if $map; |
1577 | $map = $map->customise_for ($self) if $map; |
1565 | |
1578 | |
… | |
… | |
1627 | |
1640 | |
1628 | return unless $self->type == cf::PLAYER; |
1641 | return unless $self->type == cf::PLAYER; |
1629 | |
1642 | |
1630 | $self->enter_link; |
1643 | $self->enter_link; |
1631 | |
1644 | |
1632 | (Coro::async { |
1645 | (cf::async { |
1633 | unless (eval { |
1646 | unless (eval { |
1634 | |
|
|
1635 | prepare_random_map $exit |
1647 | prepare_random_map $exit |
1636 | if $exit->slaying eq "/!"; |
1648 | if $exit->slaying eq "/!"; |
1637 | |
1649 | |
1638 | my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; |
1650 | my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; |
1639 | $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp); |
1651 | $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp); |
… | |
… | |
1701 | on_reply => sub { |
1713 | on_reply => sub { |
1702 | my ($ns, $msg) = @_; |
1714 | my ($ns, $msg) = @_; |
1703 | |
1715 | |
1704 | # this weird shuffling is so that direct followup queries |
1716 | # this weird shuffling is so that direct followup queries |
1705 | # get handled first |
1717 | # get handled first |
1706 | my $queue = delete $ns->{query_queue}; |
1718 | my $queue = delete $ns->{query_queue} |
|
|
1719 | or return; # be conservative, not sure how that can happen, but we saw a crash here |
1707 | |
1720 | |
1708 | (shift @$queue)->[1]->($msg); |
1721 | (shift @$queue)->[1]->($msg); |
1709 | |
1722 | |
1710 | push @{ $ns->{query_queue} }, @$queue; |
1723 | push @{ $ns->{query_queue} }, @$queue; |
1711 | |
1724 | |
… | |
… | |
1728 | =cut |
1741 | =cut |
1729 | |
1742 | |
1730 | sub cf::client::coro { |
1743 | sub cf::client::coro { |
1731 | my ($self, $cb) = @_; |
1744 | my ($self, $cb) = @_; |
1732 | |
1745 | |
1733 | my $coro; $coro = async { |
1746 | my $coro = &cf::async ($cb); |
1734 | eval { |
|
|
1735 | $cb->(); |
|
|
1736 | }; |
|
|
1737 | warn $@ if $@; |
|
|
1738 | }; |
|
|
1739 | |
1747 | |
1740 | $coro->on_destroy (sub { |
1748 | $coro->on_destroy (sub { |
1741 | delete $self->{_coro}{$coro+0}; |
1749 | delete $self->{_coro}{$coro+0}; |
1742 | }); |
1750 | }); |
1743 | |
1751 | |
… | |
… | |
2190 | or warn "ERROR: unable to write runtime file: $!"; |
2198 | or warn "ERROR: unable to write runtime file: $!"; |
2191 | })->(); |
2199 | })->(); |
2192 | }, |
2200 | }, |
2193 | ); |
2201 | ); |
2194 | |
2202 | |
|
|
2203 | END { cf::emergency_save } |
|
|
2204 | |
2195 | 1 |
2205 | 1 |
2196 | |
2206 | |