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.451 by root, Mon Sep 22 05:42:41 2008 UTC vs.
Revision 1.465 by root, Thu Jan 8 00:54:55 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 ();
… …
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
… …
1445 1456
1446sub exists($) { 1457sub exists($) {
1447 my ($login) = @_; 1458 my ($login) = @_;
1448 1459
1449 $cf::PLAYER{$login} 1460 $cf::PLAYER{$login}
1450 or cf::sync_job { !aio_stat path $login } 1461 or !aio_stat path $login
1451} 1462}
1452 1463
1453sub find($) { 1464sub find($) {
1454 return $cf::PLAYER{$_[0]} || do { 1465 return $cf::PLAYER{$_[0]} || do {
1455 my $login = $_[0]; 1466 my $login = $_[0];
… …
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;
… …
2772 id => "infobox", 2769 id => "infobox",
2773 title => "Body Parts", 2770 title => "Body Parts",
2774 reply => undef, 2771 reply => undef,
2775 tooltip => "Shows which body parts you posess and are available", 2772 tooltip => "Shows which body parts you posess and are available",
2776 }, 2773 },
2774 "c/statistics" => {
2775 id => "infobox",
2776 title => "Statistics",
2777 reply => undef,
2778 tooltip => "Shows your primary statistics",
2779 },
2777 "c/skills" => { 2780 "c/skills" => {
2778 id => "infobox", 2781 id => "infobox",
2779 title => "Skills", 2782 title => "Skills",
2780 reply => undef, 2783 reply => undef,
2781 tooltip => "Shows your experience per skill and item power", 2784 tooltip => "Shows your experience per skill and item power",
2785 },
2786 "c/resistances" => {
2787 id => "infobox",
2788 title => "Resistances",
2789 reply => undef,
2790 tooltip => "Shows your resistances",
2791 },
2792 "c/pets" => {
2793 id => "infobox",
2794 title => "Pets",
2795 reply => undef,
2796 tooltip => "Shows information abotu your pets/a specific pet",
2782 }, 2797 },
2783 "c/uptime" => { 2798 "c/uptime" => {
2784 id => "infobox", 2799 id => "infobox",
2785 title => "Uptime", 2800 title => "Uptime",
2786 reply => undef, 2801 reply => undef,
… …
2796 id => "party", 2811 id => "party",
2797 title => "Party", 2812 title => "Party",
2798 reply => "gsay ", 2813 reply => "gsay ",
2799 tooltip => "Messages and chat related to your party", 2814 tooltip => "Messages and chat related to your party",
2800 }, 2815 },
2816 "c/death" => {
2817 id => "death",
2818 title => "Death",
2819 reply => undef,
2820 tooltip => "Reason for and more info about your most recent death",
2821 },
2822 "c/say" => $SAY_CHANNEL,
2823 "c/chat" => $CHAT_CHANNEL,
2801); 2824);
2802 2825
2803sub cf::client::send_msg { 2826sub cf::client::send_msg {
2804 my ($self, $channel, $msg, $color, @extra) = @_; 2827 my ($self, $channel, $msg, $color, @extra) = @_;
2805 2828
… …
2810 2833
2811 # check predefined channels, for the benefit of C 2834 # check predefined channels, for the benefit of C
2812 if ($CHANNEL{$channel}) { 2835 if ($CHANNEL{$channel}) {
2813 $channel = $CHANNEL{$channel}; 2836 $channel = $CHANNEL{$channel};
2814 2837
2815 $self->ext_msg (channel_info => $channel) 2838 $self->ext_msg (channel_info => $channel);
2816 if $self->can_msg;
2817
2818 $channel = $channel->{id}; 2839 $channel = $channel->{id};
2819 2840
2820 } elsif (ref $channel) { 2841 } elsif (ref $channel) {
2821 # send meta info to client, if not yet sent 2842 # send meta info to client, if not yet sent
2822 unless (exists $self->{channel}{$channel->{id}}) { 2843 unless (exists $self->{channel}{$channel->{id}}) {
2823 $self->{channel}{$channel->{id}} = $channel; 2844 $self->{channel}{$channel->{id}} = $channel;
2824 $self->ext_msg (channel_info => $channel) 2845 $self->ext_msg (channel_info => $channel);
2825 if $self->can_msg;
2826 } 2846 }
2827 2847
2828 $channel = $channel->{id}; 2848 $channel = $channel->{id};
2829 } 2849 }
2830 2850
2831 return unless @extra || length $msg; 2851 return unless @extra || length $msg;
2832 2852
2833 if ($self->can_msg) {
2834 # default colour, mask it out 2853 # default colour, mask it out
2835 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2854 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2836 if $color & cf::NDI_DEF; 2855 if $color & cf::NDI_DEF;
2837 2856
2838 my $pkt = "msg " 2857 my $pkt = "msg "
2839 . $self->{json_coder}->encode ( 2858 . $self->{json_coder}->encode (
2840 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 2859 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2841 ); 2860 );
2842 2861
2843 # try lzf for large packets 2862 # try lzf for large packets
2844 $pkt = "lzf " . Compress::LZF::compress $pkt 2863 $pkt = "lzf " . Compress::LZF::compress $pkt
2845 if 1024 <= length $pkt and $self->{can_lzf}; 2864 if 1024 <= length $pkt and $self->{can_lzf};
2846 2865
2847 # split very large packets 2866 # split very large packets
2848 if (8192 < length $pkt and $self->{can_lzf}) { 2867 if (8192 < length $pkt and $self->{can_lzf}) {
2849 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt; 2868 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2850 $pkt = "frag"; 2869 $pkt = "frag";
2851 } 2870 }
2852 2871
2853 $self->send_packet ($pkt); 2872 $self->send_packet ($pkt);
2854 } else {
2855 if ($color >= 0) {
2856 # replace some tags by gcfclient-compatible ones
2857 for ($msg) {
2858 1 while
2859 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2860 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2861 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2862 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2863 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2864 }
2865
2866 $color &= cf::NDI_COLOR_MASK;
2867
2868 utf8::encode $msg;
2869
2870 if (0 && $msg =~ /\[/) {
2871 # COMMAND/INFO
2872 $self->send_packet ("drawextinfo $color 10 8 $msg")
2873 } else {
2874 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2875 $self->send_packet ("drawinfo $color $msg")
2876 }
2877 }
2878 }
2879} 2873}
2880 2874
2881=item $client->ext_msg ($type, @msg) 2875=item $client->ext_msg ($type, @msg)
2882 2876
2883Sends an ext event to the client. 2877Sends an ext event to the client.
… …
3341 reload_treasures; 3335 reload_treasures;
3342 3336
3343 warn "finished reloading resource files\n"; 3337 warn "finished reloading resource files\n";
3344} 3338}
3345 3339
3346sub init {
3347 my $guard = freeze_mainloop;
3348
3349 evthread_start IO::AIO::poll_fileno;
3350
3351 reload_resources;
3352}
3353
3354sub reload_config { 3340sub reload_config {
3355 open my $fh, "<:utf8", "$CONFDIR/config" 3341 open my $fh, "<:utf8", "$CONFDIR/config"
3356 or return; 3342 or return;
3357 3343
3358 local $/; 3344 local $/;
… …
3390 seek $fh, 0, 0; 3376 seek $fh, 0, 0;
3391 print $fh $$; 3377 print $fh $$;
3392} 3378}
3393 3379
3394sub main { 3380sub main {
3395 atomic; 3381 cf::init_globals; # initialise logging
3382
3383 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3384 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3385 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3386 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3387
3388 cf::init_experience;
3389 cf::init_anim;
3390 cf::init_attackmess;
3391 cf::init_dynamic;
3392
3393 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3396 3394
3397 # we must not ever block the main coroutine 3395 # we must not ever block the main coroutine
3398 local $Coro::idle = sub { 3396 local $Coro::idle = sub {
3399 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3397 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3400 (async { 3398 (async {
3401 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3399 $Coro::current->{desc} = "IDLE BUG HANDLER";
3402 EV::loop EV::LOOP_ONESHOT; 3400 EV::loop EV::LOOP_ONESHOT;
3403 })->prio (Coro::PRIO_MAX); 3401 })->prio (Coro::PRIO_MAX);
3404 }; 3402 };
3405 3403
3406 { 3404 evthread_start IO::AIO::poll_fileno;
3407 my $guard = freeze_mainloop; 3405
3406 cf::sync_job {
3407 reload_resources;
3408 reload_config; 3408 reload_config;
3409 db_init; 3409 db_init;
3410
3411 cf::load_settings;
3412 cf::load_materials;
3413 cf::init_uuid;
3414 cf::init_signals;
3415 cf::init_commands;
3416 cf::init_skills;
3417
3418 cf::init_beforeplay;
3419
3420 atomic;
3421
3410 load_extensions; 3422 load_extensions;
3411 3423
3412 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3413 }
3414
3415 utime time, time, $RUNTIMEFILE; 3424 utime time, time, $RUNTIMEFILE;
3416 3425
3417 # no (long-running) fork's whatsoever before this point(!) 3426 # no (long-running) fork's whatsoever before this point(!)
3418 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3427 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3428
3429 (pop @POST_INIT)->(0) while @POST_INIT;
3430 };
3419 3431
3420 EV::loop; 3432 EV::loop;
3421} 3433}
3422 3434
3423############################################################################# 3435#############################################################################
… …
3481 my $uuid = "$LOCALDIR/uuid"; 3493 my $uuid = "$LOCALDIR/uuid";
3482 3494
3483 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3495 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3484 or return; 3496 or return;
3485 3497
3486 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3498 my $value = uuid_seq uuid_cur;
3499
3500 unless ($value) {
3501 warn "cowardly refusing to write zero uuid value!\n";
3502 return;
3503 }
3504
3505 my $value = uuid_str $value + $uuid_skip;
3487 $uuid_skip = 0; 3506 $uuid_skip = 0;
3488 3507
3489 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3508 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3490 and return; 3509 and return;
3491 3510
… …
3513} 3532}
3514 3533
3515sub emergency_save() { 3534sub emergency_save() {
3516 my $freeze_guard = cf::freeze_mainloop; 3535 my $freeze_guard = cf::freeze_mainloop;
3517 3536
3518 warn "enter emergency perl save\n"; 3537 warn "emergency_perl_save: enter\n";
3519 3538
3520 cf::sync_job { 3539 cf::sync_job {
3540 # this is a trade-off: we want to be very quick here, so
3541 # save all maps without fsync, and later call a global sync
3542 # (which in turn might be very very slow)
3543 local $USE_FSYNC = 0;
3544
3521 # use a peculiar iteration method to avoid tripping on perl 3545 # use a peculiar iteration method to avoid tripping on perl
3522 # refcount bugs in for. also avoids problems with players 3546 # refcount bugs in for. also avoids problems with players
3523 # and maps saved/destroyed asynchronously. 3547 # and maps saved/destroyed asynchronously.
3524 warn "begin emergency player save\n"; 3548 warn "emergency_perl_save: begin player save\n";
3525 for my $login (keys %cf::PLAYER) { 3549 for my $login (keys %cf::PLAYER) {
3526 my $pl = $cf::PLAYER{$login} or next; 3550 my $pl = $cf::PLAYER{$login} or next;
3527 $pl->valid or next; 3551 $pl->valid or next;
3528 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3552 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3529 $pl->save; 3553 $pl->save;
3530 } 3554 }
3531 warn "end emergency player save\n"; 3555 warn "emergency_perl_save: end player save\n";
3532 3556
3533 warn "begin emergency map save\n"; 3557 warn "emergency_perl_save: begin map save\n";
3534 for my $path (keys %cf::MAP) { 3558 for my $path (keys %cf::MAP) {
3535 my $map = $cf::MAP{$path} or next; 3559 my $map = $cf::MAP{$path} or next;
3536 $map->valid or next; 3560 $map->valid or next;
3537 $map->save; 3561 $map->save;
3538 } 3562 }
3539 warn "end emergency map save\n"; 3563 warn "emergency_perl_save: end map save\n";
3540 3564
3541 warn "begin emergency database checkpoint\n"; 3565 warn "emergency_perl_save: begin database checkpoint\n";
3542 BDB::db_env_txn_checkpoint $DB_ENV; 3566 BDB::db_env_txn_checkpoint $DB_ENV;
3543 warn "end emergency database checkpoint\n"; 3567 warn "emergency_perl_save: end database checkpoint\n";
3544 3568
3545 warn "begin write uuid\n"; 3569 warn "emergency_perl_save: begin write uuid\n";
3546 write_uuid_sync 1; 3570 write_uuid_sync 1;
3547 warn "end write uuid\n"; 3571 warn "emergency_perl_save: end write uuid\n";
3548 }; 3572 };
3549 3573
3574 warn "emergency_perl_save: starting sync()\n";
3575 IO::AIO::aio_sync sub {
3576 warn "emergency_perl_save: finished sync()\n";
3577 };
3578
3550 warn "leave emergency perl save\n"; 3579 warn "emergency_perl_save: leave\n";
3551} 3580}
3552 3581
3553sub post_cleanup { 3582sub post_cleanup {
3554 my ($make_core) = @_; 3583 my ($make_core) = @_;
3555 3584
… …
3592 warn "can only reload from main coroutine"; 3621 warn "can only reload from main coroutine";
3593 return; 3622 return;
3594 } 3623 }
3595 3624
3596 return if $RELOAD++; 3625 return if $RELOAD++;
3626
3627 my $t1 = EV::time;
3597 3628
3598 while ($RELOAD) { 3629 while ($RELOAD) {
3599 warn "reloading..."; 3630 warn "reloading...";
3600 3631
3601 warn "entering sync_job"; 3632 warn "entering sync_job";
… …
3680 cf::reload_config; 3711 cf::reload_config;
3681 3712
3682 warn "loading extensions"; 3713 warn "loading extensions";
3683 cf::load_extensions; 3714 cf::load_extensions;
3684 3715
3716 if ($REATTACH_ON_RELOAD) {
3685 warn "reattaching attachments to objects/players"; 3717 warn "reattaching attachments to objects/players";
3686 _global_reattach; # objects, sockets 3718 _global_reattach; # objects, sockets
3687 warn "reattaching attachments to maps"; 3719 warn "reattaching attachments to maps";
3688 reattach $_ for values %MAP; 3720 reattach $_ for values %MAP;
3689 warn "reattaching attachments to players"; 3721 warn "reattaching attachments to players";
3690 reattach $_ for values %PLAYER; 3722 reattach $_ for values %PLAYER;
3723 }
3724
3725 warn "running post_init jobs";
3726 (pop @POST_INIT)->(1) while @POST_INIT;
3691 3727
3692 warn "leaving sync_job"; 3728 warn "leaving sync_job";
3693 3729
3694 1 3730 1
3695 } or do { 3731 } or do {
… …
3698 }; 3734 };
3699 3735
3700 warn "reloaded"; 3736 warn "reloaded";
3701 --$RELOAD; 3737 --$RELOAD;
3702 } 3738 }
3739
3740 $t1 = EV::time - $t1;
3741 warn "reload completed in ${t1}s\n";
3703}; 3742};
3704 3743
3705our $RELOAD_WATCHER; # used only during reload 3744our $RELOAD_WATCHER; # used only during reload
3706 3745
3707sub reload_perl() { 3746sub reload_perl() {
3708 # doing reload synchronously and two reloads happen back-to-back, 3747 # doing reload synchronously and two reloads happen back-to-back,
3709 # coro crashes during coro_state_free->destroy here. 3748 # coro crashes during coro_state_free->destroy here.
3710 3749
3750 $RELOAD_WATCHER ||= cf::async {
3751 Coro::AIO::aio_wait cache_extensions;
3752
3711 $RELOAD_WATCHER ||= EV::timer $TICK * 1.5, 0, sub { 3753 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3712 do_reload_perl; 3754 do_reload_perl;
3713 undef $RELOAD_WATCHER; 3755 undef $RELOAD_WATCHER;
3756 };
3714 }; 3757 };
3715} 3758}
3716 3759
3717register_command "reload" => sub { 3760register_command "reload" => sub {
3718 my ($who, $arg) = @_; 3761 my ($who, $arg) = @_;

Diff Legend

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