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.448 by root, Fri Sep 19 05:30:23 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 ();
… …
66$Storable::canonical = 1; # reduce rsync transfers 68$Storable::canonical = 1; # reduce rsync transfers
67Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 69Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
68 70
69$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 71$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
70 72
71{ 73# make sure c-lzf reinitialises itself
72 # very ugly, but ensure we acquire the storable lock
73
74 sub net_mstore {
75 my $guard = Coro::Storable::guard;
76 &Storable::net_mstore
77 }
78
79 sub mretrieve {
80 my $guard = Coro::Storable::guard;
81 &Storable::mretrieve
82 }
83
84 Compress::LZF::set_serializer "Coro::Storable", "cf::net_mstore", "cf::mretrieve"; 74Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
85 Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 75Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
86}
87 76
88sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 77sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
89 78
90our %COMMAND = (); 79our %COMMAND = ();
91our %COMMAND_TIME = (); 80our %COMMAND_TIME = ();
… …
94our %EXTCMD = (); 83our %EXTCMD = ();
95our %EXTICMD = (); 84our %EXTICMD = ();
96our %EXT_CORO = (); # coroutines bound to extensions 85our %EXT_CORO = (); # coroutines bound to extensions
97our %EXT_MAP = (); # pluggable maps 86our %EXT_MAP = (); # pluggable maps
98 87
99our $RELOAD; # number of reloads so far 88our $RELOAD; # number of reloads so far, non-zero while in reload
100our @EVENT; 89our @EVENT;
101 90
102our $CONFDIR = confdir; 91our $CONFDIR = confdir;
103our $DATADIR = datadir; 92our $DATADIR = datadir;
104our $LIBDIR = "$DATADIR/ext"; 93our $LIBDIR = "$DATADIR/ext";
… …
141our $LOAD; # a number between 0 (idle) and 1 (too many objects) 130our $LOAD; # a number between 0 (idle) and 1 (too many objects)
142our $LOADAVG; # same thing, but with alpha-smoothing 131our $LOADAVG; # same thing, but with alpha-smoothing
143our $JITTER; # average jitter 132our $JITTER; # average jitter
144our $TICK_START; # for load detecting purposes 133our $TICK_START; # for load detecting purposes
145 134
135our @POST_INIT;
136
137our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow)
138
146binmode STDOUT; 139binmode STDOUT;
147binmode STDERR; 140binmode STDERR;
148 141
149# read virtual server time, if available 142# read virtual server time, if available
150unless ($RUNTIME || !-e $RUNTIMEFILE) { 143unless ($RUNTIME || !-e $RUNTIMEFILE) {
… …
318our $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
319 312
320sub encode_json($) { $json_coder->encode ($_[0]) } 313sub encode_json($) { $json_coder->encode ($_[0]) }
321sub decode_json($) { $json_coder->decode ($_[0]) } 314sub decode_json($) { $json_coder->decode ($_[0]) }
322 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
323=item cf::lock_wait $string 330=item cf::lock_wait $string
324 331
325Wait until the given lock is available. See cf::lock_acquire. 332Wait until the given lock is available. See cf::lock_acquire.
326 333
327=item my $lock = cf::lock_acquire $string 334=item my $lock = cf::lock_acquire $string
328 335
329Wait 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
330a 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,
331for example when the coroutine gets canceled), the lock is automatically 338for example when the coroutine gets canceled), the lock is automatically
332returned. 339returned.
333 340
334Locks 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
335deadlocked coro. 342deadlocked coro.
… …
341 348
342Return 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.
343 350
344=cut 351=cut
345 352
346our %LOCK; 353our $LOCKS = new Coro::SemaphoreSet;
347our %LOCKER;#d#
348 354
349sub lock_wait($) { 355sub lock_wait($) {
350 my ($key) = @_; 356 $LOCKS->wait ($_[0]);
351
352 if ($LOCKER{$key} == $Coro::current) {#d#
353 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
354 return;#d#
355 }#d#
356
357 # wait for lock, if any
358 while ($LOCK{$key}) {
359 push @{ $LOCK{$key} }, $Coro::current;
360 Coro::schedule;
361 }
362} 357}
363 358
364sub lock_acquire($) { 359sub lock_acquire($) {
365 my ($key) = @_; 360 $LOCKS->guard ($_[0])
366
367 # wait, to be sure we are not locked
368 lock_wait $key;
369
370 $LOCK{$key} = [];
371 $LOCKER{$key} = $Coro::current;#d#
372
373 Coro::guard {
374 delete $LOCKER{$key};#d#
375 # wake up all waiters, to be on the safe side
376 $_->ready for @{ delete $LOCK{$key} };
377 }
378} 361}
379 362
380sub lock_active($) { 363sub lock_active($) {
381 my ($key) = @_; 364 $LOCKS->count ($_[0]) < 1
382
383 ! ! $LOCK{$key}
384} 365}
385 366
386sub freeze_mainloop { 367sub freeze_mainloop {
387 tick_inhibit_inc; 368 tick_inhibit_inc;
388 369
389 Coro::guard \&tick_inhibit_dec; 370 &Guard::guard (\&tick_inhibit_dec);
390} 371}
391 372
392=item cf::periodic $interval, $cb 373=item cf::periodic $interval, $cb
393 374
394Like 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
… …
1183 } else { 1164 } else {
1184 aio_unlink "$filename.pst"; 1165 aio_unlink "$filename.pst";
1185 } 1166 }
1186 1167
1187 aio_rename "$filename~", $filename; 1168 aio_rename "$filename~", $filename;
1169
1170 $filename =~ s%/[^/]+$%%;
1171 aio_pathsync $filename if $cf::USE_FSYNC;
1188 } else { 1172 } else {
1189 warn "FATAL: $filename~: $!\n"; 1173 warn "unable to save objects: $filename~: $!\n";
1190 } 1174 }
1191 } else { 1175 } else {
1192 aio_unlink $filename; 1176 aio_unlink $filename;
1193 aio_unlink "$filename.pst"; 1177 aio_unlink "$filename.pst";
1194 } 1178 }
… …
1285 my ($name, $cb) = @_; 1269 my ($name, $cb) = @_;
1286 1270
1287 $EXTICMD{$name} = $cb; 1271 $EXTICMD{$name} = $cb;
1288} 1272}
1289 1273
1274use File::Glob ();
1275
1290cf::player->attach ( 1276cf::player->attach (
1291 on_command => sub { 1277 on_command => sub {
1292 my ($pl, $name, $params) = @_; 1278 my ($pl, $name, $params) = @_;
1293 1279
1294 my $cb = $COMMAND{$name} 1280 my $cb = $COMMAND{$name}
… …
1325 } 1311 }
1326 1312
1327 cf::override; 1313 cf::override;
1328 }, 1314 },
1329); 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}
1330 1329
1331sub load_extensions { 1330sub load_extensions {
1332 cf::sync_job { 1331 cf::sync_job {
1333 my %todo; 1332 my %todo;
1334 1333
… …
1457 1456
1458sub exists($) { 1457sub exists($) {
1459 my ($login) = @_; 1458 my ($login) = @_;
1460 1459
1461 $cf::PLAYER{$login} 1460 $cf::PLAYER{$login}
1462 or cf::sync_job { !aio_stat path $login } 1461 or !aio_stat path $login
1463} 1462}
1464 1463
1465sub find($) { 1464sub find($) {
1466 return $cf::PLAYER{$_[0]} || do { 1465 return $cf::PLAYER{$_[0]} || do {
1467 my $login = $_[0]; 1466 my $login = $_[0];
… …
1863 1862
1864 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1863 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1865 "$UNIQUEDIR/$path" 1864 "$UNIQUEDIR/$path"
1866} 1865}
1867 1866
1868# and all this just because we cannot iterate over
1869# all maps in C++...
1870sub change_all_map_light {
1871 my ($change) = @_;
1872
1873 $_->change_map_light ($change)
1874 for grep $_->outdoor, values %cf::MAP;
1875}
1876
1877sub decay_objects { 1867sub decay_objects {
1878 my ($self) = @_; 1868 my ($self) = @_;
1879 1869
1880 return if $self->{deny_reset}; 1870 return if $self->{deny_reset};
1881 1871
… …
1963sub find { 1953sub find {
1964 my ($path, $origin) = @_; 1954 my ($path, $origin) = @_;
1965 1955
1966 $path = normalise $path, $origin && $origin->path; 1956 $path = normalise $path, $origin && $origin->path;
1967 1957
1968 cf::lock_wait "map_data:$path";#d#remove 1958 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1969 cf::lock_wait "map_find:$path"; 1959 my $guard2 = cf::lock_acquire "map_find:$path";
1970 1960
1971 $cf::MAP{$path} || do { 1961 $cf::MAP{$path} || do {
1972 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1973 my $guard2 = cf::lock_acquire "map_find:$path";
1974
1975 my $map = new_from_path cf::map $path 1962 my $map = new_from_path cf::map $path
1976 or return; 1963 or return;
1977 1964
1978 $map->{last_save} = $cf::RUNTIME; 1965 $map->{last_save} = $cf::RUNTIME;
1979 1966
… …
2046 2033
2047 unless ($self->{deny_activate}) { 2034 unless ($self->{deny_activate}) {
2048 $self->decay_objects; 2035 $self->decay_objects;
2049 $self->fix_auto_apply; 2036 $self->fix_auto_apply;
2050 $self->update_buttons; 2037 $self->update_buttons;
2051 cf::cede_to_tick;
2052 $self->set_darkness_map;
2053 cf::cede_to_tick; 2038 cf::cede_to_tick;
2054 $self->activate; 2039 $self->activate;
2055 } 2040 }
2056 2041
2057 $self->{last_save} = $cf::RUNTIME; 2042 $self->{last_save} = $cf::RUNTIME;
… …
2784 id => "infobox", 2769 id => "infobox",
2785 title => "Body Parts", 2770 title => "Body Parts",
2786 reply => undef, 2771 reply => undef,
2787 tooltip => "Shows which body parts you posess and are available", 2772 tooltip => "Shows which body parts you posess and are available",
2788 }, 2773 },
2774 "c/statistics" => {
2775 id => "infobox",
2776 title => "Statistics",
2777 reply => undef,
2778 tooltip => "Shows your primary statistics",
2779 },
2780 "c/skills" => {
2781 id => "infobox",
2782 title => "Skills",
2783 reply => undef,
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",
2797 },
2789 "c/uptime" => { 2798 "c/uptime" => {
2790 id => "infobox", 2799 id => "infobox",
2791 title => "Uptime", 2800 title => "Uptime",
2792 reply => undef, 2801 reply => undef,
2793 tooltip => "How long the server has been running since last restart", 2802 tooltip => "How long the server has been running since last restart",
… …
2802 id => "party", 2811 id => "party",
2803 title => "Party", 2812 title => "Party",
2804 reply => "gsay ", 2813 reply => "gsay ",
2805 tooltip => "Messages and chat related to your party", 2814 tooltip => "Messages and chat related to your party",
2806 }, 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,
2807); 2824);
2808 2825
2809sub cf::client::send_msg { 2826sub cf::client::send_msg {
2810 my ($self, $channel, $msg, $color, @extra) = @_; 2827 my ($self, $channel, $msg, $color, @extra) = @_;
2811 2828
… …
2816 2833
2817 # check predefined channels, for the benefit of C 2834 # check predefined channels, for the benefit of C
2818 if ($CHANNEL{$channel}) { 2835 if ($CHANNEL{$channel}) {
2819 $channel = $CHANNEL{$channel}; 2836 $channel = $CHANNEL{$channel};
2820 2837
2821 $self->ext_msg (channel_info => $channel) 2838 $self->ext_msg (channel_info => $channel);
2822 if $self->can_msg;
2823
2824 $channel = $channel->{id}; 2839 $channel = $channel->{id};
2825 2840
2826 } elsif (ref $channel) { 2841 } elsif (ref $channel) {
2827 # send meta info to client, if not yet sent 2842 # send meta info to client, if not yet sent
2828 unless (exists $self->{channel}{$channel->{id}}) { 2843 unless (exists $self->{channel}{$channel->{id}}) {
2829 $self->{channel}{$channel->{id}} = $channel; 2844 $self->{channel}{$channel->{id}} = $channel;
2830 $self->ext_msg (channel_info => $channel) 2845 $self->ext_msg (channel_info => $channel);
2831 if $self->can_msg;
2832 } 2846 }
2833 2847
2834 $channel = $channel->{id}; 2848 $channel = $channel->{id};
2835 } 2849 }
2836 2850
2837 return unless @extra || length $msg; 2851 return unless @extra || length $msg;
2838 2852
2839 if ($self->can_msg) {
2840 # default colour, mask it out 2853 # default colour, mask it out
2841 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2854 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2842 if $color & cf::NDI_DEF; 2855 if $color & cf::NDI_DEF;
2843 2856
2844 my $pkt = "msg " 2857 my $pkt = "msg "
2845 . $self->{json_coder}->encode ( 2858 . $self->{json_coder}->encode (
2846 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 2859 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2847 ); 2860 );
2848 2861
2849 # try lzf for large packets 2862 # try lzf for large packets
2850 $pkt = "lzf " . Compress::LZF::compress $pkt 2863 $pkt = "lzf " . Compress::LZF::compress $pkt
2851 if 1024 <= length $pkt and $self->{can_lzf}; 2864 if 1024 <= length $pkt and $self->{can_lzf};
2852 2865
2853 # split very large packets 2866 # split very large packets
2854 if (8192 < length $pkt and $self->{can_lzf}) { 2867 if (8192 < length $pkt and $self->{can_lzf}) {
2855 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt; 2868 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2856 $pkt = "frag"; 2869 $pkt = "frag";
2857 } 2870 }
2858 2871
2859 $self->send_packet ($pkt); 2872 $self->send_packet ($pkt);
2860 } else {
2861 if ($color >= 0) {
2862 # replace some tags by gcfclient-compatible ones
2863 for ($msg) {
2864 1 while
2865 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2866 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2867 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2868 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2869 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2870 }
2871
2872 $color &= cf::NDI_COLOR_MASK;
2873
2874 utf8::encode $msg;
2875
2876 if (0 && $msg =~ /\[/) {
2877 # COMMAND/INFO
2878 $self->send_packet ("drawextinfo $color 10 8 $msg")
2879 } else {
2880 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2881 $self->send_packet ("drawinfo $color $msg")
2882 }
2883 }
2884 }
2885} 2873}
2886 2874
2887=item $client->ext_msg ($type, @msg) 2875=item $client->ext_msg ($type, @msg)
2888 2876
2889Sends an ext event to the client. 2877Sends an ext event to the client.
… …
3347 reload_treasures; 3335 reload_treasures;
3348 3336
3349 warn "finished reloading resource files\n"; 3337 warn "finished reloading resource files\n";
3350} 3338}
3351 3339
3352sub init {
3353 my $guard = freeze_mainloop;
3354
3355 evthread_start IO::AIO::poll_fileno;
3356
3357 reload_resources;
3358}
3359
3360sub reload_config { 3340sub reload_config {
3361 open my $fh, "<:utf8", "$CONFDIR/config" 3341 open my $fh, "<:utf8", "$CONFDIR/config"
3362 or return; 3342 or return;
3363 3343
3364 local $/; 3344 local $/;
… …
3396 seek $fh, 0, 0; 3376 seek $fh, 0, 0;
3397 print $fh $$; 3377 print $fh $$;
3398} 3378}
3399 3379
3400sub main { 3380sub main {
3401 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
3402 3394
3403 # we must not ever block the main coroutine 3395 # we must not ever block the main coroutine
3404 local $Coro::idle = sub { 3396 local $Coro::idle = sub {
3405 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#
3406 (async { 3398 (async {
3407 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3399 $Coro::current->{desc} = "IDLE BUG HANDLER";
3408 EV::loop EV::LOOP_ONESHOT; 3400 EV::loop EV::LOOP_ONESHOT;
3409 })->prio (Coro::PRIO_MAX); 3401 })->prio (Coro::PRIO_MAX);
3410 }; 3402 };
3411 3403
3412 { 3404 evthread_start IO::AIO::poll_fileno;
3413 my $guard = freeze_mainloop; 3405
3406 cf::sync_job {
3407 reload_resources;
3414 reload_config; 3408 reload_config;
3415 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
3416 load_extensions; 3422 load_extensions;
3417 3423
3418 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3419 }
3420
3421 utime time, time, $RUNTIMEFILE; 3424 utime time, time, $RUNTIMEFILE;
3422 3425
3423 # no (long-running) fork's whatsoever before this point(!) 3426 # no (long-running) fork's whatsoever before this point(!)
3424 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 };
3425 3431
3426 EV::loop; 3432 EV::loop;
3427} 3433}
3428 3434
3429############################################################################# 3435#############################################################################
… …
3487 my $uuid = "$LOCALDIR/uuid"; 3493 my $uuid = "$LOCALDIR/uuid";
3488 3494
3489 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3495 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3490 or return; 3496 or return;
3491 3497
3492 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;
3493 $uuid_skip = 0; 3506 $uuid_skip = 0;
3494 3507
3495 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3508 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3496 and return; 3509 and return;
3497 3510
… …
3519} 3532}
3520 3533
3521sub emergency_save() { 3534sub emergency_save() {
3522 my $freeze_guard = cf::freeze_mainloop; 3535 my $freeze_guard = cf::freeze_mainloop;
3523 3536
3524 warn "enter emergency perl save\n"; 3537 warn "emergency_perl_save: enter\n";
3525 3538
3526 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
3527 # use a peculiar iteration method to avoid tripping on perl 3545 # use a peculiar iteration method to avoid tripping on perl
3528 # refcount bugs in for. also avoids problems with players 3546 # refcount bugs in for. also avoids problems with players
3529 # and maps saved/destroyed asynchronously. 3547 # and maps saved/destroyed asynchronously.
3530 warn "begin emergency player save\n"; 3548 warn "emergency_perl_save: begin player save\n";
3531 for my $login (keys %cf::PLAYER) { 3549 for my $login (keys %cf::PLAYER) {
3532 my $pl = $cf::PLAYER{$login} or next; 3550 my $pl = $cf::PLAYER{$login} or next;
3533 $pl->valid or next; 3551 $pl->valid or next;
3534 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3552 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3535 $pl->save; 3553 $pl->save;
3536 } 3554 }
3537 warn "end emergency player save\n"; 3555 warn "emergency_perl_save: end player save\n";
3538 3556
3539 warn "begin emergency map save\n"; 3557 warn "emergency_perl_save: begin map save\n";
3540 for my $path (keys %cf::MAP) { 3558 for my $path (keys %cf::MAP) {
3541 my $map = $cf::MAP{$path} or next; 3559 my $map = $cf::MAP{$path} or next;
3542 $map->valid or next; 3560 $map->valid or next;
3543 $map->save; 3561 $map->save;
3544 } 3562 }
3545 warn "end emergency map save\n"; 3563 warn "emergency_perl_save: end map save\n";
3546 3564
3547 warn "begin emergency database checkpoint\n"; 3565 warn "emergency_perl_save: begin database checkpoint\n";
3548 BDB::db_env_txn_checkpoint $DB_ENV; 3566 BDB::db_env_txn_checkpoint $DB_ENV;
3549 warn "end emergency database checkpoint\n"; 3567 warn "emergency_perl_save: end database checkpoint\n";
3550 3568
3551 warn "begin write uuid\n"; 3569 warn "emergency_perl_save: begin write uuid\n";
3552 write_uuid_sync 1; 3570 write_uuid_sync 1;
3553 warn "end write uuid\n"; 3571 warn "emergency_perl_save: end write uuid\n";
3554 }; 3572 };
3555 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
3556 warn "leave emergency perl save\n"; 3579 warn "emergency_perl_save: leave\n";
3557} 3580}
3558 3581
3559sub post_cleanup { 3582sub post_cleanup {
3560 my ($make_core) = @_; 3583 my ($make_core) = @_;
3561 3584
… …
3587 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3610 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3588 for my $name (keys %$leaf_symtab) { 3611 for my $name (keys %$leaf_symtab) {
3589 _gv_clear *{"$pkg$name"}; 3612 _gv_clear *{"$pkg$name"};
3590# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3613# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3591 } 3614 }
3592 warn "cleared package #$pkg\n";#d# 3615 warn "cleared package $pkg\n";#d#
3593} 3616}
3594
3595our $RELOAD; # how many times to reload
3596 3617
3597sub do_reload_perl() { 3618sub do_reload_perl() {
3598 # can/must only be called in main 3619 # can/must only be called in main
3599 if ($Coro::current != $Coro::main) { 3620 if ($Coro::current != $Coro::main) {
3600 warn "can only reload from main coroutine"; 3621 warn "can only reload from main coroutine";
3601 return; 3622 return;
3602 } 3623 }
3603 3624
3604 return if $RELOAD++; 3625 return if $RELOAD++;
3626
3627 my $t1 = EV::time;
3605 3628
3606 while ($RELOAD) { 3629 while ($RELOAD) {
3607 warn "reloading..."; 3630 warn "reloading...";
3608 3631
3609 warn "entering sync_job"; 3632 warn "entering sync_job";
… …
3688 cf::reload_config; 3711 cf::reload_config;
3689 3712
3690 warn "loading extensions"; 3713 warn "loading extensions";
3691 cf::load_extensions; 3714 cf::load_extensions;
3692 3715
3716 if ($REATTACH_ON_RELOAD) {
3693 warn "reattaching attachments to objects/players"; 3717 warn "reattaching attachments to objects/players";
3694 _global_reattach; # objects, sockets 3718 _global_reattach; # objects, sockets
3695 warn "reattaching attachments to maps"; 3719 warn "reattaching attachments to maps";
3696 reattach $_ for values %MAP; 3720 reattach $_ for values %MAP;
3697 warn "reattaching attachments to players"; 3721 warn "reattaching attachments to players";
3698 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;
3699 3727
3700 warn "leaving sync_job"; 3728 warn "leaving sync_job";
3701 3729
3702 1 3730 1
3703 } or do { 3731 } or do {
… …
3706 }; 3734 };
3707 3735
3708 warn "reloaded"; 3736 warn "reloaded";
3709 --$RELOAD; 3737 --$RELOAD;
3710 } 3738 }
3739
3740 $t1 = EV::time - $t1;
3741 warn "reload completed in ${t1}s\n";
3711}; 3742};
3712 3743
3713our $RELOAD_WATCHER; # used only during reload 3744our $RELOAD_WATCHER; # used only during reload
3714 3745
3715sub reload_perl() { 3746sub reload_perl() {
3716 # doing reload synchronously and two reloads happen back-to-back, 3747 # doing reload synchronously and two reloads happen back-to-back,
3717 # coro crashes during coro_state_free->destroy here. 3748 # coro crashes during coro_state_free->destroy here.
3718 3749
3750 $RELOAD_WATCHER ||= cf::async {
3751 Coro::AIO::aio_wait cache_extensions;
3752
3719 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3753 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3720 do_reload_perl; 3754 do_reload_perl;
3721 undef $RELOAD_WATCHER; 3755 undef $RELOAD_WATCHER;
3756 };
3722 }; 3757 };
3723} 3758}
3724 3759
3725register_command "reload" => sub { 3760register_command "reload" => sub {
3726 my ($who, $arg) = @_; 3761 my ($who, $arg) = @_;

Diff Legend

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