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.455 by root, Sat Sep 27 08:17:40 2008 UTC vs.
Revision 1.471 by root, Mon Apr 27 01:38:48 2009 UTC

… …
21 21
22package cf; 22package cf;
23 23
24use 5.10.0; 24use 5.10.0;
25use utf8; 25use utf8;
26use strict "vars", "subs"; 26use strict qw(vars subs);
27 27
28use Symbol; 28use Symbol;
29use List::Util; 29use List::Util;
30use Socket; 30use Socket;
31use EV; 31use EV;
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 ();
… …
103our %RESOURCE; 105our %RESOURCE;
104 106
105our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 107our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
106our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 108our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
107our $NEXT_TICK; 109our $NEXT_TICK;
108our $USE_FSYNC = 1; # use fsync to write maps - default off 110our $USE_FSYNC = 1; # use fsync to write maps - default on
109 111
110our $BDB_DEADLOCK_WATCHER; 112our $BDB_DEADLOCK_WATCHER;
111our $BDB_CHECKPOINT_WATCHER; 113our $BDB_CHECKPOINT_WATCHER;
112our $BDB_TRICKLE_WATCHER; 114our $BDB_TRICKLE_WATCHER;
113our $DB_ENV; 115our $DB_ENV;
114 116
117our @EXTRA_MODULES = qw(pod mapscript);
118
115our %CFG; 119our %CFG;
116 120
117our $UPTIME; $UPTIME ||= time; 121our $UPTIME; $UPTIME ||= time;
118our $RUNTIME; 122our $RUNTIME;
119our $NOW; 123our $NOW;
… …
129our $LOADAVG; # same thing, but with alpha-smoothing 133our $LOADAVG; # same thing, but with alpha-smoothing
130our $JITTER; # average jitter 134our $JITTER; # average jitter
131our $TICK_START; # for load detecting purposes 135our $TICK_START; # for load detecting purposes
132 136
133our @POST_INIT; 137our @POST_INIT;
138
139our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow)
134 140
135binmode STDOUT; 141binmode STDOUT;
136binmode STDERR; 142binmode STDERR;
137 143
138# read virtual server time, if available 144# read virtual server time, if available
139unless ($RUNTIME || !-e $RUNTIMEFILE) { 145unless ($RUNTIME || !-e $RUNTIMEFILE) {
140 open my $fh, "<", $RUNTIMEFILE 146 open my $fh, "<", $RUNTIMEFILE
141 or die "unable to read $RUNTIMEFILE file: $!"; 147 or die "unable to read $RUNTIMEFILE file: $!";
142 $RUNTIME = <$fh> + 0.; 148 $RUNTIME = <$fh> + 0.;
143} 149}
150
151eval "sub TICK() { $TICK } 1" or die;
144 152
145mkdir $_ 153mkdir $_
146 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 154 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
147 155
148our $EMERGENCY_POSITION; 156our $EMERGENCY_POSITION;
… …
328Wait until the given lock is available. See cf::lock_acquire. 336Wait until the given lock is available. See cf::lock_acquire.
329 337
330=item my $lock = cf::lock_acquire $string 338=item my $lock = cf::lock_acquire $string
331 339
332Wait until the given lock is available and then acquires it and returns 340Wait until the given lock is available and then acquires it and returns
333a Coro::guard object. If the guard object gets destroyed (goes out of scope, 341a L<Guard> object. If the guard object gets destroyed (goes out of scope,
334for example when the coroutine gets canceled), the lock is automatically 342for example when the coroutine gets canceled), the lock is automatically
335returned. 343returned.
336 344
337Locks are *not* recursive, locking from the same coro twice results in a 345Locks are *not* recursive, locking from the same coro twice results in a
338deadlocked coro. 346deadlocked coro.
… …
344 352
345Return true if the lock is currently active, i.e. somebody has locked it. 353Return true if the lock is currently active, i.e. somebody has locked it.
346 354
347=cut 355=cut
348 356
349our %LOCK; 357our $LOCKS = new Coro::SemaphoreSet;
350our %LOCKER;#d#
351 358
352sub lock_wait($) { 359sub lock_wait($) {
353 my ($key) = @_; 360 $LOCKS->wait ($_[0]);
354
355 if ($LOCKER{$key} == $Coro::current) {#d#
356 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
357 return;#d#
358 }#d#
359
360 # wait for lock, if any
361 while ($LOCK{$key}) {
362 #local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
363 push @{ $LOCK{$key} }, $Coro::current;
364 Coro::schedule;
365 }
366} 361}
367 362
368sub lock_acquire($) { 363sub lock_acquire($) {
369 my ($key) = @_; 364 $LOCKS->guard ($_[0])
370
371 # wait, to be sure we are not locked
372 lock_wait $key;
373
374 $LOCK{$key} = [];
375 $LOCKER{$key} = $Coro::current;#d#
376
377 Coro::guard {
378 delete $LOCKER{$key};#d#
379 # wake up all waiters, to be on the safe side
380 $_->ready for @{ delete $LOCK{$key} };
381 }
382} 365}
383 366
384sub lock_active($) { 367sub lock_active($) {
385 my ($key) = @_; 368 $LOCKS->count ($_[0]) < 1
386
387 ! ! $LOCK{$key}
388} 369}
389 370
390sub freeze_mainloop { 371sub freeze_mainloop {
391 tick_inhibit_inc; 372 tick_inhibit_inc;
392 373
393 Coro::guard \&tick_inhibit_dec; 374 &Guard::guard (\&tick_inhibit_dec);
394} 375}
395 376
396=item cf::periodic $interval, $cb 377=item cf::periodic $interval, $cb
397 378
398Like EV::periodic, but randomly selects a starting point so that the actions 379Like EV::periodic, but randomly selects a starting point so that the actions
… …
1187 } else { 1168 } else {
1188 aio_unlink "$filename.pst"; 1169 aio_unlink "$filename.pst";
1189 } 1170 }
1190 1171
1191 aio_rename "$filename~", $filename; 1172 aio_rename "$filename~", $filename;
1173
1174 $filename =~ s%/[^/]+$%%;
1175 aio_pathsync $filename if $cf::USE_FSYNC;
1192 } else { 1176 } else {
1193 warn "FATAL: $filename~: $!\n"; 1177 warn "unable to save objects: $filename~: $!\n";
1194 } 1178 }
1195 } else { 1179 } else {
1196 aio_unlink $filename; 1180 aio_unlink $filename;
1197 aio_unlink "$filename.pst"; 1181 aio_unlink "$filename.pst";
1198 } 1182 }
… …
1289 my ($name, $cb) = @_; 1273 my ($name, $cb) = @_;
1290 1274
1291 $EXTICMD{$name} = $cb; 1275 $EXTICMD{$name} = $cb;
1292} 1276}
1293 1277
1278use File::Glob ();
1279
1294cf::player->attach ( 1280cf::player->attach (
1295 on_command => sub { 1281 on_command => sub {
1296 my ($pl, $name, $params) = @_; 1282 my ($pl, $name, $params) = @_;
1297 1283
1298 my $cb = $COMMAND{$name} 1284 my $cb = $COMMAND{$name}
… …
1329 } 1315 }
1330 1316
1331 cf::override; 1317 cf::override;
1332 }, 1318 },
1333); 1319);
1320
1321# "readahead" all extensions
1322sub cache_extensions {
1323 my $grp = IO::AIO::aio_group;
1324
1325 add $grp IO::AIO::aio_readdir $LIBDIR, sub {
1326 for (grep /\.ext$/, @{$_[0]}) {
1327 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1328 }
1329 };
1330
1331 $grp
1332}
1334 1333
1335sub load_extensions { 1334sub load_extensions {
1336 cf::sync_job { 1335 cf::sync_job {
1337 my %todo; 1336 my %todo;
1338 1337
… …
1867 1866
1868 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1867 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1869 "$UNIQUEDIR/$path" 1868 "$UNIQUEDIR/$path"
1870} 1869}
1871 1870
1872# and all this just because we cannot iterate over
1873# all maps in C++...
1874sub change_all_map_light {
1875 my ($change) = @_;
1876
1877 $_->change_map_light ($change)
1878 for grep $_->outdoor, values %cf::MAP;
1879}
1880
1881sub decay_objects { 1871sub decay_objects {
1882 my ($self) = @_; 1872 my ($self) = @_;
1883 1873
1884 return if $self->{deny_reset}; 1874 return if $self->{deny_reset};
1885 1875
… …
1967sub find { 1957sub find {
1968 my ($path, $origin) = @_; 1958 my ($path, $origin) = @_;
1969 1959
1970 $path = normalise $path, $origin && $origin->path; 1960 $path = normalise $path, $origin && $origin->path;
1971 1961
1972 cf::lock_wait "map_data:$path";#d#remove 1962 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1973 cf::lock_wait "map_find:$path"; 1963 my $guard2 = cf::lock_acquire "map_find:$path";
1974 1964
1975 $cf::MAP{$path} || do { 1965 $cf::MAP{$path} || do {
1976 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1977 my $guard2 = cf::lock_acquire "map_find:$path";
1978
1979 my $map = new_from_path cf::map $path 1966 my $map = new_from_path cf::map $path
1980 or return; 1967 or return;
1981 1968
1982 $map->{last_save} = $cf::RUNTIME; 1969 $map->{last_save} = $cf::RUNTIME;
1983 1970
… …
2050 2037
2051 unless ($self->{deny_activate}) { 2038 unless ($self->{deny_activate}) {
2052 $self->decay_objects; 2039 $self->decay_objects;
2053 $self->fix_auto_apply; 2040 $self->fix_auto_apply;
2054 $self->update_buttons; 2041 $self->update_buttons;
2055 cf::cede_to_tick;
2056 $self->set_darkness_map;
2057 cf::cede_to_tick; 2042 cf::cede_to_tick;
2058 $self->activate; 2043 $self->activate;
2059 } 2044 }
2060 2045
2061 $self->{last_save} = $cf::RUNTIME; 2046 $self->{last_save} = $cf::RUNTIME;
… …
2403 2388
2404our $SAY_CHANNEL = { 2389our $SAY_CHANNEL = {
2405 id => "say", 2390 id => "say",
2406 title => "Map", 2391 title => "Map",
2407 reply => "say ", 2392 reply => "say ",
2408 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2393 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2409}; 2394};
2410 2395
2411our $CHAT_CHANNEL = { 2396our $CHAT_CHANNEL = {
2412 id => "chat", 2397 id => "chat",
2413 title => "Chat", 2398 title => "Chat",
… …
2788 id => "infobox", 2773 id => "infobox",
2789 title => "Body Parts", 2774 title => "Body Parts",
2790 reply => undef, 2775 reply => undef,
2791 tooltip => "Shows which body parts you posess and are available", 2776 tooltip => "Shows which body parts you posess and are available",
2792 }, 2777 },
2778 "c/statistics" => {
2779 id => "infobox",
2780 title => "Statistics",
2781 reply => undef,
2782 tooltip => "Shows your primary statistics",
2783 },
2793 "c/skills" => { 2784 "c/skills" => {
2794 id => "infobox", 2785 id => "infobox",
2795 title => "Skills", 2786 title => "Skills",
2796 reply => undef, 2787 reply => undef,
2797 tooltip => "Shows your experience per skill and item power", 2788 tooltip => "Shows your experience per skill and item power",
2789 },
2790 "c/shopitems" => {
2791 id => "infobox",
2792 title => "Shop Items",
2793 reply => undef,
2794 tooltip => "Shows the items currently for sale in this shop",
2795 },
2796 "c/resistances" => {
2797 id => "infobox",
2798 title => "Resistances",
2799 reply => undef,
2800 tooltip => "Shows your resistances",
2801 },
2802 "c/pets" => {
2803 id => "infobox",
2804 title => "Pets",
2805 reply => undef,
2806 tooltip => "Shows information abotu your pets/a specific pet",
2807 },
2808 "c/perceiveself" => {
2809 id => "infobox",
2810 title => "Perceive Self",
2811 reply => undef,
2812 tooltip => "You gained detailed knowledge about yourself",
2798 }, 2813 },
2799 "c/uptime" => { 2814 "c/uptime" => {
2800 id => "infobox", 2815 id => "infobox",
2801 title => "Uptime", 2816 title => "Uptime",
2802 reply => undef, 2817 reply => undef,
… …
2812 id => "party", 2827 id => "party",
2813 title => "Party", 2828 title => "Party",
2814 reply => "gsay ", 2829 reply => "gsay ",
2815 tooltip => "Messages and chat related to your party", 2830 tooltip => "Messages and chat related to your party",
2816 }, 2831 },
2832 "c/death" => {
2833 id => "death",
2834 title => "Death",
2835 reply => undef,
2836 tooltip => "Reason for and more info about your most recent death",
2837 },
2838 "c/say" => $SAY_CHANNEL,
2839 "c/chat" => $CHAT_CHANNEL,
2817); 2840);
2818 2841
2819sub cf::client::send_msg { 2842sub cf::client::send_msg {
2820 my ($self, $channel, $msg, $color, @extra) = @_; 2843 my ($self, $channel, $msg, $color, @extra) = @_;
2821 2844
… …
2826 2849
2827 # check predefined channels, for the benefit of C 2850 # check predefined channels, for the benefit of C
2828 if ($CHANNEL{$channel}) { 2851 if ($CHANNEL{$channel}) {
2829 $channel = $CHANNEL{$channel}; 2852 $channel = $CHANNEL{$channel};
2830 2853
2831 $self->ext_msg (channel_info => $channel) 2854 $self->ext_msg (channel_info => $channel);
2832 if $self->can_msg;
2833
2834 $channel = $channel->{id}; 2855 $channel = $channel->{id};
2835 2856
2836 } elsif (ref $channel) { 2857 } elsif (ref $channel) {
2837 # send meta info to client, if not yet sent 2858 # send meta info to client, if not yet sent
2838 unless (exists $self->{channel}{$channel->{id}}) { 2859 unless (exists $self->{channel}{$channel->{id}}) {
2839 $self->{channel}{$channel->{id}} = $channel; 2860 $self->{channel}{$channel->{id}} = $channel;
2840 $self->ext_msg (channel_info => $channel) 2861 $self->ext_msg (channel_info => $channel);
2841 if $self->can_msg;
2842 } 2862 }
2843 2863
2844 $channel = $channel->{id}; 2864 $channel = $channel->{id};
2845 } 2865 }
2846 2866
2847 return unless @extra || length $msg; 2867 return unless @extra || length $msg;
2848 2868
2849 if ($self->can_msg) {
2850 # default colour, mask it out 2869 # default colour, mask it out
2851 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2870 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2852 if $color & cf::NDI_DEF; 2871 if $color & cf::NDI_DEF;
2853 2872
2854 my $pkt = "msg " 2873 my $pkt = "msg "
2855 . $self->{json_coder}->encode ( 2874 . $self->{json_coder}->encode (
2856 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 2875 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2857 ); 2876 );
2858 2877
2859 # try lzf for large packets 2878 # try lzf for large packets
2860 $pkt = "lzf " . Compress::LZF::compress $pkt 2879 $pkt = "lzf " . Compress::LZF::compress $pkt
2861 if 1024 <= length $pkt and $self->{can_lzf}; 2880 if 1024 <= length $pkt and $self->{can_lzf};
2862 2881
2863 # split very large packets 2882 # split very large packets
2864 if (8192 < length $pkt and $self->{can_lzf}) { 2883 if (8192 < length $pkt and $self->{can_lzf}) {
2865 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt; 2884 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2866 $pkt = "frag"; 2885 $pkt = "frag";
2867 } 2886 }
2868 2887
2869 $self->send_packet ($pkt); 2888 $self->send_packet ($pkt);
2870 } else {
2871 if ($color >= 0) {
2872 # replace some tags by gcfclient-compatible ones
2873 for ($msg) {
2874 1 while
2875 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2876 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2877 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2878 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2879 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2880 }
2881
2882 $color &= cf::NDI_COLOR_MASK;
2883
2884 utf8::encode $msg;
2885
2886 if (0 && $msg =~ /\[/) {
2887 # COMMAND/INFO
2888 $self->send_packet ("drawextinfo $color 10 8 $msg")
2889 } else {
2890 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2891 $self->send_packet ("drawinfo $color $msg")
2892 }
2893 }
2894 }
2895} 2889}
2896 2890
2897=item $client->ext_msg ($type, @msg) 2891=item $client->ext_msg ($type, @msg)
2898 2892
2899Sends an ext event to the client. 2893Sends an ext event to the client.
… …
3074The following functions and methods are available within a safe environment: 3068The following functions and methods are available within a safe environment:
3075 3069
3076 cf::object 3070 cf::object
3077 contr pay_amount pay_player map x y force_find force_add destroy 3071 contr pay_amount pay_player map x y force_find force_add destroy
3078 insert remove name archname title slaying race decrease split 3072 insert remove name archname title slaying race decrease split
3073 value
3079 3074
3080 cf::object::player 3075 cf::object::player
3081 player 3076 player
3082 3077
3083 cf::player 3078 cf::player
… …
3089=cut 3084=cut
3090 3085
3091for ( 3086for (
3092 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3087 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3093 insert remove inv nrof name archname title slaying race 3088 insert remove inv nrof name archname title slaying race
3094 decrease split destroy change_exp)], 3089 decrease split destroy change_exp value msg lore send_msg)],
3095 ["cf::object::player" => qw(player)], 3090 ["cf::object::player" => qw(player)],
3096 ["cf::player" => qw(peaceful)], 3091 ["cf::player" => qw(peaceful send_msg)],
3097 ["cf::map" => qw(trigger)], 3092 ["cf::map" => qw(trigger)],
3098) { 3093) {
3099 no strict 'refs'; 3094 no strict 'refs';
3100 my ($pkg, @funs) = @$_; 3095 my ($pkg, @funs) = @$_;
3101 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3096 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
3118 my ($code, %vars) = @_; 3113 my ($code, %vars) = @_;
3119 3114
3120 my $qcode = $code; 3115 my $qcode = $code;
3121 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3116 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3122 $qcode =~ s/\n/\\n/g; 3117 $qcode =~ s/\n/\\n/g;
3118
3119 %vars = (_dummy => 0) unless %vars;
3123 3120
3124 local $_; 3121 local $_;
3125 local @safe::cf::_safe_eval_args = values %vars; 3122 local @safe::cf::_safe_eval_args = values %vars;
3126 3123
3127 my $eval = 3124 my $eval =
… …
3409 3406
3410 cf::init_experience; 3407 cf::init_experience;
3411 cf::init_anim; 3408 cf::init_anim;
3412 cf::init_attackmess; 3409 cf::init_attackmess;
3413 cf::init_dynamic; 3410 cf::init_dynamic;
3414 cf::init_block;
3415 3411
3416 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3412 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3417 3413
3418 # we must not ever block the main coroutine 3414 # we must not ever block the main coroutine
3419 local $Coro::idle = sub { 3415 local $Coro::idle = sub {
… …
3555} 3551}
3556 3552
3557sub emergency_save() { 3553sub emergency_save() {
3558 my $freeze_guard = cf::freeze_mainloop; 3554 my $freeze_guard = cf::freeze_mainloop;
3559 3555
3560 warn "enter emergency perl save\n"; 3556 warn "emergency_perl_save: enter\n";
3561 3557
3562 cf::sync_job { 3558 cf::sync_job {
3559 # this is a trade-off: we want to be very quick here, so
3560 # save all maps without fsync, and later call a global sync
3561 # (which in turn might be very very slow)
3562 local $USE_FSYNC = 0;
3563
3563 # use a peculiar iteration method to avoid tripping on perl 3564 # use a peculiar iteration method to avoid tripping on perl
3564 # refcount bugs in for. also avoids problems with players 3565 # refcount bugs in for. also avoids problems with players
3565 # and maps saved/destroyed asynchronously. 3566 # and maps saved/destroyed asynchronously.
3566 warn "begin emergency player save\n"; 3567 warn "emergency_perl_save: begin player save\n";
3567 for my $login (keys %cf::PLAYER) { 3568 for my $login (keys %cf::PLAYER) {
3568 my $pl = $cf::PLAYER{$login} or next; 3569 my $pl = $cf::PLAYER{$login} or next;
3569 $pl->valid or next; 3570 $pl->valid or next;
3570 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3571 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3571 $pl->save; 3572 $pl->save;
3572 } 3573 }
3573 warn "end emergency player save\n"; 3574 warn "emergency_perl_save: end player save\n";
3574 3575
3575 warn "begin emergency map save\n"; 3576 warn "emergency_perl_save: begin map save\n";
3576 for my $path (keys %cf::MAP) { 3577 for my $path (keys %cf::MAP) {
3577 my $map = $cf::MAP{$path} or next; 3578 my $map = $cf::MAP{$path} or next;
3578 $map->valid or next; 3579 $map->valid or next;
3579 $map->save; 3580 $map->save;
3580 } 3581 }
3581 warn "end emergency map save\n"; 3582 warn "emergency_perl_save: end map save\n";
3582 3583
3583 warn "begin emergency database checkpoint\n"; 3584 warn "emergency_perl_save: begin database checkpoint\n";
3584 BDB::db_env_txn_checkpoint $DB_ENV; 3585 BDB::db_env_txn_checkpoint $DB_ENV;
3585 warn "end emergency database checkpoint\n"; 3586 warn "emergency_perl_save: end database checkpoint\n";
3586 3587
3587 warn "begin write uuid\n"; 3588 warn "emergency_perl_save: begin write uuid\n";
3588 write_uuid_sync 1; 3589 write_uuid_sync 1;
3589 warn "end write uuid\n"; 3590 warn "emergency_perl_save: end write uuid\n";
3590 }; 3591 };
3591 3592
3593 warn "emergency_perl_save: starting sync()\n";
3594 IO::AIO::aio_sync sub {
3595 warn "emergency_perl_save: finished sync()\n";
3596 };
3597
3592 warn "leave emergency perl save\n"; 3598 warn "emergency_perl_save: leave\n";
3593} 3599}
3594 3600
3595sub post_cleanup { 3601sub post_cleanup {
3596 my ($make_core) = @_; 3602 my ($make_core) = @_;
3597 3603
… …
3634 warn "can only reload from main coroutine"; 3640 warn "can only reload from main coroutine";
3635 return; 3641 return;
3636 } 3642 }
3637 3643
3638 return if $RELOAD++; 3644 return if $RELOAD++;
3645
3646 my $t1 = EV::time;
3639 3647
3640 while ($RELOAD) { 3648 while ($RELOAD) {
3641 warn "reloading..."; 3649 warn "reloading...";
3642 3650
3643 warn "entering sync_job"; 3651 warn "entering sync_job";
… …
3704 clear_package "safe::$_" 3712 clear_package "safe::$_"
3705 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3713 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3706 3714
3707 warn "unloading cf.pm \"a bit\""; 3715 warn "unloading cf.pm \"a bit\"";
3708 delete $INC{"cf.pm"}; 3716 delete $INC{"cf.pm"};
3709 delete $INC{"cf/pod.pm"}; 3717 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3710 3718
3711 # don't, removes xs symbols, too, 3719 # don't, removes xs symbols, too,
3712 # and global variables created in xs 3720 # and global variables created in xs
3713 #clear_package __PACKAGE__; 3721 #clear_package __PACKAGE__;
3714 3722
… …
3722 cf::reload_config; 3730 cf::reload_config;
3723 3731
3724 warn "loading extensions"; 3732 warn "loading extensions";
3725 cf::load_extensions; 3733 cf::load_extensions;
3726 3734
3735 if ($REATTACH_ON_RELOAD) {
3727 warn "reattaching attachments to objects/players"; 3736 warn "reattaching attachments to objects/players";
3728 _global_reattach; # objects, sockets 3737 _global_reattach; # objects, sockets
3729 warn "reattaching attachments to maps"; 3738 warn "reattaching attachments to maps";
3730 reattach $_ for values %MAP; 3739 reattach $_ for values %MAP;
3731 warn "reattaching attachments to players"; 3740 warn "reattaching attachments to players";
3732 reattach $_ for values %PLAYER; 3741 reattach $_ for values %PLAYER;
3742 }
3733 3743
3734 warn "running post_load"; 3744 warn "running post_init jobs";
3735 (pop @POST_INIT)->(1) while @POST_INIT; 3745 (pop @POST_INIT)->(1) while @POST_INIT;
3736 3746
3737 warn "leaving sync_job"; 3747 warn "leaving sync_job";
3738 3748
3739 1 3749 1
… …
3743 }; 3753 };
3744 3754
3745 warn "reloaded"; 3755 warn "reloaded";
3746 --$RELOAD; 3756 --$RELOAD;
3747 } 3757 }
3758
3759 $t1 = EV::time - $t1;
3760 warn "reload completed in ${t1}s\n";
3748}; 3761};
3749 3762
3750our $RELOAD_WATCHER; # used only during reload 3763our $RELOAD_WATCHER; # used only during reload
3751 3764
3752sub reload_perl() { 3765sub reload_perl() {
3753 # doing reload synchronously and two reloads happen back-to-back, 3766 # doing reload synchronously and two reloads happen back-to-back,
3754 # coro crashes during coro_state_free->destroy here. 3767 # coro crashes during coro_state_free->destroy here.
3755 3768
3769 $RELOAD_WATCHER ||= cf::async {
3770 Coro::AIO::aio_wait cache_extensions;
3771
3756 $RELOAD_WATCHER ||= EV::timer $TICK * 1.5, 0, sub { 3772 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3757 do_reload_perl; 3773 do_reload_perl;
3758 undef $RELOAD_WATCHER; 3774 undef $RELOAD_WATCHER;
3775 };
3759 }; 3776 };
3760} 3777}
3761 3778
3762register_command "reload" => sub { 3779register_command "reload" => sub {
3763 my ($who, $arg) = @_; 3780 my ($who, $arg) = @_;
… …
3922 LOG llevInfo, "[ABT] [suppressed]\n"; 3939 LOG llevInfo, "[ABT] [suppressed]\n";
3923 } 3940 }
3924} 3941}
3925 3942
3926# load additional modules 3943# load additional modules
3927use cf::pod; 3944require "cf/$_.pm" for @EXTRA_MODULES;
3928 3945
3929END { cf::emergency_save } 3946END { cf::emergency_save }
3930 3947
39311 39481
3932 3949

Diff Legend

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