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.455 by root, Sat Sep 27 08:17:40 2008 UTC vs.
Revision 1.464 by root, Thu Jan 1 18:35:48 2009 UTC

… …
32use Opcode; 32use Opcode;
33use Safe; 33use Safe;
34use Safe::Hole; 34use Safe::Hole;
35use Storable (); 35use Storable ();
36 36
37use Guard ();
37use Coro (); 38use Coro ();
38use Coro::State; 39use Coro::State;
39use Coro::Handle; 40use Coro::Handle;
40use Coro::EV; 41use Coro::EV;
41use Coro::AnyEvent; 42use Coro::AnyEvent;
42use Coro::Timer; 43use Coro::Timer;
43use Coro::Signal; 44use Coro::Signal;
44use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
45use Coro::AnyEvent; 47use Coro::AnyEvent;
46use Coro::AIO; 48use Coro::AIO;
47use Coro::BDB 1.6; 49use Coro::BDB 1.6;
48use Coro::Storable; 50use Coro::Storable;
49use Coro::Util (); 51use Coro::Util ();
… …
130our $JITTER; # average jitter 132our $JITTER; # average jitter
131our $TICK_START; # for load detecting purposes 133our $TICK_START; # for load detecting purposes
132 134
133our @POST_INIT; 135our @POST_INIT;
134 136
137our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow)
138
135binmode STDOUT; 139binmode STDOUT;
136binmode STDERR; 140binmode STDERR;
137 141
138# read virtual server time, if available 142# read virtual server time, if available
139unless ($RUNTIME || !-e $RUNTIMEFILE) { 143unless ($RUNTIME || !-e $RUNTIMEFILE) {
… …
328Wait until the given lock is available. See cf::lock_acquire. 332Wait until the given lock is available. See cf::lock_acquire.
329 333
330=item my $lock = cf::lock_acquire $string 334=item my $lock = cf::lock_acquire $string
331 335
332Wait until the given lock is available and then acquires it and returns 336Wait until the given lock is available and then acquires it and returns
333a Coro::guard object. If the guard object gets destroyed (goes out of scope, 337a L<Guard> object. If the guard object gets destroyed (goes out of scope,
334for example when the coroutine gets canceled), the lock is automatically 338for example when the coroutine gets canceled), the lock is automatically
335returned. 339returned.
336 340
337Locks are *not* recursive, locking from the same coro twice results in a 341Locks are *not* recursive, locking from the same coro twice results in a
338deadlocked coro. 342deadlocked coro.
… …
344 348
345Return true if the lock is currently active, i.e. somebody has locked it. 349Return true if the lock is currently active, i.e. somebody has locked it.
346 350
347=cut 351=cut
348 352
349our %LOCK; 353our $LOCKS = new Coro::SemaphoreSet;
350our %LOCKER;#d#
351 354
352sub lock_wait($) { 355sub lock_wait($) {
353 my ($key) = @_; 356 $LOCKS->wait ($_[0]);
354
355 if ($LOCKER{$key} == $Coro::current) {#d#
356 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
357 return;#d#
358 }#d#
359
360 # wait for lock, if any
361 while ($LOCK{$key}) {
362 #local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
363 push @{ $LOCK{$key} }, $Coro::current;
364 Coro::schedule;
365 }
366} 357}
367 358
368sub lock_acquire($) { 359sub lock_acquire($) {
369 my ($key) = @_; 360 $LOCKS->guard ($_[0])
370
371 # wait, to be sure we are not locked
372 lock_wait $key;
373
374 $LOCK{$key} = [];
375 $LOCKER{$key} = $Coro::current;#d#
376
377 Coro::guard {
378 delete $LOCKER{$key};#d#
379 # wake up all waiters, to be on the safe side
380 $_->ready for @{ delete $LOCK{$key} };
381 }
382} 361}
383 362
384sub lock_active($) { 363sub lock_active($) {
385 my ($key) = @_; 364 $LOCKS->count ($_[0]) < 1
386
387 ! ! $LOCK{$key}
388} 365}
389 366
390sub freeze_mainloop { 367sub freeze_mainloop {
391 tick_inhibit_inc; 368 tick_inhibit_inc;
392 369
393 Coro::guard \&tick_inhibit_dec; 370 &Guard::guard (\&tick_inhibit_dec);
394} 371}
395 372
396=item cf::periodic $interval, $cb 373=item cf::periodic $interval, $cb
397 374
398Like EV::periodic, but randomly selects a starting point so that the actions 375Like EV::periodic, but randomly selects a starting point so that the actions
… …
1187 } else { 1164 } else {
1188 aio_unlink "$filename.pst"; 1165 aio_unlink "$filename.pst";
1189 } 1166 }
1190 1167
1191 aio_rename "$filename~", $filename; 1168 aio_rename "$filename~", $filename;
1169
1170 $filename =~ s%/[^/]+$%%;
1171 aio_pathsync $filename if $cf::USE_FSYNC;
1192 } else { 1172 } else {
1193 warn "FATAL: $filename~: $!\n"; 1173 warn "unable to save objects: $filename~: $!\n";
1194 } 1174 }
1195 } else { 1175 } else {
1196 aio_unlink $filename; 1176 aio_unlink $filename;
1197 aio_unlink "$filename.pst"; 1177 aio_unlink "$filename.pst";
1198 } 1178 }
… …
1289 my ($name, $cb) = @_; 1269 my ($name, $cb) = @_;
1290 1270
1291 $EXTICMD{$name} = $cb; 1271 $EXTICMD{$name} = $cb;
1292} 1272}
1293 1273
1274use File::Glob ();
1275
1294cf::player->attach ( 1276cf::player->attach (
1295 on_command => sub { 1277 on_command => sub {
1296 my ($pl, $name, $params) = @_; 1278 my ($pl, $name, $params) = @_;
1297 1279
1298 my $cb = $COMMAND{$name} 1280 my $cb = $COMMAND{$name}
… …
1329 } 1311 }
1330 1312
1331 cf::override; 1313 cf::override;
1332 }, 1314 },
1333); 1315);
1316
1317# "readahead" all extensions
1318sub cache_extensions {
1319 my $grp = IO::AIO::aio_group;
1320
1321 add $grp IO::AIO::aio_readdir $LIBDIR, sub {
1322 for (grep /\.ext$/, @{$_[0]}) {
1323 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1324 }
1325 };
1326
1327 $grp
1328}
1334 1329
1335sub load_extensions { 1330sub load_extensions {
1336 cf::sync_job { 1331 cf::sync_job {
1337 my %todo; 1332 my %todo;
1338 1333
… …
1867 1862
1868 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1863 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1869 "$UNIQUEDIR/$path" 1864 "$UNIQUEDIR/$path"
1870} 1865}
1871 1866
1872# and all this just because we cannot iterate over
1873# all maps in C++...
1874sub change_all_map_light {
1875 my ($change) = @_;
1876
1877 $_->change_map_light ($change)
1878 for grep $_->outdoor, values %cf::MAP;
1879}
1880
1881sub decay_objects { 1867sub decay_objects {
1882 my ($self) = @_; 1868 my ($self) = @_;
1883 1869
1884 return if $self->{deny_reset}; 1870 return if $self->{deny_reset};
1885 1871
… …
1967sub find { 1953sub find {
1968 my ($path, $origin) = @_; 1954 my ($path, $origin) = @_;
1969 1955
1970 $path = normalise $path, $origin && $origin->path; 1956 $path = normalise $path, $origin && $origin->path;
1971 1957
1972 cf::lock_wait "map_data:$path";#d#remove 1958 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1973 cf::lock_wait "map_find:$path"; 1959 my $guard2 = cf::lock_acquire "map_find:$path";
1974 1960
1975 $cf::MAP{$path} || do { 1961 $cf::MAP{$path} || do {
1976 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1977 my $guard2 = cf::lock_acquire "map_find:$path";
1978
1979 my $map = new_from_path cf::map $path 1962 my $map = new_from_path cf::map $path
1980 or return; 1963 or return;
1981 1964
1982 $map->{last_save} = $cf::RUNTIME; 1965 $map->{last_save} = $cf::RUNTIME;
1983 1966
… …
2050 2033
2051 unless ($self->{deny_activate}) { 2034 unless ($self->{deny_activate}) {
2052 $self->decay_objects; 2035 $self->decay_objects;
2053 $self->fix_auto_apply; 2036 $self->fix_auto_apply;
2054 $self->update_buttons; 2037 $self->update_buttons;
2055 cf::cede_to_tick;
2056 $self->set_darkness_map;
2057 cf::cede_to_tick; 2038 cf::cede_to_tick;
2058 $self->activate; 2039 $self->activate;
2059 } 2040 }
2060 2041
2061 $self->{last_save} = $cf::RUNTIME; 2042 $self->{last_save} = $cf::RUNTIME;
… …
2812 id => "party", 2793 id => "party",
2813 title => "Party", 2794 title => "Party",
2814 reply => "gsay ", 2795 reply => "gsay ",
2815 tooltip => "Messages and chat related to your party", 2796 tooltip => "Messages and chat related to your party",
2816 }, 2797 },
2798 "c/death" => {
2799 id => "death",
2800 title => "Death",
2801 reply => undef,
2802 tooltip => "Reason for and more info about your most recent death",
2803 },
2804 "c/say" => $SAY_CHANNEL,
2805 "c/chat" => $CHAT_CHANNEL,
2817); 2806);
2818 2807
2819sub cf::client::send_msg { 2808sub cf::client::send_msg {
2820 my ($self, $channel, $msg, $color, @extra) = @_; 2809 my ($self, $channel, $msg, $color, @extra) = @_;
2821 2810
… …
2826 2815
2827 # check predefined channels, for the benefit of C 2816 # check predefined channels, for the benefit of C
2828 if ($CHANNEL{$channel}) { 2817 if ($CHANNEL{$channel}) {
2829 $channel = $CHANNEL{$channel}; 2818 $channel = $CHANNEL{$channel};
2830 2819
2831 $self->ext_msg (channel_info => $channel) 2820 $self->ext_msg (channel_info => $channel);
2832 if $self->can_msg;
2833
2834 $channel = $channel->{id}; 2821 $channel = $channel->{id};
2835 2822
2836 } elsif (ref $channel) { 2823 } elsif (ref $channel) {
2837 # send meta info to client, if not yet sent 2824 # send meta info to client, if not yet sent
2838 unless (exists $self->{channel}{$channel->{id}}) { 2825 unless (exists $self->{channel}{$channel->{id}}) {
2839 $self->{channel}{$channel->{id}} = $channel; 2826 $self->{channel}{$channel->{id}} = $channel;
2840 $self->ext_msg (channel_info => $channel) 2827 $self->ext_msg (channel_info => $channel);
2841 if $self->can_msg;
2842 } 2828 }
2843 2829
2844 $channel = $channel->{id}; 2830 $channel = $channel->{id};
2845 } 2831 }
2846 2832
2847 return unless @extra || length $msg; 2833 return unless @extra || length $msg;
2848 2834
2849 if ($self->can_msg) {
2850 # default colour, mask it out 2835 # default colour, mask it out
2851 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2836 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2852 if $color & cf::NDI_DEF; 2837 if $color & cf::NDI_DEF;
2853 2838
2854 my $pkt = "msg " 2839 my $pkt = "msg "
2855 . $self->{json_coder}->encode ( 2840 . $self->{json_coder}->encode (
2856 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 2841 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2857 ); 2842 );
2858 2843
2859 # try lzf for large packets 2844 # try lzf for large packets
2860 $pkt = "lzf " . Compress::LZF::compress $pkt 2845 $pkt = "lzf " . Compress::LZF::compress $pkt
2861 if 1024 <= length $pkt and $self->{can_lzf}; 2846 if 1024 <= length $pkt and $self->{can_lzf};
2862 2847
2863 # split very large packets 2848 # split very large packets
2864 if (8192 < length $pkt and $self->{can_lzf}) { 2849 if (8192 < length $pkt and $self->{can_lzf}) {
2865 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt; 2850 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2866 $pkt = "frag"; 2851 $pkt = "frag";
2867 } 2852 }
2868 2853
2869 $self->send_packet ($pkt); 2854 $self->send_packet ($pkt);
2870 } else {
2871 if ($color >= 0) {
2872 # replace some tags by gcfclient-compatible ones
2873 for ($msg) {
2874 1 while
2875 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2876 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2877 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2878 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2879 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2880 }
2881
2882 $color &= cf::NDI_COLOR_MASK;
2883
2884 utf8::encode $msg;
2885
2886 if (0 && $msg =~ /\[/) {
2887 # COMMAND/INFO
2888 $self->send_packet ("drawextinfo $color 10 8 $msg")
2889 } else {
2890 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2891 $self->send_packet ("drawinfo $color $msg")
2892 }
2893 }
2894 }
2895} 2855}
2896 2856
2897=item $client->ext_msg ($type, @msg) 2857=item $client->ext_msg ($type, @msg)
2898 2858
2899Sends an ext event to the client. 2859Sends an ext event to the client.
… …
3409 3369
3410 cf::init_experience; 3370 cf::init_experience;
3411 cf::init_anim; 3371 cf::init_anim;
3412 cf::init_attackmess; 3372 cf::init_attackmess;
3413 cf::init_dynamic; 3373 cf::init_dynamic;
3414 cf::init_block;
3415 3374
3416 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3375 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3417 3376
3418 # we must not ever block the main coroutine 3377 # we must not ever block the main coroutine
3419 local $Coro::idle = sub { 3378 local $Coro::idle = sub {
… …
3555} 3514}
3556 3515
3557sub emergency_save() { 3516sub emergency_save() {
3558 my $freeze_guard = cf::freeze_mainloop; 3517 my $freeze_guard = cf::freeze_mainloop;
3559 3518
3560 warn "enter emergency perl save\n"; 3519 warn "emergency_perl_save: enter\n";
3561 3520
3562 cf::sync_job { 3521 cf::sync_job {
3522 # this is a trade-off: we want to be very quick here, so
3523 # save all maps without fsync, and later call a global sync
3524 # (which in turn might be very very slow)
3525 local $USE_FSYNC = 0;
3526
3563 # use a peculiar iteration method to avoid tripping on perl 3527 # use a peculiar iteration method to avoid tripping on perl
3564 # refcount bugs in for. also avoids problems with players 3528 # refcount bugs in for. also avoids problems with players
3565 # and maps saved/destroyed asynchronously. 3529 # and maps saved/destroyed asynchronously.
3566 warn "begin emergency player save\n"; 3530 warn "emergency_perl_save: begin player save\n";
3567 for my $login (keys %cf::PLAYER) { 3531 for my $login (keys %cf::PLAYER) {
3568 my $pl = $cf::PLAYER{$login} or next; 3532 my $pl = $cf::PLAYER{$login} or next;
3569 $pl->valid or next; 3533 $pl->valid or next;
3570 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3534 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3571 $pl->save; 3535 $pl->save;
3572 } 3536 }
3573 warn "end emergency player save\n"; 3537 warn "emergency_perl_save: end player save\n";
3574 3538
3575 warn "begin emergency map save\n"; 3539 warn "emergency_perl_save: begin map save\n";
3576 for my $path (keys %cf::MAP) { 3540 for my $path (keys %cf::MAP) {
3577 my $map = $cf::MAP{$path} or next; 3541 my $map = $cf::MAP{$path} or next;
3578 $map->valid or next; 3542 $map->valid or next;
3579 $map->save; 3543 $map->save;
3580 } 3544 }
3581 warn "end emergency map save\n"; 3545 warn "emergency_perl_save: end map save\n";
3582 3546
3583 warn "begin emergency database checkpoint\n"; 3547 warn "emergency_perl_save: begin database checkpoint\n";
3584 BDB::db_env_txn_checkpoint $DB_ENV; 3548 BDB::db_env_txn_checkpoint $DB_ENV;
3585 warn "end emergency database checkpoint\n"; 3549 warn "emergency_perl_save: end database checkpoint\n";
3586 3550
3587 warn "begin write uuid\n"; 3551 warn "emergency_perl_save: begin write uuid\n";
3588 write_uuid_sync 1; 3552 write_uuid_sync 1;
3589 warn "end write uuid\n"; 3553 warn "emergency_perl_save: end write uuid\n";
3590 }; 3554 };
3591 3555
3556 warn "emergency_perl_save: starting sync()\n";
3557 IO::AIO::aio_sync sub {
3558 warn "emergency_perl_save: finished sync()\n";
3559 };
3560
3592 warn "leave emergency perl save\n"; 3561 warn "emergency_perl_save: leave\n";
3593} 3562}
3594 3563
3595sub post_cleanup { 3564sub post_cleanup {
3596 my ($make_core) = @_; 3565 my ($make_core) = @_;
3597 3566
… …
3634 warn "can only reload from main coroutine"; 3603 warn "can only reload from main coroutine";
3635 return; 3604 return;
3636 } 3605 }
3637 3606
3638 return if $RELOAD++; 3607 return if $RELOAD++;
3608
3609 my $t1 = EV::time;
3639 3610
3640 while ($RELOAD) { 3611 while ($RELOAD) {
3641 warn "reloading..."; 3612 warn "reloading...";
3642 3613
3643 warn "entering sync_job"; 3614 warn "entering sync_job";
… …
3722 cf::reload_config; 3693 cf::reload_config;
3723 3694
3724 warn "loading extensions"; 3695 warn "loading extensions";
3725 cf::load_extensions; 3696 cf::load_extensions;
3726 3697
3698 if ($REATTACH_ON_RELOAD) {
3727 warn "reattaching attachments to objects/players"; 3699 warn "reattaching attachments to objects/players";
3728 _global_reattach; # objects, sockets 3700 _global_reattach; # objects, sockets
3729 warn "reattaching attachments to maps"; 3701 warn "reattaching attachments to maps";
3730 reattach $_ for values %MAP; 3702 reattach $_ for values %MAP;
3731 warn "reattaching attachments to players"; 3703 warn "reattaching attachments to players";
3732 reattach $_ for values %PLAYER; 3704 reattach $_ for values %PLAYER;
3705 }
3733 3706
3734 warn "running post_load"; 3707 warn "running post_init jobs";
3735 (pop @POST_INIT)->(1) while @POST_INIT; 3708 (pop @POST_INIT)->(1) while @POST_INIT;
3736 3709
3737 warn "leaving sync_job"; 3710 warn "leaving sync_job";
3738 3711
3739 1 3712 1
… …
3743 }; 3716 };
3744 3717
3745 warn "reloaded"; 3718 warn "reloaded";
3746 --$RELOAD; 3719 --$RELOAD;
3747 } 3720 }
3721
3722 $t1 = EV::time - $t1;
3723 warn "reload completed in ${t1}s\n";
3748}; 3724};
3749 3725
3750our $RELOAD_WATCHER; # used only during reload 3726our $RELOAD_WATCHER; # used only during reload
3751 3727
3752sub reload_perl() { 3728sub reload_perl() {
3753 # doing reload synchronously and two reloads happen back-to-back, 3729 # doing reload synchronously and two reloads happen back-to-back,
3754 # coro crashes during coro_state_free->destroy here. 3730 # coro crashes during coro_state_free->destroy here.
3755 3731
3732 $RELOAD_WATCHER ||= cf::async {
3733 Coro::AIO::aio_wait cache_extensions;
3734
3756 $RELOAD_WATCHER ||= EV::timer $TICK * 1.5, 0, sub { 3735 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3757 do_reload_perl; 3736 do_reload_perl;
3758 undef $RELOAD_WATCHER; 3737 undef $RELOAD_WATCHER;
3738 };
3759 }; 3739 };
3760} 3740}
3761 3741
3762register_command "reload" => sub { 3742register_command "reload" => sub {
3763 my ($who, $arg) = @_; 3743 my ($who, $arg) = @_;

Diff Legend

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