… | |
… | |
10 | use Event; |
10 | use Event; |
11 | use Opcode; |
11 | use Opcode; |
12 | use Safe; |
12 | use Safe; |
13 | use Safe::Hole; |
13 | use Safe::Hole; |
14 | |
14 | |
15 | use Coro 3.64 (); |
15 | use Coro 4.1 (); |
16 | use Coro::State; |
16 | use Coro::State; |
17 | use Coro::Handle; |
17 | use Coro::Handle; |
18 | use Coro::Event; |
18 | use Coro::Event; |
19 | use Coro::Timer; |
19 | use Coro::Timer; |
20 | use Coro::Signal; |
20 | use Coro::Signal; |
… | |
… | |
27 | use BDB (); |
27 | use BDB (); |
28 | use Data::Dumper; |
28 | use Data::Dumper; |
29 | use Digest::MD5; |
29 | use Digest::MD5; |
30 | use Fcntl; |
30 | use Fcntl; |
31 | use YAML::Syck (); |
31 | use YAML::Syck (); |
32 | use IO::AIO 2.32 (); |
32 | use IO::AIO 2.51 (); |
33 | use Time::HiRes; |
33 | use Time::HiRes; |
34 | use Compress::LZF; |
34 | use Compress::LZF; |
35 | use Digest::MD5 (); |
35 | use Digest::MD5 (); |
36 | |
36 | |
37 | # configure various modules to our taste |
37 | # configure various modules to our taste |
… | |
… | |
354 | our @SLOT_QUEUE; |
354 | our @SLOT_QUEUE; |
355 | our $SLOT_QUEUE; |
355 | our $SLOT_QUEUE; |
356 | |
356 | |
357 | $SLOT_QUEUE->cancel if $SLOT_QUEUE; |
357 | $SLOT_QUEUE->cancel if $SLOT_QUEUE; |
358 | $SLOT_QUEUE = Coro::async { |
358 | $SLOT_QUEUE = Coro::async { |
|
|
359 | $Coro::current->desc ("timeslot manager"); |
|
|
360 | |
359 | my $signal = new Coro::Signal; |
361 | my $signal = new Coro::Signal; |
360 | |
362 | |
361 | while () { |
363 | while () { |
362 | next_job: |
364 | next_job: |
363 | my $avail = cf::till_tick; |
365 | my $avail = cf::till_tick; |
… | |
… | |
371 | } |
373 | } |
372 | } |
374 | } |
373 | } |
375 | } |
374 | |
376 | |
375 | if (@SLOT_QUEUE) { |
377 | if (@SLOT_QUEUE) { |
376 | # we do not use wait_For_tick() as it returns immediately when tick is inactive |
378 | # we do not use wait_for_tick() as it returns immediately when tick is inactive |
377 | push @cf::WAIT_FOR_TICK, $signal; |
379 | push @cf::WAIT_FOR_TICK, $signal; |
378 | $signal->wait; |
380 | $signal->wait; |
379 | } else { |
381 | } else { |
380 | Coro::schedule; |
382 | Coro::schedule; |
381 | } |
383 | } |
… | |
… | |
425 | my $time = Event::time; |
427 | my $time = Event::time; |
426 | |
428 | |
427 | # this is the main coro, too bad, we have to block |
429 | # this is the main coro, too bad, we have to block |
428 | # till the operation succeeds, freezing the server :/ |
430 | # till the operation succeeds, freezing the server :/ |
429 | |
431 | |
|
|
432 | LOG llevError | logBacktrace, Carp::longmess "sync job";#d# |
|
|
433 | |
430 | # TODO: use suspend/resume instead |
434 | # TODO: use suspend/resume instead |
431 | # (but this is cancel-safe) |
435 | # (but this is cancel-safe) |
432 | my $freeze_guard = freeze_mainloop; |
436 | my $freeze_guard = freeze_mainloop; |
433 | |
437 | |
434 | my $busy = 1; |
438 | my $busy = 1; |
435 | my @res; |
439 | my @res; |
436 | |
440 | |
437 | (async { |
441 | (async { |
|
|
442 | $Coro::current->desc ("sync job coro"); |
438 | @res = eval { $job->() }; |
443 | @res = eval { $job->() }; |
439 | warn $@ if $@; |
444 | warn $@ if $@; |
440 | undef $busy; |
445 | undef $busy; |
441 | })->prio (Coro::PRIO_MAX); |
446 | })->prio (Coro::PRIO_MAX); |
442 | |
447 | |
… | |
… | |
1041 | close $fh; |
1046 | close $fh; |
1042 | |
1047 | |
1043 | if (@$objs) { |
1048 | if (@$objs) { |
1044 | if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { |
1049 | if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { |
1045 | chmod SAVE_MODE, $fh; |
1050 | chmod SAVE_MODE, $fh; |
1046 | my $data = Storable::nfreeze { version => 1, objs => $objs }; |
1051 | my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; |
1047 | aio_write $fh, 0, (length $data), $data, 0; |
1052 | aio_write $fh, 0, (length $data), $data, 0; |
1048 | aio_fsync $fh if $cf::USE_FSYNC; |
1053 | aio_fsync $fh if $cf::USE_FSYNC; |
1049 | close $fh; |
1054 | close $fh; |
1050 | aio_rename "$filename.pst~", "$filename.pst"; |
1055 | aio_rename "$filename.pst~", "$filename.pst"; |
1051 | } |
1056 | } |
… | |
… | |
1082 | |
1087 | |
1083 | unless (aio_stat "$filename.pst") { |
1088 | unless (aio_stat "$filename.pst") { |
1084 | (aio_load "$filename.pst", $av) >= 0 |
1089 | (aio_load "$filename.pst", $av) >= 0 |
1085 | or return; |
1090 | or return; |
1086 | |
1091 | |
1087 | $av = eval { (Storable::thaw $av)->{objs} }; |
1092 | my $st = eval { Coro::Storable::thaw $av } |
|
|
1093 | || eval { my $guard = Coro::Storable::guard; Storable::thaw $av }; #d# compatibility, remove |
|
|
1094 | $av = $st->{objs}; |
1088 | } |
1095 | } |
1089 | |
1096 | |
1090 | utf8::decode (my $decname = $filename); |
1097 | utf8::decode (my $decname = $filename); |
1091 | warn sprintf "loading %s (%d,%d)\n", |
1098 | warn sprintf "loading %s (%d,%d)\n", |
1092 | $decname, length $data, scalar @{$av || []}; |
1099 | $decname, length $data, scalar @{$av || []}; |
… | |
… | |
2036 | } |
2043 | } |
2037 | |
2044 | |
2038 | $MAP_PREFETCH{$path} |= $load; |
2045 | $MAP_PREFETCH{$path} |= $load; |
2039 | |
2046 | |
2040 | $MAP_PREFETCHER ||= cf::async { |
2047 | $MAP_PREFETCHER ||= cf::async { |
|
|
2048 | $Coro::current->{desc} = "map prefetcher"; |
|
|
2049 | |
2041 | while (%MAP_PREFETCH) { |
2050 | while (%MAP_PREFETCH) { |
2042 | while (my ($k, $v) = each %MAP_PREFETCH) { |
2051 | while (my ($k, $v) = each %MAP_PREFETCH) { |
2043 | if (my $map = find $k) { |
2052 | if (my $map = find $k) { |
2044 | $map->load if $v; |
2053 | $map->load if $v; |
2045 | } |
2054 | } |
… | |
… | |
2071 | return if $self->{deny_save}; |
2080 | return if $self->{deny_save}; |
2072 | |
2081 | |
2073 | local $self->{last_access} = $self->last_access;#d# |
2082 | local $self->{last_access} = $self->last_access;#d# |
2074 | |
2083 | |
2075 | cf::async { |
2084 | cf::async { |
|
|
2085 | $Coro::current->{desc} = "map player save"; |
2076 | $_->contr->save for $self->players; |
2086 | $_->contr->save for $self->players; |
2077 | }; |
2087 | }; |
2078 | |
2088 | |
2079 | if ($uniq) { |
2089 | if ($uniq) { |
2080 | $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); |
2090 | $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); |
… | |
… | |
2267 | =cut |
2277 | =cut |
2268 | |
2278 | |
2269 | sub deref { |
2279 | sub deref { |
2270 | my ($ref) = @_; |
2280 | my ($ref) = @_; |
2271 | |
2281 | |
2272 | # temporary compatibility#TODO#remove |
|
|
2273 | $ref =~ s{^<}{player/<}; |
|
|
2274 | |
|
|
2275 | if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { |
2282 | if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) { |
2276 | my ($uuid, $name) = ($1, $2); |
2283 | my ($uuid, $name) = ($1, $2); |
2277 | my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name |
2284 | my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name |
2278 | or return; |
2285 | or return; |
2279 | $pl->ob->uuid eq $uuid |
2286 | $pl->ob->uuid eq $uuid |
2280 | or return; |
2287 | or return; |
… | |
… | |
2451 | my $gen = $self->{_goto_generation} = ++$GOTOGEN; |
2458 | my $gen = $self->{_goto_generation} = ++$GOTOGEN; |
2452 | |
2459 | |
2453 | $self->enter_link; |
2460 | $self->enter_link; |
2454 | |
2461 | |
2455 | (async { |
2462 | (async { |
|
|
2463 | $Coro::current->{desc} = "player::goto $path $x $y"; |
|
|
2464 | |
2456 | # *tag paths override both path and x|y |
2465 | # *tag paths override both path and x|y |
2457 | if ($path =~ /^\*(.*)$/) { |
2466 | if ($path =~ /^\*(.*)$/) { |
2458 | if (my @obs = grep $_->map, ext::map_tags::find $1) { |
2467 | if (my @obs = grep $_->map, ext::map_tags::find $1) { |
2459 | my $ob = $obs[rand @obs]; |
2468 | my $ob = $obs[rand @obs]; |
2460 | |
2469 | |
… | |
… | |
2577 | # if exit is damned, update players death & WoR home-position |
2586 | # if exit is damned, update players death & WoR home-position |
2578 | $self->contr->savebed ($slaying, $hp, $sp) |
2587 | $self->contr->savebed ($slaying, $hp, $sp) |
2579 | if $exit->flag (FLAG_DAMNED); |
2588 | if $exit->flag (FLAG_DAMNED); |
2580 | |
2589 | |
2581 | (async { |
2590 | (async { |
|
|
2591 | $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; |
|
|
2592 | |
2582 | $self->deactivate_recursive; # just to be sure |
2593 | $self->deactivate_recursive; # just to be sure |
2583 | unless (eval { |
2594 | unless (eval { |
2584 | $self->goto ($slaying, $hp, $sp); |
2595 | $self->goto ($slaying, $hp, $sp); |
2585 | |
2596 | |
2586 | 1; |
2597 | 1; |
… | |
… | |
2623 | |
2634 | |
2624 | =cut |
2635 | =cut |
2625 | |
2636 | |
2626 | our %CHANNEL = ( |
2637 | our %CHANNEL = ( |
2627 | "c/identify" => { |
2638 | "c/identify" => { |
2628 | id => "identify", |
2639 | id => "infobox", |
2629 | title => "Identify", |
2640 | title => "Identify", |
2630 | reply => undef, |
2641 | reply => undef, |
2631 | tooltip => "Items recently identified", |
2642 | tooltip => "Items recently identified", |
2632 | }, |
2643 | }, |
2633 | "c/examine" => { |
2644 | "c/examine" => { |
2634 | id => "examine", |
2645 | id => "infobox", |
2635 | title => "Examine", |
2646 | title => "Examine", |
2636 | reply => undef, |
2647 | reply => undef, |
2637 | tooltip => "Signs and other items you examined", |
2648 | tooltip => "Signs and other items you examined", |
2638 | }, |
2649 | }, |
|
|
2650 | "c/lookat" => { |
|
|
2651 | id => "infobox", |
|
|
2652 | title => "Look", |
|
|
2653 | reply => undef, |
|
|
2654 | tooltip => "What you saw there", |
|
|
2655 | }, |
2639 | ); |
2656 | ); |
2640 | |
2657 | |
2641 | sub cf::client::send_msg { |
2658 | sub cf::client::send_msg { |
2642 | my ($self, $channel, $msg, $color, @extra) = @_; |
2659 | my ($self, $channel, $msg, $color, @extra) = @_; |
2643 | |
2660 | |
2644 | $msg = $self->pl->expand_cfpod ($msg); |
2661 | $msg = $self->pl->expand_cfpod ($msg); |
2645 | |
2662 | |
2646 | $color &= cf::NDI_CLIENT_MASK; # just in case... |
2663 | $color &= cf::NDI_CLIENT_MASK; # just in case... |
2647 | |
2664 | |
2648 | # check predefined channels, for the benefit of C |
2665 | # check predefined channels, for the benefit of C |
2649 | $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; |
2666 | if ($CHANNEL{$channel}) { |
|
|
2667 | $channel = $CHANNEL{$channel}; |
2650 | |
2668 | |
|
|
2669 | $self->ext_msg (channel_info => $channel) |
|
|
2670 | if $self->can_msg; |
|
|
2671 | |
|
|
2672 | $channel = $channel->{id}; |
|
|
2673 | |
2651 | if (ref $channel) { |
2674 | } elsif (ref $channel) { |
2652 | # send meta info to client, if not yet sent |
2675 | # send meta info to client, if not yet sent |
2653 | unless (exists $self->{channel}{$channel->{id}}) { |
2676 | unless (exists $self->{channel}{$channel->{id}}) { |
2654 | $self->{channel}{$channel->{id}} = $channel; |
2677 | $self->{channel}{$channel->{id}} = $channel; |
2655 | $self->ext_msg (channel_info => $channel) |
2678 | $self->ext_msg (channel_info => $channel) |
2656 | if $self->can_msg; |
2679 | if $self->can_msg; |
… | |
… | |
3175 | sub main { |
3198 | sub main { |
3176 | # we must not ever block the main coroutine |
3199 | # we must not ever block the main coroutine |
3177 | local $Coro::idle = sub { |
3200 | local $Coro::idle = sub { |
3178 | Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# |
3201 | Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# |
3179 | (async { |
3202 | (async { |
|
|
3203 | $Coro::current->{desc} = "IDLE BUG HANDLER"; |
3180 | Event::one_event; |
3204 | Event::one_event; |
3181 | })->prio (Coro::PRIO_MAX); |
3205 | })->prio (Coro::PRIO_MAX); |
3182 | }; |
3206 | }; |
3183 | |
3207 | |
3184 | reload_config; |
3208 | reload_config; |
… | |
… | |
3428 | register_command "reload" => sub { |
3452 | register_command "reload" => sub { |
3429 | my ($who, $arg) = @_; |
3453 | my ($who, $arg) = @_; |
3430 | |
3454 | |
3431 | if ($who->flag (FLAG_WIZ)) { |
3455 | if ($who->flag (FLAG_WIZ)) { |
3432 | $who->message ("reloading server."); |
3456 | $who->message ("reloading server."); |
|
|
3457 | async { |
|
|
3458 | $Coro::current->{desc} = "perl_reload"; |
3433 | async { reload_perl }; |
3459 | reload_perl; |
|
|
3460 | }; |
3434 | } |
3461 | } |
3435 | }; |
3462 | }; |
3436 | |
3463 | |
3437 | unshift @INC, $LIBDIR; |
3464 | unshift @INC, $LIBDIR; |
3438 | |
3465 | |
… | |
… | |
3480 | $NEXT_TICK += $TICK; |
3507 | $NEXT_TICK += $TICK; |
3481 | |
3508 | |
3482 | if ($NOW >= $NEXT_RUNTIME_WRITE) { |
3509 | if ($NOW >= $NEXT_RUNTIME_WRITE) { |
3483 | $NEXT_RUNTIME_WRITE = $NOW + 10; |
3510 | $NEXT_RUNTIME_WRITE = $NOW + 10; |
3484 | Coro::async_pool { |
3511 | Coro::async_pool { |
|
|
3512 | $Coro::current->{desc} = "runtime saver"; |
3485 | write_runtime |
3513 | write_runtime |
3486 | or warn "ERROR: unable to write runtime file: $!"; |
3514 | or warn "ERROR: unable to write runtime file: $!"; |
3487 | }; |
3515 | }; |
3488 | } |
3516 | } |
3489 | |
3517 | |
… | |
… | |
3599 | $AIO_POLL_WATCHER = Event->io ( |
3627 | $AIO_POLL_WATCHER = Event->io ( |
3600 | reentrant => 0, |
3628 | reentrant => 0, |
3601 | data => WF_AUTOCANCEL, |
3629 | data => WF_AUTOCANCEL, |
3602 | fd => IO::AIO::poll_fileno, |
3630 | fd => IO::AIO::poll_fileno, |
3603 | poll => 'r', |
3631 | poll => 'r', |
3604 | prio => 6, |
3632 | prio => 0, |
3605 | cb => \&IO::AIO::poll_cb, |
3633 | cb => \&IO::AIO::poll_cb, |
3606 | ); |
3634 | ); |
3607 | } |
3635 | } |
3608 | |
3636 | |
3609 | my $_log_backtrace; |
3637 | my $_log_backtrace; |
… | |
… | |
3615 | |
3643 | |
3616 | # limit the # of concurrent backtraces |
3644 | # limit the # of concurrent backtraces |
3617 | if ($_log_backtrace < 2) { |
3645 | if ($_log_backtrace < 2) { |
3618 | ++$_log_backtrace; |
3646 | ++$_log_backtrace; |
3619 | async { |
3647 | async { |
|
|
3648 | $Coro::current->{desc} = "abt $msg"; |
|
|
3649 | |
3620 | my @bt = fork_call { |
3650 | my @bt = fork_call { |
3621 | @addr = map { sprintf "%x", $_ } @addr; |
3651 | @addr = map { sprintf "%x", $_ } @addr; |
3622 | my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; |
3652 | my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; |
3623 | open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" |
3653 | open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" |
3624 | or die "addr2line: $!"; |
3654 | or die "addr2line: $!"; |