… | |
… | |
21 | use Coro::Semaphore; |
21 | use Coro::Semaphore; |
22 | use Coro::AIO; |
22 | use Coro::AIO; |
23 | use Coro::Storable; |
23 | use Coro::Storable; |
24 | use Coro::Util (); |
24 | use Coro::Util (); |
25 | |
25 | |
26 | use JSON::XS 1.4 (); |
26 | use JSON::XS (); |
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 (); |
… | |
… | |
272 | Wait until the given lock is available and then acquires it and returns |
272 | Wait until the given lock is available and then acquires it and returns |
273 | a Coro::guard object. If the guard object gets destroyed (goes out of scope, |
273 | a Coro::guard object. If the guard object gets destroyed (goes out of scope, |
274 | for example when the coroutine gets canceled), the lock is automatically |
274 | for example when the coroutine gets canceled), the lock is automatically |
275 | returned. |
275 | returned. |
276 | |
276 | |
|
|
277 | Locks are *not* recursive, locking from the same coro twice results in a |
|
|
278 | deadlocked coro. |
|
|
279 | |
277 | Lock names should begin with a unique identifier (for example, cf::map::find |
280 | Lock names should begin with a unique identifier (for example, cf::map::find |
278 | uses map_find and cf::map::load uses map_load). |
281 | uses map_find and cf::map::load uses map_load). |
279 | |
282 | |
280 | =item $locked = cf::lock_active $string |
283 | =item $locked = cf::lock_active $string |
281 | |
284 | |
… | |
… | |
575 | if (1) { |
578 | if (1) { |
576 | $md5 = |
579 | $md5 = |
577 | join "\x00", |
580 | join "\x00", |
578 | $processversion, |
581 | $processversion, |
579 | map { |
582 | map { |
580 | Coro::cede; |
583 | cf::cede_to_tick; |
581 | ($src->[$_], Digest::MD5::md5_hex $data[$_]) |
584 | ($src->[$_], Digest::MD5::md5_hex $data[$_]) |
582 | } 0.. $#$src; |
585 | } 0.. $#$src; |
583 | |
586 | |
584 | |
587 | |
585 | my $dbmd5 = db_get cache => "$id/md5"; |
588 | my $dbmd5 = db_get cache => "$id/md5"; |
… | |
… | |
1322 | |
1325 | |
1323 | aio_mkdir playerdir $pl, 0770; |
1326 | aio_mkdir playerdir $pl, 0770; |
1324 | $pl->{last_save} = $cf::RUNTIME; |
1327 | $pl->{last_save} = $cf::RUNTIME; |
1325 | |
1328 | |
1326 | $pl->save_pl ($path); |
1329 | $pl->save_pl ($path); |
1327 | Coro::cede; |
1330 | cf::cede_to_tick; |
1328 | } |
1331 | } |
1329 | |
1332 | |
1330 | sub new($) { |
1333 | sub new($) { |
1331 | my ($login) = @_; |
1334 | my ($login) = @_; |
1332 | |
1335 | |
… | |
… | |
1849 | local $self->{deny_reset} = 1; # loading can take a long time |
1852 | local $self->{deny_reset} = 1; # loading can take a long time |
1850 | |
1853 | |
1851 | my $path = $self->{path}; |
1854 | my $path = $self->{path}; |
1852 | |
1855 | |
1853 | { |
1856 | { |
|
|
1857 | my $guard1 = cf::lock_acquire "map_data:$path"; |
1854 | my $guard = cf::lock_acquire "map_load:$path"; |
1858 | my $guard2 = cf::lock_acquire "map_load:$path"; |
1855 | |
1859 | |
1856 | return if $self->in_memory != cf::MAP_SWAPPED; |
1860 | return if $self->in_memory != cf::MAP_SWAPPED; |
1857 | |
1861 | |
1858 | $self->in_memory (cf::MAP_LOADING); |
1862 | $self->in_memory (cf::MAP_LOADING); |
1859 | |
1863 | |
1860 | $self->alloc; |
1864 | $self->alloc; |
1861 | |
1865 | |
1862 | $self->pre_load; |
1866 | $self->pre_load; |
1863 | Coro::cede; |
1867 | cf::cede_to_tick; |
1864 | |
1868 | |
1865 | $self->_load_objects ($self->{load_path}, 1) |
1869 | $self->_load_objects ($self->{load_path}, 1) |
1866 | or return; |
1870 | or return; |
1867 | |
1871 | |
1868 | $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) |
1872 | $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) |
… | |
… | |
1874 | $self->clear_unique_items; |
1878 | $self->clear_unique_items; |
1875 | $self->_load_objects ($uniq, 0); |
1879 | $self->_load_objects ($uniq, 0); |
1876 | } |
1880 | } |
1877 | } |
1881 | } |
1878 | |
1882 | |
1879 | Coro::cede; |
1883 | cf::cede_to_tick; |
1880 | # now do the right thing for maps |
1884 | # now do the right thing for maps |
1881 | $self->link_multipart_objects; |
1885 | $self->link_multipart_objects; |
1882 | $self->difficulty ($self->estimate_difficulty) |
1886 | $self->difficulty ($self->estimate_difficulty) |
1883 | unless $self->difficulty; |
1887 | unless $self->difficulty; |
1884 | Coro::cede; |
1888 | cf::cede_to_tick; |
1885 | |
1889 | |
1886 | unless ($self->{deny_activate}) { |
1890 | unless ($self->{deny_activate}) { |
1887 | $self->decay_objects; |
1891 | $self->decay_objects; |
1888 | $self->fix_auto_apply; |
1892 | $self->fix_auto_apply; |
1889 | $self->update_buttons; |
1893 | $self->update_buttons; |
1890 | Coro::cede; |
1894 | cf::cede_to_tick; |
1891 | $self->set_darkness_map; |
1895 | $self->set_darkness_map; |
1892 | Coro::cede; |
1896 | cf::cede_to_tick; |
1893 | $self->activate; |
1897 | $self->activate; |
1894 | } |
1898 | } |
1895 | |
1899 | |
1896 | $self->{last_save} = $cf::RUNTIME; |
1900 | $self->{last_save} = $cf::RUNTIME; |
1897 | $self->last_access ($cf::RUNTIME); |
1901 | $self->last_access ($cf::RUNTIME); |
… | |
… | |
1987 | } |
1991 | } |
1988 | |
1992 | |
1989 | sub save { |
1993 | sub save { |
1990 | my ($self) = @_; |
1994 | my ($self) = @_; |
1991 | |
1995 | |
1992 | my $lock = cf::lock_acquire "map_data:" . $self->path; |
1996 | my $lock = cf::lock_acquire "map_data:$self->{path}"; |
1993 | |
1997 | |
1994 | $self->{last_save} = $cf::RUNTIME; |
1998 | $self->{last_save} = $cf::RUNTIME; |
1995 | |
1999 | |
1996 | return unless $self->dirty; |
2000 | return unless $self->dirty; |
1997 | |
2001 | |
… | |
… | |
2020 | my ($self) = @_; |
2024 | my ($self) = @_; |
2021 | |
2025 | |
2022 | # save first because save cedes |
2026 | # save first because save cedes |
2023 | $self->save; |
2027 | $self->save; |
2024 | |
2028 | |
2025 | my $lock = cf::lock_acquire "map_data:" . $self->path; |
2029 | my $lock = cf::lock_acquire "map_data:$self->{path}"; |
2026 | |
2030 | |
2027 | return if $self->players; |
2031 | return if $self->players; |
2028 | return if $self->in_memory != cf::MAP_IN_MEMORY; |
2032 | return if $self->in_memory != cf::MAP_IN_MEMORY; |
2029 | return if $self->{deny_save}; |
2033 | return if $self->{deny_save}; |
2030 | |
2034 | |
… | |
… | |
2082 | my $nuke_counter = "aaaa"; |
2086 | my $nuke_counter = "aaaa"; |
2083 | |
2087 | |
2084 | sub nuke { |
2088 | sub nuke { |
2085 | my ($self) = @_; |
2089 | my ($self) = @_; |
2086 | |
2090 | |
|
|
2091 | { |
|
|
2092 | my $lock = cf::lock_acquire "map_data:$self->{path}"; |
|
|
2093 | |
2087 | delete $cf::MAP{$self->path}; |
2094 | delete $cf::MAP{$self->path}; |
2088 | |
2095 | |
2089 | $self->unlink_save; |
|
|
2090 | |
|
|
2091 | bless $self, "cf::map"; |
2096 | bless $self, "cf::map"; |
2092 | delete $self->{deny_reset}; |
2097 | delete $self->{deny_reset}; |
2093 | $self->{deny_save} = 1; |
2098 | $self->{deny_save} = 1; |
2094 | $self->reset_timeout (1); |
2099 | $self->reset_timeout (1); |
2095 | $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); |
2100 | $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); |
2096 | |
2101 | |
|
|
2102 | $self->unlink_save; |
|
|
2103 | |
2097 | $cf::MAP{$self->path} = $self; |
2104 | $cf::MAP{$self->path} = $self; |
|
|
2105 | } |
2098 | |
2106 | |
2099 | $self->reset; # polite request, might not happen |
2107 | $self->reset; # polite request, might not happen |
2100 | } |
2108 | } |
2101 | |
2109 | |
2102 | =item $maps = cf::map::tmp_maps |
2110 | =item $maps = cf::map::tmp_maps |
… | |
… | |
2496 | the message, with C<log> being the default. If C<$color> is negative, suppress |
2504 | the message, with C<log> being the default. If C<$color> is negative, suppress |
2497 | the message unless the client supports the msg packet. |
2505 | the message unless the client supports the msg packet. |
2498 | |
2506 | |
2499 | =cut |
2507 | =cut |
2500 | |
2508 | |
|
|
2509 | our %CHANNEL = ( |
|
|
2510 | "c/identify" => { |
|
|
2511 | id => "identify", |
|
|
2512 | title => "Identify", |
|
|
2513 | reply => undef, |
|
|
2514 | tooltip => "Items recently identified", |
|
|
2515 | }, |
|
|
2516 | ); |
|
|
2517 | |
2501 | sub cf::client::send_msg { |
2518 | sub cf::client::send_msg { |
2502 | my ($self, $channel, $msg, $color, @extra) = @_; |
2519 | my ($self, $channel, $msg, $color, @extra) = @_; |
2503 | |
2520 | |
2504 | $msg = $self->pl->expand_cfpod ($msg); |
2521 | $msg = $self->pl->expand_cfpod ($msg); |
2505 | |
2522 | |
2506 | $color &= cf::NDI_CLIENT_MASK; # just in case... |
2523 | $color &= cf::NDI_CLIENT_MASK; # just in case... |
|
|
2524 | |
|
|
2525 | # check predefined channels, for the benefit of C |
|
|
2526 | $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; |
2507 | |
2527 | |
2508 | if (ref $channel) { |
2528 | if (ref $channel) { |
2509 | # send meta info to client, if not yet sent |
2529 | # send meta info to client, if not yet sent |
2510 | unless (exists $self->{channel}{$channel->{id}}) { |
2530 | unless (exists $self->{channel}{$channel->{id}}) { |
2511 | $self->{channel}{$channel->{id}} = $channel; |
2531 | $self->{channel}{$channel->{id}} = $channel; |
… | |
… | |
2558 | =cut |
2578 | =cut |
2559 | |
2579 | |
2560 | sub cf::client::ext_msg($$@) { |
2580 | sub cf::client::ext_msg($$@) { |
2561 | my ($self, $type, @msg) = @_; |
2581 | my ($self, $type, @msg) = @_; |
2562 | |
2582 | |
2563 | my $extcmd = $self->extcmd; |
|
|
2564 | |
|
|
2565 | if ($extcmd == 2) { |
2583 | if ($self->extcmd == 2) { |
2566 | $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); |
2584 | $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); |
2567 | } elsif ($extcmd == 1) { # TODO: remove |
2585 | } elsif ($self->extcmd == 1) { # TODO: remove |
2568 | push @msg, msgtype => "event_$type"; |
2586 | push @msg, msgtype => "event_$type"; |
2569 | $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); |
2587 | $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); |
2570 | } |
2588 | } |
2571 | } |
2589 | } |
2572 | |
2590 | |
… | |
… | |
2579 | sub cf::client::ext_reply($$@) { |
2597 | sub cf::client::ext_reply($$@) { |
2580 | my ($self, $id, @msg) = @_; |
2598 | my ($self, $id, @msg) = @_; |
2581 | |
2599 | |
2582 | if ($self->extcmd == 2) { |
2600 | if ($self->extcmd == 2) { |
2583 | $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); |
2601 | $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); |
2584 | } elsif ($self->ns->extcmd == 1) { |
2602 | } elsif ($self->extcmd == 1) { |
2585 | #TODO: version 1, remove |
2603 | #TODO: version 1, remove |
2586 | unshift @msg, msgtype => "reply", msgid => $id; |
2604 | unshift @msg, msgtype => "reply", msgid => $id; |
2587 | $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); |
2605 | $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); |
2588 | } |
2606 | } |
2589 | } |
2607 | } |
… | |
… | |
2834 | # the server's init and main functions |
2852 | # the server's init and main functions |
2835 | |
2853 | |
2836 | sub load_facedata($) { |
2854 | sub load_facedata($) { |
2837 | my ($path) = @_; |
2855 | my ($path) = @_; |
2838 | |
2856 | |
|
|
2857 | # HACK to clear player env face cache, we need some signal framework |
|
|
2858 | # for this (global event?) |
|
|
2859 | %ext::player_env::MUSIC_FACE_CACHE = (); |
|
|
2860 | |
2839 | my $enc = JSON::XS->new->utf8->canonical; |
2861 | my $enc = JSON::XS->new->utf8->canonical->relaxed; |
2840 | |
2862 | |
2841 | warn "loading facedata from $path\n"; |
2863 | warn "loading facedata from $path\n"; |
2842 | |
2864 | |
2843 | my $facedata; |
2865 | my $facedata; |
2844 | 0 < aio_load $path, $facedata |
2866 | 0 < aio_load $path, $facedata |
… | |
… | |
2954 | $ns->fx_want ($k, $v); |
2976 | $ns->fx_want ($k, $v); |
2955 | } |
2977 | } |
2956 | }; |
2978 | }; |
2957 | |
2979 | |
2958 | sub reload_regions { |
2980 | sub reload_regions { |
|
|
2981 | # HACK to clear player env face cache, we need some signal framework |
|
|
2982 | # for this (global event?) |
|
|
2983 | %ext::player_env::MUSIC_FACE_CACHE = (); |
|
|
2984 | |
2959 | load_resource_file "$MAPDIR/regions" |
2985 | load_resource_file "$MAPDIR/regions" |
2960 | or die "unable to load regions file\n"; |
2986 | or die "unable to load regions file\n"; |
2961 | |
2987 | |
2962 | for (cf::region::list) { |
2988 | for (cf::region::list) { |
2963 | $_->{match} = qr/$_->{match}/ |
2989 | $_->{match} = qr/$_->{match}/ |
… | |
… | |
2999 | |
3025 | |
3000 | sub init { |
3026 | sub init { |
3001 | reload_resources; |
3027 | reload_resources; |
3002 | } |
3028 | } |
3003 | |
3029 | |
3004 | sub cfg_load { |
3030 | sub reload_config { |
3005 | open my $fh, "<:utf8", "$CONFDIR/config" |
3031 | open my $fh, "<:utf8", "$CONFDIR/config" |
3006 | or return; |
3032 | or return; |
3007 | |
3033 | |
3008 | local $/; |
3034 | local $/; |
3009 | *CFG = YAML::Syck::Load <$fh>; |
3035 | *CFG = YAML::Syck::Load <$fh>; |
… | |
… | |
3029 | (async { |
3055 | (async { |
3030 | Event::one_event; |
3056 | Event::one_event; |
3031 | })->prio (Coro::PRIO_MAX); |
3057 | })->prio (Coro::PRIO_MAX); |
3032 | }; |
3058 | }; |
3033 | |
3059 | |
3034 | cfg_load; |
3060 | reload_config; |
3035 | db_init; |
3061 | db_init; |
3036 | load_extensions; |
3062 | load_extensions; |
3037 | |
3063 | |
3038 | $TICK_WATCHER->start; |
3064 | $TICK_WATCHER->start; |
3039 | Event::loop; |
3065 | Event::loop; |
… | |
… | |
3232 | warn "reloading cf.pm"; |
3258 | warn "reloading cf.pm"; |
3233 | require cf; |
3259 | require cf; |
3234 | cf::_connect_to_perl; # nominally unnecessary, but cannot hurt |
3260 | cf::_connect_to_perl; # nominally unnecessary, but cannot hurt |
3235 | |
3261 | |
3236 | warn "loading config and database again"; |
3262 | warn "loading config and database again"; |
3237 | cf::cfg_load; |
3263 | cf::reload_config; |
3238 | |
3264 | |
3239 | warn "loading extensions"; |
3265 | warn "loading extensions"; |
3240 | cf::load_extensions; |
3266 | cf::load_extensions; |
3241 | |
3267 | |
3242 | warn "reattaching attachments to objects/players"; |
3268 | warn "reattaching attachments to objects/players"; |