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.342 by root, Sun Aug 26 15:31:02 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);
… …
1987} 1997}
1988 1998
1989sub save { 1999sub save {
1990 my ($self) = @_; 2000 my ($self) = @_;
1991 2001
1992 my $lock = cf::lock_acquire "map_data:" . $self->path; 2002 my $lock = cf::lock_acquire "map_data:$self->{path}";
1993 2003
1994 $self->{last_save} = $cf::RUNTIME; 2004 $self->{last_save} = $cf::RUNTIME;
1995 2005
1996 return unless $self->dirty; 2006 return unless $self->dirty;
1997 2007
… …
2020 my ($self) = @_; 2030 my ($self) = @_;
2021 2031
2022 # save first because save cedes 2032 # save first because save cedes
2023 $self->save; 2033 $self->save;
2024 2034
2025 my $lock = cf::lock_acquire "map_data:" . $self->path; 2035 my $lock = cf::lock_acquire "map_data:$self->{path}";
2026 2036
2027 return if $self->players; 2037 return if $self->players;
2028 return if $self->in_memory != cf::MAP_IN_MEMORY; 2038 return if $self->in_memory != cf::MAP_IN_MEMORY;
2029 return if $self->{deny_save}; 2039 return if $self->{deny_save};
2030 2040
… …
2082my $nuke_counter = "aaaa"; 2092my $nuke_counter = "aaaa";
2083 2093
2084sub nuke { 2094sub nuke {
2085 my ($self) = @_; 2095 my ($self) = @_;
2086 2096
2097 {
2098 my $lock = cf::lock_acquire "map_data:$self->{path}";
2099
2087 delete $cf::MAP{$self->path}; 2100 delete $cf::MAP{$self->path};
2088 2101
2089 $self->unlink_save; 2102 $self->unlink_save;
2090 2103
2091 bless $self, "cf::map"; 2104 bless $self, "cf::map";
2092 delete $self->{deny_reset}; 2105 delete $self->{deny_reset};
2093 $self->{deny_save} = 1; 2106 $self->{deny_save} = 1;
2094 $self->reset_timeout (1); 2107 $self->reset_timeout (1);
2095 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2108 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2096 2109
2097 $cf::MAP{$self->path} = $self; 2110 $cf::MAP{$self->path} = $self;
2111 }
2098 2112
2099 $self->reset; # polite request, might not happen 2113 $self->reset; # polite request, might not happen
2100} 2114}
2101 2115
2102=item $maps = cf::map::tmp_maps 2116=item $maps = cf::map::tmp_maps
… …
2496the 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
2497the message unless the client supports the msg packet. 2511the message unless the client supports the msg packet.
2498 2512
2499=cut 2513=cut
2500 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
2501sub cf::client::send_msg { 2530sub cf::client::send_msg {
2502 my ($self, $channel, $msg, $color, @extra) = @_; 2531 my ($self, $channel, $msg, $color, @extra) = @_;
2503 2532
2504 $msg = $self->pl->expand_cfpod ($msg); 2533 $msg = $self->pl->expand_cfpod ($msg);
2505 2534
2506 $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};
2507 2539
2508 if (ref $channel) { 2540 if (ref $channel) {
2509 # send meta info to client, if not yet sent 2541 # send meta info to client, if not yet sent
2510 unless (exists $self->{channel}{$channel->{id}}) { 2542 unless (exists $self->{channel}{$channel->{id}}) {
2511 $self->{channel}{$channel->{id}} = $channel; 2543 $self->{channel}{$channel->{id}} = $channel;
2512 $self->ext_msg (channel_info => $channel); 2544 $self->ext_msg (channel_info => $channel)
2545 if $self->can_msg;
2513 } 2546 }
2514 2547
2515 $channel = $channel->{id}; 2548 $channel = $channel->{id};
2516 } 2549 }
2517 2550
… …
2558=cut 2591=cut
2559 2592
2560sub cf::client::ext_msg($$@) { 2593sub cf::client::ext_msg($$@) {
2561 my ($self, $type, @msg) = @_; 2594 my ($self, $type, @msg) = @_;
2562 2595
2563 my $extcmd = $self->extcmd;
2564
2565 if ($extcmd == 2) { 2596 if ($self->extcmd == 2) {
2566 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2597 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2567 } elsif ($extcmd == 1) { # TODO: remove 2598 } elsif ($self->extcmd == 1) { # TODO: remove
2568 push @msg, msgtype => "event_$type"; 2599 push @msg, msgtype => "event_$type";
2569 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2600 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2570 } 2601 }
2571} 2602}
2572 2603
… …
2579sub cf::client::ext_reply($$@) { 2610sub cf::client::ext_reply($$@) {
2580 my ($self, $id, @msg) = @_; 2611 my ($self, $id, @msg) = @_;
2581 2612
2582 if ($self->extcmd == 2) { 2613 if ($self->extcmd == 2) {
2583 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 2614 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2584 } elsif ($self->ns->extcmd == 1) { 2615 } elsif ($self->extcmd == 1) {
2585 #TODO: version 1, remove 2616 #TODO: version 1, remove
2586 unshift @msg, msgtype => "reply", msgid => $id; 2617 unshift @msg, msgtype => "reply", msgid => $id;
2587 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2618 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2588 } 2619 }
2589} 2620}
… …
2834# the server's init and main functions 2865# the server's init and main functions
2835 2866
2836sub load_facedata($) { 2867sub load_facedata($) {
2837 my ($path) = @_; 2868 my ($path) = @_;
2838 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
2839 my $enc = JSON::XS->new->utf8->canonical; 2874 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2840 2875
2841 warn "loading facedata from $path\n"; 2876 warn "loading facedata from $path\n";
2842 2877
2843 my $facedata; 2878 my $facedata;
2844 0 < aio_load $path, $facedata 2879 0 < aio_load $path, $facedata
… …
2954 $ns->fx_want ($k, $v); 2989 $ns->fx_want ($k, $v);
2955 } 2990 }
2956}; 2991};
2957 2992
2958sub 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
2959 load_resource_file "$MAPDIR/regions" 2998 load_resource_file "$MAPDIR/regions"
2960 or die "unable to load regions file\n"; 2999 or die "unable to load regions file\n";
2961 3000
2962 for (cf::region::list) { 3001 for (cf::region::list) {
2963 $_->{match} = qr/$_->{match}/ 3002 $_->{match} = qr/$_->{match}/
… …
2999 3038
3000sub init { 3039sub init {
3001 reload_resources; 3040 reload_resources;
3002} 3041}
3003 3042
3004sub cfg_load { 3043sub reload_config {
3005 open my $fh, "<:utf8", "$CONFDIR/config" 3044 open my $fh, "<:utf8", "$CONFDIR/config"
3006 or return; 3045 or return;
3007 3046
3008 local $/; 3047 local $/;
3009 *CFG = YAML::Syck::Load <$fh>; 3048 *CFG = YAML::Syck::Load <$fh>;
… …
3029 (async { 3068 (async {
3030 Event::one_event; 3069 Event::one_event;
3031 })->prio (Coro::PRIO_MAX); 3070 })->prio (Coro::PRIO_MAX);
3032 }; 3071 };
3033 3072
3034 cfg_load; 3073 reload_config;
3035 db_init; 3074 db_init;
3036 load_extensions; 3075 load_extensions;
3037 3076
3038 $TICK_WATCHER->start; 3077 $TICK_WATCHER->start;
3039 Event::loop; 3078 Event::loop;
… …
3232 warn "reloading cf.pm"; 3271 warn "reloading cf.pm";
3233 require cf; 3272 require cf;
3234 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3273 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3235 3274
3236 warn "loading config and database again"; 3275 warn "loading config and database again";
3237 cf::cfg_load; 3276 cf::reload_config;
3238 3277
3239 warn "loading extensions"; 3278 warn "loading extensions";
3240 cf::load_extensions; 3279 cf::load_extensions;
3241 3280
3242 warn "reattaching attachments to objects/players"; 3281 warn "reattaching attachments to objects/players";

Diff Legend

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