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.343 by root, Mon Aug 27 01:13:48 2007 UTC vs.
Revision 1.352 by root, Sun Sep 2 04:57:14 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);
… …
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;
… …
2832# the server's init and main functions 2859# the server's init and main functions
2833 2860
2834sub load_facedata($) { 2861sub load_facedata($) {
2835 my ($path) = @_; 2862 my ($path) = @_;
2836 2863
2864 # HACK to clear player env face cache, we need some signal framework
2865 # for this (global event?)
2866 %ext::player_env::MUSIC_FACE_CACHE = ();
2867
2837 my $enc = JSON::XS->new->utf8->canonical; 2868 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2838 2869
2839 warn "loading facedata from $path\n"; 2870 warn "loading facedata from $path\n";
2840 2871
2841 my $facedata; 2872 my $facedata;
2842 0 < aio_load $path, $facedata 2873 0 < aio_load $path, $facedata
… …
2952 $ns->fx_want ($k, $v); 2983 $ns->fx_want ($k, $v);
2953 } 2984 }
2954}; 2985};
2955 2986
2956sub reload_regions { 2987sub reload_regions {
2988 # HACK to clear player env face cache, we need some signal framework
2989 # for this (global event?)
2990 %ext::player_env::MUSIC_FACE_CACHE = ();
2991
2957 load_resource_file "$MAPDIR/regions" 2992 load_resource_file "$MAPDIR/regions"
2958 or die "unable to load regions file\n"; 2993 or die "unable to load regions file\n";
2959 2994
2960 for (cf::region::list) { 2995 for (cf::region::list) {
2961 $_->{match} = qr/$_->{match}/ 2996 $_->{match} = qr/$_->{match}/
… …
2997 3032
2998sub init { 3033sub init {
2999 reload_resources; 3034 reload_resources;
3000} 3035}
3001 3036
3002sub cfg_load { 3037sub reload_config {
3003 open my $fh, "<:utf8", "$CONFDIR/config" 3038 open my $fh, "<:utf8", "$CONFDIR/config"
3004 or return; 3039 or return;
3005 3040
3006 local $/; 3041 local $/;
3007 *CFG = YAML::Syck::Load <$fh>; 3042 *CFG = YAML::Syck::Load <$fh>;
… …
3027 (async { 3062 (async {
3028 Event::one_event; 3063 Event::one_event;
3029 })->prio (Coro::PRIO_MAX); 3064 })->prio (Coro::PRIO_MAX);
3030 }; 3065 };
3031 3066
3032 cfg_load; 3067 reload_config;
3033 db_init; 3068 db_init;
3034 load_extensions; 3069 load_extensions;
3035 3070
3036 $TICK_WATCHER->start; 3071 $TICK_WATCHER->start;
3037 Event::loop; 3072 Event::loop;
… …
3230 warn "reloading cf.pm"; 3265 warn "reloading cf.pm";
3231 require cf; 3266 require cf;
3232 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3267 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3233 3268
3234 warn "loading config and database again"; 3269 warn "loading config and database again";
3235 cf::cfg_load; 3270 cf::reload_config;
3236 3271
3237 warn "loading extensions"; 3272 warn "loading extensions";
3238 cf::load_extensions; 3273 cf::load_extensions;
3239 3274
3240 warn "reattaching attachments to objects/players"; 3275 warn "reattaching attachments to objects/players";

Diff Legend

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