ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.337 by root, Tue Aug 21 00:54:01 2007 UTC vs.
Revision 1.353 by root, Sun Sep 2 08:43:46 2007 UTC

… …
21use Coro::Semaphore; 21use Coro::Semaphore;
22use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable; 23use Coro::Storable;
24use Coro::Util (); 24use Coro::Util ();
25 25
26use JSON::XS 1.4 (); 26use JSON::XS ();
27use BDB (); 27use BDB ();
28use Data::Dumper; 28use Data::Dumper;
29use Digest::MD5; 29use Digest::MD5;
30use Fcntl; 30use Fcntl;
31use YAML::Syck (); 31use YAML::Syck ();
… …
272Wait until the given lock is available and then acquires it and returns 272Wait until the given lock is available and then acquires it and returns
273a Coro::guard object. If the guard object gets destroyed (goes out of scope, 273a Coro::guard object. If the guard object gets destroyed (goes out of scope,
274for example when the coroutine gets canceled), the lock is automatically 274for example when the coroutine gets canceled), the lock is automatically
275returned. 275returned.
276 276
277Locks are *not* recursive, locking from the same coro twice results in a
278deadlocked coro.
279
277Lock names should begin with a unique identifier (for example, cf::map::find 280Lock names should begin with a unique identifier (for example, cf::map::find
278uses map_find and cf::map::load uses map_load). 281uses 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";
… …
1149 my ($type, $reply, @payload) = 1152 my ($type, $reply, @payload) =
1150 "ARRAY" eq ref $msg 1153 "ARRAY" eq ref $msg
1151 ? @$msg 1154 ? @$msg
1152 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 1155 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1153 1156
1157 my @reply;
1158
1154 if (my $cb = $EXTCMD{$type}) { 1159 if (my $cb = $EXTCMD{$type}) {
1155 my @reply = $cb->($pl, @payload); 1160 @reply = $cb->($pl, @payload);
1156
1157 $pl->ext_reply ($reply, @reply)
1158 if $reply;
1159 } 1161 }
1162
1163 $pl->ext_reply ($reply, @reply)
1164 if $reply;
1165
1160 } else { 1166 } else {
1161 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1167 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1162 } 1168 }
1163 1169
1164 cf::override; 1170 cf::override;
… …
1319 1325
1320 aio_mkdir playerdir $pl, 0770; 1326 aio_mkdir playerdir $pl, 0770;
1321 $pl->{last_save} = $cf::RUNTIME; 1327 $pl->{last_save} = $cf::RUNTIME;
1322 1328
1323 $pl->save_pl ($path); 1329 $pl->save_pl ($path);
1324 Coro::cede; 1330 cf::cede_to_tick;
1325} 1331}
1326 1332
1327sub new($) { 1333sub new($) {
1328 my ($login) = @_; 1334 my ($login) = @_;
1329 1335
… …
1457sub expand_cfpod { 1463sub expand_cfpod {
1458 ((my $self), (local $_)) = @_; 1464 ((my $self), (local $_)) = @_;
1459 1465
1460 # escape & and < 1466 # escape & and <
1461 s/&/&amp;/g; 1467 s/&/&amp;/g;
1462 s/(?<![BIUGH])</&lt;/g; 1468 s/(?<![BIUGHT])</&lt;/g;
1463 1469
1464 # this is buggy, it needs to properly take care of nested <'s 1470 # this is buggy, it needs to properly take care of nested <'s
1465 1471
1466 1 while 1472 1 while
1467 # replace B<>, I<>, U<> etc. 1473 # replace B<>, I<>, U<> etc.
1468 s/B<([^\>]*)>/<b>$1<\/b>/ 1474 s/B<([^\>]*)>/<b>$1<\/b>/
1469 || s/I<([^\>]*)>/<i>$1<\/i>/ 1475 || s/I<([^\>]*)>/<i>$1<\/i>/
1470 || s/U<([^\>]*)>/<u>$1<\/u>/ 1476 || s/U<([^\>]*)>/<u>$1<\/u>/
1477 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1471 # replace G<male|female> tags 1478 # replace G<male|female> tags
1472 || s{G<([^>|]*)\|([^>]*)>}{ 1479 || s{G<([^>|]*)\|([^>]*)>}{
1473 $self->gender ? $2 : $1 1480 $self->gender ? $2 : $1
1474 }ge 1481 }ge
1475 # replace H<hint text> 1482 # replace H<hint text>
… …
1846 local $self->{deny_reset} = 1; # loading can take a long time 1853 local $self->{deny_reset} = 1; # loading can take a long time
1847 1854
1848 my $path = $self->{path}; 1855 my $path = $self->{path};
1849 1856
1850 { 1857 {
1858 my $guard1 = cf::lock_acquire "map_data:$path";
1851 my $guard = cf::lock_acquire "map_load:$path"; 1859 my $guard2 = cf::lock_acquire "map_load:$path";
1852 1860
1853 return if $self->in_memory != cf::MAP_SWAPPED; 1861 return if $self->in_memory != cf::MAP_SWAPPED;
1854 1862
1855 $self->in_memory (cf::MAP_LOADING); 1863 $self->in_memory (cf::MAP_LOADING);
1856 1864
1857 $self->alloc; 1865 $self->alloc;
1858 1866
1859 $self->pre_load; 1867 $self->pre_load;
1860 Coro::cede; 1868 cf::cede_to_tick;
1861 1869
1862 $self->_load_objects ($self->{load_path}, 1) 1870 $self->_load_objects ($self->{load_path}, 1)
1863 or return; 1871 or return;
1864 1872
1865 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1873 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
… …
1871 $self->clear_unique_items; 1879 $self->clear_unique_items;
1872 $self->_load_objects ($uniq, 0); 1880 $self->_load_objects ($uniq, 0);
1873 } 1881 }
1874 } 1882 }
1875 1883
1876 Coro::cede; 1884 cf::cede_to_tick;
1877 # now do the right thing for maps 1885 # now do the right thing for maps
1878 $self->link_multipart_objects; 1886 $self->link_multipart_objects;
1879 $self->difficulty ($self->estimate_difficulty) 1887 $self->difficulty ($self->estimate_difficulty)
1880 unless $self->difficulty; 1888 unless $self->difficulty;
1881 Coro::cede; 1889 cf::cede_to_tick;
1882 1890
1883 unless ($self->{deny_activate}) { 1891 unless ($self->{deny_activate}) {
1884 $self->decay_objects; 1892 $self->decay_objects;
1885 $self->fix_auto_apply; 1893 $self->fix_auto_apply;
1886 $self->update_buttons; 1894 $self->update_buttons;
1887 Coro::cede; 1895 cf::cede_to_tick;
1888 $self->set_darkness_map; 1896 $self->set_darkness_map;
1889 Coro::cede; 1897 cf::cede_to_tick;
1890 $self->activate; 1898 $self->activate;
1891 } 1899 }
1892 1900
1893 $self->{last_save} = $cf::RUNTIME; 1901 $self->{last_save} = $cf::RUNTIME;
1894 $self->last_access ($cf::RUNTIME); 1902 $self->last_access ($cf::RUNTIME);
… …
1944} 1952}
1945 1953
1946sub do_load_sync { 1954sub do_load_sync {
1947 my ($map) = @_; 1955 my ($map) = @_;
1948 1956
1957 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1958 if $Coro::current == $Coro::main;
1959
1949 cf::sync_job { $map->load }; 1960 cf::sync_job { $map->load };
1950} 1961}
1951 1962
1952our %MAP_PREFETCH; 1963our %MAP_PREFETCH;
1953our $MAP_PREFETCHER = undef; 1964our $MAP_PREFETCHER = undef;
1954 1965
1955sub find_async { 1966sub find_async {
1956 my ($path, $origin) = @_; 1967 my ($path, $origin, $load) = @_;
1957 1968
1958 $path = normalise $path, $origin && $origin->{path}; 1969 $path = normalise $path, $origin && $origin->{path};
1959 1970
1960 if (my $map = $cf::MAP{$path}) { 1971 if (my $map = $cf::MAP{$path}) {
1961 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1972 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1962 } 1973 }
1963 1974
1964 undef $MAP_PREFETCH{$path}; 1975 $MAP_PREFETCH{$path} |= $load;
1976
1965 $MAP_PREFETCHER ||= cf::async { 1977 $MAP_PREFETCHER ||= cf::async {
1966 while (%MAP_PREFETCH) { 1978 while (%MAP_PREFETCH) {
1967 for my $path (keys %MAP_PREFETCH) { 1979 while (my ($k, $v) = each %MAP_PREFETCH) {
1968 if (my $map = find $path) { 1980 if (my $map = find $k) {
1969 $map->load; 1981 $map->load if $v;
1970 } 1982 }
1971 1983
1972 delete $MAP_PREFETCH{$path}; 1984 delete $MAP_PREFETCH{$k};
1973 } 1985 }
1974 } 1986 }
1975 undef $MAP_PREFETCHER; 1987 undef $MAP_PREFETCHER;
1976 }; 1988 };
1977 $MAP_PREFETCHER->prio (6); 1989 $MAP_PREFETCHER->prio (6);
… …
1980} 1992}
1981 1993
1982sub save { 1994sub save {
1983 my ($self) = @_; 1995 my ($self) = @_;
1984 1996
1985 my $lock = cf::lock_acquire "map_data:" . $self->path; 1997 my $lock = cf::lock_acquire "map_data:$self->{path}";
1986 1998
1987 $self->{last_save} = $cf::RUNTIME; 1999 $self->{last_save} = $cf::RUNTIME;
1988 2000
1989 return unless $self->dirty; 2001 return unless $self->dirty;
1990 2002
… …
2013 my ($self) = @_; 2025 my ($self) = @_;
2014 2026
2015 # save first because save cedes 2027 # save first because save cedes
2016 $self->save; 2028 $self->save;
2017 2029
2018 my $lock = cf::lock_acquire "map_data:" . $self->path; 2030 my $lock = cf::lock_acquire "map_data:$self->{path}";
2019 2031
2020 return if $self->players; 2032 return if $self->players;
2021 return if $self->in_memory != cf::MAP_IN_MEMORY; 2033 return if $self->in_memory != cf::MAP_IN_MEMORY;
2022 return if $self->{deny_save}; 2034 return if $self->{deny_save};
2023 2035
… …
2075my $nuke_counter = "aaaa"; 2087my $nuke_counter = "aaaa";
2076 2088
2077sub nuke { 2089sub nuke {
2078 my ($self) = @_; 2090 my ($self) = @_;
2079 2091
2092 {
2093 my $lock = cf::lock_acquire "map_data:$self->{path}";
2094
2080 delete $cf::MAP{$self->path}; 2095 delete $cf::MAP{$self->path};
2081 2096
2082 $self->unlink_save; 2097 $self->unlink_save;
2083 2098
2084 bless $self, "cf::map"; 2099 bless $self, "cf::map";
2085 delete $self->{deny_reset}; 2100 delete $self->{deny_reset};
2086 $self->{deny_save} = 1; 2101 $self->{deny_save} = 1;
2087 $self->reset_timeout (1); 2102 $self->reset_timeout (1);
2088 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2103 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2089 2104
2090 $cf::MAP{$self->path} = $self; 2105 $cf::MAP{$self->path} = $self;
2106 }
2091 2107
2092 $self->reset; # polite request, might not happen 2108 $self->reset; # polite request, might not happen
2093} 2109}
2094 2110
2095=item $maps = cf::map::tmp_maps 2111=item $maps = cf::map::tmp_maps
… …
2489the message, with C<log> being the default. If C<$color> is negative, suppress 2505the message, with C<log> being the default. If C<$color> is negative, suppress
2490the message unless the client supports the msg packet. 2506the message unless the client supports the msg packet.
2491 2507
2492=cut 2508=cut
2493 2509
2510our %CHANNEL = (
2511 "c/identify" => {
2512 id => "identify",
2513 title => "Identify",
2514 reply => undef,
2515 tooltip => "Items recently identified",
2516 },
2517 "c/examine" => {
2518 id => "examine",
2519 title => "Examine",
2520 reply => undef,
2521 tooltip => "Signs and other items you examined",
2522 },
2523);
2524
2494sub cf::client::send_msg { 2525sub cf::client::send_msg {
2495 my ($self, $channel, $msg, $color, @extra) = @_; 2526 my ($self, $channel, $msg, $color, @extra) = @_;
2496 2527
2497 $msg = $self->pl->expand_cfpod ($msg); 2528 $msg = $self->pl->expand_cfpod ($msg);
2498 2529
2499 $color &= cf::NDI_CLIENT_MASK; # just in case... 2530 $color &= cf::NDI_CLIENT_MASK; # just in case...
2531
2532 # check predefined channels, for the benefit of C
2533 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2500 2534
2501 if (ref $channel) { 2535 if (ref $channel) {
2502 # send meta info to client, if not yet sent 2536 # send meta info to client, if not yet sent
2503 unless (exists $self->{channel}{$channel->{id}}) { 2537 unless (exists $self->{channel}{$channel->{id}}) {
2504 $self->{channel}{$channel->{id}} = $channel; 2538 $self->{channel}{$channel->{id}} = $channel;
2505 $self->ext_msg (channel_info => $channel); 2539 $self->ext_msg (channel_info => $channel)
2540 if $self->can_msg;
2506 } 2541 }
2507 2542
2508 $channel = $channel->{id}; 2543 $channel = $channel->{id};
2509 } 2544 }
2510 2545
… …
2551=cut 2586=cut
2552 2587
2553sub cf::client::ext_msg($$@) { 2588sub cf::client::ext_msg($$@) {
2554 my ($self, $type, @msg) = @_; 2589 my ($self, $type, @msg) = @_;
2555 2590
2556 my $extcmd = $self->extcmd;
2557
2558 if ($extcmd == 2) { 2591 if ($self->extcmd == 2) {
2559 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2592 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2560 } elsif ($extcmd == 1) { # TODO: remove 2593 } elsif ($self->extcmd == 1) { # TODO: remove
2561 push @msg, msgtype => "event_$type"; 2594 push @msg, msgtype => "event_$type";
2562 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2595 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2563 } 2596 }
2564} 2597}
2565 2598
… …
2572sub cf::client::ext_reply($$@) { 2605sub cf::client::ext_reply($$@) {
2573 my ($self, $id, @msg) = @_; 2606 my ($self, $id, @msg) = @_;
2574 2607
2575 if ($self->extcmd == 2) { 2608 if ($self->extcmd == 2) {
2576 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 2609 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2577 } elsif ($self->ns->extcmd == 1) { 2610 } elsif ($self->extcmd == 1) {
2578 #TODO: version 1, remove 2611 #TODO: version 1, remove
2579 unshift @msg, msgtype => "reply", msgid => $id; 2612 unshift @msg, msgtype => "reply", msgid => $id;
2580 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2613 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2581 } 2614 }
2582} 2615}
… …
2646 my ($type, $reply, @payload) = 2679 my ($type, $reply, @payload) =
2647 "ARRAY" eq ref $msg 2680 "ARRAY" eq ref $msg
2648 ? @$msg 2681 ? @$msg
2649 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 2682 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2650 2683
2684 my @reply;
2685
2651 if (my $cb = $EXTICMD{$type}) { 2686 if (my $cb = $EXTICMD{$type}) {
2652 my @reply = $cb->($ns, @payload); 2687 @reply = $cb->($ns, @payload);
2653
2654 $ns->ext_reply ($reply, @reply)
2655 if $reply;
2656 } 2688 }
2689
2690 $ns->ext_reply ($reply, @reply)
2691 if $reply;
2692
2657 } else { 2693 } else {
2658 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2694 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2659 } 2695 }
2660 2696
2661 cf::override; 2697 cf::override;
… …
2722 2758
2723The following functions and methods are available within a safe environment: 2759The following functions and methods are available within a safe environment:
2724 2760
2725 cf::object 2761 cf::object
2726 contr pay_amount pay_player map x y force_find force_add 2762 contr pay_amount pay_player map x y force_find force_add
2727 insert remove name archname title slaying race 2763 insert remove name archname title slaying race decrease_ob_nr
2728 2764
2729 cf::object::player 2765 cf::object::player
2730 player 2766 player
2731 2767
2732 cf::player 2768 cf::player
… …
2737 2773
2738=cut 2774=cut
2739 2775
2740for ( 2776for (
2741 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2777 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2742 insert remove inv name archname title slaying race)], 2778 insert remove inv name archname title slaying race
2779 decrease_ob_nr)],
2743 ["cf::object::player" => qw(player)], 2780 ["cf::object::player" => qw(player)],
2744 ["cf::player" => qw(peaceful)], 2781 ["cf::player" => qw(peaceful)],
2745 ["cf::map" => qw(trigger)], 2782 ["cf::map" => qw(trigger)],
2746) { 2783) {
2747 no strict 'refs'; 2784 no strict 'refs';
… …
2823# the server's init and main functions 2860# the server's init and main functions
2824 2861
2825sub load_facedata($) { 2862sub load_facedata($) {
2826 my ($path) = @_; 2863 my ($path) = @_;
2827 2864
2865 # HACK to clear player env face cache, we need some signal framework
2866 # for this (global event?)
2867 %ext::player_env::MUSIC_FACE_CACHE = ();
2868
2828 my $enc = JSON::XS->new->utf8->canonical; 2869 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2829 2870
2830 warn "loading facedata from $path\n"; 2871 warn "loading facedata from $path\n";
2831 2872
2832 my $facedata; 2873 my $facedata;
2833 0 < aio_load $path, $facedata 2874 0 < aio_load $path, $facedata
… …
2943 $ns->fx_want ($k, $v); 2984 $ns->fx_want ($k, $v);
2944 } 2985 }
2945}; 2986};
2946 2987
2947sub reload_regions { 2988sub reload_regions {
2989 # HACK to clear player env face cache, we need some signal framework
2990 # for this (global event?)
2991 %ext::player_env::MUSIC_FACE_CACHE = ();
2992
2948 load_resource_file "$MAPDIR/regions" 2993 load_resource_file "$MAPDIR/regions"
2949 or die "unable to load regions file\n"; 2994 or die "unable to load regions file\n";
2950 2995
2951 for (cf::region::list) { 2996 for (cf::region::list) {
2952 $_->{match} = qr/$_->{match}/ 2997 $_->{match} = qr/$_->{match}/
… …
2988 3033
2989sub init { 3034sub init {
2990 reload_resources; 3035 reload_resources;
2991} 3036}
2992 3037
2993sub cfg_load { 3038sub reload_config {
2994 open my $fh, "<:utf8", "$CONFDIR/config" 3039 open my $fh, "<:utf8", "$CONFDIR/config"
2995 or return; 3040 or return;
2996 3041
2997 local $/; 3042 local $/;
2998 *CFG = YAML::Syck::Load <$fh>; 3043 *CFG = YAML::Syck::Load <$fh>;
… …
3018 (async { 3063 (async {
3019 Event::one_event; 3064 Event::one_event;
3020 })->prio (Coro::PRIO_MAX); 3065 })->prio (Coro::PRIO_MAX);
3021 }; 3066 };
3022 3067
3023 cfg_load; 3068 reload_config;
3024 db_init; 3069 db_init;
3025 load_extensions; 3070 load_extensions;
3026 3071
3027 $TICK_WATCHER->start; 3072 $TICK_WATCHER->start;
3028 Event::loop; 3073 Event::loop;
… …
3221 warn "reloading cf.pm"; 3266 warn "reloading cf.pm";
3222 require cf; 3267 require cf;
3223 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3268 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3224 3269
3225 warn "loading config and database again"; 3270 warn "loading config and database again";
3226 cf::cfg_load; 3271 cf::reload_config;
3227 3272
3228 warn "loading extensions"; 3273 warn "loading extensions";
3229 cf::load_extensions; 3274 cf::load_extensions;
3230 3275
3231 warn "reattaching attachments to objects/players"; 3276 warn "reattaching attachments to objects/players";

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines