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.340 by root, Fri Aug 24 00:40:31 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);
… …
1948 1953
1949sub do_load_sync { 1954sub do_load_sync {
1950 my ($map) = @_; 1955 my ($map) = @_;
1951 1956
1952 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 1957 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1953 if $Coro::current != $Coro::main; 1958 if $Coro::current == $Coro::main;
1954 1959
1955 cf::sync_job { $map->load }; 1960 cf::sync_job { $map->load };
1956} 1961}
1957 1962
1958our %MAP_PREFETCH; 1963our %MAP_PREFETCH;
… …
1987} 1992}
1988 1993
1989sub save { 1994sub save {
1990 my ($self) = @_; 1995 my ($self) = @_;
1991 1996
1992 my $lock = cf::lock_acquire "map_data:" . $self->path; 1997 my $lock = cf::lock_acquire "map_data:$self->{path}";
1993 1998
1994 $self->{last_save} = $cf::RUNTIME; 1999 $self->{last_save} = $cf::RUNTIME;
1995 2000
1996 return unless $self->dirty; 2001 return unless $self->dirty;
1997 2002
… …
2020 my ($self) = @_; 2025 my ($self) = @_;
2021 2026
2022 # save first because save cedes 2027 # save first because save cedes
2023 $self->save; 2028 $self->save;
2024 2029
2025 my $lock = cf::lock_acquire "map_data:" . $self->path; 2030 my $lock = cf::lock_acquire "map_data:$self->{path}";
2026 2031
2027 return if $self->players; 2032 return if $self->players;
2028 return if $self->in_memory != cf::MAP_IN_MEMORY; 2033 return if $self->in_memory != cf::MAP_IN_MEMORY;
2029 return if $self->{deny_save}; 2034 return if $self->{deny_save};
2030 2035
… …
2082my $nuke_counter = "aaaa"; 2087my $nuke_counter = "aaaa";
2083 2088
2084sub nuke { 2089sub nuke {
2085 my ($self) = @_; 2090 my ($self) = @_;
2086 2091
2092 {
2093 my $lock = cf::lock_acquire "map_data:$self->{path}";
2094
2087 delete $cf::MAP{$self->path}; 2095 delete $cf::MAP{$self->path};
2088 2096
2089 $self->unlink_save; 2097 $self->unlink_save;
2090 2098
2091 bless $self, "cf::map"; 2099 bless $self, "cf::map";
2092 delete $self->{deny_reset}; 2100 delete $self->{deny_reset};
2093 $self->{deny_save} = 1; 2101 $self->{deny_save} = 1;
2094 $self->reset_timeout (1); 2102 $self->reset_timeout (1);
2095 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2103 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2096 2104
2097 $cf::MAP{$self->path} = $self; 2105 $cf::MAP{$self->path} = $self;
2106 }
2098 2107
2099 $self->reset; # polite request, might not happen 2108 $self->reset; # polite request, might not happen
2100} 2109}
2101 2110
2102=item $maps = cf::map::tmp_maps 2111=item $maps = cf::map::tmp_maps
… …
2496the 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
2497the message unless the client supports the msg packet. 2506the message unless the client supports the msg packet.
2498 2507
2499=cut 2508=cut
2500 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
2501sub cf::client::send_msg { 2525sub cf::client::send_msg {
2502 my ($self, $channel, $msg, $color, @extra) = @_; 2526 my ($self, $channel, $msg, $color, @extra) = @_;
2503 2527
2504 $msg = $self->pl->expand_cfpod ($msg); 2528 $msg = $self->pl->expand_cfpod ($msg);
2505 2529
2506 $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};
2507 2534
2508 if (ref $channel) { 2535 if (ref $channel) {
2509 # send meta info to client, if not yet sent 2536 # send meta info to client, if not yet sent
2510 unless (exists $self->{channel}{$channel->{id}}) { 2537 unless (exists $self->{channel}{$channel->{id}}) {
2511 $self->{channel}{$channel->{id}} = $channel; 2538 $self->{channel}{$channel->{id}} = $channel;
2512 $self->ext_msg (channel_info => $channel); 2539 $self->ext_msg (channel_info => $channel)
2540 if $self->can_msg;
2513 } 2541 }
2514 2542
2515 $channel = $channel->{id}; 2543 $channel = $channel->{id};
2516 } 2544 }
2517 2545
… …
2558=cut 2586=cut
2559 2587
2560sub cf::client::ext_msg($$@) { 2588sub cf::client::ext_msg($$@) {
2561 my ($self, $type, @msg) = @_; 2589 my ($self, $type, @msg) = @_;
2562 2590
2563 my $extcmd = $self->extcmd;
2564
2565 if ($extcmd == 2) { 2591 if ($self->extcmd == 2) {
2566 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2592 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2567 } elsif ($extcmd == 1) { # TODO: remove 2593 } elsif ($self->extcmd == 1) { # TODO: remove
2568 push @msg, msgtype => "event_$type"; 2594 push @msg, msgtype => "event_$type";
2569 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2595 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2570 } 2596 }
2571} 2597}
2572 2598
… …
2579sub cf::client::ext_reply($$@) { 2605sub cf::client::ext_reply($$@) {
2580 my ($self, $id, @msg) = @_; 2606 my ($self, $id, @msg) = @_;
2581 2607
2582 if ($self->extcmd == 2) { 2608 if ($self->extcmd == 2) {
2583 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 2609 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2584 } elsif ($self->ns->extcmd == 1) { 2610 } elsif ($self->extcmd == 1) {
2585 #TODO: version 1, remove 2611 #TODO: version 1, remove
2586 unshift @msg, msgtype => "reply", msgid => $id; 2612 unshift @msg, msgtype => "reply", msgid => $id;
2587 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2613 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2588 } 2614 }
2589} 2615}
… …
2732 2758
2733The following functions and methods are available within a safe environment: 2759The following functions and methods are available within a safe environment:
2734 2760
2735 cf::object 2761 cf::object
2736 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
2737 insert remove name archname title slaying race 2763 insert remove name archname title slaying race decrease_ob_nr
2738 2764
2739 cf::object::player 2765 cf::object::player
2740 player 2766 player
2741 2767
2742 cf::player 2768 cf::player
… …
2747 2773
2748=cut 2774=cut
2749 2775
2750for ( 2776for (
2751 ["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
2752 insert remove inv name archname title slaying race)], 2778 insert remove inv name archname title slaying race
2779 decrease_ob_nr)],
2753 ["cf::object::player" => qw(player)], 2780 ["cf::object::player" => qw(player)],
2754 ["cf::player" => qw(peaceful)], 2781 ["cf::player" => qw(peaceful)],
2755 ["cf::map" => qw(trigger)], 2782 ["cf::map" => qw(trigger)],
2756) { 2783) {
2757 no strict 'refs'; 2784 no strict 'refs';
… …
2833# the server's init and main functions 2860# the server's init and main functions
2834 2861
2835sub load_facedata($) { 2862sub load_facedata($) {
2836 my ($path) = @_; 2863 my ($path) = @_;
2837 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
2838 my $enc = JSON::XS->new->utf8->canonical; 2869 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2839 2870
2840 warn "loading facedata from $path\n"; 2871 warn "loading facedata from $path\n";
2841 2872
2842 my $facedata; 2873 my $facedata;
2843 0 < aio_load $path, $facedata 2874 0 < aio_load $path, $facedata
… …
2953 $ns->fx_want ($k, $v); 2984 $ns->fx_want ($k, $v);
2954 } 2985 }
2955}; 2986};
2956 2987
2957sub 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
2958 load_resource_file "$MAPDIR/regions" 2993 load_resource_file "$MAPDIR/regions"
2959 or die "unable to load regions file\n"; 2994 or die "unable to load regions file\n";
2960 2995
2961 for (cf::region::list) { 2996 for (cf::region::list) {
2962 $_->{match} = qr/$_->{match}/ 2997 $_->{match} = qr/$_->{match}/
… …
2998 3033
2999sub init { 3034sub init {
3000 reload_resources; 3035 reload_resources;
3001} 3036}
3002 3037
3003sub cfg_load { 3038sub reload_config {
3004 open my $fh, "<:utf8", "$CONFDIR/config" 3039 open my $fh, "<:utf8", "$CONFDIR/config"
3005 or return; 3040 or return;
3006 3041
3007 local $/; 3042 local $/;
3008 *CFG = YAML::Syck::Load <$fh>; 3043 *CFG = YAML::Syck::Load <$fh>;
… …
3028 (async { 3063 (async {
3029 Event::one_event; 3064 Event::one_event;
3030 })->prio (Coro::PRIO_MAX); 3065 })->prio (Coro::PRIO_MAX);
3031 }; 3066 };
3032 3067
3033 cfg_load; 3068 reload_config;
3034 db_init; 3069 db_init;
3035 load_extensions; 3070 load_extensions;
3036 3071
3037 $TICK_WATCHER->start; 3072 $TICK_WATCHER->start;
3038 Event::loop; 3073 Event::loop;
… …
3231 warn "reloading cf.pm"; 3266 warn "reloading cf.pm";
3232 require cf; 3267 require cf;
3233 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3268 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3234 3269
3235 warn "loading config and database again"; 3270 warn "loading config and database again";
3236 cf::cfg_load; 3271 cf::reload_config;
3237 3272
3238 warn "loading extensions"; 3273 warn "loading extensions";
3239 cf::load_extensions; 3274 cf::load_extensions;
3240 3275
3241 warn "reattaching attachments to objects/players"; 3276 warn "reattaching attachments to objects/players";

Diff Legend

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