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

Diff Legend

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