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.449 by root, Sat Sep 20 00:09:27 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 ();
… …
81our %EXTCMD = (); 83our %EXTCMD = ();
82our %EXTICMD = (); 84our %EXTICMD = ();
83our %EXT_CORO = (); # coroutines bound to extensions 85our %EXT_CORO = (); # coroutines bound to extensions
84our %EXT_MAP = (); # pluggable maps 86our %EXT_MAP = (); # pluggable maps
85 87
86our $RELOAD; # number of reloads so far 88our $RELOAD; # number of reloads so far, non-zero while in reload
87our @EVENT; 89our @EVENT;
88 90
89our $CONFDIR = confdir; 91our $CONFDIR = confdir;
90our $DATADIR = datadir; 92our $DATADIR = datadir;
91our $LIBDIR = "$DATADIR/ext"; 93our $LIBDIR = "$DATADIR/ext";
… …
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 push @{ $LOCK{$key} }, $Coro::current;
347 Coro::schedule;
348 }
349} 357}
350 358
351sub lock_acquire($) { 359sub lock_acquire($) {
352 my ($key) = @_; 360 $LOCKS->guard ($_[0])
353
354 # wait, to be sure we are not locked
355 lock_wait $key;
356
357 $LOCK{$key} = [];
358 $LOCKER{$key} = $Coro::current;#d#
359
360 Coro::guard {
361 delete $LOCKER{$key};#d#
362 # wake up all waiters, to be on the safe side
363 $_->ready for @{ delete $LOCK{$key} };
364 }
365} 361}
366 362
367sub lock_active($) { 363sub lock_active($) {
368 my ($key) = @_; 364 $LOCKS->count ($_[0]) < 1
369
370 ! ! $LOCK{$key}
371} 365}
372 366
373sub freeze_mainloop { 367sub freeze_mainloop {
374 tick_inhibit_inc; 368 tick_inhibit_inc;
375 369
376 Coro::guard \&tick_inhibit_dec; 370 &Guard::guard (\&tick_inhibit_dec);
377} 371}
378 372
379=item cf::periodic $interval, $cb 373=item cf::periodic $interval, $cb
380 374
381Like 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
… …
1170 } else { 1164 } else {
1171 aio_unlink "$filename.pst"; 1165 aio_unlink "$filename.pst";
1172 } 1166 }
1173 1167
1174 aio_rename "$filename~", $filename; 1168 aio_rename "$filename~", $filename;
1169
1170 $filename =~ s%/[^/]+$%%;
1171 aio_pathsync $filename if $cf::USE_FSYNC;
1175 } else { 1172 } else {
1176 warn "FATAL: $filename~: $!\n"; 1173 warn "FATAL: $filename~: $!\n";
1177 } 1174 }
1178 } else { 1175 } else {
1179 aio_unlink $filename; 1176 aio_unlink $filename;
… …
1272 my ($name, $cb) = @_; 1269 my ($name, $cb) = @_;
1273 1270
1274 $EXTICMD{$name} = $cb; 1271 $EXTICMD{$name} = $cb;
1275} 1272}
1276 1273
1274use File::Glob ();
1275
1277cf::player->attach ( 1276cf::player->attach (
1278 on_command => sub { 1277 on_command => sub {
1279 my ($pl, $name, $params) = @_; 1278 my ($pl, $name, $params) = @_;
1280 1279
1281 my $cb = $COMMAND{$name} 1280 my $cb = $COMMAND{$name}
… …
1312 } 1311 }
1313 1312
1314 cf::override; 1313 cf::override;
1315 }, 1314 },
1316); 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}
1317 1329
1318sub load_extensions { 1330sub load_extensions {
1319 cf::sync_job { 1331 cf::sync_job {
1320 my %todo; 1332 my %todo;
1321 1333
… …
1444 1456
1445sub exists($) { 1457sub exists($) {
1446 my ($login) = @_; 1458 my ($login) = @_;
1447 1459
1448 $cf::PLAYER{$login} 1460 $cf::PLAYER{$login}
1449 or cf::sync_job { !aio_stat path $login } 1461 or !aio_stat path $login
1450} 1462}
1451 1463
1452sub find($) { 1464sub find($) {
1453 return $cf::PLAYER{$_[0]} || do { 1465 return $cf::PLAYER{$_[0]} || do {
1454 my $login = $_[0]; 1466 my $login = $_[0];
… …
1950sub find { 1962sub find {
1951 my ($path, $origin) = @_; 1963 my ($path, $origin) = @_;
1952 1964
1953 $path = normalise $path, $origin && $origin->path; 1965 $path = normalise $path, $origin && $origin->path;
1954 1966
1955 cf::lock_wait "map_data:$path";#d#remove 1967 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1956 cf::lock_wait "map_find:$path"; 1968 my $guard2 = cf::lock_acquire "map_find:$path";
1957 1969
1958 $cf::MAP{$path} || do { 1970 $cf::MAP{$path} || do {
1959 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1960 my $guard2 = cf::lock_acquire "map_find:$path";
1961
1962 my $map = new_from_path cf::map $path 1971 my $map = new_from_path cf::map $path
1963 or return; 1972 or return;
1964 1973
1965 $map->{last_save} = $cf::RUNTIME; 1974 $map->{last_save} = $cf::RUNTIME;
1966 1975
… …
2771 id => "infobox", 2780 id => "infobox",
2772 title => "Body Parts", 2781 title => "Body Parts",
2773 reply => undef, 2782 reply => undef,
2774 tooltip => "Shows which body parts you posess and are available", 2783 tooltip => "Shows which body parts you posess and are available",
2775 }, 2784 },
2785 "c/skills" => {
2786 id => "infobox",
2787 title => "Skills",
2788 reply => undef,
2789 tooltip => "Shows your experience per skill and item power",
2790 },
2776 "c/uptime" => { 2791 "c/uptime" => {
2777 id => "infobox", 2792 id => "infobox",
2778 title => "Uptime", 2793 title => "Uptime",
2779 reply => undef, 2794 reply => undef,
2780 tooltip => "How long the server has been running since last restart", 2795 tooltip => "How long the server has been running since last restart",
… …
3334 reload_treasures; 3349 reload_treasures;
3335 3350
3336 warn "finished reloading resource files\n"; 3351 warn "finished reloading resource files\n";
3337} 3352}
3338 3353
3339sub init {
3340 my $guard = freeze_mainloop;
3341
3342 evthread_start IO::AIO::poll_fileno;
3343
3344 reload_resources;
3345}
3346
3347sub reload_config { 3354sub reload_config {
3348 open my $fh, "<:utf8", "$CONFDIR/config" 3355 open my $fh, "<:utf8", "$CONFDIR/config"
3349 or return; 3356 or return;
3350 3357
3351 local $/; 3358 local $/;
… …
3383 seek $fh, 0, 0; 3390 seek $fh, 0, 0;
3384 print $fh $$; 3391 print $fh $$;
3385} 3392}
3386 3393
3387sub main { 3394sub main {
3388 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
3389 3409
3390 # we must not ever block the main coroutine 3410 # we must not ever block the main coroutine
3391 local $Coro::idle = sub { 3411 local $Coro::idle = sub {
3392 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#
3393 (async { 3413 (async {
3394 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3414 $Coro::current->{desc} = "IDLE BUG HANDLER";
3395 EV::loop EV::LOOP_ONESHOT; 3415 EV::loop EV::LOOP_ONESHOT;
3396 })->prio (Coro::PRIO_MAX); 3416 })->prio (Coro::PRIO_MAX);
3397 }; 3417 };
3398 3418
3399 { 3419 evthread_start IO::AIO::poll_fileno;
3400 my $guard = freeze_mainloop; 3420
3421 cf::sync_job {
3422 reload_resources;
3401 reload_config; 3423 reload_config;
3402 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
3403 load_extensions; 3437 load_extensions;
3404 3438
3405 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3406 }
3407
3408 utime time, time, $RUNTIMEFILE; 3439 utime time, time, $RUNTIMEFILE;
3409 3440
3410 # no (long-running) fork's whatsoever before this point(!) 3441 # no (long-running) fork's whatsoever before this point(!)
3411 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 };
3412 3446
3413 EV::loop; 3447 EV::loop;
3414} 3448}
3415 3449
3416############################################################################# 3450#############################################################################
… …
3474 my $uuid = "$LOCALDIR/uuid"; 3508 my $uuid = "$LOCALDIR/uuid";
3475 3509
3476 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3510 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3477 or return; 3511 or return;
3478 3512
3479 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;
3480 $uuid_skip = 0; 3521 $uuid_skip = 0;
3481 3522
3482 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3523 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3483 and return; 3524 and return;
3484 3525
… …
3506} 3547}
3507 3548
3508sub emergency_save() { 3549sub emergency_save() {
3509 my $freeze_guard = cf::freeze_mainloop; 3550 my $freeze_guard = cf::freeze_mainloop;
3510 3551
3511 warn "enter emergency perl save\n"; 3552 warn "emergency_perl_save: enter\n";
3512 3553
3513 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
3514 # use a peculiar iteration method to avoid tripping on perl 3560 # use a peculiar iteration method to avoid tripping on perl
3515 # refcount bugs in for. also avoids problems with players 3561 # refcount bugs in for. also avoids problems with players
3516 # and maps saved/destroyed asynchronously. 3562 # and maps saved/destroyed asynchronously.
3517 warn "begin emergency player save\n"; 3563 warn "emergency_perl_save: begin player save\n";
3518 for my $login (keys %cf::PLAYER) { 3564 for my $login (keys %cf::PLAYER) {
3519 my $pl = $cf::PLAYER{$login} or next; 3565 my $pl = $cf::PLAYER{$login} or next;
3520 $pl->valid or next; 3566 $pl->valid or next;
3521 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3567 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3522 $pl->save; 3568 $pl->save;
3523 } 3569 }
3524 warn "end emergency player save\n"; 3570 warn "emergency_perl_save: end player save\n";
3525 3571
3526 warn "begin emergency map save\n"; 3572 warn "emergency_perl_save: begin map save\n";
3527 for my $path (keys %cf::MAP) { 3573 for my $path (keys %cf::MAP) {
3528 my $map = $cf::MAP{$path} or next; 3574 my $map = $cf::MAP{$path} or next;
3529 $map->valid or next; 3575 $map->valid or next;
3530 $map->save; 3576 $map->save;
3531 } 3577 }
3532 warn "end emergency map save\n"; 3578 warn "emergency_perl_save: end map save\n";
3533 3579
3534 warn "begin emergency database checkpoint\n"; 3580 warn "emergency_perl_save: begin database checkpoint\n";
3535 BDB::db_env_txn_checkpoint $DB_ENV; 3581 BDB::db_env_txn_checkpoint $DB_ENV;
3536 warn "end emergency database checkpoint\n"; 3582 warn "emergency_perl_save: end database checkpoint\n";
3537 3583
3538 warn "begin write uuid\n"; 3584 warn "emergency_perl_save: begin write uuid\n";
3539 write_uuid_sync 1; 3585 write_uuid_sync 1;
3540 warn "end write uuid\n"; 3586 warn "emergency_perl_save: end write uuid\n";
3541 }; 3587 };
3542 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
3543 warn "leave emergency perl save\n"; 3594 warn "emergency_perl_save: leave\n";
3544} 3595}
3545 3596
3546sub post_cleanup { 3597sub post_cleanup {
3547 my ($make_core) = @_; 3598 my ($make_core) = @_;
3548 3599
… …
3574 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3625 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3575 for my $name (keys %$leaf_symtab) { 3626 for my $name (keys %$leaf_symtab) {
3576 _gv_clear *{"$pkg$name"}; 3627 _gv_clear *{"$pkg$name"};
3577# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3628# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3578 } 3629 }
3579 warn "cleared package #$pkg\n";#d# 3630 warn "cleared package $pkg\n";#d#
3580} 3631}
3581
3582our $RELOAD; # how many times to reload
3583 3632
3584sub do_reload_perl() { 3633sub do_reload_perl() {
3585 # can/must only be called in main 3634 # can/must only be called in main
3586 if ($Coro::current != $Coro::main) { 3635 if ($Coro::current != $Coro::main) {
3587 warn "can only reload from main coroutine"; 3636 warn "can only reload from main coroutine";
3588 return; 3637 return;
3589 } 3638 }
3590 3639
3591 return if $RELOAD++; 3640 return if $RELOAD++;
3641
3642 my $t1 = EV::time;
3592 3643
3593 while ($RELOAD) { 3644 while ($RELOAD) {
3594 warn "reloading..."; 3645 warn "reloading...";
3595 3646
3596 warn "entering sync_job"; 3647 warn "entering sync_job";
… …
3675 cf::reload_config; 3726 cf::reload_config;
3676 3727
3677 warn "loading extensions"; 3728 warn "loading extensions";
3678 cf::load_extensions; 3729 cf::load_extensions;
3679 3730
3731 if ($REATTACH_ON_RELOAD) {
3680 warn "reattaching attachments to objects/players"; 3732 warn "reattaching attachments to objects/players";
3681 _global_reattach; # objects, sockets 3733 _global_reattach; # objects, sockets
3682 warn "reattaching attachments to maps"; 3734 warn "reattaching attachments to maps";
3683 reattach $_ for values %MAP; 3735 reattach $_ for values %MAP;
3684 warn "reattaching attachments to players"; 3736 warn "reattaching attachments to players";
3685 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;
3686 3742
3687 warn "leaving sync_job"; 3743 warn "leaving sync_job";
3688 3744
3689 1 3745 1
3690 } or do { 3746 } or do {
… …
3693 }; 3749 };
3694 3750
3695 warn "reloaded"; 3751 warn "reloaded";
3696 --$RELOAD; 3752 --$RELOAD;
3697 } 3753 }
3754
3755 $t1 = EV::time - $t1;
3756 warn "reload completed in ${t1}s\n";
3698}; 3757};
3699 3758
3700our $RELOAD_WATCHER; # used only during reload 3759our $RELOAD_WATCHER; # used only during reload
3701 3760
3702sub reload_perl() { 3761sub reload_perl() {
3703 # doing reload synchronously and two reloads happen back-to-back, 3762 # doing reload synchronously and two reloads happen back-to-back,
3704 # coro crashes during coro_state_free->destroy here. 3763 # coro crashes during coro_state_free->destroy here.
3705 3764
3765 $RELOAD_WATCHER ||= cf::async {
3766 Coro::AIO::aio_wait cache_extensions;
3767
3706 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3768 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3707 do_reload_perl; 3769 do_reload_perl;
3708 undef $RELOAD_WATCHER; 3770 undef $RELOAD_WATCHER;
3771 };
3709 }; 3772 };
3710} 3773}
3711 3774
3712register_command "reload" => sub { 3775register_command "reload" => sub {
3713 my ($who, $arg) = @_; 3776 my ($who, $arg) = @_;

Diff Legend

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