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.400 by root, Mon Dec 17 06:36:34 2007 UTC vs.
Revision 1.471 by root, Mon Apr 27 01:38:48 2009 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify
7# it under the terms of the GNU General Public License as published by
8# the Free Software Foundation, either version 3 of the License, or
9# (at your option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19# The authors can be reached via e-mail to <support@deliantra.net>
20#
21
1package cf; 22package cf;
2 23
24use 5.10.0;
3use utf8; 25use utf8;
4use strict; 26use strict qw(vars subs);
5 27
6use Symbol; 28use Symbol;
7use List::Util; 29use List::Util;
8use Socket; 30use Socket;
9use EV; 31use EV;
10use Opcode; 32use Opcode;
11use Safe; 33use Safe;
12use Safe::Hole; 34use Safe::Hole;
13use Storable (); 35use Storable ();
14 36
37use Guard ();
15use Coro 4.32 (); 38use Coro ();
16use Coro::State; 39use Coro::State;
17use Coro::Handle; 40use Coro::Handle;
18use Coro::EV; 41use Coro::EV;
42use Coro::AnyEvent;
19use Coro::Timer; 43use Coro::Timer;
20use Coro::Signal; 44use Coro::Signal;
21use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
47use Coro::AnyEvent;
22use Coro::AIO; 48use Coro::AIO;
23use Coro::BDB; 49use Coro::BDB 1.6;
24use Coro::Storable; 50use Coro::Storable;
25use Coro::Util (); 51use Coro::Util ();
26 52
27use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
28use BDB (); 54use BDB ();
29use Data::Dumper; 55use Data::Dumper;
30use Digest::MD5; 56use Digest::MD5;
31use Fcntl; 57use Fcntl;
32use YAML::Syck (); 58use YAML ();
33use IO::AIO 2.51 (); 59use IO::AIO ();
34use Time::HiRes; 60use Time::HiRes;
35use Compress::LZF; 61use Compress::LZF;
36use Digest::MD5 (); 62use Digest::MD5 ();
63
64AnyEvent::detect;
37 65
38# configure various modules to our taste 66# configure various modules to our taste
39# 67#
40$Storable::canonical = 1; # reduce rsync transfers 68$Storable::canonical = 1; # reduce rsync transfers
41Coro::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
70
71$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
72
73# make sure c-lzf reinitialises itself
74Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
42Compress::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
43
44# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
45$YAML::Syck::ImplicitUnicode = 1;
46
47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
48 76
49sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 77sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
50 78
51our %COMMAND = (); 79our %COMMAND = ();
52our %COMMAND_TIME = (); 80our %COMMAND_TIME = ();
55our %EXTCMD = (); 83our %EXTCMD = ();
56our %EXTICMD = (); 84our %EXTICMD = ();
57our %EXT_CORO = (); # coroutines bound to extensions 85our %EXT_CORO = (); # coroutines bound to extensions
58our %EXT_MAP = (); # pluggable maps 86our %EXT_MAP = (); # pluggable maps
59 87
60our $RELOAD; # number of reloads so far 88our $RELOAD; # number of reloads so far, non-zero while in reload
61our @EVENT; 89our @EVENT;
62 90
63our $CONFDIR = confdir; 91our $CONFDIR = confdir;
64our $DATADIR = datadir; 92our $DATADIR = datadir;
65our $LIBDIR = "$DATADIR/ext"; 93our $LIBDIR = "$DATADIR/ext";
66our $PODDIR = "$DATADIR/pod"; 94our $PODDIR = "$DATADIR/pod";
67our $MAPDIR = "$DATADIR/" . mapdir; 95our $MAPDIR = "$DATADIR/" . mapdir;
68our $LOCALDIR = localdir; 96our $LOCALDIR = localdir;
69our $TMPDIR = "$LOCALDIR/" . tmpdir; 97our $TMPDIR = "$LOCALDIR/" . tmpdir;
70our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 98our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
71our $PLAYERDIR = "$LOCALDIR/" . playerdir; 99our $PLAYERDIR = "$LOCALDIR/" . playerdir;
72our $RANDOMDIR = "$LOCALDIR/random"; 100our $RANDOMDIR = "$LOCALDIR/random";
73our $BDBDIR = "$LOCALDIR/db"; 101our $BDBDIR = "$LOCALDIR/db";
102our $PIDFILE = "$LOCALDIR/pid";
103our $RUNTIMEFILE = "$LOCALDIR/runtime";
104
105our %RESOURCE;
74 106
75our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 107our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
76our $TICK_WATCHER;
77our $AIO_POLL_WATCHER;
78our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 108our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
79our $NEXT_TICK; 109our $NEXT_TICK;
80our $USE_FSYNC = 1; # use fsync to write maps - default off 110our $USE_FSYNC = 1; # use fsync to write maps - default on
81 111
82our $BDB_POLL_WATCHER;
83our $BDB_DEADLOCK_WATCHER; 112our $BDB_DEADLOCK_WATCHER;
84our $BDB_CHECKPOINT_WATCHER; 113our $BDB_CHECKPOINT_WATCHER;
85our $BDB_TRICKLE_WATCHER; 114our $BDB_TRICKLE_WATCHER;
86our $DB_ENV; 115our $DB_ENV;
87 116
117our @EXTRA_MODULES = qw(pod mapscript);
118
88our %CFG; 119our %CFG;
89 120
90our $UPTIME; $UPTIME ||= time; 121our $UPTIME; $UPTIME ||= time;
91our $RUNTIME; 122our $RUNTIME;
92our $NOW; 123our $NOW;
98# used to convert map paths into valid unix filenames by replacing / by ∕ 129# used to convert map paths into valid unix filenames by replacing / by ∕
99our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 130our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
100 131
101our $LOAD; # a number between 0 (idle) and 1 (too many objects) 132our $LOAD; # a number between 0 (idle) and 1 (too many objects)
102our $LOADAVG; # same thing, but with alpha-smoothing 133our $LOADAVG; # same thing, but with alpha-smoothing
134our $JITTER; # average jitter
103our $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)
104 140
105binmode STDOUT; 141binmode STDOUT;
106binmode STDERR; 142binmode STDERR;
107 143
108# read virtual server time, if available 144# read virtual server time, if available
109unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 145unless ($RUNTIME || !-e $RUNTIMEFILE) {
110 open my $fh, "<", "$LOCALDIR/runtime" 146 open my $fh, "<", $RUNTIMEFILE
111 or die "unable to read runtime file: $!"; 147 or die "unable to read $RUNTIMEFILE file: $!";
112 $RUNTIME = <$fh> + 0.; 148 $RUNTIME = <$fh> + 0.;
113} 149}
150
151eval "sub TICK() { $TICK } 1" or die;
114 152
115mkdir $_ 153mkdir $_
116 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 154 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
117 155
118our $EMERGENCY_POSITION; 156our $EMERGENCY_POSITION;
192 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 230 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
193 231
194 LOG llevError, $msg; 232 LOG llevError, $msg;
195 }; 233 };
196} 234}
235
236$Coro::State::DIEHOOK = sub {
237 return unless $^S eq 0; # "eq", not "=="
238
239 if ($Coro::current == $Coro::main) {#d#
240 warn "DIEHOOK called in main context, Coro bug?\n";#d#
241 return;#d#
242 }#d#
243
244 # kill coroutine otherwise
245 warn Carp::longmess $_[0];
246 Coro::terminate
247};
248
249$SIG{__DIE__} = sub { }; #d#?
197 250
198@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 251@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
199@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 252@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
200@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 253@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
201@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 254@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
208for my $pkg (qw( 261for my $pkg (qw(
209 cf::global cf::attachable 262 cf::global cf::attachable
210 cf::object cf::object::player 263 cf::object cf::object::player
211 cf::client cf::player 264 cf::client cf::player
212 cf::arch cf::living 265 cf::arch cf::living
266 cf::map cf::mapspace
213 cf::map cf::party cf::region 267 cf::party cf::region
214)) { 268)) {
215 no strict 'refs';
216 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 269 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
217} 270}
218 271
219$EV::DIED = sub { 272$EV::DIED = sub {
220 warn "error in event callback: @_"; 273 warn "error in event callback: @_";
262our $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
263 316
264sub encode_json($) { $json_coder->encode ($_[0]) } 317sub encode_json($) { $json_coder->encode ($_[0]) }
265sub decode_json($) { $json_coder->decode ($_[0]) } 318sub decode_json($) { $json_coder->decode ($_[0]) }
266 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
267=item cf::lock_wait $string 334=item cf::lock_wait $string
268 335
269Wait until the given lock is available. See cf::lock_acquire. 336Wait until the given lock is available. See cf::lock_acquire.
270 337
271=item my $lock = cf::lock_acquire $string 338=item my $lock = cf::lock_acquire $string
272 339
273Wait 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
274a 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,
275for example when the coroutine gets canceled), the lock is automatically 342for example when the coroutine gets canceled), the lock is automatically
276returned. 343returned.
277 344
278Locks 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
279deadlocked coro. 346deadlocked coro.
285 352
286Return 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.
287 354
288=cut 355=cut
289 356
290our %LOCK; 357our $LOCKS = new Coro::SemaphoreSet;
291our %LOCKER;#d#
292 358
293sub lock_wait($) { 359sub lock_wait($) {
294 my ($key) = @_; 360 $LOCKS->wait ($_[0]);
295
296 if ($LOCKER{$key} == $Coro::current) {#d#
297 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
298 return;#d#
299 }#d#
300
301 # wait for lock, if any
302 while ($LOCK{$key}) {
303 push @{ $LOCK{$key} }, $Coro::current;
304 Coro::schedule;
305 }
306} 361}
307 362
308sub lock_acquire($) { 363sub lock_acquire($) {
309 my ($key) = @_; 364 $LOCKS->guard ($_[0])
310
311 # wait, to be sure we are not locked
312 lock_wait $key;
313
314 $LOCK{$key} = [];
315 $LOCKER{$key} = $Coro::current;#d#
316
317 Coro::guard {
318 delete $LOCKER{$key};#d#
319 # wake up all waiters, to be on the safe side
320 $_->ready for @{ delete $LOCK{$key} };
321 }
322} 365}
323 366
324sub lock_active($) { 367sub lock_active($) {
325 my ($key) = @_; 368 $LOCKS->count ($_[0]) < 1
326
327 ! ! $LOCK{$key}
328} 369}
329 370
330sub freeze_mainloop { 371sub freeze_mainloop {
331 return unless $TICK_WATCHER->is_active; 372 tick_inhibit_inc;
332 373
333 my $guard = Coro::guard { 374 &Guard::guard (\&tick_inhibit_dec);
334 $TICK_WATCHER->start;
335 };
336 $TICK_WATCHER->stop;
337 $guard
338} 375}
339 376
340=item cf::periodic $interval, $cb 377=item cf::periodic $interval, $cb
341 378
342Like 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
397 } 434 }
398 } 435 }
399}; 436};
400 437
401sub get_slot($;$$) { 438sub get_slot($;$$) {
439 return if tick_inhibit || $Coro::current == $Coro::main;
440
402 my ($time, $pri, $name) = @_; 441 my ($time, $pri, $name) = @_;
403 442
404 $time = $TICK * .6 if $time > $TICK * .6; 443 $time = $TICK * .6 if $time > $TICK * .6;
405 my $sig = new Coro::Signal; 444 my $sig = new Coro::Signal;
406 445
443 # this is the main coro, too bad, we have to block 482 # this is the main coro, too bad, we have to block
444 # till the operation succeeds, freezing the server :/ 483 # till the operation succeeds, freezing the server :/
445 484
446 LOG llevError, Carp::longmess "sync job";#d# 485 LOG llevError, Carp::longmess "sync job";#d#
447 486
448 # TODO: use suspend/resume instead
449 # (but this is cancel-safe)
450 my $freeze_guard = freeze_mainloop; 487 my $freeze_guard = freeze_mainloop;
451 488
452 my $busy = 1; 489 my $busy = 1;
453 my @res; 490 my @res;
454 491
465 } else { 502 } else {
466 EV::loop EV::LOOP_ONESHOT; 503 EV::loop EV::LOOP_ONESHOT;
467 } 504 }
468 } 505 }
469 506
470 $time = EV::time - $time; 507 my $time = EV::time - $time;
471 508
472 LOG llevError | logBacktrace, Carp::longmess "long sync job"
473 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
474
475 $tick_start += $time; # do not account sync jobs to server load 509 $TICK_START += $time; # do not account sync jobs to server load
476 510
477 wantarray ? @res : $res[0] 511 wantarray ? @res : $res[0]
478 } else { 512 } else {
479 # we are in another coroutine, how wonderful, everything just works 513 # we are in another coroutine, how wonderful, everything just works
480 514
522 reset_signals; 556 reset_signals;
523 &$cb 557 &$cb
524 }, @args; 558 }, @args;
525 559
526 wantarray ? @res : $res[-1] 560 wantarray ? @res : $res[-1]
561}
562
563=item $coin = coin_from_name $name
564
565=cut
566
567our %coin_alias = (
568 "silver" => "silvercoin",
569 "silvercoin" => "silvercoin",
570 "silvercoins" => "silvercoin",
571 "gold" => "goldcoin",
572 "goldcoin" => "goldcoin",
573 "goldcoins" => "goldcoin",
574 "platinum" => "platinacoin",
575 "platinumcoin" => "platinacoin",
576 "platinumcoins" => "platinacoin",
577 "platina" => "platinacoin",
578 "platinacoin" => "platinacoin",
579 "platinacoins" => "platinacoin",
580 "royalty" => "royalty",
581 "royalties" => "royalty",
582);
583
584sub coin_from_name($) {
585 $coin_alias{$_[0]}
586 ? cf::arch::find $coin_alias{$_[0]}
587 : undef
527} 588}
528 589
529=item $value = cf::db_get $family => $key 590=item $value = cf::db_get $family => $key
530 591
531Returns a single value from the environment database. 592Returns a single value from the environment database.
670 731
671############################################################################# 732#############################################################################
672 733
673=head2 ATTACHABLE OBJECTS 734=head2 ATTACHABLE OBJECTS
674 735
675Many objects in crossfire are so-called attachable objects. That means you can 736Many objects in deliantra are so-called attachable objects. That means you can
676attach callbacks/event handlers (a collection of which is called an "attachment") 737attach callbacks/event handlers (a collection of which is called an "attachment")
677to it. All such attachable objects support the following methods. 738to it. All such attachable objects support the following methods.
678 739
679In the following description, CLASS can be any of C<global>, C<object> 740In the following description, CLASS can be any of C<global>, C<object>
680C<player>, C<client> or C<map> (i.e. the attachable objects in 741C<player>, C<client> or C<map> (i.e. the attachable objects in
730=item cf::CLASS::attachment $name, ... 791=item cf::CLASS::attachment $name, ...
731 792
732Register an attachment by C<$name> through which attachable objects of the 793Register an attachment by C<$name> through which attachable objects of the
733given CLASS can refer to this attachment. 794given CLASS can refer to this attachment.
734 795
735Some classes such as crossfire maps and objects can specify attachments 796Some classes such as deliantra maps and objects can specify attachments
736that are attached at load/instantiate time, thus the need for a name. 797that are attached at load/instantiate time, thus the need for a name.
737 798
738These calls expect any number of the following handler/hook descriptions: 799These calls expect any number of the following handler/hook descriptions:
739 800
740=over 4 801=over 4
968 } 1029 }
969 1030
970 0 1031 0
971} 1032}
972 1033
973=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1034=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
974 1035
975=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1036=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
976 1037
977Generate an object-specific event with the given arguments. 1038Generate an object-specific event with the given arguments.
978 1039
1031 1092
1032sub reattach { 1093sub reattach {
1033 # basically do the same as instantiate, without calling instantiate 1094 # basically do the same as instantiate, without calling instantiate
1034 my ($obj) = @_; 1095 my ($obj) = @_;
1035 1096
1097 # no longer needed after getting rid of delete_package?
1036 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1098 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1037 1099
1038 my $registry = $obj->registry; 1100 my $registry = $obj->registry;
1039 1101
1040 @$registry = (); 1102 @$registry = ();
1041 1103
1087 utf8::decode (my $decname = $filename); 1149 utf8::decode (my $decname = $filename);
1088 warn sprintf "saving %s (%d,%d)\n", 1150 warn sprintf "saving %s (%d,%d)\n",
1089 $decname, length $$rdata, scalar @$objs; 1151 $decname, length $$rdata, scalar @$objs;
1090 1152
1091 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1153 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1092 chmod SAVE_MODE, $fh; 1154 aio_chmod $fh, SAVE_MODE;
1093 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1155 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1094 aio_fsync $fh if $cf::USE_FSYNC; 1156 aio_fsync $fh if $cf::USE_FSYNC;
1095 close $fh; 1157 aio_close $fh;
1096 1158
1097 if (@$objs) { 1159 if (@$objs) {
1098 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1160 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1099 chmod SAVE_MODE, $fh; 1161 aio_chmod $fh, SAVE_MODE;
1100 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1162 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1101 aio_write $fh, 0, (length $data), $data, 0; 1163 aio_write $fh, 0, (length $data), $data, 0;
1102 aio_fsync $fh if $cf::USE_FSYNC; 1164 aio_fsync $fh if $cf::USE_FSYNC;
1103 close $fh; 1165 aio_close $fh;
1104 aio_rename "$filename.pst~", "$filename.pst"; 1166 aio_rename "$filename.pst~", "$filename.pst";
1105 } 1167 }
1106 } else { 1168 } else {
1107 aio_unlink "$filename.pst"; 1169 aio_unlink "$filename.pst";
1108 } 1170 }
1109 1171
1110 aio_rename "$filename~", $filename; 1172 aio_rename "$filename~", $filename;
1173
1174 $filename =~ s%/[^/]+$%%;
1175 aio_pathsync $filename if $cf::USE_FSYNC;
1111 } else { 1176 } else {
1112 warn "FATAL: $filename~: $!\n"; 1177 warn "unable to save objects: $filename~: $!\n";
1113 } 1178 }
1114 } else { 1179 } else {
1115 aio_unlink $filename; 1180 aio_unlink $filename;
1116 aio_unlink "$filename.pst"; 1181 aio_unlink "$filename.pst";
1117 } 1182 }
1208 my ($name, $cb) = @_; 1273 my ($name, $cb) = @_;
1209 1274
1210 $EXTICMD{$name} = $cb; 1275 $EXTICMD{$name} = $cb;
1211} 1276}
1212 1277
1278use File::Glob ();
1279
1213cf::player->attach ( 1280cf::player->attach (
1214 on_command => sub { 1281 on_command => sub {
1215 my ($pl, $name, $params) = @_; 1282 my ($pl, $name, $params) = @_;
1216 1283
1217 my $cb = $COMMAND{$name} 1284 my $cb = $COMMAND{$name}
1249 1316
1250 cf::override; 1317 cf::override;
1251 }, 1318 },
1252); 1319);
1253 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}
1333
1254sub load_extensions { 1334sub load_extensions {
1255 cf::sync_job { 1335 cf::sync_job {
1256 my %todo; 1336 my %todo;
1257 1337
1258 for my $path (<$LIBDIR/*.ext>) { 1338 for my $path (<$LIBDIR/*.ext>) {
1277 1357
1278 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1358 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1279 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1359 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1280 1360
1281 $ext{source} = 1361 $ext{source} =
1282 "package $pkg; use strict; use utf8;\n" 1362 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1283 . "#line 1 \"$path\"\n{\n" 1363 . "#line 1 \"$path\"\n{\n"
1284 . $source 1364 . $source
1285 . "\n};\n1"; 1365 . "\n};\n1";
1286 1366
1287 $todo{$base} = \%ext; 1367 $todo{$base} = \%ext;
1303 my $msg = $@ ? "$v->{path}: $@\n" 1383 my $msg = $@ ? "$v->{path}: $@\n"
1304 : "$v->{base}: extension inactive.\n"; 1384 : "$v->{base}: extension inactive.\n";
1305 1385
1306 if (exists $v->{meta}{mandatory}) { 1386 if (exists $v->{meta}{mandatory}) {
1307 warn $msg; 1387 warn $msg;
1308 warn "mandatory extension failed to load, exiting.\n"; 1388 cf::cleanup "mandatory extension failed to load, exiting.";
1309 exit 1;
1310 } 1389 }
1311 1390
1312 warn $msg; 1391 warn $msg;
1313 } 1392 }
1314 1393
1328 1407
1329=back 1408=back
1330 1409
1331=head2 CORE EXTENSIONS 1410=head2 CORE EXTENSIONS
1332 1411
1333Functions and methods that extend core crossfire objects. 1412Functions and methods that extend core deliantra objects.
1334 1413
1335=cut 1414=cut
1336 1415
1337package cf::player; 1416package cf::player;
1338 1417
1381 1460
1382sub exists($) { 1461sub exists($) {
1383 my ($login) = @_; 1462 my ($login) = @_;
1384 1463
1385 $cf::PLAYER{$login} 1464 $cf::PLAYER{$login}
1386 or cf::sync_job { !aio_stat path $login } 1465 or !aio_stat path $login
1387} 1466}
1388 1467
1389sub find($) { 1468sub find($) {
1390 return $cf::PLAYER{$_[0]} || do { 1469 return $cf::PLAYER{$_[0]} || do {
1391 my $login = $_[0]; 1470 my $login = $_[0];
1403 my $f = new_from_file cf::object::thawer path $login 1482 my $f = new_from_file cf::object::thawer path $login
1404 or return; 1483 or return;
1405 1484
1406 my $pl = cf::player::load_pl $f 1485 my $pl = cf::player::load_pl $f
1407 or return; 1486 or return;
1487
1408 local $cf::PLAYER_LOADING{$login} = $pl; 1488 local $cf::PLAYER_LOADING{$login} = $pl;
1409 $f->resolve_delayed_derefs; 1489 $f->resolve_delayed_derefs;
1410 $cf::PLAYER{$login} = $pl 1490 $cf::PLAYER{$login} = $pl
1411 } 1491 }
1412 } 1492 }
1422 1502
1423 return if $pl->{deny_save}; 1503 return if $pl->{deny_save};
1424 1504
1425 aio_mkdir playerdir $pl, 0770; 1505 aio_mkdir playerdir $pl, 0770;
1426 $pl->{last_save} = $cf::RUNTIME; 1506 $pl->{last_save} = $cf::RUNTIME;
1507
1508 cf::get_slot 0.01;
1427 1509
1428 $pl->save_pl ($path); 1510 $pl->save_pl ($path);
1429 cf::cede_to_tick; 1511 cf::cede_to_tick;
1430} 1512}
1431 1513
1463 my ($pl) = @_; 1545 my ($pl) = @_;
1464 1546
1465 my $name = $pl->ob->name; 1547 my $name = $pl->ob->name;
1466 1548
1467 $pl->{deny_save} = 1; 1549 $pl->{deny_save} = 1;
1468 $pl->password ("*"); # this should lock out the player until we nuked the dir 1550 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1469 1551
1470 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1552 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1471 $pl->deactivate; 1553 $pl->deactivate;
1554 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1555 $pl->ob->check_score;
1472 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1556 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1473 $pl->ns->destroy if $pl->ns; 1557 $pl->ns->destroy if $pl->ns;
1474 1558
1475 my $path = playerdir $pl; 1559 my $path = playerdir $pl;
1476 my $temp = "$path~$cf::RUNTIME~deleting~"; 1560 my $temp = "$path~$cf::RUNTIME~deleting~";
1515 1599
1516 for my $login (@$dirs) { 1600 for my $login (@$dirs) {
1517 my $path = path $login; 1601 my $path = path $login;
1518 1602
1519 # a .pst is a dead give-away for a valid player 1603 # a .pst is a dead give-away for a valid player
1520 unless (-e "$path.pst") { 1604 # if no pst file found, open and chekc for blocked users
1605 if (aio_stat "$path.pst") {
1521 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1606 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1522 aio_read $fh, 0, 512, my $buf, 0 or next; 1607 aio_read $fh, 0, 512, my $buf, 0 or next;
1523 $buf !~ /^password -------------$/m or next; # official not-valid tag 1608 $buf !~ /^password -------------$/m or next; # official not-valid tag
1524 } 1609 }
1525 1610
1556 } 1641 }
1557 1642
1558 \@paths 1643 \@paths
1559} 1644}
1560 1645
1561=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1646=item $protocol_xml = $player->expand_cfpod ($cfpod)
1562 1647
1563Expand crossfire pod fragments into protocol xml. 1648Expand deliantra pod fragments into protocol xml.
1564
1565=cut
1566
1567use re 'eval';
1568
1569my $group;
1570my $interior; $interior = qr{
1571 # match a pod interior sequence sans C<< >>
1572 (?:
1573 \ (.*?)\ (?{ $group = $^N })
1574 | < (??{$interior}) >
1575 )
1576}x;
1577
1578sub expand_cfpod {
1579 my ($self, $pod) = @_;
1580
1581 my $xml;
1582
1583 while () {
1584 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1585 $group = $1;
1586
1587 $group =~ s/&/&amp;/g;
1588 $group =~ s/</&lt;/g;
1589
1590 $xml .= $group;
1591 } elsif ($pod =~ m%\G
1592 ([BCGHITU])
1593 <
1594 (?:
1595 ([^<>]*) (?{ $group = $^N })
1596 | < $interior >
1597 )
1598 >
1599 %gcsx
1600 ) {
1601 my ($code, $data) = ($1, $group);
1602
1603 if ($code eq "B") {
1604 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1605 } elsif ($code eq "I") {
1606 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1607 } elsif ($code eq "U") {
1608 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1609 } elsif ($code eq "C") {
1610 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1611 } elsif ($code eq "T") {
1612 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1613 } elsif ($code eq "G") {
1614 my ($male, $female) = split /\|/, $data;
1615 $data = $self->gender ? $female : $male;
1616 $xml .= expand_cfpod ($self, $data);
1617 } elsif ($code eq "H") {
1618 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1619 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1620 "")
1621 [$self->{hintmode}];
1622 } else {
1623 $xml .= "error processing '$code($data)' directive";
1624 }
1625 } else {
1626 if ($pod =~ /\G(.+)/) {
1627 warn "parse error while expanding $pod (at $1)";
1628 }
1629 last;
1630 }
1631 }
1632
1633 for ($xml) {
1634 # create single paragraphs (very hackish)
1635 s/(?<=\S)\n(?=\w)/ /g;
1636
1637 # compress some whitespace
1638 s/\s+\n/\n/g; # ws line-ends
1639 s/\n\n+/\n/g; # double lines
1640 s/^\n+//; # beginning lines
1641 s/\n+$//; # ending lines
1642 }
1643
1644 $xml
1645}
1646
1647no re 'eval';
1648
1649sub hintmode {
1650 $_[0]{hintmode} = $_[1] if @_ > 1;
1651 $_[0]{hintmode}
1652}
1653 1649
1654=item $player->ext_reply ($msgid, @msg) 1650=item $player->ext_reply ($msgid, @msg)
1655 1651
1656Sends an ext reply to the player. 1652Sends an ext reply to the player.
1657 1653
1724our $MAX_RESET = 3600; 1720our $MAX_RESET = 3600;
1725our $DEFAULT_RESET = 3000; 1721our $DEFAULT_RESET = 3000;
1726 1722
1727sub generate_random_map { 1723sub generate_random_map {
1728 my ($self, $rmp) = @_; 1724 my ($self, $rmp) = @_;
1725
1726 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1727
1729 # mit "rum" bekleckern, nicht 1728 # mit "rum" bekleckern, nicht
1730 $self->_create_random_map ( 1729 $self->_create_random_map (
1731 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1730 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1732 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1731 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1733 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1732 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1855 1854
1856# the temporary/swap location 1855# the temporary/swap location
1857sub save_path { 1856sub save_path {
1858 my ($self) = @_; 1857 my ($self) = @_;
1859 1858
1860 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1859 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1861 "$TMPDIR/$path.map" 1860 "$TMPDIR/$path.map"
1862} 1861}
1863 1862
1864# the unique path, undef == no special unique path 1863# the unique path, undef == no special unique path
1865sub uniq_path { 1864sub uniq_path {
1866 my ($self) = @_; 1865 my ($self) = @_;
1867 1866
1868 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1867 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1869 "$UNIQUEDIR/$path" 1868 "$UNIQUEDIR/$path"
1870}
1871
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} 1869}
1880 1870
1881sub decay_objects { 1871sub decay_objects {
1882 my ($self) = @_; 1872 my ($self) = @_;
1883 1873
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_find:$path";
1977 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
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
1985 or return; 1972 or return;
1986 1973
1987 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1974 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1988 # doing this can freeze the server in a sync job, obviously 1975 # doing this can freeze the server in a sync job, obviously
1989 #$cf::WAIT_FOR_TICK->wait; 1976 #$cf::WAIT_FOR_TICK->wait;
1977 undef $guard2;
1990 undef $guard1; 1978 undef $guard1;
1991 undef $guard2;
1992 $map->reset; 1979 $map->reset;
1993 return find $path; 1980 return find $path;
1994 } 1981 }
1995 1982
1996 $cf::MAP{$path} = $map 1983 $cf::MAP{$path} = $map
2023 my $f = new_from_file cf::object::thawer $self->{load_path}; 2010 my $f = new_from_file cf::object::thawer $self->{load_path};
2024 $f->skip_block; 2011 $f->skip_block;
2025 $self->_load_objects ($f) 2012 $self->_load_objects ($f)
2026 or return; 2013 or return;
2027 2014
2028 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2015 $self->post_load_original
2029 if delete $self->{load_original}; 2016 if delete $self->{load_original};
2030 2017
2031 if (my $uniq = $self->uniq_path) { 2018 if (my $uniq = $self->uniq_path) {
2032 utf8::encode $uniq; 2019 utf8::encode $uniq;
2033 unless (aio_stat $uniq) { 2020 unless (aio_stat $uniq) {
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; 2042 cf::cede_to_tick;
2056 $self->set_darkness_map;
2057 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;
2062 $self->last_access ($cf::RUNTIME); 2047 $self->last_access ($cf::RUNTIME);
2063 2048
2064 $self->in_memory (cf::MAP_IN_MEMORY); 2049 $self->in_memory (cf::MAP_ACTIVE);
2065 } 2050 }
2066 2051
2067 $self->post_load; 2052 $self->post_load;
2068} 2053}
2069 2054
2127 my ($path, $origin, $load) = @_; 2112 my ($path, $origin, $load) = @_;
2128 2113
2129 $path = normalise $path, $origin && $origin->{path}; 2114 $path = normalise $path, $origin && $origin->{path};
2130 2115
2131 if (my $map = $cf::MAP{$path}) { 2116 if (my $map = $cf::MAP{$path}) {
2132 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2117 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2133 } 2118 }
2134 2119
2135 $MAP_PREFETCH{$path} |= $load; 2120 $MAP_PREFETCH{$path} |= $load;
2136 2121
2137 $MAP_PREFETCHER ||= cf::async { 2122 $MAP_PREFETCHER ||= cf::async {
2174 cf::async { 2159 cf::async {
2175 $Coro::current->{desc} = "map player save"; 2160 $Coro::current->{desc} = "map player save";
2176 $_->contr->save for $self->players; 2161 $_->contr->save for $self->players;
2177 }; 2162 };
2178 2163
2164 cf::get_slot 0.02;
2165
2179 if ($uniq) { 2166 if ($uniq) {
2180 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2167 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2181 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2168 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2182 } else { 2169 } else {
2183 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2170 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2191 $self->save; 2178 $self->save;
2192 2179
2193 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2180 my $lock = cf::lock_acquire "map_data:$self->{path}";
2194 2181
2195 return if $self->players; 2182 return if $self->players;
2196 return if $self->in_memory != cf::MAP_IN_MEMORY; 2183 return if $self->in_memory != cf::MAP_ACTIVE;
2197 return if $self->{deny_save}; 2184 return if $self->{deny_save};
2198 2185
2199 $self->in_memory (cf::MAP_SWAPPED); 2186 $self->in_memory (cf::MAP_SWAPPED);
2200 2187
2201 $self->deactivate; 2188 $self->deactivate;
2319 2306
2320sub unique_maps() { 2307sub unique_maps() {
2321 [ 2308 [
2322 map { 2309 map {
2323 utf8::decode $_; 2310 utf8::decode $_;
2324 /\.map$/ 2311 s/\.map$//; # TODO future compatibility hack
2312 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2313 ? ()
2325 ? normalise $_ 2314 : normalise $_
2326 : ()
2327 } @{ aio_readdir $UNIQUEDIR or [] } 2315 } @{ aio_readdir $UNIQUEDIR or [] }
2328 ] 2316 ]
2329} 2317}
2330 2318
2331package cf;
2332
2333=back 2319=back
2334 2320
2335=head3 cf::object 2321=head3 cf::object
2336 2322
2337=cut 2323=cut
2340 2326
2341=over 4 2327=over 4
2342 2328
2343=item $ob->inv_recursive 2329=item $ob->inv_recursive
2344 2330
2345Returns the inventory of the object _and_ their inventories, recursively. 2331Returns the inventory of the object I<and> their inventories, recursively,
2332but I<not> the object itself.
2346 2333
2347=cut 2334=cut
2348 2335
2349sub inv_recursive_; 2336sub inv_recursive_;
2350sub inv_recursive_ { 2337sub inv_recursive_ {
2355 inv_recursive_ inv $_[0] 2342 inv_recursive_ inv $_[0]
2356} 2343}
2357 2344
2358=item $ref = $ob->ref 2345=item $ref = $ob->ref
2359 2346
2360creates and returns a persistent reference to an objetc that can be stored as a string. 2347Creates and returns a persistent reference to an object that can be stored as a string.
2361 2348
2362=item $ob = cf::object::deref ($refstring) 2349=item $ob = cf::object::deref ($refstring)
2363 2350
2364returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2351returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2365even if the object actually exists. May block. 2352even if the object actually exists. May block.
2397can be C<undef>. Does the right thing when the player is currently in a 2384can be C<undef>. Does the right thing when the player is currently in a
2398dialogue with the given NPC character. 2385dialogue with the given NPC character.
2399 2386
2400=cut 2387=cut
2401 2388
2389our $SAY_CHANNEL = {
2390 id => "say",
2391 title => "Map",
2392 reply => "say ",
2393 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2394};
2395
2396our $CHAT_CHANNEL = {
2397 id => "chat",
2398 title => "Chat",
2399 reply => "chat ",
2400 tooltip => "Player chat and shouts, global to the server.",
2401};
2402
2402# rough implementation of a future "reply" method that works 2403# rough implementation of a future "reply" method that works
2403# with dialog boxes. 2404# with dialog boxes.
2404#TODO: the first argument must go, split into a $npc->reply_to ( method 2405#TODO: the first argument must go, split into a $npc->reply_to ( method
2405sub cf::object::player::reply($$$;$) { 2406sub cf::object::player::reply($$$;$) {
2406 my ($self, $npc, $msg, $flags) = @_; 2407 my ($self, $npc, $msg, $flags) = @_;
2417 my $dialog = $pl->{npc_dialog}; 2418 my $dialog = $pl->{npc_dialog};
2418 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2419 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2419 2420
2420 } else { 2421 } else {
2421 $msg = $npc->name . " says: $msg" if $npc; 2422 $msg = $npc->name . " says: $msg" if $npc;
2422 $self->message ($msg, $flags); 2423 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2423 } 2424 }
2424 } 2425 }
2425} 2426}
2426 2427
2427=item $object->send_msg ($channel, $msg, $color, [extra...]) 2428=item $object->send_msg ($channel, $msg, $color, [extra...])
2452 2453
2453=item $player_object->enter_link 2454=item $player_object->enter_link
2454 2455
2455Freezes the player and moves him/her to a special map (C<{link}>). 2456Freezes the player and moves him/her to a special map (C<{link}>).
2456 2457
2457The player should be reasonably safe there for short amounts of time. You 2458The player should be reasonably safe there for short amounts of time (e.g.
2458I<MUST> call C<leave_link> as soon as possible, though. 2459for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2460though, as the palyer cannot control the character while it is on the link
2461map.
2459 2462
2460Will never block. 2463Will never block.
2461 2464
2462=item $player_object->leave_link ($map, $x, $y) 2465=item $player_object->leave_link ($map, $x, $y)
2463 2466
2521 2524
2522 $map->load; 2525 $map->load;
2523 $map->load_neighbours; 2526 $map->load_neighbours;
2524 2527
2525 return unless $self->contr->active; 2528 return unless $self->contr->active;
2529 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2526 $self->activate_recursive; 2530 $self->activate_recursive;
2527 2531
2528 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2532 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2529 $self->enter_map ($map, $x, $y); 2533 $self->enter_map ($map, $x, $y);
2530} 2534}
2534Moves the player to the given map-path and coordinates by first freezing 2538Moves the player to the given map-path and coordinates by first freezing
2535her, loading and preparing them map, calling the provided $check callback 2539her, loading and preparing them map, calling the provided $check callback
2536that has to return the map if sucecssful, and then unfreezes the player on 2540that has to return the map if sucecssful, and then unfreezes the player on
2537the new (success) or old (failed) map position. In either case, $done will 2541the new (success) or old (failed) map position. In either case, $done will
2538be called at the end of this process. 2542be called at the end of this process.
2543
2544Note that $check will be called with a potentially non-loaded map, so if
2545it needs a loaded map it has to call C<< ->load >>.
2539 2546
2540=cut 2547=cut
2541 2548
2542our $GOTOGEN; 2549our $GOTOGEN;
2543 2550
2622} 2629}
2623 2630
2624sub prepare_random_map { 2631sub prepare_random_map {
2625 my ($exit) = @_; 2632 my ($exit) = @_;
2626 2633
2627 my $guard = cf::lock_acquire "exit_prepare:$exit";
2628
2629 # all this does is basically replace the /! path by 2634 # all this does is basically replace the /! path by
2630 # a new random map path (?random/...) with a seed 2635 # a new random map path (?random/...) with a seed
2631 # that depends on the exit object 2636 # that depends on the exit object
2632 2637
2633 my $rmp = parse_random_map_params $exit->msg; 2638 my $rmp = parse_random_map_params $exit->msg;
2635 if ($exit->map) { 2640 if ($exit->map) {
2636 $rmp->{region} = $exit->region->name; 2641 $rmp->{region} = $exit->region->name;
2637 $rmp->{origin_map} = $exit->map->path; 2642 $rmp->{origin_map} = $exit->map->path;
2638 $rmp->{origin_x} = $exit->x; 2643 $rmp->{origin_x} = $exit->x;
2639 $rmp->{origin_y} = $exit->y; 2644 $rmp->{origin_y} = $exit->y;
2645
2646 $exit->map->touch;
2640 } 2647 }
2641 2648
2642 $rmp->{random_seed} ||= $exit->random_seed; 2649 $rmp->{random_seed} ||= $exit->random_seed;
2643 2650
2644 my $data = cf::encode_json $rmp; 2651 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2645 my $md5 = Digest::MD5::md5_hex $data; 2652 my $md5 = Digest::MD5::md5_hex $data;
2646 my $meta = "$RANDOMDIR/$md5.meta"; 2653 my $meta = "$RANDOMDIR/$md5.meta";
2647 2654
2648 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2655 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2649 aio_write $fh, 0, (length $data), $data, 0; 2656 aio_write $fh, 0, (length $data), $data, 0;
2650 undef $fh; 2657 undef $fh;
2651 aio_rename "$meta~", $meta; 2658 aio_rename "$meta~", $meta;
2652 2659
2660 my $slaying = "?random/$md5";
2661
2662 if ($exit->valid) {
2653 $exit->slaying ("?random/$md5"); 2663 $exit->slaying ("?random/$md5");
2654 $exit->msg (undef); 2664 $exit->msg (undef);
2665 }
2655 } 2666 }
2656} 2667}
2657 2668
2658sub cf::object::player::enter_exit { 2669sub cf::object::player::enter_exit {
2659 my ($self, $exit) = @_; 2670 my ($self, $exit) = @_;
2660 2671
2661 return unless $self->type == cf::PLAYER; 2672 return unless $self->type == cf::PLAYER;
2662 2673
2663 if ($exit->slaying eq "/!") {
2664 #TODO: this should de-fi-ni-te-ly not be a sync-job
2665 # the problem is that $exit might not survive long enough
2666 # so it needs to be done right now, right here
2667 cf::sync_job { prepare_random_map $exit };
2668 }
2669
2670 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2671 my $hp = $exit->stats->hp;
2672 my $sp = $exit->stats->sp;
2673
2674 $self->enter_link; 2674 $self->enter_link;
2675 2675
2676 # if exit is damned, update players death & WoR home-position
2677 $self->contr->savebed ($slaying, $hp, $sp)
2678 if $exit->flag (FLAG_DAMNED);
2679
2680 (async { 2676 (async {
2681 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2677 $Coro::current->{desc} = "enter_exit";
2682 2678
2683 $self->deactivate_recursive; # just to be sure
2684 unless (eval { 2679 unless (eval {
2680 $self->deactivate_recursive; # just to be sure
2681
2682 # random map handling
2683 {
2684 my $guard = cf::lock_acquire "exit_prepare:$exit";
2685
2686 prepare_random_map $exit
2687 if $exit->slaying eq "/!";
2688 }
2689
2690 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2691 my $x = $exit->stats->hp;
2692 my $y = $exit->stats->sp;
2693
2685 $self->goto ($slaying, $hp, $sp); 2694 $self->goto ($map, $x, $y);
2686 2695
2696 # if exit is damned, update players death & WoR home-position
2697 $self->contr->savebed ($map, $x, $y)
2698 if $exit->flag (cf::FLAG_DAMNED);
2699
2687 1; 2700 1
2688 }) { 2701 }) {
2689 $self->message ("Something went wrong deep within the crossfire server. " 2702 $self->message ("Something went wrong deep within the deliantra server. "
2690 . "I'll try to bring you back to the map you were before. " 2703 . "I'll try to bring you back to the map you were before. "
2691 . "Please report this to the dungeon master!", 2704 . "Please report this to the dungeon master!",
2692 cf::NDI_UNIQUE | cf::NDI_RED); 2705 cf::NDI_UNIQUE | cf::NDI_RED);
2693 2706
2694 warn "ERROR in enter_exit: $@"; 2707 warn "ERROR in enter_exit: $@";
2760 id => "infobox", 2773 id => "infobox",
2761 title => "Body Parts", 2774 title => "Body Parts",
2762 reply => undef, 2775 reply => undef,
2763 tooltip => "Shows which body parts you posess and are available", 2776 tooltip => "Shows which body parts you posess and are available",
2764 }, 2777 },
2778 "c/statistics" => {
2779 id => "infobox",
2780 title => "Statistics",
2781 reply => undef,
2782 tooltip => "Shows your primary statistics",
2783 },
2784 "c/skills" => {
2785 id => "infobox",
2786 title => "Skills",
2787 reply => undef,
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",
2813 },
2765 "c/uptime" => { 2814 "c/uptime" => {
2766 id => "infobox", 2815 id => "infobox",
2767 title => "Uptime", 2816 title => "Uptime",
2768 reply => undef, 2817 reply => undef,
2769 tooltip => "How long the server has been running since last restart", 2818 tooltip => "How long the server has been running since last restart",
2772 id => "infobox", 2821 id => "infobox",
2773 title => "Map Info", 2822 title => "Map Info",
2774 reply => undef, 2823 reply => undef,
2775 tooltip => "Information related to the maps", 2824 tooltip => "Information related to the maps",
2776 }, 2825 },
2826 "c/party" => {
2827 id => "party",
2828 title => "Party",
2829 reply => "gsay ",
2830 tooltip => "Messages and chat related to your party",
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,
2777); 2840);
2778 2841
2779sub cf::client::send_msg { 2842sub cf::client::send_msg {
2780 my ($self, $channel, $msg, $color, @extra) = @_; 2843 my ($self, $channel, $msg, $color, @extra) = @_;
2781 2844
2782 $msg = $self->pl->expand_cfpod ($msg); 2845 $msg = $self->pl->expand_cfpod ($msg)
2846 unless $color & cf::NDI_VERBATIM;
2783 2847
2784 $color &= cf::NDI_CLIENT_MASK; # just in case... 2848 $color &= cf::NDI_CLIENT_MASK; # just in case...
2785 2849
2786 # check predefined channels, for the benefit of C 2850 # check predefined channels, for the benefit of C
2787 if ($CHANNEL{$channel}) { 2851 if ($CHANNEL{$channel}) {
2788 $channel = $CHANNEL{$channel}; 2852 $channel = $CHANNEL{$channel};
2789 2853
2790 $self->ext_msg (channel_info => $channel) 2854 $self->ext_msg (channel_info => $channel);
2791 if $self->can_msg;
2792
2793 $channel = $channel->{id}; 2855 $channel = $channel->{id};
2794 2856
2795 } elsif (ref $channel) { 2857 } elsif (ref $channel) {
2796 # send meta info to client, if not yet sent 2858 # send meta info to client, if not yet sent
2797 unless (exists $self->{channel}{$channel->{id}}) { 2859 unless (exists $self->{channel}{$channel->{id}}) {
2798 $self->{channel}{$channel->{id}} = $channel; 2860 $self->{channel}{$channel->{id}} = $channel;
2799 $self->ext_msg (channel_info => $channel) 2861 $self->ext_msg (channel_info => $channel);
2800 if $self->can_msg;
2801 } 2862 }
2802 2863
2803 $channel = $channel->{id}; 2864 $channel = $channel->{id};
2804 } 2865 }
2805 2866
2806 return unless @extra || length $msg; 2867 return unless @extra || length $msg;
2807 2868
2808 if ($self->can_msg) {
2809 # default colour, mask it out 2869 # default colour, mask it out
2810 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2870 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2811 if $color & cf::NDI_DEF; 2871 if $color & cf::NDI_DEF;
2812 2872
2813 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2873 my $pkt = "msg "
2874 . $self->{json_coder}->encode (
2814 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2875 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2815 } else { 2876 );
2816 if ($color >= 0) {
2817 # replace some tags by gcfclient-compatible ones
2818 for ($msg) {
2819 1 while
2820 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2821 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2822 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2823 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2824 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2825 }
2826 2877
2827 $color &= cf::NDI_COLOR_MASK; 2878 # try lzf for large packets
2879 $pkt = "lzf " . Compress::LZF::compress $pkt
2880 if 1024 <= length $pkt and $self->{can_lzf};
2828 2881
2829 utf8::encode $msg; 2882 # split very large packets
2830 2883 if (8192 < length $pkt and $self->{can_lzf}) {
2831 if (0 && $msg =~ /\[/) { 2884 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2832 # COMMAND/INFO 2885 $pkt = "frag";
2833 $self->send_packet ("drawextinfo $color 10 8 $msg")
2834 } else {
2835 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2836 $self->send_packet ("drawinfo $color $msg")
2837 }
2838 }
2839 } 2886 }
2887
2888 $self->send_packet ($pkt);
2840} 2889}
2841 2890
2842=item $client->ext_msg ($type, @msg) 2891=item $client->ext_msg ($type, @msg)
2843 2892
2844Sends an ext event to the client. 2893Sends an ext event to the client.
3018 3067
3019The following functions and methods are available within a safe environment: 3068The following functions and methods are available within a safe environment:
3020 3069
3021 cf::object 3070 cf::object
3022 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
3023 insert remove name archname title slaying race decrease_ob_nr 3072 insert remove name archname title slaying race decrease split
3073 value
3024 3074
3025 cf::object::player 3075 cf::object::player
3026 player 3076 player
3027 3077
3028 cf::player 3078 cf::player
3033 3083
3034=cut 3084=cut
3035 3085
3036for ( 3086for (
3037 ["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
3038 insert remove inv name archname title slaying race 3088 insert remove inv nrof name archname title slaying race
3039 decrease_ob_nr destroy)], 3089 decrease split destroy change_exp value msg lore send_msg)],
3040 ["cf::object::player" => qw(player)], 3090 ["cf::object::player" => qw(player)],
3041 ["cf::player" => qw(peaceful)], 3091 ["cf::player" => qw(peaceful send_msg)],
3042 ["cf::map" => qw(trigger)], 3092 ["cf::map" => qw(trigger)],
3043) { 3093) {
3044 no strict 'refs'; 3094 no strict 'refs';
3045 my ($pkg, @funs) = @$_; 3095 my ($pkg, @funs) = @$_;
3046 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3096 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3063 my ($code, %vars) = @_; 3113 my ($code, %vars) = @_;
3064 3114
3065 my $qcode = $code; 3115 my $qcode = $code;
3066 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3116 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3067 $qcode =~ s/\n/\\n/g; 3117 $qcode =~ s/\n/\\n/g;
3118
3119 %vars = (_dummy => 0) unless %vars;
3068 3120
3069 local $_; 3121 local $_;
3070 local @safe::cf::_safe_eval_args = values %vars; 3122 local @safe::cf::_safe_eval_args = values %vars;
3071 3123
3072 my $eval = 3124 my $eval =
3149 { 3201 {
3150 my $faces = $facedata->{faceinfo}; 3202 my $faces = $facedata->{faceinfo};
3151 3203
3152 while (my ($face, $info) = each %$faces) { 3204 while (my ($face, $info) = each %$faces) {
3153 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3205 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3206
3154 cf::face::set_visibility $idx, $info->{visibility}; 3207 cf::face::set_visibility $idx, $info->{visibility};
3155 cf::face::set_magicmap $idx, $info->{magicmap}; 3208 cf::face::set_magicmap $idx, $info->{magicmap};
3156 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3209 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
3157 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3210 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3158 3211
3159 cf::cede_to_tick; 3212 cf::cede_to_tick;
3160 } 3213 }
3161 3214
3162 while (my ($face, $info) = each %$faces) { 3215 while (my ($face, $info) = each %$faces) {
3163 next unless $info->{smooth}; 3216 next unless $info->{smooth};
3217
3164 my $idx = cf::face::find $face 3218 my $idx = cf::face::find $face
3165 or next; 3219 or next;
3220
3166 if (my $smooth = cf::face::find $info->{smooth}) { 3221 if (my $smooth = cf::face::find $info->{smooth}) {
3167 cf::face::set_smooth $idx, $smooth; 3222 cf::face::set_smooth $idx, $smooth;
3168 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3223 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3169 } else { 3224 } else {
3170 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3225 warn "smooth face '$info->{smooth}' not found for face '$face'";
3188 { 3243 {
3189 # TODO: for gcfclient pleasure, we should give resources 3244 # TODO: for gcfclient pleasure, we should give resources
3190 # that gcfclient doesn't grok a >10000 face index. 3245 # that gcfclient doesn't grok a >10000 face index.
3191 my $res = $facedata->{resource}; 3246 my $res = $facedata->{resource};
3192 3247
3193 my $soundconf = delete $res->{"res/sound.conf"};
3194
3195 while (my ($name, $info) = each %$res) { 3248 while (my ($name, $info) = each %$res) {
3249 if (defined $info->{type}) {
3196 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3250 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3197 my $data; 3251 my $data;
3198 3252
3199 if ($info->{type} & 1) { 3253 if ($info->{type} & 1) {
3200 # prepend meta info 3254 # prepend meta info
3201 3255
3202 my $meta = $enc->encode ({ 3256 my $meta = $enc->encode ({
3203 name => $name, 3257 name => $name,
3204 %{ $info->{meta} || {} }, 3258 %{ $info->{meta} || {} },
3205 }); 3259 });
3206 3260
3207 $data = pack "(w/a*)*", $meta, $info->{data}; 3261 $data = pack "(w/a*)*", $meta, $info->{data};
3262 } else {
3263 $data = $info->{data};
3264 }
3265
3266 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3267 cf::face::set_type $idx, $info->{type};
3208 } else { 3268 } else {
3209 $data = $info->{data}; 3269 $RESOURCE{$name} = $info;
3210 } 3270 }
3211 3271
3212 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3213 cf::face::set_type $idx, $info->{type};
3214
3215 cf::cede_to_tick; 3272 cf::cede_to_tick;
3216 } 3273 }
3217
3218 if ($soundconf) {
3219 $soundconf = $enc->decode (delete $soundconf->{data});
3220
3221 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3222 my $sound = $soundconf->{compat}[$_]
3223 or next;
3224
3225 my $face = cf::face::find "sound/$sound->[1]";
3226 cf::sound::set $sound->[0] => $face;
3227 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3228 }
3229
3230 while (my ($k, $v) = each %{$soundconf->{event}}) {
3231 my $face = cf::face::find "sound/$v";
3232 cf::sound::set $k => $face;
3233 }
3234 }
3235 } 3274 }
3275
3276 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3236 3277
3237 1 3278 1
3238} 3279}
3280
3281cf::global->attach (on_resource_update => sub {
3282 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3283 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3284
3285 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3286 my $sound = $soundconf->{compat}[$_]
3287 or next;
3288
3289 my $face = cf::face::find "sound/$sound->[1]";
3290 cf::sound::set $sound->[0] => $face;
3291 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3292 }
3293
3294 while (my ($k, $v) = each %{$soundconf->{event}}) {
3295 my $face = cf::face::find "sound/$v";
3296 cf::sound::set $k => $face;
3297 }
3298 }
3299});
3239 3300
3240register_exticmd fx_want => sub { 3301register_exticmd fx_want => sub {
3241 my ($ns, $want) = @_; 3302 my ($ns, $want) = @_;
3242 3303
3243 while (my ($k, $v) = each %$want) { 3304 while (my ($k, $v) = each %$want) {
3244 $ns->fx_want ($k, $v); 3305 $ns->fx_want ($k, $v);
3245 } 3306 }
3246}; 3307};
3308
3309sub load_resource_file($) {
3310 my $guard = lock_acquire "load_resource_file";
3311
3312 my $status = load_resource_file_ $_[0];
3313 get_slot 0.1, 100;
3314 cf::arch::commit_load;
3315
3316 $status
3317}
3247 3318
3248sub reload_regions { 3319sub reload_regions {
3249 # HACK to clear player env face cache, we need some signal framework 3320 # HACK to clear player env face cache, we need some signal framework
3250 # for this (global event?) 3321 # for this (global event?)
3251 %ext::player_env::MUSIC_FACE_CACHE = (); 3322 %ext::player_env::MUSIC_FACE_CACHE = ();
3265} 3336}
3266 3337
3267sub reload_archetypes { 3338sub reload_archetypes {
3268 load_resource_file "$DATADIR/archetypes" 3339 load_resource_file "$DATADIR/archetypes"
3269 or die "unable to load archetypes\n"; 3340 or die "unable to load archetypes\n";
3270 #d# NEED to laod twice to resolve forward references
3271 # this really needs to be done in an extra post-pass
3272 # (which needs to be synchronous, so solve it differently)
3273 load_resource_file "$DATADIR/archetypes"
3274 or die "unable to load archetypes\n";
3275} 3341}
3276 3342
3277sub reload_treasures { 3343sub reload_treasures {
3278 load_resource_file "$DATADIR/treasures" 3344 load_resource_file "$DATADIR/treasures"
3279 or die "unable to load treasurelists\n"; 3345 or die "unable to load treasurelists\n";
3280} 3346}
3281 3347
3282sub reload_resources { 3348sub reload_resources {
3283 warn "reloading resource files...\n"; 3349 warn "reloading resource files...\n";
3284 3350
3351 reload_facedata;
3352 reload_archetypes;
3285 reload_regions; 3353 reload_regions;
3286 reload_facedata;
3287 #reload_archetypes;#d#
3288 reload_archetypes;
3289 reload_treasures; 3354 reload_treasures;
3290 3355
3291 warn "finished reloading resource files\n"; 3356 warn "finished reloading resource files\n";
3292}
3293
3294sub init {
3295 reload_resources;
3296} 3357}
3297 3358
3298sub reload_config { 3359sub reload_config {
3299 open my $fh, "<:utf8", "$CONFDIR/config" 3360 open my $fh, "<:utf8", "$CONFDIR/config"
3300 or return; 3361 or return;
3301 3362
3302 local $/; 3363 local $/;
3303 *CFG = YAML::Syck::Load <$fh>; 3364 *CFG = YAML::Load <$fh>;
3304 3365
3305 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3366 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3306 3367
3307 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3368 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3308 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3369 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3314 }; 3375 };
3315 warn $@ if $@; 3376 warn $@ if $@;
3316 } 3377 }
3317} 3378}
3318 3379
3380sub pidfile() {
3381 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3382 or die "$PIDFILE: $!";
3383 flock $fh, &Fcntl::LOCK_EX
3384 or die "$PIDFILE: flock: $!";
3385 $fh
3386}
3387
3388# make sure only one server instance is running at any one time
3389sub atomic {
3390 my $fh = pidfile;
3391
3392 my $pid = <$fh>;
3393 kill 9, $pid if $pid > 0;
3394
3395 seek $fh, 0, 0;
3396 print $fh $$;
3397}
3398
3319sub main { 3399sub main {
3400 cf::init_globals; # initialise logging
3401
3402 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3403 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3404 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3405 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3406
3407 cf::init_experience;
3408 cf::init_anim;
3409 cf::init_attackmess;
3410 cf::init_dynamic;
3411
3412 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3413
3320 # we must not ever block the main coroutine 3414 # we must not ever block the main coroutine
3321 local $Coro::idle = sub { 3415 local $Coro::idle = sub {
3322 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3416 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3323 (async { 3417 (async {
3324 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3418 $Coro::current->{desc} = "IDLE BUG HANDLER";
3325 EV::loop EV::LOOP_ONESHOT; 3419 EV::loop EV::LOOP_ONESHOT;
3326 })->prio (Coro::PRIO_MAX); 3420 })->prio (Coro::PRIO_MAX);
3327 }; 3421 };
3328 3422
3423 evthread_start IO::AIO::poll_fileno;
3424
3425 cf::sync_job {
3426 reload_resources;
3329 reload_config; 3427 reload_config;
3330 db_init; 3428 db_init;
3429
3430 cf::load_settings;
3431 cf::load_materials;
3432 cf::init_uuid;
3433 cf::init_signals;
3434 cf::init_commands;
3435 cf::init_skills;
3436
3437 cf::init_beforeplay;
3438
3439 atomic;
3440
3331 load_extensions; 3441 load_extensions;
3332 3442
3333 $TICK_WATCHER->start; 3443 utime time, time, $RUNTIMEFILE;
3334 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3444
3445 # no (long-running) fork's whatsoever before this point(!)
3446 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3447
3448 (pop @POST_INIT)->(0) while @POST_INIT;
3449 };
3450
3335 EV::loop; 3451 EV::loop;
3336} 3452}
3337 3453
3338############################################################################# 3454#############################################################################
3339# initialisation and cleanup 3455# initialisation and cleanup
3346 cf::cleanup "SIG$signal"; 3462 cf::cleanup "SIG$signal";
3347 }; 3463 };
3348 } 3464 }
3349} 3465}
3350 3466
3351sub write_runtime { 3467sub write_runtime_sync {
3352 my $runtime = "$LOCALDIR/runtime";
3353
3354 # first touch the runtime file to show we are still running: 3468 # first touch the runtime file to show we are still running:
3355 # the fsync below can take a very very long time. 3469 # the fsync below can take a very very long time.
3356 3470
3357 IO::AIO::aio_utime $runtime, undef, undef; 3471 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3358 3472
3359 my $guard = cf::lock_acquire "write_runtime"; 3473 my $guard = cf::lock_acquire "write_runtime";
3360 3474
3361 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3475 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3362 or return; 3476 or return;
3363 3477
3364 my $value = $cf::RUNTIME + 90 + 10; 3478 my $value = $cf::RUNTIME + 90 + 10;
3365 # 10 is the runtime save interval, for a monotonic clock 3479 # 10 is the runtime save interval, for a monotonic clock
3366 # 60 allows for the watchdog to kill the server. 3480 # 60 allows for the watchdog to kill the server.
3376 aio_utime $fh, undef, undef; 3490 aio_utime $fh, undef, undef;
3377 3491
3378 close $fh 3492 close $fh
3379 or return; 3493 or return;
3380 3494
3381 aio_rename "$runtime~", $runtime 3495 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3382 and return; 3496 and return;
3383 3497
3384 warn "runtime file written.\n"; 3498 warn "runtime file written.\n";
3385 3499
3386 1 3500 1
3501}
3502
3503our $uuid_lock;
3504our $uuid_skip;
3505
3506sub write_uuid_sync($) {
3507 $uuid_skip ||= $_[0];
3508
3509 return if $uuid_lock;
3510 local $uuid_lock = 1;
3511
3512 my $uuid = "$LOCALDIR/uuid";
3513
3514 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3515 or return;
3516
3517 my $value = uuid_seq uuid_cur;
3518
3519 unless ($value) {
3520 warn "cowardly refusing to write zero uuid value!\n";
3521 return;
3522 }
3523
3524 my $value = uuid_str $value + $uuid_skip;
3525 $uuid_skip = 0;
3526
3527 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3528 and return;
3529
3530 # always fsync - this file is important
3531 aio_fsync $fh
3532 and return;
3533
3534 close $fh
3535 or return;
3536
3537 aio_rename "$uuid~", $uuid
3538 and return;
3539
3540 warn "uuid file written ($value).\n";
3541
3542 1
3543
3544}
3545
3546sub write_uuid($$) {
3547 my ($skip, $sync) = @_;
3548
3549 $sync ? write_uuid_sync $skip
3550 : async { write_uuid_sync $skip };
3387} 3551}
3388 3552
3389sub emergency_save() { 3553sub emergency_save() {
3390 my $freeze_guard = cf::freeze_mainloop; 3554 my $freeze_guard = cf::freeze_mainloop;
3391 3555
3392 warn "enter emergency perl save\n"; 3556 warn "emergency_perl_save: enter\n";
3393 3557
3394 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
3395 # use a peculiar iteration method to avoid tripping on perl 3564 # use a peculiar iteration method to avoid tripping on perl
3396 # refcount bugs in for. also avoids problems with players 3565 # refcount bugs in for. also avoids problems with players
3397 # and maps saved/destroyed asynchronously. 3566 # and maps saved/destroyed asynchronously.
3398 warn "begin emergency player save\n"; 3567 warn "emergency_perl_save: begin player save\n";
3399 for my $login (keys %cf::PLAYER) { 3568 for my $login (keys %cf::PLAYER) {
3400 my $pl = $cf::PLAYER{$login} or next; 3569 my $pl = $cf::PLAYER{$login} or next;
3401 $pl->valid or next; 3570 $pl->valid or next;
3402 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3571 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3403 $pl->save; 3572 $pl->save;
3404 } 3573 }
3405 warn "end emergency player save\n"; 3574 warn "emergency_perl_save: end player save\n";
3406 3575
3407 warn "begin emergency map save\n"; 3576 warn "emergency_perl_save: begin map save\n";
3408 for my $path (keys %cf::MAP) { 3577 for my $path (keys %cf::MAP) {
3409 my $map = $cf::MAP{$path} or next; 3578 my $map = $cf::MAP{$path} or next;
3410 $map->valid or next; 3579 $map->valid or next;
3411 $map->save; 3580 $map->save;
3412 } 3581 }
3413 warn "end emergency map save\n"; 3582 warn "emergency_perl_save: end map save\n";
3414 3583
3415 warn "begin emergency database checkpoint\n"; 3584 warn "emergency_perl_save: begin database checkpoint\n";
3416 BDB::db_env_txn_checkpoint $DB_ENV; 3585 BDB::db_env_txn_checkpoint $DB_ENV;
3417 warn "end emergency database checkpoint\n"; 3586 warn "emergency_perl_save: end database checkpoint\n";
3587
3588 warn "emergency_perl_save: begin write uuid\n";
3589 write_uuid_sync 1;
3590 warn "emergency_perl_save: end write uuid\n";
3418 }; 3591 };
3419 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
3420 warn "leave emergency perl save\n"; 3598 warn "emergency_perl_save: leave\n";
3421} 3599}
3422 3600
3423sub post_cleanup { 3601sub post_cleanup {
3424 my ($make_core) = @_; 3602 my ($make_core) = @_;
3425 3603
3426 warn Carp::longmess "post_cleanup backtrace" 3604 warn Carp::longmess "post_cleanup backtrace"
3427 if $make_core; 3605 if $make_core;
3606
3607 my $fh = pidfile;
3608 unlink $PIDFILE if <$fh> == $$;
3609}
3610
3611# a safer delete_package, copied from Symbol
3612sub clear_package($) {
3613 my $pkg = shift;
3614
3615 # expand to full symbol table name if needed
3616 unless ($pkg =~ /^main::.*::$/) {
3617 $pkg = "main$pkg" if $pkg =~ /^::/;
3618 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3619 $pkg .= '::' unless $pkg =~ /::$/;
3620 }
3621
3622 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3623 my $stem_symtab = *{$stem}{HASH};
3624
3625 defined $stem_symtab and exists $stem_symtab->{$leaf}
3626 or return;
3627
3628 # clear all symbols
3629 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3630 for my $name (keys %$leaf_symtab) {
3631 _gv_clear *{"$pkg$name"};
3632# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3633 }
3634 warn "cleared package $pkg\n";#d#
3428} 3635}
3429 3636
3430sub do_reload_perl() { 3637sub do_reload_perl() {
3431 # can/must only be called in main 3638 # can/must only be called in main
3432 if ($Coro::current != $Coro::main) { 3639 if ($Coro::current != $Coro::main) {
3433 warn "can only reload from main coroutine"; 3640 warn "can only reload from main coroutine";
3434 return; 3641 return;
3435 } 3642 }
3436 3643
3644 return if $RELOAD++;
3645
3646 my $t1 = EV::time;
3647
3648 while ($RELOAD) {
3437 warn "reloading..."; 3649 warn "reloading...";
3438 3650
3439 warn "entering sync_job"; 3651 warn "entering sync_job";
3440 3652
3441 cf::sync_job { 3653 cf::sync_job {
3442 cf::write_runtime; # external watchdog should not bark 3654 cf::write_runtime_sync; # external watchdog should not bark
3443 cf::emergency_save; 3655 cf::emergency_save;
3444 cf::write_runtime; # external watchdog should not bark 3656 cf::write_runtime_sync; # external watchdog should not bark
3445 3657
3446 warn "syncing database to disk"; 3658 warn "syncing database to disk";
3447 BDB::db_env_txn_checkpoint $DB_ENV; 3659 BDB::db_env_txn_checkpoint $DB_ENV;
3448 3660
3449 # if anything goes wrong in here, we should simply crash as we already saved 3661 # if anything goes wrong in here, we should simply crash as we already saved
3450 3662
3451 warn "flushing outstanding aio requests"; 3663 warn "flushing outstanding aio requests";
3452 for (;;) {
3453 BDB::flush;
3454 IO::AIO::flush;
3455 Coro::cede_notself;
3456 last unless IO::AIO::nreqs || BDB::nreqs; 3664 while (IO::AIO::nreqs || BDB::nreqs) {
3457 warn "iterate..."; 3665 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3458 }
3459
3460 ++$RELOAD;
3461
3462 warn "cancelling all extension coros";
3463 $_->cancel for values %EXT_CORO;
3464 %EXT_CORO = ();
3465
3466 warn "removing commands";
3467 %COMMAND = ();
3468
3469 warn "removing ext/exti commands";
3470 %EXTCMD = ();
3471 %EXTICMD = ();
3472
3473 warn "unloading/nuking all extensions";
3474 for my $pkg (@EXTS) {
3475 warn "... unloading $pkg";
3476
3477 if (my $cb = $pkg->can ("unload")) {
3478 eval {
3479 $cb->($pkg);
3480 1
3481 } or warn "$pkg unloaded, but with errors: $@";
3482 } 3666 }
3483 3667
3484 warn "... nuking $pkg"; 3668 warn "cancelling all extension coros";
3485 Symbol::delete_package $pkg; 3669 $_->cancel for values %EXT_CORO;
3486 } 3670 %EXT_CORO = ();
3487 3671
3488 warn "unloading all perl modules loaded from $LIBDIR"; 3672 warn "removing commands";
3489 while (my ($k, $v) = each %INC) { 3673 %COMMAND = ();
3490 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3491 3674
3675 warn "removing ext/exti commands";
3676 %EXTCMD = ();
3677 %EXTICMD = ();
3678
3679 warn "unloading/nuking all extensions";
3680 for my $pkg (@EXTS) {
3492 warn "... unloading $k"; 3681 warn "... unloading $pkg";
3493 delete $INC{$k};
3494 3682
3495 $k =~ s/\.pm$//;
3496 $k =~ s/\//::/g;
3497
3498 if (my $cb = $k->can ("unload_module")) { 3683 if (my $cb = $pkg->can ("unload")) {
3684 eval {
3499 $cb->(); 3685 $cb->($pkg);
3686 1
3687 } or warn "$pkg unloaded, but with errors: $@";
3688 }
3689
3690 warn "... clearing $pkg";
3691 clear_package $pkg;
3500 } 3692 }
3501 3693
3502 Symbol::delete_package $k; 3694 warn "unloading all perl modules loaded from $LIBDIR";
3695 while (my ($k, $v) = each %INC) {
3696 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3697
3698 warn "... unloading $k";
3699 delete $INC{$k};
3700
3701 $k =~ s/\.pm$//;
3702 $k =~ s/\//::/g;
3703
3704 if (my $cb = $k->can ("unload_module")) {
3705 $cb->();
3706 }
3707
3708 clear_package $k;
3503 } 3709 }
3504 3710
3505 warn "getting rid of safe::, as good as possible"; 3711 warn "getting rid of safe::, as good as possible";
3506 Symbol::delete_package "safe::$_" 3712 clear_package "safe::$_"
3507 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);
3508 3714
3509 warn "unloading cf.pm \"a bit\""; 3715 warn "unloading cf.pm \"a bit\"";
3510 delete $INC{"cf.pm"}; 3716 delete $INC{"cf.pm"};
3511 delete $INC{"cf/pod.pm"}; 3717 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3512 3718
3513 # don't, removes xs symbols, too, 3719 # don't, removes xs symbols, too,
3514 # and global variables created in xs 3720 # and global variables created in xs
3515 #Symbol::delete_package __PACKAGE__; 3721 #clear_package __PACKAGE__;
3516 3722
3517 warn "unload completed, starting to reload now"; 3723 warn "unload completed, starting to reload now";
3518 3724
3519 warn "reloading cf.pm"; 3725 warn "reloading cf.pm";
3520 require cf; 3726 require cf;
3521 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3727 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3522 3728
3523 warn "loading config and database again"; 3729 warn "loading config and database again";
3524 cf::reload_config; 3730 cf::reload_config;
3525 3731
3526 warn "loading extensions"; 3732 warn "loading extensions";
3527 cf::load_extensions; 3733 cf::load_extensions;
3528 3734
3735 if ($REATTACH_ON_RELOAD) {
3529 warn "reattaching attachments to objects/players"; 3736 warn "reattaching attachments to objects/players";
3530 _global_reattach; # objects, sockets 3737 _global_reattach; # objects, sockets
3531 warn "reattaching attachments to maps"; 3738 warn "reattaching attachments to maps";
3532 reattach $_ for values %MAP; 3739 reattach $_ for values %MAP;
3533 warn "reattaching attachments to players"; 3740 warn "reattaching attachments to players";
3534 reattach $_ for values %PLAYER; 3741 reattach $_ for values %PLAYER;
3742 }
3535 3743
3744 warn "running post_init jobs";
3745 (pop @POST_INIT)->(1) while @POST_INIT;
3746
3536 warn "leaving sync_job"; 3747 warn "leaving sync_job";
3537 3748
3538 1 3749 1
3539 } or do { 3750 } or do {
3540 warn $@; 3751 warn $@;
3541 warn "error while reloading, exiting."; 3752 cf::cleanup "error while reloading, exiting.";
3542 exit 1;
3543 }; 3753 };
3544 3754
3545 warn "reloaded"; 3755 warn "reloaded";
3756 --$RELOAD;
3757 }
3758
3759 $t1 = EV::time - $t1;
3760 warn "reload completed in ${t1}s\n";
3546}; 3761};
3547 3762
3548our $RELOAD_WATCHER; # used only during reload 3763our $RELOAD_WATCHER; # used only during reload
3549 3764
3550sub reload_perl() { 3765sub reload_perl() {
3551 # doing reload synchronously and two reloads happen back-to-back, 3766 # doing reload synchronously and two reloads happen back-to-back,
3552 # coro crashes during coro_state_free->destroy here. 3767 # coro crashes during coro_state_free->destroy here.
3553 3768
3769 $RELOAD_WATCHER ||= cf::async {
3770 Coro::AIO::aio_wait cache_extensions;
3771
3554 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3772 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3773 do_reload_perl;
3555 undef $RELOAD_WATCHER; 3774 undef $RELOAD_WATCHER;
3556 do_reload_perl; 3775 };
3557 }; 3776 };
3558} 3777}
3559 3778
3560register_command "reload" => sub { 3779register_command "reload" => sub {
3561 my ($who, $arg) = @_; 3780 my ($who, $arg) = @_;
3575 3794
3576our @WAIT_FOR_TICK; 3795our @WAIT_FOR_TICK;
3577our @WAIT_FOR_TICK_BEGIN; 3796our @WAIT_FOR_TICK_BEGIN;
3578 3797
3579sub wait_for_tick { 3798sub wait_for_tick {
3580 return unless $TICK_WATCHER->is_active;
3581 return if $Coro::current == $Coro::main; 3799 return if tick_inhibit || $Coro::current == $Coro::main;
3582 3800
3583 my $signal = new Coro::Signal; 3801 my $signal = new Coro::Signal;
3584 push @WAIT_FOR_TICK, $signal; 3802 push @WAIT_FOR_TICK, $signal;
3585 $signal->wait; 3803 $signal->wait;
3586} 3804}
3587 3805
3588sub wait_for_tick_begin { 3806sub wait_for_tick_begin {
3589 return unless $TICK_WATCHER->is_active;
3590 return if $Coro::current == $Coro::main; 3807 return if tick_inhibit || $Coro::current == $Coro::main;
3591 3808
3592 my $signal = new Coro::Signal; 3809 my $signal = new Coro::Signal;
3593 push @WAIT_FOR_TICK_BEGIN, $signal; 3810 push @WAIT_FOR_TICK_BEGIN, $signal;
3594 $signal->wait; 3811 $signal->wait;
3595} 3812}
3596 3813
3597$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 3814sub tick {
3598 if ($Coro::current != $Coro::main) { 3815 if ($Coro::current != $Coro::main) {
3599 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3816 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3600 unless ++$bug_warning > 10; 3817 unless ++$bug_warning > 10;
3601 return; 3818 return;
3602 } 3819 }
3603 3820
3604 $NOW = $tick_start = EV::now;
3605
3606 cf::server_tick; # one server iteration 3821 cf::server_tick; # one server iteration
3607 3822
3608 $RUNTIME += $TICK;
3609 $NEXT_TICK += $TICK;
3610
3611 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3823 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3612 $NEXT_RUNTIME_WRITE = $NOW + 10; 3824 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3613 Coro::async_pool { 3825 Coro::async_pool {
3614 $Coro::current->{desc} = "runtime saver"; 3826 $Coro::current->{desc} = "runtime saver";
3615 write_runtime 3827 write_runtime_sync
3616 or warn "ERROR: unable to write runtime file: $!"; 3828 or warn "ERROR: unable to write runtime file: $!";
3617 }; 3829 };
3618 } 3830 }
3619 3831
3620 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3832 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3622 } 3834 }
3623 while (my $sig = shift @WAIT_FOR_TICK) { 3835 while (my $sig = shift @WAIT_FOR_TICK) {
3624 $sig->send; 3836 $sig->send;
3625 } 3837 }
3626 3838
3627 $LOAD = ($NOW - $tick_start) / $TICK; 3839 $LOAD = ($NOW - $TICK_START) / $TICK;
3628 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3840 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3629 3841
3630 _post_tick; 3842 if (0) {
3631}; 3843 if ($NEXT_TICK) {
3632$TICK_WATCHER->priority (EV::MAXPRI); 3844 my $jitter = $TICK_START - $NEXT_TICK;
3845 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3846 warn "jitter $JITTER\n";#d#
3847 }
3848 }
3849}
3633 3850
3634{ 3851{
3852 # configure BDB
3853
3635 BDB::min_parallel 8; 3854 BDB::min_parallel 8;
3636 BDB::max_poll_reqs $TICK * 0.1; 3855 BDB::max_poll_reqs $TICK * 0.1;
3856 $AnyEvent::BDB::WATCHER->priority (1);
3637 3857
3638 unless ($DB_ENV) { 3858 unless ($DB_ENV) {
3639 $DB_ENV = BDB::db_env_create; 3859 $DB_ENV = BDB::db_env_create;
3640 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3860 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3641 | BDB::LOG_AUTOREMOVE, 1); 3861 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3862 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3642 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3863 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3643 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3864 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3644 3865
3645 cf::sync_job { 3866 cf::sync_job {
3646 eval { 3867 eval {
3668 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3889 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3669 }; 3890 };
3670} 3891}
3671 3892
3672{ 3893{
3894 # configure IO::AIO
3895
3673 IO::AIO::min_parallel 8; 3896 IO::AIO::min_parallel 8;
3674
3675 undef $Coro::AIO::WATCHER;
3676 IO::AIO::max_poll_time $TICK * 0.1; 3897 IO::AIO::max_poll_time $TICK * 0.1;
3677 $AIO_POLL_WATCHER = EV::io IO::AIO::poll_fileno, EV::READ, \&IO::AIO::poll_cb; 3898 undef $AnyEvent::AIO::WATCHER;
3678} 3899}
3679 3900
3680my $_log_backtrace; 3901my $_log_backtrace;
3681 3902
3682sub _log_backtrace { 3903sub _log_backtrace {
3685 $msg =~ s/\n//; 3906 $msg =~ s/\n//;
3686 3907
3687 # limit the # of concurrent backtraces 3908 # limit the # of concurrent backtraces
3688 if ($_log_backtrace < 2) { 3909 if ($_log_backtrace < 2) {
3689 ++$_log_backtrace; 3910 ++$_log_backtrace;
3911 my $perl_bt = Carp::longmess $msg;
3690 async { 3912 async {
3691 $Coro::current->{desc} = "abt $msg"; 3913 $Coro::current->{desc} = "abt $msg";
3692 3914
3693 my @bt = fork_call { 3915 my @bt = fork_call {
3694 @addr = map { sprintf "%x", $_ } @addr; 3916 @addr = map { sprintf "%x", $_ } @addr;
3705 } 3927 }
3706 3928
3707 @funcs 3929 @funcs
3708 }; 3930 };
3709 3931
3710 LOG llevInfo, "[ABT] $msg\n"; 3932 LOG llevInfo, "[ABT] $perl_bt\n";
3933 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3711 LOG llevInfo, "[ABT] $_\n" for @bt; 3934 LOG llevInfo, "[ABT] $_\n" for @bt;
3712 --$_log_backtrace; 3935 --$_log_backtrace;
3713 }; 3936 };
3714 } else { 3937 } else {
3715 LOG llevInfo, "[ABT] $msg\n"; 3938 LOG llevInfo, "[ABT] $msg\n";
3716 LOG llevInfo, "[ABT] [suppressed]\n"; 3939 LOG llevInfo, "[ABT] [suppressed]\n";
3717 } 3940 }
3718} 3941}
3719 3942
3720# load additional modules 3943# load additional modules
3721use cf::pod; 3944require "cf/$_.pm" for @EXTRA_MODULES;
3722 3945
3723END { cf::emergency_save } 3946END { cf::emergency_save }
3724 3947
37251 39481
3726 3949

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines