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.338 by root, Tue Aug 21 01:07:47 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";
… …
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
1330sub new($) { 1333sub new($) {
1331 my ($login) = @_; 1334 my ($login) = @_;
1332 1335
… …
1460sub expand_cfpod { 1463sub expand_cfpod {
1461 ((my $self), (local $_)) = @_; 1464 ((my $self), (local $_)) = @_;
1462 1465
1463 # escape & and < 1466 # escape & and <
1464 s/&/&amp;/g; 1467 s/&/&amp;/g;
1465 s/(?<![BIUGH])</&lt;/g; 1468 s/(?<![BIUGHT])</&lt;/g;
1466 1469
1467 # 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
1468 1471
1469 1 while 1472 1 while
1470 # replace B<>, I<>, U<> etc. 1473 # replace B<>, I<>, U<> etc.
1471 s/B<([^\>]*)>/<b>$1<\/b>/ 1474 s/B<([^\>]*)>/<b>$1<\/b>/
1472 || s/I<([^\>]*)>/<i>$1<\/i>/ 1475 || s/I<([^\>]*)>/<i>$1<\/i>/
1473 || s/U<([^\>]*)>/<u>$1<\/u>/ 1476 || s/U<([^\>]*)>/<u>$1<\/u>/
1477 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1474 # replace G<male|female> tags 1478 # replace G<male|female> tags
1475 || s{G<([^>|]*)\|([^>]*)>}{ 1479 || s{G<([^>|]*)\|([^>]*)>}{
1476 $self->gender ? $2 : $1 1480 $self->gender ? $2 : $1
1477 }ge 1481 }ge
1478 # replace H<hint text> 1482 # replace H<hint text>
… …
1849 local $self->{deny_reset} = 1; # loading can take a long time 1853 local $self->{deny_reset} = 1; # loading can take a long time
1850 1854
1851 my $path = $self->{path}; 1855 my $path = $self->{path};
1852 1856
1853 { 1857 {
1858 my $guard1 = cf::lock_acquire "map_data:$path";
1854 my $guard = cf::lock_acquire "map_load:$path"; 1859 my $guard2 = cf::lock_acquire "map_load:$path";
1855 1860
1856 return if $self->in_memory != cf::MAP_SWAPPED; 1861 return if $self->in_memory != cf::MAP_SWAPPED;
1857 1862
1858 $self->in_memory (cf::MAP_LOADING); 1863 $self->in_memory (cf::MAP_LOADING);
1859 1864
1860 $self->alloc; 1865 $self->alloc;
1861 1866
1862 $self->pre_load; 1867 $self->pre_load;
1863 Coro::cede; 1868 cf::cede_to_tick;
1864 1869
1865 $self->_load_objects ($self->{load_path}, 1) 1870 $self->_load_objects ($self->{load_path}, 1)
1866 or return; 1871 or return;
1867 1872
1868 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1873 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
… …
1874 $self->clear_unique_items; 1879 $self->clear_unique_items;
1875 $self->_load_objects ($uniq, 0); 1880 $self->_load_objects ($uniq, 0);
1876 } 1881 }
1877 } 1882 }
1878 1883
1879 Coro::cede; 1884 cf::cede_to_tick;
1880 # now do the right thing for maps 1885 # now do the right thing for maps
1881 $self->link_multipart_objects; 1886 $self->link_multipart_objects;
1882 $self->difficulty ($self->estimate_difficulty) 1887 $self->difficulty ($self->estimate_difficulty)
1883 unless $self->difficulty; 1888 unless $self->difficulty;
1884 Coro::cede; 1889 cf::cede_to_tick;
1885 1890
1886 unless ($self->{deny_activate}) { 1891 unless ($self->{deny_activate}) {
1887 $self->decay_objects; 1892 $self->decay_objects;
1888 $self->fix_auto_apply; 1893 $self->fix_auto_apply;
1889 $self->update_buttons; 1894 $self->update_buttons;
1890 Coro::cede; 1895 cf::cede_to_tick;
1891 $self->set_darkness_map; 1896 $self->set_darkness_map;
1892 Coro::cede; 1897 cf::cede_to_tick;
1893 $self->activate; 1898 $self->activate;
1894 } 1899 }
1895 1900
1896 $self->{last_save} = $cf::RUNTIME; 1901 $self->{last_save} = $cf::RUNTIME;
1897 $self->last_access ($cf::RUNTIME); 1902 $self->last_access ($cf::RUNTIME);
… …
1947} 1952}
1948 1953
1949sub do_load_sync { 1954sub do_load_sync {
1950 my ($map) = @_; 1955 my ($map) = @_;
1951 1956
1957 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1958 if $Coro::current == $Coro::main;
1959
1952 cf::sync_job { $map->load }; 1960 cf::sync_job { $map->load };
1953} 1961}
1954 1962
1955our %MAP_PREFETCH; 1963our %MAP_PREFETCH;
1956our $MAP_PREFETCHER = undef; 1964our $MAP_PREFETCHER = undef;
1957 1965
1958sub find_async { 1966sub find_async {
1959 my ($path, $origin) = @_; 1967 my ($path, $origin, $load) = @_;
1960 1968
1961 $path = normalise $path, $origin && $origin->{path}; 1969 $path = normalise $path, $origin && $origin->{path};
1962 1970
1963 if (my $map = $cf::MAP{$path}) { 1971 if (my $map = $cf::MAP{$path}) {
1964 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1972 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1965 } 1973 }
1966 1974
1967 undef $MAP_PREFETCH{$path}; 1975 $MAP_PREFETCH{$path} |= $load;
1976
1968 $MAP_PREFETCHER ||= cf::async { 1977 $MAP_PREFETCHER ||= cf::async {
1969 while (%MAP_PREFETCH) { 1978 while (%MAP_PREFETCH) {
1970 for my $path (keys %MAP_PREFETCH) { 1979 while (my ($k, $v) = each %MAP_PREFETCH) {
1971 if (my $map = find $path) { 1980 if (my $map = find $k) {
1972 $map->load; 1981 $map->load if $v;
1973 } 1982 }
1974 1983
1975 delete $MAP_PREFETCH{$path}; 1984 delete $MAP_PREFETCH{$k};
1976 } 1985 }
1977 } 1986 }
1978 undef $MAP_PREFETCHER; 1987 undef $MAP_PREFETCHER;
1979 }; 1988 };
1980 $MAP_PREFETCHER->prio (6); 1989 $MAP_PREFETCHER->prio (6);
… …
1983} 1992}
1984 1993
1985sub save { 1994sub save {
1986 my ($self) = @_; 1995 my ($self) = @_;
1987 1996
1988 my $lock = cf::lock_acquire "map_data:" . $self->path; 1997 my $lock = cf::lock_acquire "map_data:$self->{path}";
1989 1998
1990 $self->{last_save} = $cf::RUNTIME; 1999 $self->{last_save} = $cf::RUNTIME;
1991 2000
1992 return unless $self->dirty; 2001 return unless $self->dirty;
1993 2002
… …
2016 my ($self) = @_; 2025 my ($self) = @_;
2017 2026
2018 # save first because save cedes 2027 # save first because save cedes
2019 $self->save; 2028 $self->save;
2020 2029
2021 my $lock = cf::lock_acquire "map_data:" . $self->path; 2030 my $lock = cf::lock_acquire "map_data:$self->{path}";
2022 2031
2023 return if $self->players; 2032 return if $self->players;
2024 return if $self->in_memory != cf::MAP_IN_MEMORY; 2033 return if $self->in_memory != cf::MAP_IN_MEMORY;
2025 return if $self->{deny_save}; 2034 return if $self->{deny_save};
2026 2035
… …
2078my $nuke_counter = "aaaa"; 2087my $nuke_counter = "aaaa";
2079 2088
2080sub nuke { 2089sub nuke {
2081 my ($self) = @_; 2090 my ($self) = @_;
2082 2091
2092 {
2093 my $lock = cf::lock_acquire "map_data:$self->{path}";
2094
2083 delete $cf::MAP{$self->path}; 2095 delete $cf::MAP{$self->path};
2084 2096
2085 $self->unlink_save; 2097 $self->unlink_save;
2086 2098
2087 bless $self, "cf::map"; 2099 bless $self, "cf::map";
2088 delete $self->{deny_reset}; 2100 delete $self->{deny_reset};
2089 $self->{deny_save} = 1; 2101 $self->{deny_save} = 1;
2090 $self->reset_timeout (1); 2102 $self->reset_timeout (1);
2091 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2103 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2092 2104
2093 $cf::MAP{$self->path} = $self; 2105 $cf::MAP{$self->path} = $self;
2106 }
2094 2107
2095 $self->reset; # polite request, might not happen 2108 $self->reset; # polite request, might not happen
2096} 2109}
2097 2110
2098=item $maps = cf::map::tmp_maps 2111=item $maps = cf::map::tmp_maps
… …
2492the 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
2493the message unless the client supports the msg packet. 2506the message unless the client supports the msg packet.
2494 2507
2495=cut 2508=cut
2496 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
2497sub cf::client::send_msg { 2525sub cf::client::send_msg {
2498 my ($self, $channel, $msg, $color, @extra) = @_; 2526 my ($self, $channel, $msg, $color, @extra) = @_;
2499 2527
2500 $msg = $self->pl->expand_cfpod ($msg); 2528 $msg = $self->pl->expand_cfpod ($msg);
2501 2529
2502 $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};
2503 2534
2504 if (ref $channel) { 2535 if (ref $channel) {
2505 # send meta info to client, if not yet sent 2536 # send meta info to client, if not yet sent
2506 unless (exists $self->{channel}{$channel->{id}}) { 2537 unless (exists $self->{channel}{$channel->{id}}) {
2507 $self->{channel}{$channel->{id}} = $channel; 2538 $self->{channel}{$channel->{id}} = $channel;
2508 $self->ext_msg (channel_info => $channel); 2539 $self->ext_msg (channel_info => $channel)
2540 if $self->can_msg;
2509 } 2541 }
2510 2542
2511 $channel = $channel->{id}; 2543 $channel = $channel->{id};
2512 } 2544 }
2513 2545
… …
2554=cut 2586=cut
2555 2587
2556sub cf::client::ext_msg($$@) { 2588sub cf::client::ext_msg($$@) {
2557 my ($self, $type, @msg) = @_; 2589 my ($self, $type, @msg) = @_;
2558 2590
2559 my $extcmd = $self->extcmd;
2560
2561 if ($extcmd == 2) { 2591 if ($self->extcmd == 2) {
2562 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2592 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2563 } elsif ($extcmd == 1) { # TODO: remove 2593 } elsif ($self->extcmd == 1) { # TODO: remove
2564 push @msg, msgtype => "event_$type"; 2594 push @msg, msgtype => "event_$type";
2565 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2595 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2566 } 2596 }
2567} 2597}
2568 2598
… …
2575sub cf::client::ext_reply($$@) { 2605sub cf::client::ext_reply($$@) {
2576 my ($self, $id, @msg) = @_; 2606 my ($self, $id, @msg) = @_;
2577 2607
2578 if ($self->extcmd == 2) { 2608 if ($self->extcmd == 2) {
2579 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 2609 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2580 } elsif ($self->ns->extcmd == 1) { 2610 } elsif ($self->extcmd == 1) {
2581 #TODO: version 1, remove 2611 #TODO: version 1, remove
2582 unshift @msg, msgtype => "reply", msgid => $id; 2612 unshift @msg, msgtype => "reply", msgid => $id;
2583 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2613 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2584 } 2614 }
2585} 2615}
… …
2728 2758
2729The following functions and methods are available within a safe environment: 2759The following functions and methods are available within a safe environment:
2730 2760
2731 cf::object 2761 cf::object
2732 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
2733 insert remove name archname title slaying race 2763 insert remove name archname title slaying race decrease_ob_nr
2734 2764
2735 cf::object::player 2765 cf::object::player
2736 player 2766 player
2737 2767
2738 cf::player 2768 cf::player
… …
2743 2773
2744=cut 2774=cut
2745 2775
2746for ( 2776for (
2747 ["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
2748 insert remove inv name archname title slaying race)], 2778 insert remove inv name archname title slaying race
2779 decrease_ob_nr)],
2749 ["cf::object::player" => qw(player)], 2780 ["cf::object::player" => qw(player)],
2750 ["cf::player" => qw(peaceful)], 2781 ["cf::player" => qw(peaceful)],
2751 ["cf::map" => qw(trigger)], 2782 ["cf::map" => qw(trigger)],
2752) { 2783) {
2753 no strict 'refs'; 2784 no strict 'refs';
… …
2829# the server's init and main functions 2860# the server's init and main functions
2830 2861
2831sub load_facedata($) { 2862sub load_facedata($) {
2832 my ($path) = @_; 2863 my ($path) = @_;
2833 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
2834 my $enc = JSON::XS->new->utf8->canonical; 2869 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2835 2870
2836 warn "loading facedata from $path\n"; 2871 warn "loading facedata from $path\n";
2837 2872
2838 my $facedata; 2873 my $facedata;
2839 0 < aio_load $path, $facedata 2874 0 < aio_load $path, $facedata
… …
2949 $ns->fx_want ($k, $v); 2984 $ns->fx_want ($k, $v);
2950 } 2985 }
2951}; 2986};
2952 2987
2953sub 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
2954 load_resource_file "$MAPDIR/regions" 2993 load_resource_file "$MAPDIR/regions"
2955 or die "unable to load regions file\n"; 2994 or die "unable to load regions file\n";
2956 2995
2957 for (cf::region::list) { 2996 for (cf::region::list) {
2958 $_->{match} = qr/$_->{match}/ 2997 $_->{match} = qr/$_->{match}/
… …
2994 3033
2995sub init { 3034sub init {
2996 reload_resources; 3035 reload_resources;
2997} 3036}
2998 3037
2999sub cfg_load { 3038sub reload_config {
3000 open my $fh, "<:utf8", "$CONFDIR/config" 3039 open my $fh, "<:utf8", "$CONFDIR/config"
3001 or return; 3040 or return;
3002 3041
3003 local $/; 3042 local $/;
3004 *CFG = YAML::Syck::Load <$fh>; 3043 *CFG = YAML::Syck::Load <$fh>;
… …
3024 (async { 3063 (async {
3025 Event::one_event; 3064 Event::one_event;
3026 })->prio (Coro::PRIO_MAX); 3065 })->prio (Coro::PRIO_MAX);
3027 }; 3066 };
3028 3067
3029 cfg_load; 3068 reload_config;
3030 db_init; 3069 db_init;
3031 load_extensions; 3070 load_extensions;
3032 3071
3033 $TICK_WATCHER->start; 3072 $TICK_WATCHER->start;
3034 Event::loop; 3073 Event::loop;
… …
3227 warn "reloading cf.pm"; 3266 warn "reloading cf.pm";
3228 require cf; 3267 require cf;
3229 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3268 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3230 3269
3231 warn "loading config and database again"; 3270 warn "loading config and database again";
3232 cf::cfg_load; 3271 cf::reload_config;
3233 3272
3234 warn "loading extensions"; 3273 warn "loading extensions";
3235 cf::load_extensions; 3274 cf::load_extensions;
3236 3275
3237 warn "reattaching attachments to objects/players"; 3276 warn "reattaching attachments to objects/players";

Diff Legend

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