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.355 by root, Sun Sep 2 12:45:44 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
… …
478sub fork_call(&@) { 481sub fork_call(&@) {
479 my ($cb, @args) = @_; 482 my ($cb, @args) = @_;
480 483
481 # we seemingly have to make a local copy of the whole thing, 484 # we seemingly have to make a local copy of the whole thing,
482 # otherwise perl prematurely frees the stuff :/ 485 # otherwise perl prematurely frees the stuff :/
483 # TODO: investigate and fix (liekly this will be rather laborious) 486 # TODO: investigate and fix (likely this will be rather laborious)
484 487
485 my @res = Coro::Util::fork_eval { 488 my @res = Coro::Util::fork_eval {
486 reset_signals; 489 reset_signals;
487 &$cb 490 &$cb
488 }, @args; 491 }, @args;
… …
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
… …
1410 or return []; 1413 or return [];
1411 1414
1412 my @logins; 1415 my @logins;
1413 1416
1414 for my $login (@$dirs) { 1417 for my $login (@$dirs) {
1418 my $path = path $login;
1419
1420 # a .pst is a dead give-away for a valid player
1421 unless (-e "$path.pst") {
1415 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1422 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1416 aio_read $fh, 0, 512, my $buf, 0 or next; 1423 aio_read $fh, 0, 512, my $buf, 0 or next;
1417 $buf !~ /^password -------------$/m or next; # official not-valid tag 1424 $buf !~ /^password -------------$/m or next; # official not-valid tag
1425 }
1418 1426
1419 utf8::decode $login; 1427 utf8::decode $login;
1420 push @logins, $login; 1428 push @logins, $login;
1421 } 1429 }
1422 1430
… …
1460sub expand_cfpod { 1468sub expand_cfpod {
1461 ((my $self), (local $_)) = @_; 1469 ((my $self), (local $_)) = @_;
1462 1470
1463 # escape & and < 1471 # escape & and <
1464 s/&/&amp;/g; 1472 s/&/&amp;/g;
1465 s/(?<![BIUGH])</&lt;/g; 1473 s/(?<![BIUGHT])</&lt;/g;
1466 1474
1467 # this is buggy, it needs to properly take care of nested <'s 1475 # this is buggy, it needs to properly take care of nested <'s
1468 1476
1469 1 while 1477 1 while
1470 # replace B<>, I<>, U<> etc. 1478 # replace B<>, I<>, U<> etc.
1471 s/B<([^\>]*)>/<b>$1<\/b>/ 1479 s/B<([^\>]*)>/<b>$1<\/b>/
1472 || s/I<([^\>]*)>/<i>$1<\/i>/ 1480 || s/I<([^\>]*)>/<i>$1<\/i>/
1473 || s/U<([^\>]*)>/<u>$1<\/u>/ 1481 || s/U<([^\>]*)>/<u>$1<\/u>/
1482 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1474 # replace G<male|female> tags 1483 # replace G<male|female> tags
1475 || s{G<([^>|]*)\|([^>]*)>}{ 1484 || s{G<([^>|]*)\|([^>]*)>}{
1476 $self->gender ? $2 : $1 1485 $self->gender ? $2 : $1
1477 }ge 1486 }ge
1478 # replace H<hint text> 1487 # replace H<hint text>
… …
1849 local $self->{deny_reset} = 1; # loading can take a long time 1858 local $self->{deny_reset} = 1; # loading can take a long time
1850 1859
1851 my $path = $self->{path}; 1860 my $path = $self->{path};
1852 1861
1853 { 1862 {
1863 my $guard1 = cf::lock_acquire "map_data:$path";
1854 my $guard = cf::lock_acquire "map_load:$path"; 1864 my $guard2 = cf::lock_acquire "map_load:$path";
1855 1865
1856 return if $self->in_memory != cf::MAP_SWAPPED; 1866 return if $self->in_memory != cf::MAP_SWAPPED;
1857 1867
1858 $self->in_memory (cf::MAP_LOADING); 1868 $self->in_memory (cf::MAP_LOADING);
1859 1869
1860 $self->alloc; 1870 $self->alloc;
1861 1871
1862 $self->pre_load; 1872 $self->pre_load;
1863 Coro::cede; 1873 cf::cede_to_tick;
1864 1874
1865 $self->_load_objects ($self->{load_path}, 1) 1875 $self->_load_objects ($self->{load_path}, 1)
1866 or return; 1876 or return;
1867 1877
1868 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1878 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
… …
1874 $self->clear_unique_items; 1884 $self->clear_unique_items;
1875 $self->_load_objects ($uniq, 0); 1885 $self->_load_objects ($uniq, 0);
1876 } 1886 }
1877 } 1887 }
1878 1888
1879 Coro::cede; 1889 cf::cede_to_tick;
1880 # now do the right thing for maps 1890 # now do the right thing for maps
1881 $self->link_multipart_objects; 1891 $self->link_multipart_objects;
1882 $self->difficulty ($self->estimate_difficulty) 1892 $self->difficulty ($self->estimate_difficulty)
1883 unless $self->difficulty; 1893 unless $self->difficulty;
1884 Coro::cede; 1894 cf::cede_to_tick;
1885 1895
1886 unless ($self->{deny_activate}) { 1896 unless ($self->{deny_activate}) {
1887 $self->decay_objects; 1897 $self->decay_objects;
1888 $self->fix_auto_apply; 1898 $self->fix_auto_apply;
1889 $self->update_buttons; 1899 $self->update_buttons;
1890 Coro::cede; 1900 cf::cede_to_tick;
1891 $self->set_darkness_map; 1901 $self->set_darkness_map;
1892 Coro::cede; 1902 cf::cede_to_tick;
1893 $self->activate; 1903 $self->activate;
1894 } 1904 }
1895 1905
1896 $self->{last_save} = $cf::RUNTIME; 1906 $self->{last_save} = $cf::RUNTIME;
1897 $self->last_access ($cf::RUNTIME); 1907 $self->last_access ($cf::RUNTIME);
… …
1947} 1957}
1948 1958
1949sub do_load_sync { 1959sub do_load_sync {
1950 my ($map) = @_; 1960 my ($map) = @_;
1951 1961
1962 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1963 if $Coro::current == $Coro::main;
1964
1952 cf::sync_job { $map->load }; 1965 cf::sync_job { $map->load };
1953} 1966}
1954 1967
1955our %MAP_PREFETCH; 1968our %MAP_PREFETCH;
1956our $MAP_PREFETCHER = undef; 1969our $MAP_PREFETCHER = undef;
1957 1970
1958sub find_async { 1971sub find_async {
1959 my ($path, $origin) = @_; 1972 my ($path, $origin, $load) = @_;
1960 1973
1961 $path = normalise $path, $origin && $origin->{path}; 1974 $path = normalise $path, $origin && $origin->{path};
1962 1975
1963 if (my $map = $cf::MAP{$path}) { 1976 if (my $map = $cf::MAP{$path}) {
1964 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1977 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1965 } 1978 }
1966 1979
1967 undef $MAP_PREFETCH{$path}; 1980 $MAP_PREFETCH{$path} |= $load;
1981
1968 $MAP_PREFETCHER ||= cf::async { 1982 $MAP_PREFETCHER ||= cf::async {
1969 while (%MAP_PREFETCH) { 1983 while (%MAP_PREFETCH) {
1970 for my $path (keys %MAP_PREFETCH) { 1984 while (my ($k, $v) = each %MAP_PREFETCH) {
1971 if (my $map = find $path) { 1985 if (my $map = find $k) {
1972 $map->load; 1986 $map->load if $v;
1973 } 1987 }
1974 1988
1975 delete $MAP_PREFETCH{$path}; 1989 delete $MAP_PREFETCH{$k};
1976 } 1990 }
1977 } 1991 }
1978 undef $MAP_PREFETCHER; 1992 undef $MAP_PREFETCHER;
1979 }; 1993 };
1980 $MAP_PREFETCHER->prio (6); 1994 $MAP_PREFETCHER->prio (6);
… …
1983} 1997}
1984 1998
1985sub save { 1999sub save {
1986 my ($self) = @_; 2000 my ($self) = @_;
1987 2001
1988 my $lock = cf::lock_acquire "map_data:" . $self->path; 2002 my $lock = cf::lock_acquire "map_data:$self->{path}";
1989 2003
1990 $self->{last_save} = $cf::RUNTIME; 2004 $self->{last_save} = $cf::RUNTIME;
1991 2005
1992 return unless $self->dirty; 2006 return unless $self->dirty;
1993 2007
… …
2016 my ($self) = @_; 2030 my ($self) = @_;
2017 2031
2018 # save first because save cedes 2032 # save first because save cedes
2019 $self->save; 2033 $self->save;
2020 2034
2021 my $lock = cf::lock_acquire "map_data:" . $self->path; 2035 my $lock = cf::lock_acquire "map_data:$self->{path}";
2022 2036
2023 return if $self->players; 2037 return if $self->players;
2024 return if $self->in_memory != cf::MAP_IN_MEMORY; 2038 return if $self->in_memory != cf::MAP_IN_MEMORY;
2025 return if $self->{deny_save}; 2039 return if $self->{deny_save};
2026 2040
… …
2078my $nuke_counter = "aaaa"; 2092my $nuke_counter = "aaaa";
2079 2093
2080sub nuke { 2094sub nuke {
2081 my ($self) = @_; 2095 my ($self) = @_;
2082 2096
2097 {
2098 my $lock = cf::lock_acquire "map_data:$self->{path}";
2099
2083 delete $cf::MAP{$self->path}; 2100 delete $cf::MAP{$self->path};
2084 2101
2085 $self->unlink_save; 2102 $self->unlink_save;
2086 2103
2087 bless $self, "cf::map"; 2104 bless $self, "cf::map";
2088 delete $self->{deny_reset}; 2105 delete $self->{deny_reset};
2089 $self->{deny_save} = 1; 2106 $self->{deny_save} = 1;
2090 $self->reset_timeout (1); 2107 $self->reset_timeout (1);
2091 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2108 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2092 2109
2093 $cf::MAP{$self->path} = $self; 2110 $cf::MAP{$self->path} = $self;
2111 }
2094 2112
2095 $self->reset; # polite request, might not happen 2113 $self->reset; # polite request, might not happen
2096} 2114}
2097 2115
2098=item $maps = cf::map::tmp_maps 2116=item $maps = cf::map::tmp_maps
… …
2492the message, with C<log> being the default. If C<$color> is negative, suppress 2510the message, with C<log> being the default. If C<$color> is negative, suppress
2493the message unless the client supports the msg packet. 2511the message unless the client supports the msg packet.
2494 2512
2495=cut 2513=cut
2496 2514
2515our %CHANNEL = (
2516 "c/identify" => {
2517 id => "identify",
2518 title => "Identify",
2519 reply => undef,
2520 tooltip => "Items recently identified",
2521 },
2522 "c/examine" => {
2523 id => "examine",
2524 title => "Examine",
2525 reply => undef,
2526 tooltip => "Signs and other items you examined",
2527 },
2528);
2529
2497sub cf::client::send_msg { 2530sub cf::client::send_msg {
2498 my ($self, $channel, $msg, $color, @extra) = @_; 2531 my ($self, $channel, $msg, $color, @extra) = @_;
2499 2532
2500 $msg = $self->pl->expand_cfpod ($msg); 2533 $msg = $self->pl->expand_cfpod ($msg);
2501 2534
2502 $color &= cf::NDI_CLIENT_MASK; # just in case... 2535 $color &= cf::NDI_CLIENT_MASK; # just in case...
2536
2537 # check predefined channels, for the benefit of C
2538 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2503 2539
2504 if (ref $channel) { 2540 if (ref $channel) {
2505 # send meta info to client, if not yet sent 2541 # send meta info to client, if not yet sent
2506 unless (exists $self->{channel}{$channel->{id}}) { 2542 unless (exists $self->{channel}{$channel->{id}}) {
2507 $self->{channel}{$channel->{id}} = $channel; 2543 $self->{channel}{$channel->{id}} = $channel;
2508 $self->ext_msg (channel_info => $channel); 2544 $self->ext_msg (channel_info => $channel)
2545 if $self->can_msg;
2509 } 2546 }
2510 2547
2511 $channel = $channel->{id}; 2548 $channel = $channel->{id};
2512 } 2549 }
2513 2550
… …
2554=cut 2591=cut
2555 2592
2556sub cf::client::ext_msg($$@) { 2593sub cf::client::ext_msg($$@) {
2557 my ($self, $type, @msg) = @_; 2594 my ($self, $type, @msg) = @_;
2558 2595
2559 my $extcmd = $self->extcmd;
2560
2561 if ($extcmd == 2) { 2596 if ($self->extcmd == 2) {
2562 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2597 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2563 } elsif ($extcmd == 1) { # TODO: remove 2598 } elsif ($self->extcmd == 1) { # TODO: remove
2564 push @msg, msgtype => "event_$type"; 2599 push @msg, msgtype => "event_$type";
2565 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2600 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2566 } 2601 }
2567} 2602}
2568 2603
… …
2575sub cf::client::ext_reply($$@) { 2610sub cf::client::ext_reply($$@) {
2576 my ($self, $id, @msg) = @_; 2611 my ($self, $id, @msg) = @_;
2577 2612
2578 if ($self->extcmd == 2) { 2613 if ($self->extcmd == 2) {
2579 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 2614 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2580 } elsif ($self->ns->extcmd == 1) { 2615 } elsif ($self->extcmd == 1) {
2581 #TODO: version 1, remove 2616 #TODO: version 1, remove
2582 unshift @msg, msgtype => "reply", msgid => $id; 2617 unshift @msg, msgtype => "reply", msgid => $id;
2583 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2618 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2584 } 2619 }
2585} 2620}
… …
2728 2763
2729The following functions and methods are available within a safe environment: 2764The following functions and methods are available within a safe environment:
2730 2765
2731 cf::object 2766 cf::object
2732 contr pay_amount pay_player map x y force_find force_add 2767 contr pay_amount pay_player map x y force_find force_add
2733 insert remove name archname title slaying race 2768 insert remove name archname title slaying race decrease_ob_nr
2734 2769
2735 cf::object::player 2770 cf::object::player
2736 player 2771 player
2737 2772
2738 cf::player 2773 cf::player
… …
2743 2778
2744=cut 2779=cut
2745 2780
2746for ( 2781for (
2747 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2782 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2748 insert remove inv name archname title slaying race)], 2783 insert remove inv name archname title slaying race
2784 decrease_ob_nr)],
2749 ["cf::object::player" => qw(player)], 2785 ["cf::object::player" => qw(player)],
2750 ["cf::player" => qw(peaceful)], 2786 ["cf::player" => qw(peaceful)],
2751 ["cf::map" => qw(trigger)], 2787 ["cf::map" => qw(trigger)],
2752) { 2788) {
2753 no strict 'refs'; 2789 no strict 'refs';
… …
2829# the server's init and main functions 2865# the server's init and main functions
2830 2866
2831sub load_facedata($) { 2867sub load_facedata($) {
2832 my ($path) = @_; 2868 my ($path) = @_;
2833 2869
2870 # HACK to clear player env face cache, we need some signal framework
2871 # for this (global event?)
2872 %ext::player_env::MUSIC_FACE_CACHE = ();
2873
2834 my $enc = JSON::XS->new->utf8->canonical; 2874 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2835 2875
2836 warn "loading facedata from $path\n"; 2876 warn "loading facedata from $path\n";
2837 2877
2838 my $facedata; 2878 my $facedata;
2839 0 < aio_load $path, $facedata 2879 0 < aio_load $path, $facedata
… …
2949 $ns->fx_want ($k, $v); 2989 $ns->fx_want ($k, $v);
2950 } 2990 }
2951}; 2991};
2952 2992
2953sub reload_regions { 2993sub reload_regions {
2994 # HACK to clear player env face cache, we need some signal framework
2995 # for this (global event?)
2996 %ext::player_env::MUSIC_FACE_CACHE = ();
2997
2954 load_resource_file "$MAPDIR/regions" 2998 load_resource_file "$MAPDIR/regions"
2955 or die "unable to load regions file\n"; 2999 or die "unable to load regions file\n";
2956 3000
2957 for (cf::region::list) { 3001 for (cf::region::list) {
2958 $_->{match} = qr/$_->{match}/ 3002 $_->{match} = qr/$_->{match}/
… …
2994 3038
2995sub init { 3039sub init {
2996 reload_resources; 3040 reload_resources;
2997} 3041}
2998 3042
2999sub cfg_load { 3043sub reload_config {
3000 open my $fh, "<:utf8", "$CONFDIR/config" 3044 open my $fh, "<:utf8", "$CONFDIR/config"
3001 or return; 3045 or return;
3002 3046
3003 local $/; 3047 local $/;
3004 *CFG = YAML::Syck::Load <$fh>; 3048 *CFG = YAML::Syck::Load <$fh>;
… …
3024 (async { 3068 (async {
3025 Event::one_event; 3069 Event::one_event;
3026 })->prio (Coro::PRIO_MAX); 3070 })->prio (Coro::PRIO_MAX);
3027 }; 3071 };
3028 3072
3029 cfg_load; 3073 reload_config;
3030 db_init; 3074 db_init;
3031 load_extensions; 3075 load_extensions;
3032 3076
3033 $TICK_WATCHER->start; 3077 $TICK_WATCHER->start;
3034 Event::loop; 3078 Event::loop;
… …
3227 warn "reloading cf.pm"; 3271 warn "reloading cf.pm";
3228 require cf; 3272 require cf;
3229 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3273 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3230 3274
3231 warn "loading config and database again"; 3275 warn "loading config and database again";
3232 cf::cfg_load; 3276 cf::reload_config;
3233 3277
3234 warn "loading extensions"; 3278 warn "loading extensions";
3235 cf::load_extensions; 3279 cf::load_extensions;
3236 3280
3237 warn "reattaching attachments to objects/players"; 3281 warn "reattaching attachments to objects/players";

Diff Legend

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