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.459 by root, Sat Dec 13 21:46:12 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 "FATAL: $filename~: $!\n";
1178 } 1174 }
1179 } else { 1175 } else {
1180 aio_unlink $filename; 1176 aio_unlink $filename;
… …
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
… …
1951sub find { 1962sub find {
1952 my ($path, $origin) = @_; 1963 my ($path, $origin) = @_;
1953 1964
1954 $path = normalise $path, $origin && $origin->path; 1965 $path = normalise $path, $origin && $origin->path;
1955 1966
1956 cf::lock_wait "map_data:$path";#d#remove 1967 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1957 cf::lock_wait "map_find:$path"; 1968 my $guard2 = cf::lock_acquire "map_find:$path";
1958 1969
1959 $cf::MAP{$path} || do { 1970 $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 1971 my $map = new_from_path cf::map $path
1964 or return; 1972 or return;
1965 1973
1966 $map->{last_save} = $cf::RUNTIME; 1974 $map->{last_save} = $cf::RUNTIME;
1967 1975
… …
3341 reload_treasures; 3349 reload_treasures;
3342 3350
3343 warn "finished reloading resource files\n"; 3351 warn "finished reloading resource files\n";
3344} 3352}
3345 3353
3346sub init {
3347 my $guard = freeze_mainloop;
3348
3349 evthread_start IO::AIO::poll_fileno;
3350
3351 reload_resources;
3352}
3353
3354sub reload_config { 3354sub reload_config {
3355 open my $fh, "<:utf8", "$CONFDIR/config" 3355 open my $fh, "<:utf8", "$CONFDIR/config"
3356 or return; 3356 or return;
3357 3357
3358 local $/; 3358 local $/;
… …
3390 seek $fh, 0, 0; 3390 seek $fh, 0, 0;
3391 print $fh $$; 3391 print $fh $$;
3392} 3392}
3393 3393
3394sub main { 3394sub main {
3395 atomic; 3395 cf::init_globals; # initialise logging
3396
3397 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3398 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3399 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3400 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3401
3402 cf::init_experience;
3403 cf::init_anim;
3404 cf::init_attackmess;
3405 cf::init_dynamic;
3406 cf::init_block;
3407
3408 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3396 3409
3397 # we must not ever block the main coroutine 3410 # we must not ever block the main coroutine
3398 local $Coro::idle = sub { 3411 local $Coro::idle = sub {
3399 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3412 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3400 (async { 3413 (async {
3401 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3414 $Coro::current->{desc} = "IDLE BUG HANDLER";
3402 EV::loop EV::LOOP_ONESHOT; 3415 EV::loop EV::LOOP_ONESHOT;
3403 })->prio (Coro::PRIO_MAX); 3416 })->prio (Coro::PRIO_MAX);
3404 }; 3417 };
3405 3418
3406 { 3419 evthread_start IO::AIO::poll_fileno;
3407 my $guard = freeze_mainloop; 3420
3421 cf::sync_job {
3422 reload_resources;
3408 reload_config; 3423 reload_config;
3409 db_init; 3424 db_init;
3425
3426 cf::load_settings;
3427 cf::load_materials;
3428 cf::init_uuid;
3429 cf::init_signals;
3430 cf::init_commands;
3431 cf::init_skills;
3432
3433 cf::init_beforeplay;
3434
3435 atomic;
3436
3410 load_extensions; 3437 load_extensions;
3411 3438
3412 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3413 }
3414
3415 utime time, time, $RUNTIMEFILE; 3439 utime time, time, $RUNTIMEFILE;
3416 3440
3417 # no (long-running) fork's whatsoever before this point(!) 3441 # no (long-running) fork's whatsoever before this point(!)
3418 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3442 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3443
3444 (pop @POST_INIT)->(0) while @POST_INIT;
3445 };
3419 3446
3420 EV::loop; 3447 EV::loop;
3421} 3448}
3422 3449
3423############################################################################# 3450#############################################################################
… …
3481 my $uuid = "$LOCALDIR/uuid"; 3508 my $uuid = "$LOCALDIR/uuid";
3482 3509
3483 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3510 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3484 or return; 3511 or return;
3485 3512
3486 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3513 my $value = uuid_seq uuid_cur;
3514
3515 unless ($value) {
3516 warn "cowardly refusing to write zero uuid value!\n";
3517 return;
3518 }
3519
3520 my $value = uuid_str $value + $uuid_skip;
3487 $uuid_skip = 0; 3521 $uuid_skip = 0;
3488 3522
3489 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3523 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3490 and return; 3524 and return;
3491 3525
… …
3513} 3547}
3514 3548
3515sub emergency_save() { 3549sub emergency_save() {
3516 my $freeze_guard = cf::freeze_mainloop; 3550 my $freeze_guard = cf::freeze_mainloop;
3517 3551
3518 warn "enter emergency perl save\n"; 3552 warn "emergency_perl_save: enter\n";
3519 3553
3520 cf::sync_job { 3554 cf::sync_job {
3555 # this is a trade-off: we want to be very quick here, so
3556 # save all maps without fsync, and later call a global sync
3557 # (which in turn might be very very slow)
3558 local $USE_FSYNC = 0;
3559
3521 # use a peculiar iteration method to avoid tripping on perl 3560 # use a peculiar iteration method to avoid tripping on perl
3522 # refcount bugs in for. also avoids problems with players 3561 # refcount bugs in for. also avoids problems with players
3523 # and maps saved/destroyed asynchronously. 3562 # and maps saved/destroyed asynchronously.
3524 warn "begin emergency player save\n"; 3563 warn "emergency_perl_save: begin player save\n";
3525 for my $login (keys %cf::PLAYER) { 3564 for my $login (keys %cf::PLAYER) {
3526 my $pl = $cf::PLAYER{$login} or next; 3565 my $pl = $cf::PLAYER{$login} or next;
3527 $pl->valid or next; 3566 $pl->valid or next;
3528 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3567 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3529 $pl->save; 3568 $pl->save;
3530 } 3569 }
3531 warn "end emergency player save\n"; 3570 warn "emergency_perl_save: end player save\n";
3532 3571
3533 warn "begin emergency map save\n"; 3572 warn "emergency_perl_save: begin map save\n";
3534 for my $path (keys %cf::MAP) { 3573 for my $path (keys %cf::MAP) {
3535 my $map = $cf::MAP{$path} or next; 3574 my $map = $cf::MAP{$path} or next;
3536 $map->valid or next; 3575 $map->valid or next;
3537 $map->save; 3576 $map->save;
3538 } 3577 }
3539 warn "end emergency map save\n"; 3578 warn "emergency_perl_save: end map save\n";
3540 3579
3541 warn "begin emergency database checkpoint\n"; 3580 warn "emergency_perl_save: begin database checkpoint\n";
3542 BDB::db_env_txn_checkpoint $DB_ENV; 3581 BDB::db_env_txn_checkpoint $DB_ENV;
3543 warn "end emergency database checkpoint\n"; 3582 warn "emergency_perl_save: end database checkpoint\n";
3544 3583
3545 warn "begin write uuid\n"; 3584 warn "emergency_perl_save: begin write uuid\n";
3546 write_uuid_sync 1; 3585 write_uuid_sync 1;
3547 warn "end write uuid\n"; 3586 warn "emergency_perl_save: end write uuid\n";
3548 }; 3587 };
3549 3588
3589 warn "emergency_perl_save: starting sync()\n";
3590 IO::AIO::aio_sync sub {
3591 warn "emergency_perl_save: finished sync()\n";
3592 };
3593
3550 warn "leave emergency perl save\n"; 3594 warn "emergency_perl_save: leave\n";
3551} 3595}
3552 3596
3553sub post_cleanup { 3597sub post_cleanup {
3554 my ($make_core) = @_; 3598 my ($make_core) = @_;
3555 3599
… …
3592 warn "can only reload from main coroutine"; 3636 warn "can only reload from main coroutine";
3593 return; 3637 return;
3594 } 3638 }
3595 3639
3596 return if $RELOAD++; 3640 return if $RELOAD++;
3641
3642 my $t1 = EV::time;
3597 3643
3598 while ($RELOAD) { 3644 while ($RELOAD) {
3599 warn "reloading..."; 3645 warn "reloading...";
3600 3646
3601 warn "entering sync_job"; 3647 warn "entering sync_job";
… …
3680 cf::reload_config; 3726 cf::reload_config;
3681 3727
3682 warn "loading extensions"; 3728 warn "loading extensions";
3683 cf::load_extensions; 3729 cf::load_extensions;
3684 3730
3731 if ($REATTACH_ON_RELOAD) {
3685 warn "reattaching attachments to objects/players"; 3732 warn "reattaching attachments to objects/players";
3686 _global_reattach; # objects, sockets 3733 _global_reattach; # objects, sockets
3687 warn "reattaching attachments to maps"; 3734 warn "reattaching attachments to maps";
3688 reattach $_ for values %MAP; 3735 reattach $_ for values %MAP;
3689 warn "reattaching attachments to players"; 3736 warn "reattaching attachments to players";
3690 reattach $_ for values %PLAYER; 3737 reattach $_ for values %PLAYER;
3738 }
3739
3740 warn "running post_init jobs";
3741 (pop @POST_INIT)->(1) while @POST_INIT;
3691 3742
3692 warn "leaving sync_job"; 3743 warn "leaving sync_job";
3693 3744
3694 1 3745 1
3695 } or do { 3746 } or do {
… …
3698 }; 3749 };
3699 3750
3700 warn "reloaded"; 3751 warn "reloaded";
3701 --$RELOAD; 3752 --$RELOAD;
3702 } 3753 }
3754
3755 $t1 = EV::time - $t1;
3756 warn "reload completed in ${t1}s\n";
3703}; 3757};
3704 3758
3705our $RELOAD_WATCHER; # used only during reload 3759our $RELOAD_WATCHER; # used only during reload
3706 3760
3707sub reload_perl() { 3761sub reload_perl() {
3708 # doing reload synchronously and two reloads happen back-to-back, 3762 # doing reload synchronously and two reloads happen back-to-back,
3709 # coro crashes during coro_state_free->destroy here. 3763 # coro crashes during coro_state_free->destroy here.
3710 3764
3765 $RELOAD_WATCHER ||= cf::async {
3766 Coro::AIO::aio_wait cache_extensions;
3767
3711 $RELOAD_WATCHER ||= EV::timer $TICK * 1.5, 0, sub { 3768 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3712 do_reload_perl; 3769 do_reload_perl;
3713 undef $RELOAD_WATCHER; 3770 undef $RELOAD_WATCHER;
3771 };
3714 }; 3772 };
3715} 3773}
3716 3774
3717register_command "reload" => sub { 3775register_command "reload" => sub {
3718 my ($who, $arg) = @_; 3776 my ($who, $arg) = @_;

Diff Legend

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