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.450 by root, Mon Sep 22 01:33:09 2008 UTC vs.
Revision 1.466 by root, Thu Jan 8 03:03:24 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 ();
… …
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";
… …
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;
… …
127 131
128our $LOAD; # a number between 0 (idle) and 1 (too many objects) 132our $LOAD; # a number between 0 (idle) and 1 (too many objects)
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
136
137our @POST_INIT;
138
139our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow)
132 140
133binmode STDOUT; 141binmode STDOUT;
134binmode STDERR; 142binmode STDERR;
135 143
136# read virtual server time, if available 144# read virtual server time, if available
… …
305our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 313our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
306 314
307sub encode_json($) { $json_coder->encode ($_[0]) } 315sub encode_json($) { $json_coder->encode ($_[0]) }
308sub decode_json($) { $json_coder->decode ($_[0]) } 316sub decode_json($) { $json_coder->decode ($_[0]) }
309 317
318=item cf::post_init { BLOCK }
319
320Execute the given codeblock, I<after> all extensions have been (re-)loaded,
321but I<before> the server starts ticking again.
322
323The cdoeblock will have a single boolean argument to indicate whether this
324is a reload or not.
325
326=cut
327
328sub post_init(&) {
329 push @POST_INIT, shift;
330}
331
310=item cf::lock_wait $string 332=item cf::lock_wait $string
311 333
312Wait until the given lock is available. See cf::lock_acquire. 334Wait until the given lock is available. See cf::lock_acquire.
313 335
314=item my $lock = cf::lock_acquire $string 336=item my $lock = cf::lock_acquire $string
315 337
316Wait until the given lock is available and then acquires it and returns 338Wait 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, 339a L<Guard> object. If the guard object gets destroyed (goes out of scope,
318for example when the coroutine gets canceled), the lock is automatically 340for example when the coroutine gets canceled), the lock is automatically
319returned. 341returned.
320 342
321Locks are *not* recursive, locking from the same coro twice results in a 343Locks are *not* recursive, locking from the same coro twice results in a
322deadlocked coro. 344deadlocked coro.
… …
328 350
329Return true if the lock is currently active, i.e. somebody has locked it. 351Return true if the lock is currently active, i.e. somebody has locked it.
330 352
331=cut 353=cut
332 354
333our %LOCK; 355our $LOCKS = new Coro::SemaphoreSet;
334our %LOCKER;#d#
335 356
336sub lock_wait($) { 357sub lock_wait($) {
337 my ($key) = @_; 358 $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} 359}
350 360
351sub lock_acquire($) { 361sub lock_acquire($) {
352 my ($key) = @_; 362 $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} 363}
366 364
367sub lock_active($) { 365sub lock_active($) {
368 my ($key) = @_; 366 $LOCKS->count ($_[0]) < 1
369
370 ! ! $LOCK{$key}
371} 367}
372 368
373sub freeze_mainloop { 369sub freeze_mainloop {
374 tick_inhibit_inc; 370 tick_inhibit_inc;
375 371
376 Coro::guard \&tick_inhibit_dec; 372 &Guard::guard (\&tick_inhibit_dec);
377} 373}
378 374
379=item cf::periodic $interval, $cb 375=item cf::periodic $interval, $cb
380 376
381Like EV::periodic, but randomly selects a starting point so that the actions 377Like EV::periodic, but randomly selects a starting point so that the actions
… …
1170 } else { 1166 } else {
1171 aio_unlink "$filename.pst"; 1167 aio_unlink "$filename.pst";
1172 } 1168 }
1173 1169
1174 aio_rename "$filename~", $filename; 1170 aio_rename "$filename~", $filename;
1171
1172 $filename =~ s%/[^/]+$%%;
1173 aio_pathsync $filename if $cf::USE_FSYNC;
1175 } else { 1174 } else {
1176 warn "FATAL: $filename~: $!\n"; 1175 warn "unable to save objects: $filename~: $!\n";
1177 } 1176 }
1178 } else { 1177 } else {
1179 aio_unlink $filename; 1178 aio_unlink $filename;
1180 aio_unlink "$filename.pst"; 1179 aio_unlink "$filename.pst";
1181 } 1180 }
… …
1272 my ($name, $cb) = @_; 1271 my ($name, $cb) = @_;
1273 1272
1274 $EXTICMD{$name} = $cb; 1273 $EXTICMD{$name} = $cb;
1275} 1274}
1276 1275
1276use File::Glob ();
1277
1277cf::player->attach ( 1278cf::player->attach (
1278 on_command => sub { 1279 on_command => sub {
1279 my ($pl, $name, $params) = @_; 1280 my ($pl, $name, $params) = @_;
1280 1281
1281 my $cb = $COMMAND{$name} 1282 my $cb = $COMMAND{$name}
… …
1312 } 1313 }
1313 1314
1314 cf::override; 1315 cf::override;
1315 }, 1316 },
1316); 1317);
1318
1319# "readahead" all extensions
1320sub cache_extensions {
1321 my $grp = IO::AIO::aio_group;
1322
1323 add $grp IO::AIO::aio_readdir $LIBDIR, sub {
1324 for (grep /\.ext$/, @{$_[0]}) {
1325 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1326 }
1327 };
1328
1329 $grp
1330}
1317 1331
1318sub load_extensions { 1332sub load_extensions {
1319 cf::sync_job { 1333 cf::sync_job {
1320 my %todo; 1334 my %todo;
1321 1335
… …
1444 1458
1445sub exists($) { 1459sub exists($) {
1446 my ($login) = @_; 1460 my ($login) = @_;
1447 1461
1448 $cf::PLAYER{$login} 1462 $cf::PLAYER{$login}
1449 or cf::sync_job { !aio_stat path $login } 1463 or !aio_stat path $login
1450} 1464}
1451 1465
1452sub find($) { 1466sub find($) {
1453 return $cf::PLAYER{$_[0]} || do { 1467 return $cf::PLAYER{$_[0]} || do {
1454 my $login = $_[0]; 1468 my $login = $_[0];
… …
1850 1864
1851 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1865 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1852 "$UNIQUEDIR/$path" 1866 "$UNIQUEDIR/$path"
1853} 1867}
1854 1868
1855# and all this just because we cannot iterate over
1856# all maps in C++...
1857sub change_all_map_light {
1858 my ($change) = @_;
1859
1860 $_->change_map_light ($change)
1861 for grep $_->outdoor, values %cf::MAP;
1862}
1863
1864sub decay_objects { 1869sub decay_objects {
1865 my ($self) = @_; 1870 my ($self) = @_;
1866 1871
1867 return if $self->{deny_reset}; 1872 return if $self->{deny_reset};
1868 1873
… …
1950sub find { 1955sub find {
1951 my ($path, $origin) = @_; 1956 my ($path, $origin) = @_;
1952 1957
1953 $path = normalise $path, $origin && $origin->path; 1958 $path = normalise $path, $origin && $origin->path;
1954 1959
1955 cf::lock_wait "map_data:$path";#d#remove 1960 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1956 cf::lock_wait "map_find:$path"; 1961 my $guard2 = cf::lock_acquire "map_find:$path";
1957 1962
1958 $cf::MAP{$path} || do { 1963 $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 1964 my $map = new_from_path cf::map $path
1963 or return; 1965 or return;
1964 1966
1965 $map->{last_save} = $cf::RUNTIME; 1967 $map->{last_save} = $cf::RUNTIME;
1966 1968
… …
2033 2035
2034 unless ($self->{deny_activate}) { 2036 unless ($self->{deny_activate}) {
2035 $self->decay_objects; 2037 $self->decay_objects;
2036 $self->fix_auto_apply; 2038 $self->fix_auto_apply;
2037 $self->update_buttons; 2039 $self->update_buttons;
2038 cf::cede_to_tick;
2039 $self->set_darkness_map;
2040 cf::cede_to_tick; 2040 cf::cede_to_tick;
2041 $self->activate; 2041 $self->activate;
2042 } 2042 }
2043 2043
2044 $self->{last_save} = $cf::RUNTIME; 2044 $self->{last_save} = $cf::RUNTIME;
… …
2771 id => "infobox", 2771 id => "infobox",
2772 title => "Body Parts", 2772 title => "Body Parts",
2773 reply => undef, 2773 reply => undef,
2774 tooltip => "Shows which body parts you posess and are available", 2774 tooltip => "Shows which body parts you posess and are available",
2775 }, 2775 },
2776 "c/statistics" => {
2777 id => "infobox",
2778 title => "Statistics",
2779 reply => undef,
2780 tooltip => "Shows your primary statistics",
2781 },
2776 "c/skills" => { 2782 "c/skills" => {
2777 id => "infobox", 2783 id => "infobox",
2778 title => "Skills", 2784 title => "Skills",
2779 reply => undef, 2785 reply => undef,
2780 tooltip => "Shows your experience per skill and item power", 2786 tooltip => "Shows your experience per skill and item power",
2787 },
2788 "c/resistances" => {
2789 id => "infobox",
2790 title => "Resistances",
2791 reply => undef,
2792 tooltip => "Shows your resistances",
2793 },
2794 "c/pets" => {
2795 id => "infobox",
2796 title => "Pets",
2797 reply => undef,
2798 tooltip => "Shows information abotu your pets/a specific pet",
2781 }, 2799 },
2782 "c/uptime" => { 2800 "c/uptime" => {
2783 id => "infobox", 2801 id => "infobox",
2784 title => "Uptime", 2802 title => "Uptime",
2785 reply => undef, 2803 reply => undef,
… …
2795 id => "party", 2813 id => "party",
2796 title => "Party", 2814 title => "Party",
2797 reply => "gsay ", 2815 reply => "gsay ",
2798 tooltip => "Messages and chat related to your party", 2816 tooltip => "Messages and chat related to your party",
2799 }, 2817 },
2818 "c/death" => {
2819 id => "death",
2820 title => "Death",
2821 reply => undef,
2822 tooltip => "Reason for and more info about your most recent death",
2823 },
2824 "c/say" => $SAY_CHANNEL,
2825 "c/chat" => $CHAT_CHANNEL,
2800); 2826);
2801 2827
2802sub cf::client::send_msg { 2828sub cf::client::send_msg {
2803 my ($self, $channel, $msg, $color, @extra) = @_; 2829 my ($self, $channel, $msg, $color, @extra) = @_;
2804 2830
… …
2809 2835
2810 # check predefined channels, for the benefit of C 2836 # check predefined channels, for the benefit of C
2811 if ($CHANNEL{$channel}) { 2837 if ($CHANNEL{$channel}) {
2812 $channel = $CHANNEL{$channel}; 2838 $channel = $CHANNEL{$channel};
2813 2839
2814 $self->ext_msg (channel_info => $channel) 2840 $self->ext_msg (channel_info => $channel);
2815 if $self->can_msg;
2816
2817 $channel = $channel->{id}; 2841 $channel = $channel->{id};
2818 2842
2819 } elsif (ref $channel) { 2843 } elsif (ref $channel) {
2820 # send meta info to client, if not yet sent 2844 # send meta info to client, if not yet sent
2821 unless (exists $self->{channel}{$channel->{id}}) { 2845 unless (exists $self->{channel}{$channel->{id}}) {
2822 $self->{channel}{$channel->{id}} = $channel; 2846 $self->{channel}{$channel->{id}} = $channel;
2823 $self->ext_msg (channel_info => $channel) 2847 $self->ext_msg (channel_info => $channel);
2824 if $self->can_msg;
2825 } 2848 }
2826 2849
2827 $channel = $channel->{id}; 2850 $channel = $channel->{id};
2828 } 2851 }
2829 2852
2830 return unless @extra || length $msg; 2853 return unless @extra || length $msg;
2831 2854
2832 if ($self->can_msg) {
2833 # default colour, mask it out 2855 # default colour, mask it out
2834 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2856 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2835 if $color & cf::NDI_DEF; 2857 if $color & cf::NDI_DEF;
2836 2858
2837 my $pkt = "msg " 2859 my $pkt = "msg "
2838 . $self->{json_coder}->encode ( 2860 . $self->{json_coder}->encode (
2839 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 2861 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2840 ); 2862 );
2841 2863
2842 # try lzf for large packets 2864 # try lzf for large packets
2843 $pkt = "lzf " . Compress::LZF::compress $pkt 2865 $pkt = "lzf " . Compress::LZF::compress $pkt
2844 if 1024 <= length $pkt and $self->{can_lzf}; 2866 if 1024 <= length $pkt and $self->{can_lzf};
2845 2867
2846 # split very large packets 2868 # split very large packets
2847 if (8192 < length $pkt and $self->{can_lzf}) { 2869 if (8192 < length $pkt and $self->{can_lzf}) {
2848 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt; 2870 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2849 $pkt = "frag"; 2871 $pkt = "frag";
2850 } 2872 }
2851 2873
2852 $self->send_packet ($pkt); 2874 $self->send_packet ($pkt);
2853 } else {
2854 if ($color >= 0) {
2855 # replace some tags by gcfclient-compatible ones
2856 for ($msg) {
2857 1 while
2858 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2859 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2860 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2861 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2862 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2863 }
2864
2865 $color &= cf::NDI_COLOR_MASK;
2866
2867 utf8::encode $msg;
2868
2869 if (0 && $msg =~ /\[/) {
2870 # COMMAND/INFO
2871 $self->send_packet ("drawextinfo $color 10 8 $msg")
2872 } else {
2873 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2874 $self->send_packet ("drawinfo $color $msg")
2875 }
2876 }
2877 }
2878} 2875}
2879 2876
2880=item $client->ext_msg ($type, @msg) 2877=item $client->ext_msg ($type, @msg)
2881 2878
2882Sends an ext event to the client. 2879Sends an ext event to the client.
… …
3057The following functions and methods are available within a safe environment: 3054The following functions and methods are available within a safe environment:
3058 3055
3059 cf::object 3056 cf::object
3060 contr pay_amount pay_player map x y force_find force_add destroy 3057 contr pay_amount pay_player map x y force_find force_add destroy
3061 insert remove name archname title slaying race decrease split 3058 insert remove name archname title slaying race decrease split
3059 value
3062 3060
3063 cf::object::player 3061 cf::object::player
3064 player 3062 player
3065 3063
3066 cf::player 3064 cf::player
… …
3072=cut 3070=cut
3073 3071
3074for ( 3072for (
3075 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3073 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3076 insert remove inv nrof name archname title slaying race 3074 insert remove inv nrof name archname title slaying race
3077 decrease split destroy change_exp)], 3075 decrease split destroy change_exp value msg lore send_msg)],
3078 ["cf::object::player" => qw(player)], 3076 ["cf::object::player" => qw(player)],
3079 ["cf::player" => qw(peaceful)], 3077 ["cf::player" => qw(peaceful send_msg)],
3080 ["cf::map" => qw(trigger)], 3078 ["cf::map" => qw(trigger)],
3081) { 3079) {
3082 no strict 'refs'; 3080 no strict 'refs';
3083 my ($pkg, @funs) = @$_; 3081 my ($pkg, @funs) = @$_;
3084 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3082 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
3101 my ($code, %vars) = @_; 3099 my ($code, %vars) = @_;
3102 3100
3103 my $qcode = $code; 3101 my $qcode = $code;
3104 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3102 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3105 $qcode =~ s/\n/\\n/g; 3103 $qcode =~ s/\n/\\n/g;
3104
3105 %vars = (_dummy => 0) unless %vars;
3106 3106
3107 local $_; 3107 local $_;
3108 local @safe::cf::_safe_eval_args = values %vars; 3108 local @safe::cf::_safe_eval_args = values %vars;
3109 3109
3110 my $eval = 3110 my $eval =
… …
3340 reload_treasures; 3340 reload_treasures;
3341 3341
3342 warn "finished reloading resource files\n"; 3342 warn "finished reloading resource files\n";
3343} 3343}
3344 3344
3345sub init {
3346 my $guard = freeze_mainloop;
3347
3348 evthread_start IO::AIO::poll_fileno;
3349
3350 reload_resources;
3351}
3352
3353sub reload_config { 3345sub reload_config {
3354 open my $fh, "<:utf8", "$CONFDIR/config" 3346 open my $fh, "<:utf8", "$CONFDIR/config"
3355 or return; 3347 or return;
3356 3348
3357 local $/; 3349 local $/;
… …
3389 seek $fh, 0, 0; 3381 seek $fh, 0, 0;
3390 print $fh $$; 3382 print $fh $$;
3391} 3383}
3392 3384
3393sub main { 3385sub main {
3394 atomic; 3386 cf::init_globals; # initialise logging
3387
3388 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3389 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3390 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3391 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3392
3393 cf::init_experience;
3394 cf::init_anim;
3395 cf::init_attackmess;
3396 cf::init_dynamic;
3397
3398 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3395 3399
3396 # we must not ever block the main coroutine 3400 # we must not ever block the main coroutine
3397 local $Coro::idle = sub { 3401 local $Coro::idle = sub {
3398 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3402 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3399 (async { 3403 (async {
3400 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3404 $Coro::current->{desc} = "IDLE BUG HANDLER";
3401 EV::loop EV::LOOP_ONESHOT; 3405 EV::loop EV::LOOP_ONESHOT;
3402 })->prio (Coro::PRIO_MAX); 3406 })->prio (Coro::PRIO_MAX);
3403 }; 3407 };
3404 3408
3405 { 3409 evthread_start IO::AIO::poll_fileno;
3406 my $guard = freeze_mainloop; 3410
3411 cf::sync_job {
3412 reload_resources;
3407 reload_config; 3413 reload_config;
3408 db_init; 3414 db_init;
3415
3416 cf::load_settings;
3417 cf::load_materials;
3418 cf::init_uuid;
3419 cf::init_signals;
3420 cf::init_commands;
3421 cf::init_skills;
3422
3423 cf::init_beforeplay;
3424
3425 atomic;
3426
3409 load_extensions; 3427 load_extensions;
3410 3428
3411 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3412 }
3413
3414 utime time, time, $RUNTIMEFILE; 3429 utime time, time, $RUNTIMEFILE;
3415 3430
3416 # no (long-running) fork's whatsoever before this point(!) 3431 # no (long-running) fork's whatsoever before this point(!)
3417 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3432 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3433
3434 (pop @POST_INIT)->(0) while @POST_INIT;
3435 };
3418 3436
3419 EV::loop; 3437 EV::loop;
3420} 3438}
3421 3439
3422############################################################################# 3440#############################################################################
… …
3480 my $uuid = "$LOCALDIR/uuid"; 3498 my $uuid = "$LOCALDIR/uuid";
3481 3499
3482 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3500 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3483 or return; 3501 or return;
3484 3502
3485 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3503 my $value = uuid_seq uuid_cur;
3504
3505 unless ($value) {
3506 warn "cowardly refusing to write zero uuid value!\n";
3507 return;
3508 }
3509
3510 my $value = uuid_str $value + $uuid_skip;
3486 $uuid_skip = 0; 3511 $uuid_skip = 0;
3487 3512
3488 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3513 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3489 and return; 3514 and return;
3490 3515
… …
3512} 3537}
3513 3538
3514sub emergency_save() { 3539sub emergency_save() {
3515 my $freeze_guard = cf::freeze_mainloop; 3540 my $freeze_guard = cf::freeze_mainloop;
3516 3541
3517 warn "enter emergency perl save\n"; 3542 warn "emergency_perl_save: enter\n";
3518 3543
3519 cf::sync_job { 3544 cf::sync_job {
3545 # this is a trade-off: we want to be very quick here, so
3546 # save all maps without fsync, and later call a global sync
3547 # (which in turn might be very very slow)
3548 local $USE_FSYNC = 0;
3549
3520 # use a peculiar iteration method to avoid tripping on perl 3550 # use a peculiar iteration method to avoid tripping on perl
3521 # refcount bugs in for. also avoids problems with players 3551 # refcount bugs in for. also avoids problems with players
3522 # and maps saved/destroyed asynchronously. 3552 # and maps saved/destroyed asynchronously.
3523 warn "begin emergency player save\n"; 3553 warn "emergency_perl_save: begin player save\n";
3524 for my $login (keys %cf::PLAYER) { 3554 for my $login (keys %cf::PLAYER) {
3525 my $pl = $cf::PLAYER{$login} or next; 3555 my $pl = $cf::PLAYER{$login} or next;
3526 $pl->valid or next; 3556 $pl->valid or next;
3527 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3557 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3528 $pl->save; 3558 $pl->save;
3529 } 3559 }
3530 warn "end emergency player save\n"; 3560 warn "emergency_perl_save: end player save\n";
3531 3561
3532 warn "begin emergency map save\n"; 3562 warn "emergency_perl_save: begin map save\n";
3533 for my $path (keys %cf::MAP) { 3563 for my $path (keys %cf::MAP) {
3534 my $map = $cf::MAP{$path} or next; 3564 my $map = $cf::MAP{$path} or next;
3535 $map->valid or next; 3565 $map->valid or next;
3536 $map->save; 3566 $map->save;
3537 } 3567 }
3538 warn "end emergency map save\n"; 3568 warn "emergency_perl_save: end map save\n";
3539 3569
3540 warn "begin emergency database checkpoint\n"; 3570 warn "emergency_perl_save: begin database checkpoint\n";
3541 BDB::db_env_txn_checkpoint $DB_ENV; 3571 BDB::db_env_txn_checkpoint $DB_ENV;
3542 warn "end emergency database checkpoint\n"; 3572 warn "emergency_perl_save: end database checkpoint\n";
3543 3573
3544 warn "begin write uuid\n"; 3574 warn "emergency_perl_save: begin write uuid\n";
3545 write_uuid_sync 1; 3575 write_uuid_sync 1;
3546 warn "end write uuid\n"; 3576 warn "emergency_perl_save: end write uuid\n";
3547 }; 3577 };
3548 3578
3579 warn "emergency_perl_save: starting sync()\n";
3580 IO::AIO::aio_sync sub {
3581 warn "emergency_perl_save: finished sync()\n";
3582 };
3583
3549 warn "leave emergency perl save\n"; 3584 warn "emergency_perl_save: leave\n";
3550} 3585}
3551 3586
3552sub post_cleanup { 3587sub post_cleanup {
3553 my ($make_core) = @_; 3588 my ($make_core) = @_;
3554 3589
… …
3580 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3615 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3581 for my $name (keys %$leaf_symtab) { 3616 for my $name (keys %$leaf_symtab) {
3582 _gv_clear *{"$pkg$name"}; 3617 _gv_clear *{"$pkg$name"};
3583# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3618# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3584 } 3619 }
3585 warn "cleared package #$pkg\n";#d# 3620 warn "cleared package $pkg\n";#d#
3586} 3621}
3587
3588our $RELOAD; # how many times to reload
3589 3622
3590sub do_reload_perl() { 3623sub do_reload_perl() {
3591 # can/must only be called in main 3624 # can/must only be called in main
3592 if ($Coro::current != $Coro::main) { 3625 if ($Coro::current != $Coro::main) {
3593 warn "can only reload from main coroutine"; 3626 warn "can only reload from main coroutine";
3594 return; 3627 return;
3595 } 3628 }
3596 3629
3597 return if $RELOAD++; 3630 return if $RELOAD++;
3631
3632 my $t1 = EV::time;
3598 3633
3599 while ($RELOAD) { 3634 while ($RELOAD) {
3600 warn "reloading..."; 3635 warn "reloading...";
3601 3636
3602 warn "entering sync_job"; 3637 warn "entering sync_job";
… …
3663 clear_package "safe::$_" 3698 clear_package "safe::$_"
3664 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3699 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3665 3700
3666 warn "unloading cf.pm \"a bit\""; 3701 warn "unloading cf.pm \"a bit\"";
3667 delete $INC{"cf.pm"}; 3702 delete $INC{"cf.pm"};
3668 delete $INC{"cf/pod.pm"}; 3703 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3669 3704
3670 # don't, removes xs symbols, too, 3705 # don't, removes xs symbols, too,
3671 # and global variables created in xs 3706 # and global variables created in xs
3672 #clear_package __PACKAGE__; 3707 #clear_package __PACKAGE__;
3673 3708
… …
3681 cf::reload_config; 3716 cf::reload_config;
3682 3717
3683 warn "loading extensions"; 3718 warn "loading extensions";
3684 cf::load_extensions; 3719 cf::load_extensions;
3685 3720
3721 if ($REATTACH_ON_RELOAD) {
3686 warn "reattaching attachments to objects/players"; 3722 warn "reattaching attachments to objects/players";
3687 _global_reattach; # objects, sockets 3723 _global_reattach; # objects, sockets
3688 warn "reattaching attachments to maps"; 3724 warn "reattaching attachments to maps";
3689 reattach $_ for values %MAP; 3725 reattach $_ for values %MAP;
3690 warn "reattaching attachments to players"; 3726 warn "reattaching attachments to players";
3691 reattach $_ for values %PLAYER; 3727 reattach $_ for values %PLAYER;
3728 }
3729
3730 warn "running post_init jobs";
3731 (pop @POST_INIT)->(1) while @POST_INIT;
3692 3732
3693 warn "leaving sync_job"; 3733 warn "leaving sync_job";
3694 3734
3695 1 3735 1
3696 } or do { 3736 } or do {
… …
3699 }; 3739 };
3700 3740
3701 warn "reloaded"; 3741 warn "reloaded";
3702 --$RELOAD; 3742 --$RELOAD;
3703 } 3743 }
3744
3745 $t1 = EV::time - $t1;
3746 warn "reload completed in ${t1}s\n";
3704}; 3747};
3705 3748
3706our $RELOAD_WATCHER; # used only during reload 3749our $RELOAD_WATCHER; # used only during reload
3707 3750
3708sub reload_perl() { 3751sub reload_perl() {
3709 # doing reload synchronously and two reloads happen back-to-back, 3752 # doing reload synchronously and two reloads happen back-to-back,
3710 # coro crashes during coro_state_free->destroy here. 3753 # coro crashes during coro_state_free->destroy here.
3711 3754
3755 $RELOAD_WATCHER ||= cf::async {
3756 Coro::AIO::aio_wait cache_extensions;
3757
3712 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3758 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3713 do_reload_perl; 3759 do_reload_perl;
3714 undef $RELOAD_WATCHER; 3760 undef $RELOAD_WATCHER;
3761 };
3715 }; 3762 };
3716} 3763}
3717 3764
3718register_command "reload" => sub { 3765register_command "reload" => sub {
3719 my ($who, $arg) = @_; 3766 my ($who, $arg) = @_;
… …
3878 LOG llevInfo, "[ABT] [suppressed]\n"; 3925 LOG llevInfo, "[ABT] [suppressed]\n";
3879 } 3926 }
3880} 3927}
3881 3928
3882# load additional modules 3929# load additional modules
3883use cf::pod; 3930eval "use cf::$_" for @EXTRA_MODULES;
3884 3931
3885END { cf::emergency_save } 3932END { cf::emergency_save }
3886 3933
38871 39341
3888 3935

Diff Legend

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