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.452 by root, Tue Sep 23 00:24:52 2008 UTC vs.
Revision 1.462 by root, Tue Dec 23 06:58:23 2008 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 ();
… …
128our $LOAD; # a number between 0 (idle) and 1 (too many objects) 130our $LOAD; # a number between 0 (idle) and 1 (too many objects)
129our $LOADAVG; # same thing, but with alpha-smoothing 131our $LOADAVG; # same thing, but with alpha-smoothing
130our $JITTER; # average jitter 132our $JITTER; # average jitter
131our $TICK_START; # for load detecting purposes 133our $TICK_START; # for load detecting purposes
132 134
135our @POST_INIT;
136
137our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow)
138
133binmode STDOUT; 139binmode STDOUT;
134binmode STDERR; 140binmode STDERR;
135 141
136# read virtual server time, if available 142# read virtual server time, if available
137unless ($RUNTIME || !-e $RUNTIMEFILE) { 143unless ($RUNTIME || !-e $RUNTIMEFILE) {
… …
305our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 311our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
306 312
307sub encode_json($) { $json_coder->encode ($_[0]) } 313sub encode_json($) { $json_coder->encode ($_[0]) }
308sub decode_json($) { $json_coder->decode ($_[0]) } 314sub decode_json($) { $json_coder->decode ($_[0]) }
309 315
316=item cf::post_init { BLOCK }
317
318Execute the given codeblock, I<after> all extensions have been (re-)loaded,
319but I<before> the server starts ticking again.
320
321The cdoeblock will have a single boolean argument to indicate whether this
322is a reload or not.
323
324=cut
325
326sub post_init(&) {
327 push @POST_INIT, shift;
328}
329
310=item cf::lock_wait $string 330=item cf::lock_wait $string
311 331
312Wait until the given lock is available. See cf::lock_acquire. 332Wait until the given lock is available. See cf::lock_acquire.
313 333
314=item my $lock = cf::lock_acquire $string 334=item my $lock = cf::lock_acquire $string
315 335
316Wait 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
317a 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,
318for example when the coroutine gets canceled), the lock is automatically 338for example when the coroutine gets canceled), the lock is automatically
319returned. 339returned.
320 340
321Locks 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
322deadlocked coro. 342deadlocked coro.
… …
328 348
329Return 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.
330 350
331=cut 351=cut
332 352
333our %LOCK; 353our $LOCKS = new Coro::SemaphoreSet;
334our %LOCKER;#d#
335 354
336sub lock_wait($) { 355sub lock_wait($) {
337 my ($key) = @_; 356 $LOCKS->wait ($_[0]);
338
339 if ($LOCKER{$key} == $Coro::current) {#d#
340 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
341 return;#d#
342 }#d#
343
344 # wait for lock, if any
345 while ($LOCK{$key}) {
346 #local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
347 push @{ $LOCK{$key} }, $Coro::current;
348 Coro::schedule;
349 }
350} 357}
351 358
352sub lock_acquire($) { 359sub lock_acquire($) {
353 my ($key) = @_; 360 $LOCKS->guard ($_[0])
354
355 # wait, to be sure we are not locked
356 lock_wait $key;
357
358 $LOCK{$key} = [];
359 $LOCKER{$key} = $Coro::current;#d#
360
361 Coro::guard {
362 delete $LOCKER{$key};#d#
363 # wake up all waiters, to be on the safe side
364 $_->ready for @{ delete $LOCK{$key} };
365 }
366} 361}
367 362
368sub lock_active($) { 363sub lock_active($) {
369 my ($key) = @_; 364 $LOCKS->count ($_[0]) < 1
370
371 ! ! $LOCK{$key}
372} 365}
373 366
374sub freeze_mainloop { 367sub freeze_mainloop {
375 tick_inhibit_inc; 368 tick_inhibit_inc;
376 369
377 Coro::guard \&tick_inhibit_dec; 370 &Guard::guard (\&tick_inhibit_dec);
378} 371}
379 372
380=item cf::periodic $interval, $cb 373=item cf::periodic $interval, $cb
381 374
382Like 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
… …
1171 } else { 1164 } else {
1172 aio_unlink "$filename.pst"; 1165 aio_unlink "$filename.pst";
1173 } 1166 }
1174 1167
1175 aio_rename "$filename~", $filename; 1168 aio_rename "$filename~", $filename;
1169
1170 $filename =~ s%/[^/]+$%%;
1171 aio_pathsync $filename if $cf::USE_FSYNC;
1176 } else { 1172 } else {
1177 warn "FATAL: $filename~: $!\n"; 1173 warn "unable to save objects: $filename~: $!\n";
1178 } 1174 }
1179 } else { 1175 } else {
1180 aio_unlink $filename; 1176 aio_unlink $filename;
1181 aio_unlink "$filename.pst"; 1177 aio_unlink "$filename.pst";
1182 } 1178 }
… …
1273 my ($name, $cb) = @_; 1269 my ($name, $cb) = @_;
1274 1270
1275 $EXTICMD{$name} = $cb; 1271 $EXTICMD{$name} = $cb;
1276} 1272}
1277 1273
1274use File::Glob ();
1275
1278cf::player->attach ( 1276cf::player->attach (
1279 on_command => sub { 1277 on_command => sub {
1280 my ($pl, $name, $params) = @_; 1278 my ($pl, $name, $params) = @_;
1281 1279
1282 my $cb = $COMMAND{$name} 1280 my $cb = $COMMAND{$name}
… …
1313 } 1311 }
1314 1312
1315 cf::override; 1313 cf::override;
1316 }, 1314 },
1317); 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}
1318 1329
1319sub load_extensions { 1330sub load_extensions {
1320 cf::sync_job { 1331 cf::sync_job {
1321 my %todo; 1332 my %todo;
1322 1333
… …
1851 1862
1852 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1863 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1853 "$UNIQUEDIR/$path" 1864 "$UNIQUEDIR/$path"
1854} 1865}
1855 1866
1856# and all this just because we cannot iterate over
1857# all maps in C++...
1858sub change_all_map_light {
1859 my ($change) = @_;
1860
1861 $_->change_map_light ($change)
1862 for grep $_->outdoor, values %cf::MAP;
1863}
1864
1865sub decay_objects { 1867sub decay_objects {
1866 my ($self) = @_; 1868 my ($self) = @_;
1867 1869
1868 return if $self->{deny_reset}; 1870 return if $self->{deny_reset};
1869 1871
… …
1951sub find { 1953sub find {
1952 my ($path, $origin) = @_; 1954 my ($path, $origin) = @_;
1953 1955
1954 $path = normalise $path, $origin && $origin->path; 1956 $path = normalise $path, $origin && $origin->path;
1955 1957
1956 cf::lock_wait "map_data:$path";#d#remove 1958 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1957 cf::lock_wait "map_find:$path"; 1959 my $guard2 = cf::lock_acquire "map_find:$path";
1958 1960
1959 $cf::MAP{$path} || do { 1961 $cf::MAP{$path} || do {
1960 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1961 my $guard2 = cf::lock_acquire "map_find:$path";
1962
1963 my $map = new_from_path cf::map $path 1962 my $map = new_from_path cf::map $path
1964 or return; 1963 or return;
1965 1964
1966 $map->{last_save} = $cf::RUNTIME; 1965 $map->{last_save} = $cf::RUNTIME;
1967 1966
… …
2034 2033
2035 unless ($self->{deny_activate}) { 2034 unless ($self->{deny_activate}) {
2036 $self->decay_objects; 2035 $self->decay_objects;
2037 $self->fix_auto_apply; 2036 $self->fix_auto_apply;
2038 $self->update_buttons; 2037 $self->update_buttons;
2039 cf::cede_to_tick;
2040 $self->set_darkness_map;
2041 cf::cede_to_tick; 2038 cf::cede_to_tick;
2042 $self->activate; 2039 $self->activate;
2043 } 2040 }
2044 2041
2045 $self->{last_save} = $cf::RUNTIME; 2042 $self->{last_save} = $cf::RUNTIME;
… …
2796 id => "party", 2793 id => "party",
2797 title => "Party", 2794 title => "Party",
2798 reply => "gsay ", 2795 reply => "gsay ",
2799 tooltip => "Messages and chat related to your party", 2796 tooltip => "Messages and chat related to your party",
2800 }, 2797 },
2798 "c/say" => $SAY_CHANNEL,
2799 "c/chat" => $CHAT_CHANNEL,
2801); 2800);
2802 2801
2803sub cf::client::send_msg { 2802sub cf::client::send_msg {
2804 my ($self, $channel, $msg, $color, @extra) = @_; 2803 my ($self, $channel, $msg, $color, @extra) = @_;
2805 2804
… …
3341 reload_treasures; 3340 reload_treasures;
3342 3341
3343 warn "finished reloading resource files\n"; 3342 warn "finished reloading resource files\n";
3344} 3343}
3345 3344
3346sub init {
3347 my $guard = freeze_mainloop;
3348
3349 evthread_start IO::AIO::poll_fileno;
3350
3351 reload_resources;
3352}
3353
3354sub reload_config { 3345sub reload_config {
3355 open my $fh, "<:utf8", "$CONFDIR/config" 3346 open my $fh, "<:utf8", "$CONFDIR/config"
3356 or return; 3347 or return;
3357 3348
3358 local $/; 3349 local $/;
… …
3390 seek $fh, 0, 0; 3381 seek $fh, 0, 0;
3391 print $fh $$; 3382 print $fh $$;
3392} 3383}
3393 3384
3394sub main { 3385sub main {
3395 atomic; 3386 cf::init_globals; # initialise logging
3387
3388 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3389 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3390 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3391 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3392
3393 cf::init_experience;
3394 cf::init_anim;
3395 cf::init_attackmess;
3396 cf::init_dynamic;
3397
3398 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3396 3399
3397 # we must not ever block the main coroutine 3400 # we must not ever block the main coroutine
3398 local $Coro::idle = sub { 3401 local $Coro::idle = sub {
3399 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3402 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3400 (async { 3403 (async {
3401 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3404 $Coro::current->{desc} = "IDLE BUG HANDLER";
3402 EV::loop EV::LOOP_ONESHOT; 3405 EV::loop EV::LOOP_ONESHOT;
3403 })->prio (Coro::PRIO_MAX); 3406 })->prio (Coro::PRIO_MAX);
3404 }; 3407 };
3405 3408
3406 { 3409 evthread_start IO::AIO::poll_fileno;
3407 my $guard = freeze_mainloop; 3410
3411 cf::sync_job {
3412 reload_resources;
3408 reload_config; 3413 reload_config;
3409 db_init; 3414 db_init;
3415
3416 cf::load_settings;
3417 cf::load_materials;
3418 cf::init_uuid;
3419 cf::init_signals;
3420 cf::init_commands;
3421 cf::init_skills;
3422
3423 cf::init_beforeplay;
3424
3425 atomic;
3426
3410 load_extensions; 3427 load_extensions;
3411 3428
3412 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3413 }
3414
3415 utime time, time, $RUNTIMEFILE; 3429 utime time, time, $RUNTIMEFILE;
3416 3430
3417 # no (long-running) fork's whatsoever before this point(!) 3431 # no (long-running) fork's whatsoever before this point(!)
3418 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3432 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3433
3434 (pop @POST_INIT)->(0) while @POST_INIT;
3435 };
3419 3436
3420 EV::loop; 3437 EV::loop;
3421} 3438}
3422 3439
3423############################################################################# 3440#############################################################################
… …
3481 my $uuid = "$LOCALDIR/uuid"; 3498 my $uuid = "$LOCALDIR/uuid";
3482 3499
3483 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3500 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3484 or return; 3501 or return;
3485 3502
3486 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3503 my $value = uuid_seq uuid_cur;
3504
3505 unless ($value) {
3506 warn "cowardly refusing to write zero uuid value!\n";
3507 return;
3508 }
3509
3510 my $value = uuid_str $value + $uuid_skip;
3487 $uuid_skip = 0; 3511 $uuid_skip = 0;
3488 3512
3489 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3513 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3490 and return; 3514 and return;
3491 3515
… …
3513} 3537}
3514 3538
3515sub emergency_save() { 3539sub emergency_save() {
3516 my $freeze_guard = cf::freeze_mainloop; 3540 my $freeze_guard = cf::freeze_mainloop;
3517 3541
3518 warn "enter emergency perl save\n"; 3542 warn "emergency_perl_save: enter\n";
3519 3543
3520 cf::sync_job { 3544 cf::sync_job {
3545 # this is a trade-off: we want to be very quick here, so
3546 # save all maps without fsync, and later call a global sync
3547 # (which in turn might be very very slow)
3548 local $USE_FSYNC = 0;
3549
3521 # use a peculiar iteration method to avoid tripping on perl 3550 # use a peculiar iteration method to avoid tripping on perl
3522 # refcount bugs in for. also avoids problems with players 3551 # refcount bugs in for. also avoids problems with players
3523 # and maps saved/destroyed asynchronously. 3552 # and maps saved/destroyed asynchronously.
3524 warn "begin emergency player save\n"; 3553 warn "emergency_perl_save: begin player save\n";
3525 for my $login (keys %cf::PLAYER) { 3554 for my $login (keys %cf::PLAYER) {
3526 my $pl = $cf::PLAYER{$login} or next; 3555 my $pl = $cf::PLAYER{$login} or next;
3527 $pl->valid or next; 3556 $pl->valid or next;
3528 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3557 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3529 $pl->save; 3558 $pl->save;
3530 } 3559 }
3531 warn "end emergency player save\n"; 3560 warn "emergency_perl_save: end player save\n";
3532 3561
3533 warn "begin emergency map save\n"; 3562 warn "emergency_perl_save: begin map save\n";
3534 for my $path (keys %cf::MAP) { 3563 for my $path (keys %cf::MAP) {
3535 my $map = $cf::MAP{$path} or next; 3564 my $map = $cf::MAP{$path} or next;
3536 $map->valid or next; 3565 $map->valid or next;
3537 $map->save; 3566 $map->save;
3538 } 3567 }
3539 warn "end emergency map save\n"; 3568 warn "emergency_perl_save: end map save\n";
3540 3569
3541 warn "begin emergency database checkpoint\n"; 3570 warn "emergency_perl_save: begin database checkpoint\n";
3542 BDB::db_env_txn_checkpoint $DB_ENV; 3571 BDB::db_env_txn_checkpoint $DB_ENV;
3543 warn "end emergency database checkpoint\n"; 3572 warn "emergency_perl_save: end database checkpoint\n";
3544 3573
3545 warn "begin write uuid\n"; 3574 warn "emergency_perl_save: begin write uuid\n";
3546 write_uuid_sync 1; 3575 write_uuid_sync 1;
3547 warn "end write uuid\n"; 3576 warn "emergency_perl_save: end write uuid\n";
3548 }; 3577 };
3549 3578
3579 warn "emergency_perl_save: starting sync()\n";
3580 IO::AIO::aio_sync sub {
3581 warn "emergency_perl_save: finished sync()\n";
3582 };
3583
3550 warn "leave emergency perl save\n"; 3584 warn "emergency_perl_save: leave\n";
3551} 3585}
3552 3586
3553sub post_cleanup { 3587sub post_cleanup {
3554 my ($make_core) = @_; 3588 my ($make_core) = @_;
3555 3589
… …
3592 warn "can only reload from main coroutine"; 3626 warn "can only reload from main coroutine";
3593 return; 3627 return;
3594 } 3628 }
3595 3629
3596 return if $RELOAD++; 3630 return if $RELOAD++;
3631
3632 my $t1 = EV::time;
3597 3633
3598 while ($RELOAD) { 3634 while ($RELOAD) {
3599 warn "reloading..."; 3635 warn "reloading...";
3600 3636
3601 warn "entering sync_job"; 3637 warn "entering sync_job";
… …
3680 cf::reload_config; 3716 cf::reload_config;
3681 3717
3682 warn "loading extensions"; 3718 warn "loading extensions";
3683 cf::load_extensions; 3719 cf::load_extensions;
3684 3720
3721 if ($REATTACH_ON_RELOAD) {
3685 warn "reattaching attachments to objects/players"; 3722 warn "reattaching attachments to objects/players";
3686 _global_reattach; # objects, sockets 3723 _global_reattach; # objects, sockets
3687 warn "reattaching attachments to maps"; 3724 warn "reattaching attachments to maps";
3688 reattach $_ for values %MAP; 3725 reattach $_ for values %MAP;
3689 warn "reattaching attachments to players"; 3726 warn "reattaching attachments to players";
3690 reattach $_ for values %PLAYER; 3727 reattach $_ for values %PLAYER;
3728 }
3729
3730 warn "running post_init jobs";
3731 (pop @POST_INIT)->(1) while @POST_INIT;
3691 3732
3692 warn "leaving sync_job"; 3733 warn "leaving sync_job";
3693 3734
3694 1 3735 1
3695 } or do { 3736 } or do {
… …
3698 }; 3739 };
3699 3740
3700 warn "reloaded"; 3741 warn "reloaded";
3701 --$RELOAD; 3742 --$RELOAD;
3702 } 3743 }
3744
3745 $t1 = EV::time - $t1;
3746 warn "reload completed in ${t1}s\n";
3703}; 3747};
3704 3748
3705our $RELOAD_WATCHER; # used only during reload 3749our $RELOAD_WATCHER; # used only during reload
3706 3750
3707sub reload_perl() { 3751sub reload_perl() {
3708 # doing reload synchronously and two reloads happen back-to-back, 3752 # doing reload synchronously and two reloads happen back-to-back,
3709 # coro crashes during coro_state_free->destroy here. 3753 # coro crashes during coro_state_free->destroy here.
3710 3754
3755 $RELOAD_WATCHER ||= cf::async {
3756 Coro::AIO::aio_wait cache_extensions;
3757
3711 $RELOAD_WATCHER ||= EV::timer $TICK * 1.5, 0, sub { 3758 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3712 do_reload_perl; 3759 do_reload_perl;
3713 undef $RELOAD_WATCHER; 3760 undef $RELOAD_WATCHER;
3761 };
3714 }; 3762 };
3715} 3763}
3716 3764
3717register_command "reload" => sub { 3765register_command "reload" => sub {
3718 my ($who, $arg) = @_; 3766 my ($who, $arg) = @_;

Diff Legend

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