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.402 by root, Mon Dec 17 07:03:32 2007 UTC vs.
Revision 1.466 by root, Thu Jan 8 03:03:24 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 off
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}
114 150
115mkdir $_ 151mkdir $_
116 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 152 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
192 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 228 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
193 229
194 LOG llevError, $msg; 230 LOG llevError, $msg;
195 }; 231 };
196} 232}
233
234$Coro::State::DIEHOOK = sub {
235 return unless $^S eq 0; # "eq", not "=="
236
237 if ($Coro::current == $Coro::main) {#d#
238 warn "DIEHOOK called in main context, Coro bug?\n";#d#
239 return;#d#
240 }#d#
241
242 # kill coroutine otherwise
243 warn Carp::longmess $_[0];
244 Coro::terminate
245};
246
247$SIG{__DIE__} = sub { }; #d#?
197 248
198@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 249@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
199@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 250@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
200@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 251@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
201@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 252@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
208for my $pkg (qw( 259for my $pkg (qw(
209 cf::global cf::attachable 260 cf::global cf::attachable
210 cf::object cf::object::player 261 cf::object cf::object::player
211 cf::client cf::player 262 cf::client cf::player
212 cf::arch cf::living 263 cf::arch cf::living
264 cf::map cf::mapspace
213 cf::map cf::party cf::region 265 cf::party cf::region
214)) { 266)) {
215 no strict 'refs';
216 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 267 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
217} 268}
218 269
219$EV::DIED = sub { 270$EV::DIED = sub {
220 warn "error in event callback: @_"; 271 warn "error in event callback: @_";
262our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 313our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
263 314
264sub encode_json($) { $json_coder->encode ($_[0]) } 315sub encode_json($) { $json_coder->encode ($_[0]) }
265sub decode_json($) { $json_coder->decode ($_[0]) } 316sub decode_json($) { $json_coder->decode ($_[0]) }
266 317
318=item cf::post_init { BLOCK }
319
320Execute the given codeblock, I<after> all extensions have been (re-)loaded,
321but I<before> the server starts ticking again.
322
323The cdoeblock will have a single boolean argument to indicate whether this
324is a reload or not.
325
326=cut
327
328sub post_init(&) {
329 push @POST_INIT, shift;
330}
331
267=item cf::lock_wait $string 332=item cf::lock_wait $string
268 333
269Wait until the given lock is available. See cf::lock_acquire. 334Wait until the given lock is available. See cf::lock_acquire.
270 335
271=item my $lock = cf::lock_acquire $string 336=item my $lock = cf::lock_acquire $string
272 337
273Wait until the given lock is available and then acquires it and returns 338Wait until the given lock is available and then acquires it and returns
274a Coro::guard object. If the guard object gets destroyed (goes out of scope, 339a L<Guard> object. If the guard object gets destroyed (goes out of scope,
275for example when the coroutine gets canceled), the lock is automatically 340for example when the coroutine gets canceled), the lock is automatically
276returned. 341returned.
277 342
278Locks are *not* recursive, locking from the same coro twice results in a 343Locks are *not* recursive, locking from the same coro twice results in a
279deadlocked coro. 344deadlocked coro.
285 350
286Return true if the lock is currently active, i.e. somebody has locked it. 351Return true if the lock is currently active, i.e. somebody has locked it.
287 352
288=cut 353=cut
289 354
290our %LOCK; 355our $LOCKS = new Coro::SemaphoreSet;
291our %LOCKER;#d#
292 356
293sub lock_wait($) { 357sub lock_wait($) {
294 my ($key) = @_; 358 $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} 359}
307 360
308sub lock_acquire($) { 361sub lock_acquire($) {
309 my ($key) = @_; 362 $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} 363}
323 364
324sub lock_active($) { 365sub lock_active($) {
325 my ($key) = @_; 366 $LOCKS->count ($_[0]) < 1
326
327 ! ! $LOCK{$key}
328} 367}
329 368
330sub freeze_mainloop { 369sub freeze_mainloop {
331 return unless $TICK_WATCHER->is_active; 370 tick_inhibit_inc;
332 371
333 my $guard = Coro::guard { 372 &Guard::guard (\&tick_inhibit_dec);
334 $TICK_WATCHER->start;
335 };
336 $TICK_WATCHER->stop;
337 $guard
338} 373}
339 374
340=item cf::periodic $interval, $cb 375=item cf::periodic $interval, $cb
341 376
342Like EV::periodic, but randomly selects a starting point so that the actions 377Like EV::periodic, but randomly selects a starting point so that the actions
397 } 432 }
398 } 433 }
399}; 434};
400 435
401sub get_slot($;$$) { 436sub get_slot($;$$) {
437 return if tick_inhibit || $Coro::current == $Coro::main;
438
402 my ($time, $pri, $name) = @_; 439 my ($time, $pri, $name) = @_;
403 440
404 $time = $TICK * .6 if $time > $TICK * .6; 441 $time = $TICK * .6 if $time > $TICK * .6;
405 my $sig = new Coro::Signal; 442 my $sig = new Coro::Signal;
406 443
443 # this is the main coro, too bad, we have to block 480 # this is the main coro, too bad, we have to block
444 # till the operation succeeds, freezing the server :/ 481 # till the operation succeeds, freezing the server :/
445 482
446 LOG llevError, Carp::longmess "sync job";#d# 483 LOG llevError, Carp::longmess "sync job";#d#
447 484
448 # TODO: use suspend/resume instead
449 # (but this is cancel-safe)
450 my $freeze_guard = freeze_mainloop; 485 my $freeze_guard = freeze_mainloop;
451 486
452 my $busy = 1; 487 my $busy = 1;
453 my @res; 488 my @res;
454 489
465 } else { 500 } else {
466 EV::loop EV::LOOP_ONESHOT; 501 EV::loop EV::LOOP_ONESHOT;
467 } 502 }
468 } 503 }
469 504
470 $time = EV::time - $time; 505 my $time = EV::time - $time;
471 506
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 507 $TICK_START += $time; # do not account sync jobs to server load
476 508
477 wantarray ? @res : $res[0] 509 wantarray ? @res : $res[0]
478 } else { 510 } else {
479 # we are in another coroutine, how wonderful, everything just works 511 # we are in another coroutine, how wonderful, everything just works
480 512
522 reset_signals; 554 reset_signals;
523 &$cb 555 &$cb
524 }, @args; 556 }, @args;
525 557
526 wantarray ? @res : $res[-1] 558 wantarray ? @res : $res[-1]
559}
560
561=item $coin = coin_from_name $name
562
563=cut
564
565our %coin_alias = (
566 "silver" => "silvercoin",
567 "silvercoin" => "silvercoin",
568 "silvercoins" => "silvercoin",
569 "gold" => "goldcoin",
570 "goldcoin" => "goldcoin",
571 "goldcoins" => "goldcoin",
572 "platinum" => "platinacoin",
573 "platinumcoin" => "platinacoin",
574 "platinumcoins" => "platinacoin",
575 "platina" => "platinacoin",
576 "platinacoin" => "platinacoin",
577 "platinacoins" => "platinacoin",
578 "royalty" => "royalty",
579 "royalties" => "royalty",
580);
581
582sub coin_from_name($) {
583 $coin_alias{$_[0]}
584 ? cf::arch::find $coin_alias{$_[0]}
585 : undef
527} 586}
528 587
529=item $value = cf::db_get $family => $key 588=item $value = cf::db_get $family => $key
530 589
531Returns a single value from the environment database. 590Returns a single value from the environment database.
670 729
671############################################################################# 730#############################################################################
672 731
673=head2 ATTACHABLE OBJECTS 732=head2 ATTACHABLE OBJECTS
674 733
675Many objects in crossfire are so-called attachable objects. That means you can 734Many objects in deliantra are so-called attachable objects. That means you can
676attach callbacks/event handlers (a collection of which is called an "attachment") 735attach callbacks/event handlers (a collection of which is called an "attachment")
677to it. All such attachable objects support the following methods. 736to it. All such attachable objects support the following methods.
678 737
679In the following description, CLASS can be any of C<global>, C<object> 738In 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 739C<player>, C<client> or C<map> (i.e. the attachable objects in
730=item cf::CLASS::attachment $name, ... 789=item cf::CLASS::attachment $name, ...
731 790
732Register an attachment by C<$name> through which attachable objects of the 791Register an attachment by C<$name> through which attachable objects of the
733given CLASS can refer to this attachment. 792given CLASS can refer to this attachment.
734 793
735Some classes such as crossfire maps and objects can specify attachments 794Some classes such as deliantra maps and objects can specify attachments
736that are attached at load/instantiate time, thus the need for a name. 795that are attached at load/instantiate time, thus the need for a name.
737 796
738These calls expect any number of the following handler/hook descriptions: 797These calls expect any number of the following handler/hook descriptions:
739 798
740=over 4 799=over 4
968 } 1027 }
969 1028
970 0 1029 0
971} 1030}
972 1031
973=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1032=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
974 1033
975=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1034=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
976 1035
977Generate an object-specific event with the given arguments. 1036Generate an object-specific event with the given arguments.
978 1037
1031 1090
1032sub reattach { 1091sub reattach {
1033 # basically do the same as instantiate, without calling instantiate 1092 # basically do the same as instantiate, without calling instantiate
1034 my ($obj) = @_; 1093 my ($obj) = @_;
1035 1094
1095 # no longer needed after getting rid of delete_package?
1036 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1096 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1037 1097
1038 my $registry = $obj->registry; 1098 my $registry = $obj->registry;
1039 1099
1040 @$registry = (); 1100 @$registry = ();
1041 1101
1087 utf8::decode (my $decname = $filename); 1147 utf8::decode (my $decname = $filename);
1088 warn sprintf "saving %s (%d,%d)\n", 1148 warn sprintf "saving %s (%d,%d)\n",
1089 $decname, length $$rdata, scalar @$objs; 1149 $decname, length $$rdata, scalar @$objs;
1090 1150
1091 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1151 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1092 chmod SAVE_MODE, $fh; 1152 aio_chmod $fh, SAVE_MODE;
1093 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1153 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1094 aio_fsync $fh if $cf::USE_FSYNC; 1154 aio_fsync $fh if $cf::USE_FSYNC;
1095 close $fh; 1155 aio_close $fh;
1096 1156
1097 if (@$objs) { 1157 if (@$objs) {
1098 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1158 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1099 chmod SAVE_MODE, $fh; 1159 aio_chmod $fh, SAVE_MODE;
1100 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1160 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1101 aio_write $fh, 0, (length $data), $data, 0; 1161 aio_write $fh, 0, (length $data), $data, 0;
1102 aio_fsync $fh if $cf::USE_FSYNC; 1162 aio_fsync $fh if $cf::USE_FSYNC;
1103 close $fh; 1163 aio_close $fh;
1104 aio_rename "$filename.pst~", "$filename.pst"; 1164 aio_rename "$filename.pst~", "$filename.pst";
1105 } 1165 }
1106 } else { 1166 } else {
1107 aio_unlink "$filename.pst"; 1167 aio_unlink "$filename.pst";
1108 } 1168 }
1109 1169
1110 aio_rename "$filename~", $filename; 1170 aio_rename "$filename~", $filename;
1171
1172 $filename =~ s%/[^/]+$%%;
1173 aio_pathsync $filename if $cf::USE_FSYNC;
1111 } else { 1174 } else {
1112 warn "FATAL: $filename~: $!\n"; 1175 warn "unable to save objects: $filename~: $!\n";
1113 } 1176 }
1114 } else { 1177 } else {
1115 aio_unlink $filename; 1178 aio_unlink $filename;
1116 aio_unlink "$filename.pst"; 1179 aio_unlink "$filename.pst";
1117 } 1180 }
1208 my ($name, $cb) = @_; 1271 my ($name, $cb) = @_;
1209 1272
1210 $EXTICMD{$name} = $cb; 1273 $EXTICMD{$name} = $cb;
1211} 1274}
1212 1275
1276use File::Glob ();
1277
1213cf::player->attach ( 1278cf::player->attach (
1214 on_command => sub { 1279 on_command => sub {
1215 my ($pl, $name, $params) = @_; 1280 my ($pl, $name, $params) = @_;
1216 1281
1217 my $cb = $COMMAND{$name} 1282 my $cb = $COMMAND{$name}
1249 1314
1250 cf::override; 1315 cf::override;
1251 }, 1316 },
1252); 1317);
1253 1318
1319# "readahead" all extensions
1320sub cache_extensions {
1321 my $grp = IO::AIO::aio_group;
1322
1323 add $grp IO::AIO::aio_readdir $LIBDIR, sub {
1324 for (grep /\.ext$/, @{$_[0]}) {
1325 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1326 }
1327 };
1328
1329 $grp
1330}
1331
1254sub load_extensions { 1332sub load_extensions {
1255 cf::sync_job { 1333 cf::sync_job {
1256 my %todo; 1334 my %todo;
1257 1335
1258 for my $path (<$LIBDIR/*.ext>) { 1336 for my $path (<$LIBDIR/*.ext>) {
1277 1355
1278 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1356 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1279 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1357 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1280 1358
1281 $ext{source} = 1359 $ext{source} =
1282 "package $pkg; use strict; use utf8;\n" 1360 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1283 . "#line 1 \"$path\"\n{\n" 1361 . "#line 1 \"$path\"\n{\n"
1284 . $source 1362 . $source
1285 . "\n};\n1"; 1363 . "\n};\n1";
1286 1364
1287 $todo{$base} = \%ext; 1365 $todo{$base} = \%ext;
1303 my $msg = $@ ? "$v->{path}: $@\n" 1381 my $msg = $@ ? "$v->{path}: $@\n"
1304 : "$v->{base}: extension inactive.\n"; 1382 : "$v->{base}: extension inactive.\n";
1305 1383
1306 if (exists $v->{meta}{mandatory}) { 1384 if (exists $v->{meta}{mandatory}) {
1307 warn $msg; 1385 warn $msg;
1308 warn "mandatory extension failed to load, exiting.\n"; 1386 cf::cleanup "mandatory extension failed to load, exiting.";
1309 exit 1;
1310 } 1387 }
1311 1388
1312 warn $msg; 1389 warn $msg;
1313 } 1390 }
1314 1391
1328 1405
1329=back 1406=back
1330 1407
1331=head2 CORE EXTENSIONS 1408=head2 CORE EXTENSIONS
1332 1409
1333Functions and methods that extend core crossfire objects. 1410Functions and methods that extend core deliantra objects.
1334 1411
1335=cut 1412=cut
1336 1413
1337package cf::player; 1414package cf::player;
1338 1415
1381 1458
1382sub exists($) { 1459sub exists($) {
1383 my ($login) = @_; 1460 my ($login) = @_;
1384 1461
1385 $cf::PLAYER{$login} 1462 $cf::PLAYER{$login}
1386 or cf::sync_job { !aio_stat path $login } 1463 or !aio_stat path $login
1387} 1464}
1388 1465
1389sub find($) { 1466sub find($) {
1390 return $cf::PLAYER{$_[0]} || do { 1467 return $cf::PLAYER{$_[0]} || do {
1391 my $login = $_[0]; 1468 my $login = $_[0];
1403 my $f = new_from_file cf::object::thawer path $login 1480 my $f = new_from_file cf::object::thawer path $login
1404 or return; 1481 or return;
1405 1482
1406 my $pl = cf::player::load_pl $f 1483 my $pl = cf::player::load_pl $f
1407 or return; 1484 or return;
1485
1408 local $cf::PLAYER_LOADING{$login} = $pl; 1486 local $cf::PLAYER_LOADING{$login} = $pl;
1409 $f->resolve_delayed_derefs; 1487 $f->resolve_delayed_derefs;
1410 $cf::PLAYER{$login} = $pl 1488 $cf::PLAYER{$login} = $pl
1411 } 1489 }
1412 } 1490 }
1422 1500
1423 return if $pl->{deny_save}; 1501 return if $pl->{deny_save};
1424 1502
1425 aio_mkdir playerdir $pl, 0770; 1503 aio_mkdir playerdir $pl, 0770;
1426 $pl->{last_save} = $cf::RUNTIME; 1504 $pl->{last_save} = $cf::RUNTIME;
1505
1506 cf::get_slot 0.01;
1427 1507
1428 $pl->save_pl ($path); 1508 $pl->save_pl ($path);
1429 cf::cede_to_tick; 1509 cf::cede_to_tick;
1430} 1510}
1431 1511
1463 my ($pl) = @_; 1543 my ($pl) = @_;
1464 1544
1465 my $name = $pl->ob->name; 1545 my $name = $pl->ob->name;
1466 1546
1467 $pl->{deny_save} = 1; 1547 $pl->{deny_save} = 1;
1468 $pl->password ("*"); # this should lock out the player until we nuked the dir 1548 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1469 1549
1470 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1550 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1471 $pl->deactivate; 1551 $pl->deactivate;
1552 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1553 $pl->ob->check_score;
1472 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1554 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1473 $pl->ns->destroy if $pl->ns; 1555 $pl->ns->destroy if $pl->ns;
1474 1556
1475 my $path = playerdir $pl; 1557 my $path = playerdir $pl;
1476 my $temp = "$path~$cf::RUNTIME~deleting~"; 1558 my $temp = "$path~$cf::RUNTIME~deleting~";
1515 1597
1516 for my $login (@$dirs) { 1598 for my $login (@$dirs) {
1517 my $path = path $login; 1599 my $path = path $login;
1518 1600
1519 # a .pst is a dead give-away for a valid player 1601 # a .pst is a dead give-away for a valid player
1520 unless (-e "$path.pst") { 1602 # if no pst file found, open and chekc for blocked users
1603 if (aio_stat "$path.pst") {
1521 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1604 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1522 aio_read $fh, 0, 512, my $buf, 0 or next; 1605 aio_read $fh, 0, 512, my $buf, 0 or next;
1523 $buf !~ /^password -------------$/m or next; # official not-valid tag 1606 $buf !~ /^password -------------$/m or next; # official not-valid tag
1524 } 1607 }
1525 1608
1556 } 1639 }
1557 1640
1558 \@paths 1641 \@paths
1559} 1642}
1560 1643
1561=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1644=item $protocol_xml = $player->expand_cfpod ($cfpod)
1562 1645
1563Expand crossfire pod fragments into protocol xml. 1646Expand 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 1647
1654=item $player->ext_reply ($msgid, @msg) 1648=item $player->ext_reply ($msgid, @msg)
1655 1649
1656Sends an ext reply to the player. 1650Sends an ext reply to the player.
1657 1651
1724our $MAX_RESET = 3600; 1718our $MAX_RESET = 3600;
1725our $DEFAULT_RESET = 3000; 1719our $DEFAULT_RESET = 3000;
1726 1720
1727sub generate_random_map { 1721sub generate_random_map {
1728 my ($self, $rmp) = @_; 1722 my ($self, $rmp) = @_;
1723
1724 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1725
1729 # mit "rum" bekleckern, nicht 1726 # mit "rum" bekleckern, nicht
1730 $self->_create_random_map ( 1727 $self->_create_random_map (
1731 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1728 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1732 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1729 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1733 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1730 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1855 1852
1856# the temporary/swap location 1853# the temporary/swap location
1857sub save_path { 1854sub save_path {
1858 my ($self) = @_; 1855 my ($self) = @_;
1859 1856
1860 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1857 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1861 "$TMPDIR/$path.map" 1858 "$TMPDIR/$path.map"
1862} 1859}
1863 1860
1864# the unique path, undef == no special unique path 1861# the unique path, undef == no special unique path
1865sub uniq_path { 1862sub uniq_path {
1866 my ($self) = @_; 1863 my ($self) = @_;
1867 1864
1868 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1865 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1869 "$UNIQUEDIR/$path" 1866 "$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} 1867}
1880 1868
1881sub decay_objects { 1869sub decay_objects {
1882 my ($self) = @_; 1870 my ($self) = @_;
1883 1871
1967sub find { 1955sub find {
1968 my ($path, $origin) = @_; 1956 my ($path, $origin) = @_;
1969 1957
1970 $path = normalise $path, $origin && $origin->path; 1958 $path = normalise $path, $origin && $origin->path;
1971 1959
1972 cf::lock_wait "map_data:$path";#d#remove 1960 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1973 cf::lock_wait "map_find:$path"; 1961 my $guard2 = cf::lock_acquire "map_find:$path";
1974 1962
1975 $cf::MAP{$path} || do { 1963 $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 1964 my $map = new_from_path cf::map $path
1980 or return; 1965 or return;
1981 1966
1982 $map->{last_save} = $cf::RUNTIME; 1967 $map->{last_save} = $cf::RUNTIME;
1983 1968
1985 or return; 1970 or return;
1986 1971
1987 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1972 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1988 # doing this can freeze the server in a sync job, obviously 1973 # doing this can freeze the server in a sync job, obviously
1989 #$cf::WAIT_FOR_TICK->wait; 1974 #$cf::WAIT_FOR_TICK->wait;
1975 undef $guard2;
1990 undef $guard1; 1976 undef $guard1;
1991 undef $guard2;
1992 $map->reset; 1977 $map->reset;
1993 return find $path; 1978 return find $path;
1994 } 1979 }
1995 1980
1996 $cf::MAP{$path} = $map 1981 $cf::MAP{$path} = $map
2023 my $f = new_from_file cf::object::thawer $self->{load_path}; 2008 my $f = new_from_file cf::object::thawer $self->{load_path};
2024 $f->skip_block; 2009 $f->skip_block;
2025 $self->_load_objects ($f) 2010 $self->_load_objects ($f)
2026 or return; 2011 or return;
2027 2012
2028 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2013 $self->post_load_original
2029 if delete $self->{load_original}; 2014 if delete $self->{load_original};
2030 2015
2031 if (my $uniq = $self->uniq_path) { 2016 if (my $uniq = $self->uniq_path) {
2032 utf8::encode $uniq; 2017 utf8::encode $uniq;
2033 unless (aio_stat $uniq) { 2018 unless (aio_stat $uniq) {
2051 unless ($self->{deny_activate}) { 2036 unless ($self->{deny_activate}) {
2052 $self->decay_objects; 2037 $self->decay_objects;
2053 $self->fix_auto_apply; 2038 $self->fix_auto_apply;
2054 $self->update_buttons; 2039 $self->update_buttons;
2055 cf::cede_to_tick; 2040 cf::cede_to_tick;
2056 $self->set_darkness_map;
2057 cf::cede_to_tick;
2058 $self->activate; 2041 $self->activate;
2059 } 2042 }
2060 2043
2061 $self->{last_save} = $cf::RUNTIME; 2044 $self->{last_save} = $cf::RUNTIME;
2062 $self->last_access ($cf::RUNTIME); 2045 $self->last_access ($cf::RUNTIME);
2063 2046
2064 $self->in_memory (cf::MAP_IN_MEMORY); 2047 $self->in_memory (cf::MAP_ACTIVE);
2065 } 2048 }
2066 2049
2067 $self->post_load; 2050 $self->post_load;
2068} 2051}
2069 2052
2127 my ($path, $origin, $load) = @_; 2110 my ($path, $origin, $load) = @_;
2128 2111
2129 $path = normalise $path, $origin && $origin->{path}; 2112 $path = normalise $path, $origin && $origin->{path};
2130 2113
2131 if (my $map = $cf::MAP{$path}) { 2114 if (my $map = $cf::MAP{$path}) {
2132 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2115 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2133 } 2116 }
2134 2117
2135 $MAP_PREFETCH{$path} |= $load; 2118 $MAP_PREFETCH{$path} |= $load;
2136 2119
2137 $MAP_PREFETCHER ||= cf::async { 2120 $MAP_PREFETCHER ||= cf::async {
2174 cf::async { 2157 cf::async {
2175 $Coro::current->{desc} = "map player save"; 2158 $Coro::current->{desc} = "map player save";
2176 $_->contr->save for $self->players; 2159 $_->contr->save for $self->players;
2177 }; 2160 };
2178 2161
2162 cf::get_slot 0.02;
2163
2179 if ($uniq) { 2164 if ($uniq) {
2180 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2165 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2181 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2166 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2182 } else { 2167 } else {
2183 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2168 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2191 $self->save; 2176 $self->save;
2192 2177
2193 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2178 my $lock = cf::lock_acquire "map_data:$self->{path}";
2194 2179
2195 return if $self->players; 2180 return if $self->players;
2196 return if $self->in_memory != cf::MAP_IN_MEMORY; 2181 return if $self->in_memory != cf::MAP_ACTIVE;
2197 return if $self->{deny_save}; 2182 return if $self->{deny_save};
2198 2183
2199 $self->in_memory (cf::MAP_SWAPPED); 2184 $self->in_memory (cf::MAP_SWAPPED);
2200 2185
2201 $self->deactivate; 2186 $self->deactivate;
2319 2304
2320sub unique_maps() { 2305sub unique_maps() {
2321 [ 2306 [
2322 map { 2307 map {
2323 utf8::decode $_; 2308 utf8::decode $_;
2324 /\.map$/ 2309 s/\.map$//; # TODO future compatibility hack
2310 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2311 ? ()
2325 ? normalise $_ 2312 : normalise $_
2326 : ()
2327 } @{ aio_readdir $UNIQUEDIR or [] } 2313 } @{ aio_readdir $UNIQUEDIR or [] }
2328 ] 2314 ]
2329} 2315}
2330 2316
2331package cf;
2332
2333=back 2317=back
2334 2318
2335=head3 cf::object 2319=head3 cf::object
2336 2320
2337=cut 2321=cut
2340 2324
2341=over 4 2325=over 4
2342 2326
2343=item $ob->inv_recursive 2327=item $ob->inv_recursive
2344 2328
2345Returns the inventory of the object _and_ their inventories, recursively. 2329Returns the inventory of the object I<and> their inventories, recursively,
2330but I<not> the object itself.
2346 2331
2347=cut 2332=cut
2348 2333
2349sub inv_recursive_; 2334sub inv_recursive_;
2350sub inv_recursive_ { 2335sub inv_recursive_ {
2355 inv_recursive_ inv $_[0] 2340 inv_recursive_ inv $_[0]
2356} 2341}
2357 2342
2358=item $ref = $ob->ref 2343=item $ref = $ob->ref
2359 2344
2360creates and returns a persistent reference to an objetc that can be stored as a string. 2345Creates and returns a persistent reference to an object that can be stored as a string.
2361 2346
2362=item $ob = cf::object::deref ($refstring) 2347=item $ob = cf::object::deref ($refstring)
2363 2348
2364returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2349returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2365even if the object actually exists. May block. 2350even if the object actually exists. May block.
2397can be C<undef>. Does the right thing when the player is currently in a 2382can be C<undef>. Does the right thing when the player is currently in a
2398dialogue with the given NPC character. 2383dialogue with the given NPC character.
2399 2384
2400=cut 2385=cut
2401 2386
2387our $SAY_CHANNEL = {
2388 id => "say",
2389 title => "Map",
2390 reply => "say ",
2391 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2392};
2393
2394our $CHAT_CHANNEL = {
2395 id => "chat",
2396 title => "Chat",
2397 reply => "chat ",
2398 tooltip => "Player chat and shouts, global to the server.",
2399};
2400
2402# rough implementation of a future "reply" method that works 2401# rough implementation of a future "reply" method that works
2403# with dialog boxes. 2402# with dialog boxes.
2404#TODO: the first argument must go, split into a $npc->reply_to ( method 2403#TODO: the first argument must go, split into a $npc->reply_to ( method
2405sub cf::object::player::reply($$$;$) { 2404sub cf::object::player::reply($$$;$) {
2406 my ($self, $npc, $msg, $flags) = @_; 2405 my ($self, $npc, $msg, $flags) = @_;
2417 my $dialog = $pl->{npc_dialog}; 2416 my $dialog = $pl->{npc_dialog};
2418 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2417 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2419 2418
2420 } else { 2419 } else {
2421 $msg = $npc->name . " says: $msg" if $npc; 2420 $msg = $npc->name . " says: $msg" if $npc;
2422 $self->message ($msg, $flags); 2421 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2423 } 2422 }
2424 } 2423 }
2425} 2424}
2426 2425
2427=item $object->send_msg ($channel, $msg, $color, [extra...]) 2426=item $object->send_msg ($channel, $msg, $color, [extra...])
2452 2451
2453=item $player_object->enter_link 2452=item $player_object->enter_link
2454 2453
2455Freezes the player and moves him/her to a special map (C<{link}>). 2454Freezes the player and moves him/her to a special map (C<{link}>).
2456 2455
2457The player should be reasonably safe there for short amounts of time. You 2456The player should be reasonably safe there for short amounts of time (e.g.
2458I<MUST> call C<leave_link> as soon as possible, though. 2457for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2458though, as the palyer cannot control the character while it is on the link
2459map.
2459 2460
2460Will never block. 2461Will never block.
2461 2462
2462=item $player_object->leave_link ($map, $x, $y) 2463=item $player_object->leave_link ($map, $x, $y)
2463 2464
2521 2522
2522 $map->load; 2523 $map->load;
2523 $map->load_neighbours; 2524 $map->load_neighbours;
2524 2525
2525 return unless $self->contr->active; 2526 return unless $self->contr->active;
2527 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2526 $self->activate_recursive; 2528 $self->activate_recursive;
2527 2529
2528 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2530 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2529 $self->enter_map ($map, $x, $y); 2531 $self->enter_map ($map, $x, $y);
2530} 2532}
2534Moves the player to the given map-path and coordinates by first freezing 2536Moves the player to the given map-path and coordinates by first freezing
2535her, loading and preparing them map, calling the provided $check callback 2537her, loading and preparing them map, calling the provided $check callback
2536that has to return the map if sucecssful, and then unfreezes the player on 2538that 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 2539the new (success) or old (failed) map position. In either case, $done will
2538be called at the end of this process. 2540be called at the end of this process.
2541
2542Note that $check will be called with a potentially non-loaded map, so if
2543it needs a loaded map it has to call C<< ->load >>.
2539 2544
2540=cut 2545=cut
2541 2546
2542our $GOTOGEN; 2547our $GOTOGEN;
2543 2548
2622} 2627}
2623 2628
2624sub prepare_random_map { 2629sub prepare_random_map {
2625 my ($exit) = @_; 2630 my ($exit) = @_;
2626 2631
2627 my $guard = cf::lock_acquire "exit_prepare:$exit";
2628
2629 # all this does is basically replace the /! path by 2632 # all this does is basically replace the /! path by
2630 # a new random map path (?random/...) with a seed 2633 # a new random map path (?random/...) with a seed
2631 # that depends on the exit object 2634 # that depends on the exit object
2632 2635
2633 my $rmp = parse_random_map_params $exit->msg; 2636 my $rmp = parse_random_map_params $exit->msg;
2635 if ($exit->map) { 2638 if ($exit->map) {
2636 $rmp->{region} = $exit->region->name; 2639 $rmp->{region} = $exit->region->name;
2637 $rmp->{origin_map} = $exit->map->path; 2640 $rmp->{origin_map} = $exit->map->path;
2638 $rmp->{origin_x} = $exit->x; 2641 $rmp->{origin_x} = $exit->x;
2639 $rmp->{origin_y} = $exit->y; 2642 $rmp->{origin_y} = $exit->y;
2643
2644 $exit->map->touch;
2640 } 2645 }
2641 2646
2642 $rmp->{random_seed} ||= $exit->random_seed; 2647 $rmp->{random_seed} ||= $exit->random_seed;
2643 2648
2644 my $data = cf::encode_json $rmp; 2649 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2645 my $md5 = Digest::MD5::md5_hex $data; 2650 my $md5 = Digest::MD5::md5_hex $data;
2646 my $meta = "$RANDOMDIR/$md5.meta"; 2651 my $meta = "$RANDOMDIR/$md5.meta";
2647 2652
2648 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2653 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2649 aio_write $fh, 0, (length $data), $data, 0; 2654 aio_write $fh, 0, (length $data), $data, 0;
2650 undef $fh; 2655 undef $fh;
2651 aio_rename "$meta~", $meta; 2656 aio_rename "$meta~", $meta;
2652 2657
2658 my $slaying = "?random/$md5";
2659
2660 if ($exit->valid) {
2653 $exit->slaying ("?random/$md5"); 2661 $exit->slaying ("?random/$md5");
2654 $exit->msg (undef); 2662 $exit->msg (undef);
2663 }
2655 } 2664 }
2656} 2665}
2657 2666
2658sub cf::object::player::enter_exit { 2667sub cf::object::player::enter_exit {
2659 my ($self, $exit) = @_; 2668 my ($self, $exit) = @_;
2660 2669
2661 return unless $self->type == cf::PLAYER; 2670 return unless $self->type == cf::PLAYER;
2662 2671
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; 2672 $self->enter_link;
2675 2673
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 { 2674 (async {
2681 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2675 $Coro::current->{desc} = "enter_exit";
2682 2676
2683 $self->deactivate_recursive; # just to be sure
2684 unless (eval { 2677 unless (eval {
2678 $self->deactivate_recursive; # just to be sure
2679
2680 # random map handling
2681 {
2682 my $guard = cf::lock_acquire "exit_prepare:$exit";
2683
2684 prepare_random_map $exit
2685 if $exit->slaying eq "/!";
2686 }
2687
2688 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2689 my $x = $exit->stats->hp;
2690 my $y = $exit->stats->sp;
2691
2685 $self->goto ($slaying, $hp, $sp); 2692 $self->goto ($map, $x, $y);
2686 2693
2694 # if exit is damned, update players death & WoR home-position
2695 $self->contr->savebed ($map, $x, $y)
2696 if $exit->flag (cf::FLAG_DAMNED);
2697
2687 1; 2698 1
2688 }) { 2699 }) {
2689 $self->message ("Something went wrong deep within the crossfire server. " 2700 $self->message ("Something went wrong deep within the deliantra server. "
2690 . "I'll try to bring you back to the map you were before. " 2701 . "I'll try to bring you back to the map you were before. "
2691 . "Please report this to the dungeon master!", 2702 . "Please report this to the dungeon master!",
2692 cf::NDI_UNIQUE | cf::NDI_RED); 2703 cf::NDI_UNIQUE | cf::NDI_RED);
2693 2704
2694 warn "ERROR in enter_exit: $@"; 2705 warn "ERROR in enter_exit: $@";
2760 id => "infobox", 2771 id => "infobox",
2761 title => "Body Parts", 2772 title => "Body Parts",
2762 reply => undef, 2773 reply => undef,
2763 tooltip => "Shows which body parts you posess and are available", 2774 tooltip => "Shows which body parts you posess and are available",
2764 }, 2775 },
2776 "c/statistics" => {
2777 id => "infobox",
2778 title => "Statistics",
2779 reply => undef,
2780 tooltip => "Shows your primary statistics",
2781 },
2782 "c/skills" => {
2783 id => "infobox",
2784 title => "Skills",
2785 reply => undef,
2786 tooltip => "Shows your experience per skill and item power",
2787 },
2788 "c/resistances" => {
2789 id => "infobox",
2790 title => "Resistances",
2791 reply => undef,
2792 tooltip => "Shows your resistances",
2793 },
2794 "c/pets" => {
2795 id => "infobox",
2796 title => "Pets",
2797 reply => undef,
2798 tooltip => "Shows information abotu your pets/a specific pet",
2799 },
2765 "c/uptime" => { 2800 "c/uptime" => {
2766 id => "infobox", 2801 id => "infobox",
2767 title => "Uptime", 2802 title => "Uptime",
2768 reply => undef, 2803 reply => undef,
2769 tooltip => "How long the server has been running since last restart", 2804 tooltip => "How long the server has been running since last restart",
2772 id => "infobox", 2807 id => "infobox",
2773 title => "Map Info", 2808 title => "Map Info",
2774 reply => undef, 2809 reply => undef,
2775 tooltip => "Information related to the maps", 2810 tooltip => "Information related to the maps",
2776 }, 2811 },
2812 "c/party" => {
2813 id => "party",
2814 title => "Party",
2815 reply => "gsay ",
2816 tooltip => "Messages and chat related to your party",
2817 },
2818 "c/death" => {
2819 id => "death",
2820 title => "Death",
2821 reply => undef,
2822 tooltip => "Reason for and more info about your most recent death",
2823 },
2824 "c/say" => $SAY_CHANNEL,
2825 "c/chat" => $CHAT_CHANNEL,
2777); 2826);
2778 2827
2779sub cf::client::send_msg { 2828sub cf::client::send_msg {
2780 my ($self, $channel, $msg, $color, @extra) = @_; 2829 my ($self, $channel, $msg, $color, @extra) = @_;
2781 2830
2782 $msg = $self->pl->expand_cfpod ($msg); 2831 $msg = $self->pl->expand_cfpod ($msg)
2832 unless $color & cf::NDI_VERBATIM;
2783 2833
2784 $color &= cf::NDI_CLIENT_MASK; # just in case... 2834 $color &= cf::NDI_CLIENT_MASK; # just in case...
2785 2835
2786 # check predefined channels, for the benefit of C 2836 # check predefined channels, for the benefit of C
2787 if ($CHANNEL{$channel}) { 2837 if ($CHANNEL{$channel}) {
2788 $channel = $CHANNEL{$channel}; 2838 $channel = $CHANNEL{$channel};
2789 2839
2790 $self->ext_msg (channel_info => $channel) 2840 $self->ext_msg (channel_info => $channel);
2791 if $self->can_msg;
2792
2793 $channel = $channel->{id}; 2841 $channel = $channel->{id};
2794 2842
2795 } elsif (ref $channel) { 2843 } elsif (ref $channel) {
2796 # send meta info to client, if not yet sent 2844 # send meta info to client, if not yet sent
2797 unless (exists $self->{channel}{$channel->{id}}) { 2845 unless (exists $self->{channel}{$channel->{id}}) {
2798 $self->{channel}{$channel->{id}} = $channel; 2846 $self->{channel}{$channel->{id}} = $channel;
2799 $self->ext_msg (channel_info => $channel) 2847 $self->ext_msg (channel_info => $channel);
2800 if $self->can_msg;
2801 } 2848 }
2802 2849
2803 $channel = $channel->{id}; 2850 $channel = $channel->{id};
2804 } 2851 }
2805 2852
2806 return unless @extra || length $msg; 2853 return unless @extra || length $msg;
2807 2854
2808 if ($self->can_msg) {
2809 # default colour, mask it out 2855 # default colour, mask it out
2810 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2856 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2811 if $color & cf::NDI_DEF; 2857 if $color & cf::NDI_DEF;
2812 2858
2813 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2859 my $pkt = "msg "
2860 . $self->{json_coder}->encode (
2814 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2861 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2815 } else { 2862 );
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 2863
2827 $color &= cf::NDI_COLOR_MASK; 2864 # try lzf for large packets
2865 $pkt = "lzf " . Compress::LZF::compress $pkt
2866 if 1024 <= length $pkt and $self->{can_lzf};
2828 2867
2829 utf8::encode $msg; 2868 # split very large packets
2830 2869 if (8192 < length $pkt and $self->{can_lzf}) {
2831 if (0 && $msg =~ /\[/) { 2870 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2832 # COMMAND/INFO 2871 $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 } 2872 }
2873
2874 $self->send_packet ($pkt);
2840} 2875}
2841 2876
2842=item $client->ext_msg ($type, @msg) 2877=item $client->ext_msg ($type, @msg)
2843 2878
2844Sends an ext event to the client. 2879Sends an ext event to the client.
3018 3053
3019The following functions and methods are available within a safe environment: 3054The following functions and methods are available within a safe environment:
3020 3055
3021 cf::object 3056 cf::object
3022 contr pay_amount pay_player map x y force_find force_add destroy 3057 contr pay_amount pay_player map x y force_find force_add destroy
3023 insert remove name archname title slaying race decrease_ob_nr 3058 insert remove name archname title slaying race decrease split
3059 value
3024 3060
3025 cf::object::player 3061 cf::object::player
3026 player 3062 player
3027 3063
3028 cf::player 3064 cf::player
3033 3069
3034=cut 3070=cut
3035 3071
3036for ( 3072for (
3037 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3073 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3038 insert remove inv name archname title slaying race 3074 insert remove inv nrof name archname title slaying race
3039 decrease_ob_nr destroy)], 3075 decrease split destroy change_exp value msg lore send_msg)],
3040 ["cf::object::player" => qw(player)], 3076 ["cf::object::player" => qw(player)],
3041 ["cf::player" => qw(peaceful)], 3077 ["cf::player" => qw(peaceful send_msg)],
3042 ["cf::map" => qw(trigger)], 3078 ["cf::map" => qw(trigger)],
3043) { 3079) {
3044 no strict 'refs'; 3080 no strict 'refs';
3045 my ($pkg, @funs) = @$_; 3081 my ($pkg, @funs) = @$_;
3046 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3082 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3063 my ($code, %vars) = @_; 3099 my ($code, %vars) = @_;
3064 3100
3065 my $qcode = $code; 3101 my $qcode = $code;
3066 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3102 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3067 $qcode =~ s/\n/\\n/g; 3103 $qcode =~ s/\n/\\n/g;
3104
3105 %vars = (_dummy => 0) unless %vars;
3068 3106
3069 local $_; 3107 local $_;
3070 local @safe::cf::_safe_eval_args = values %vars; 3108 local @safe::cf::_safe_eval_args = values %vars;
3071 3109
3072 my $eval = 3110 my $eval =
3149 { 3187 {
3150 my $faces = $facedata->{faceinfo}; 3188 my $faces = $facedata->{faceinfo};
3151 3189
3152 while (my ($face, $info) = each %$faces) { 3190 while (my ($face, $info) = each %$faces) {
3153 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3191 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3192
3154 cf::face::set_visibility $idx, $info->{visibility}; 3193 cf::face::set_visibility $idx, $info->{visibility};
3155 cf::face::set_magicmap $idx, $info->{magicmap}; 3194 cf::face::set_magicmap $idx, $info->{magicmap};
3156 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3195 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}; 3196 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3158 3197
3159 cf::cede_to_tick; 3198 cf::cede_to_tick;
3160 } 3199 }
3161 3200
3162 while (my ($face, $info) = each %$faces) { 3201 while (my ($face, $info) = each %$faces) {
3163 next unless $info->{smooth}; 3202 next unless $info->{smooth};
3203
3164 my $idx = cf::face::find $face 3204 my $idx = cf::face::find $face
3165 or next; 3205 or next;
3206
3166 if (my $smooth = cf::face::find $info->{smooth}) { 3207 if (my $smooth = cf::face::find $info->{smooth}) {
3167 cf::face::set_smooth $idx, $smooth; 3208 cf::face::set_smooth $idx, $smooth;
3168 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3209 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3169 } else { 3210 } else {
3170 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3211 warn "smooth face '$info->{smooth}' not found for face '$face'";
3188 { 3229 {
3189 # TODO: for gcfclient pleasure, we should give resources 3230 # TODO: for gcfclient pleasure, we should give resources
3190 # that gcfclient doesn't grok a >10000 face index. 3231 # that gcfclient doesn't grok a >10000 face index.
3191 my $res = $facedata->{resource}; 3232 my $res = $facedata->{resource};
3192 3233
3193 my $soundconf = delete $res->{"res/sound.conf"};
3194
3195 while (my ($name, $info) = each %$res) { 3234 while (my ($name, $info) = each %$res) {
3235 if (defined $info->{type}) {
3196 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3236 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3197 my $data; 3237 my $data;
3198 3238
3199 if ($info->{type} & 1) { 3239 if ($info->{type} & 1) {
3200 # prepend meta info 3240 # prepend meta info
3201 3241
3202 my $meta = $enc->encode ({ 3242 my $meta = $enc->encode ({
3203 name => $name, 3243 name => $name,
3204 %{ $info->{meta} || {} }, 3244 %{ $info->{meta} || {} },
3205 }); 3245 });
3206 3246
3207 $data = pack "(w/a*)*", $meta, $info->{data}; 3247 $data = pack "(w/a*)*", $meta, $info->{data};
3248 } else {
3249 $data = $info->{data};
3250 }
3251
3252 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3253 cf::face::set_type $idx, $info->{type};
3208 } else { 3254 } else {
3209 $data = $info->{data}; 3255 $RESOURCE{$name} = $info;
3210 } 3256 }
3211 3257
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; 3258 cf::cede_to_tick;
3216 } 3259 }
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 } 3260 }
3261
3262 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3236 3263
3237 1 3264 1
3238} 3265}
3266
3267cf::global->attach (on_resource_update => sub {
3268 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3269 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3270
3271 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3272 my $sound = $soundconf->{compat}[$_]
3273 or next;
3274
3275 my $face = cf::face::find "sound/$sound->[1]";
3276 cf::sound::set $sound->[0] => $face;
3277 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3278 }
3279
3280 while (my ($k, $v) = each %{$soundconf->{event}}) {
3281 my $face = cf::face::find "sound/$v";
3282 cf::sound::set $k => $face;
3283 }
3284 }
3285});
3239 3286
3240register_exticmd fx_want => sub { 3287register_exticmd fx_want => sub {
3241 my ($ns, $want) = @_; 3288 my ($ns, $want) = @_;
3242 3289
3243 while (my ($k, $v) = each %$want) { 3290 while (my ($k, $v) = each %$want) {
3244 $ns->fx_want ($k, $v); 3291 $ns->fx_want ($k, $v);
3245 } 3292 }
3246}; 3293};
3294
3295sub load_resource_file($) {
3296 my $guard = lock_acquire "load_resource_file";
3297
3298 my $status = load_resource_file_ $_[0];
3299 get_slot 0.1, 100;
3300 cf::arch::commit_load;
3301
3302 $status
3303}
3247 3304
3248sub reload_regions { 3305sub reload_regions {
3249 # HACK to clear player env face cache, we need some signal framework 3306 # HACK to clear player env face cache, we need some signal framework
3250 # for this (global event?) 3307 # for this (global event?)
3251 %ext::player_env::MUSIC_FACE_CACHE = (); 3308 %ext::player_env::MUSIC_FACE_CACHE = ();
3265} 3322}
3266 3323
3267sub reload_archetypes { 3324sub reload_archetypes {
3268 load_resource_file "$DATADIR/archetypes" 3325 load_resource_file "$DATADIR/archetypes"
3269 or die "unable to load archetypes\n"; 3326 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} 3327}
3276 3328
3277sub reload_treasures { 3329sub reload_treasures {
3278 load_resource_file "$DATADIR/treasures" 3330 load_resource_file "$DATADIR/treasures"
3279 or die "unable to load treasurelists\n"; 3331 or die "unable to load treasurelists\n";
3280} 3332}
3281 3333
3282sub reload_resources { 3334sub reload_resources {
3283 warn "reloading resource files...\n"; 3335 warn "reloading resource files...\n";
3284 3336
3337 reload_facedata;
3338 reload_archetypes;
3285 reload_regions; 3339 reload_regions;
3286 reload_facedata;
3287 #reload_archetypes;#d#
3288 reload_archetypes;
3289 reload_treasures; 3340 reload_treasures;
3290 3341
3291 warn "finished reloading resource files\n"; 3342 warn "finished reloading resource files\n";
3292}
3293
3294sub init {
3295 reload_resources;
3296} 3343}
3297 3344
3298sub reload_config { 3345sub reload_config {
3299 open my $fh, "<:utf8", "$CONFDIR/config" 3346 open my $fh, "<:utf8", "$CONFDIR/config"
3300 or return; 3347 or return;
3301 3348
3302 local $/; 3349 local $/;
3303 *CFG = YAML::Syck::Load <$fh>; 3350 *CFG = YAML::Load <$fh>;
3304 3351
3305 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3352 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3306 3353
3307 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3354 $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}; 3355 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3314 }; 3361 };
3315 warn $@ if $@; 3362 warn $@ if $@;
3316 } 3363 }
3317} 3364}
3318 3365
3366sub pidfile() {
3367 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3368 or die "$PIDFILE: $!";
3369 flock $fh, &Fcntl::LOCK_EX
3370 or die "$PIDFILE: flock: $!";
3371 $fh
3372}
3373
3374# make sure only one server instance is running at any one time
3375sub atomic {
3376 my $fh = pidfile;
3377
3378 my $pid = <$fh>;
3379 kill 9, $pid if $pid > 0;
3380
3381 seek $fh, 0, 0;
3382 print $fh $$;
3383}
3384
3319sub main { 3385sub main {
3386 cf::init_globals; # initialise logging
3387
3388 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3389 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3390 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3391 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3392
3393 cf::init_experience;
3394 cf::init_anim;
3395 cf::init_attackmess;
3396 cf::init_dynamic;
3397
3398 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3399
3320 # we must not ever block the main coroutine 3400 # we must not ever block the main coroutine
3321 local $Coro::idle = sub { 3401 local $Coro::idle = sub {
3322 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3402 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3323 (async { 3403 (async {
3324 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3404 $Coro::current->{desc} = "IDLE BUG HANDLER";
3325 EV::loop EV::LOOP_ONESHOT; 3405 EV::loop EV::LOOP_ONESHOT;
3326 })->prio (Coro::PRIO_MAX); 3406 })->prio (Coro::PRIO_MAX);
3327 }; 3407 };
3328 3408
3409 evthread_start IO::AIO::poll_fileno;
3410
3411 cf::sync_job {
3412 reload_resources;
3329 reload_config; 3413 reload_config;
3330 db_init; 3414 db_init;
3415
3416 cf::load_settings;
3417 cf::load_materials;
3418 cf::init_uuid;
3419 cf::init_signals;
3420 cf::init_commands;
3421 cf::init_skills;
3422
3423 cf::init_beforeplay;
3424
3425 atomic;
3426
3331 load_extensions; 3427 load_extensions;
3332 3428
3333 $TICK_WATCHER->start; 3429 utime time, time, $RUNTIMEFILE;
3334 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3430
3431 # no (long-running) fork's whatsoever before this point(!)
3432 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3433
3434 (pop @POST_INIT)->(0) while @POST_INIT;
3435 };
3436
3335 EV::loop; 3437 EV::loop;
3336} 3438}
3337 3439
3338############################################################################# 3440#############################################################################
3339# initialisation and cleanup 3441# initialisation and cleanup
3346 cf::cleanup "SIG$signal"; 3448 cf::cleanup "SIG$signal";
3347 }; 3449 };
3348 } 3450 }
3349} 3451}
3350 3452
3351sub write_runtime { 3453sub write_runtime_sync {
3352 my $runtime = "$LOCALDIR/runtime";
3353
3354 # first touch the runtime file to show we are still running: 3454 # first touch the runtime file to show we are still running:
3355 # the fsync below can take a very very long time. 3455 # the fsync below can take a very very long time.
3356 3456
3357 IO::AIO::aio_utime $runtime, undef, undef; 3457 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3358 3458
3359 my $guard = cf::lock_acquire "write_runtime"; 3459 my $guard = cf::lock_acquire "write_runtime";
3360 3460
3361 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3461 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3362 or return; 3462 or return;
3363 3463
3364 my $value = $cf::RUNTIME + 90 + 10; 3464 my $value = $cf::RUNTIME + 90 + 10;
3365 # 10 is the runtime save interval, for a monotonic clock 3465 # 10 is the runtime save interval, for a monotonic clock
3366 # 60 allows for the watchdog to kill the server. 3466 # 60 allows for the watchdog to kill the server.
3376 aio_utime $fh, undef, undef; 3476 aio_utime $fh, undef, undef;
3377 3477
3378 close $fh 3478 close $fh
3379 or return; 3479 or return;
3380 3480
3381 aio_rename "$runtime~", $runtime 3481 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3382 and return; 3482 and return;
3383 3483
3384 warn "runtime file written.\n"; 3484 warn "runtime file written.\n";
3385 3485
3386 1 3486 1
3487}
3488
3489our $uuid_lock;
3490our $uuid_skip;
3491
3492sub write_uuid_sync($) {
3493 $uuid_skip ||= $_[0];
3494
3495 return if $uuid_lock;
3496 local $uuid_lock = 1;
3497
3498 my $uuid = "$LOCALDIR/uuid";
3499
3500 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3501 or return;
3502
3503 my $value = uuid_seq uuid_cur;
3504
3505 unless ($value) {
3506 warn "cowardly refusing to write zero uuid value!\n";
3507 return;
3508 }
3509
3510 my $value = uuid_str $value + $uuid_skip;
3511 $uuid_skip = 0;
3512
3513 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3514 and return;
3515
3516 # always fsync - this file is important
3517 aio_fsync $fh
3518 and return;
3519
3520 close $fh
3521 or return;
3522
3523 aio_rename "$uuid~", $uuid
3524 and return;
3525
3526 warn "uuid file written ($value).\n";
3527
3528 1
3529
3530}
3531
3532sub write_uuid($$) {
3533 my ($skip, $sync) = @_;
3534
3535 $sync ? write_uuid_sync $skip
3536 : async { write_uuid_sync $skip };
3387} 3537}
3388 3538
3389sub emergency_save() { 3539sub emergency_save() {
3390 my $freeze_guard = cf::freeze_mainloop; 3540 my $freeze_guard = cf::freeze_mainloop;
3391 3541
3392 warn "enter emergency perl save\n"; 3542 warn "emergency_perl_save: enter\n";
3393 3543
3394 cf::sync_job { 3544 cf::sync_job {
3545 # this is a trade-off: we want to be very quick here, so
3546 # save all maps without fsync, and later call a global sync
3547 # (which in turn might be very very slow)
3548 local $USE_FSYNC = 0;
3549
3395 # use a peculiar iteration method to avoid tripping on perl 3550 # use a peculiar iteration method to avoid tripping on perl
3396 # refcount bugs in for. also avoids problems with players 3551 # refcount bugs in for. also avoids problems with players
3397 # and maps saved/destroyed asynchronously. 3552 # and maps saved/destroyed asynchronously.
3398 warn "begin emergency player save\n"; 3553 warn "emergency_perl_save: begin player save\n";
3399 for my $login (keys %cf::PLAYER) { 3554 for my $login (keys %cf::PLAYER) {
3400 my $pl = $cf::PLAYER{$login} or next; 3555 my $pl = $cf::PLAYER{$login} or next;
3401 $pl->valid or next; 3556 $pl->valid or next;
3402 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3557 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3403 $pl->save; 3558 $pl->save;
3404 } 3559 }
3405 warn "end emergency player save\n"; 3560 warn "emergency_perl_save: end player save\n";
3406 3561
3407 warn "begin emergency map save\n"; 3562 warn "emergency_perl_save: begin map save\n";
3408 for my $path (keys %cf::MAP) { 3563 for my $path (keys %cf::MAP) {
3409 my $map = $cf::MAP{$path} or next; 3564 my $map = $cf::MAP{$path} or next;
3410 $map->valid or next; 3565 $map->valid or next;
3411 $map->save; 3566 $map->save;
3412 } 3567 }
3413 warn "end emergency map save\n"; 3568 warn "emergency_perl_save: end map save\n";
3414 3569
3415 warn "begin emergency database checkpoint\n"; 3570 warn "emergency_perl_save: begin database checkpoint\n";
3416 BDB::db_env_txn_checkpoint $DB_ENV; 3571 BDB::db_env_txn_checkpoint $DB_ENV;
3417 warn "end emergency database checkpoint\n"; 3572 warn "emergency_perl_save: end database checkpoint\n";
3573
3574 warn "emergency_perl_save: begin write uuid\n";
3575 write_uuid_sync 1;
3576 warn "emergency_perl_save: end write uuid\n";
3418 }; 3577 };
3419 3578
3579 warn "emergency_perl_save: starting sync()\n";
3580 IO::AIO::aio_sync sub {
3581 warn "emergency_perl_save: finished sync()\n";
3582 };
3583
3420 warn "leave emergency perl save\n"; 3584 warn "emergency_perl_save: leave\n";
3421} 3585}
3422 3586
3423sub post_cleanup { 3587sub post_cleanup {
3424 my ($make_core) = @_; 3588 my ($make_core) = @_;
3425 3589
3426 warn Carp::longmess "post_cleanup backtrace" 3590 warn Carp::longmess "post_cleanup backtrace"
3427 if $make_core; 3591 if $make_core;
3592
3593 my $fh = pidfile;
3594 unlink $PIDFILE if <$fh> == $$;
3595}
3596
3597# a safer delete_package, copied from Symbol
3598sub clear_package($) {
3599 my $pkg = shift;
3600
3601 # expand to full symbol table name if needed
3602 unless ($pkg =~ /^main::.*::$/) {
3603 $pkg = "main$pkg" if $pkg =~ /^::/;
3604 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3605 $pkg .= '::' unless $pkg =~ /::$/;
3606 }
3607
3608 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3609 my $stem_symtab = *{$stem}{HASH};
3610
3611 defined $stem_symtab and exists $stem_symtab->{$leaf}
3612 or return;
3613
3614 # clear all symbols
3615 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3616 for my $name (keys %$leaf_symtab) {
3617 _gv_clear *{"$pkg$name"};
3618# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3619 }
3620 warn "cleared package $pkg\n";#d#
3428} 3621}
3429 3622
3430sub do_reload_perl() { 3623sub do_reload_perl() {
3431 # can/must only be called in main 3624 # can/must only be called in main
3432 if ($Coro::current != $Coro::main) { 3625 if ($Coro::current != $Coro::main) {
3433 warn "can only reload from main coroutine"; 3626 warn "can only reload from main coroutine";
3434 return; 3627 return;
3435 } 3628 }
3436 3629
3630 return if $RELOAD++;
3631
3632 my $t1 = EV::time;
3633
3634 while ($RELOAD) {
3437 warn "reloading..."; 3635 warn "reloading...";
3438 3636
3439 warn "entering sync_job"; 3637 warn "entering sync_job";
3440 3638
3441 cf::sync_job { 3639 cf::sync_job {
3442 cf::write_runtime; # external watchdog should not bark 3640 cf::write_runtime_sync; # external watchdog should not bark
3443 cf::emergency_save; 3641 cf::emergency_save;
3444 cf::write_runtime; # external watchdog should not bark 3642 cf::write_runtime_sync; # external watchdog should not bark
3445 3643
3446 warn "syncing database to disk"; 3644 warn "syncing database to disk";
3447 BDB::db_env_txn_checkpoint $DB_ENV; 3645 BDB::db_env_txn_checkpoint $DB_ENV;
3448 3646
3449 # if anything goes wrong in here, we should simply crash as we already saved 3647 # if anything goes wrong in here, we should simply crash as we already saved
3450 3648
3451 warn "flushing outstanding aio requests"; 3649 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; 3650 while (IO::AIO::nreqs || BDB::nreqs) {
3457 warn "iterate..."; 3651 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 } 3652 }
3483 3653
3484 warn "... nuking $pkg"; 3654 warn "cancelling all extension coros";
3485 Symbol::delete_package $pkg; 3655 $_->cancel for values %EXT_CORO;
3486 } 3656 %EXT_CORO = ();
3487 3657
3488 warn "unloading all perl modules loaded from $LIBDIR"; 3658 warn "removing commands";
3489 while (my ($k, $v) = each %INC) { 3659 %COMMAND = ();
3490 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3491 3660
3661 warn "removing ext/exti commands";
3662 %EXTCMD = ();
3663 %EXTICMD = ();
3664
3665 warn "unloading/nuking all extensions";
3666 for my $pkg (@EXTS) {
3492 warn "... unloading $k"; 3667 warn "... unloading $pkg";
3493 delete $INC{$k};
3494 3668
3495 $k =~ s/\.pm$//;
3496 $k =~ s/\//::/g;
3497
3498 if (my $cb = $k->can ("unload_module")) { 3669 if (my $cb = $pkg->can ("unload")) {
3670 eval {
3499 $cb->(); 3671 $cb->($pkg);
3672 1
3673 } or warn "$pkg unloaded, but with errors: $@";
3674 }
3675
3676 warn "... clearing $pkg";
3677 clear_package $pkg;
3500 } 3678 }
3501 3679
3502 Symbol::delete_package $k; 3680 warn "unloading all perl modules loaded from $LIBDIR";
3681 while (my ($k, $v) = each %INC) {
3682 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3683
3684 warn "... unloading $k";
3685 delete $INC{$k};
3686
3687 $k =~ s/\.pm$//;
3688 $k =~ s/\//::/g;
3689
3690 if (my $cb = $k->can ("unload_module")) {
3691 $cb->();
3692 }
3693
3694 clear_package $k;
3503 } 3695 }
3504 3696
3505 warn "getting rid of safe::, as good as possible"; 3697 warn "getting rid of safe::, as good as possible";
3506 Symbol::delete_package "safe::$_" 3698 clear_package "safe::$_"
3507 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3699 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3508 3700
3509 warn "unloading cf.pm \"a bit\""; 3701 warn "unloading cf.pm \"a bit\"";
3510 delete $INC{"cf.pm"}; 3702 delete $INC{"cf.pm"};
3511 delete $INC{"cf/pod.pm"}; 3703 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3512 3704
3513 # don't, removes xs symbols, too, 3705 # don't, removes xs symbols, too,
3514 # and global variables created in xs 3706 # and global variables created in xs
3515 #Symbol::delete_package __PACKAGE__; 3707 #clear_package __PACKAGE__;
3516 3708
3517 warn "unload completed, starting to reload now"; 3709 warn "unload completed, starting to reload now";
3518 3710
3519 warn "reloading cf.pm"; 3711 warn "reloading cf.pm";
3520 require cf; 3712 require cf;
3521 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3713 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3522 3714
3523 warn "loading config and database again"; 3715 warn "loading config and database again";
3524 cf::reload_config; 3716 cf::reload_config;
3525 3717
3526 warn "loading extensions"; 3718 warn "loading extensions";
3527 cf::load_extensions; 3719 cf::load_extensions;
3528 3720
3721 if ($REATTACH_ON_RELOAD) {
3529 warn "reattaching attachments to objects/players"; 3722 warn "reattaching attachments to objects/players";
3530 _global_reattach; # objects, sockets 3723 _global_reattach; # objects, sockets
3531 warn "reattaching attachments to maps"; 3724 warn "reattaching attachments to maps";
3532 reattach $_ for values %MAP; 3725 reattach $_ for values %MAP;
3533 warn "reattaching attachments to players"; 3726 warn "reattaching attachments to players";
3534 reattach $_ for values %PLAYER; 3727 reattach $_ for values %PLAYER;
3728 }
3535 3729
3730 warn "running post_init jobs";
3731 (pop @POST_INIT)->(1) while @POST_INIT;
3732
3536 warn "leaving sync_job"; 3733 warn "leaving sync_job";
3537 3734
3538 1 3735 1
3539 } or do { 3736 } or do {
3540 warn $@; 3737 warn $@;
3541 warn "error while reloading, exiting."; 3738 cf::cleanup "error while reloading, exiting.";
3542 exit 1;
3543 }; 3739 };
3544 3740
3545 warn "reloaded"; 3741 warn "reloaded";
3742 --$RELOAD;
3743 }
3744
3745 $t1 = EV::time - $t1;
3746 warn "reload completed in ${t1}s\n";
3546}; 3747};
3547 3748
3548our $RELOAD_WATCHER; # used only during reload 3749our $RELOAD_WATCHER; # used only during reload
3549 3750
3550sub reload_perl() { 3751sub reload_perl() {
3551 # doing reload synchronously and two reloads happen back-to-back, 3752 # doing reload synchronously and two reloads happen back-to-back,
3552 # coro crashes during coro_state_free->destroy here. 3753 # coro crashes during coro_state_free->destroy here.
3553 3754
3755 $RELOAD_WATCHER ||= cf::async {
3756 Coro::AIO::aio_wait cache_extensions;
3757
3554 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3758 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3759 do_reload_perl;
3555 undef $RELOAD_WATCHER; 3760 undef $RELOAD_WATCHER;
3556 do_reload_perl; 3761 };
3557 }; 3762 };
3558} 3763}
3559 3764
3560register_command "reload" => sub { 3765register_command "reload" => sub {
3561 my ($who, $arg) = @_; 3766 my ($who, $arg) = @_;
3575 3780
3576our @WAIT_FOR_TICK; 3781our @WAIT_FOR_TICK;
3577our @WAIT_FOR_TICK_BEGIN; 3782our @WAIT_FOR_TICK_BEGIN;
3578 3783
3579sub wait_for_tick { 3784sub wait_for_tick {
3580 return unless $TICK_WATCHER->is_active;
3581 return if $Coro::current == $Coro::main; 3785 return if tick_inhibit || $Coro::current == $Coro::main;
3582 3786
3583 my $signal = new Coro::Signal; 3787 my $signal = new Coro::Signal;
3584 push @WAIT_FOR_TICK, $signal; 3788 push @WAIT_FOR_TICK, $signal;
3585 $signal->wait; 3789 $signal->wait;
3586} 3790}
3587 3791
3588sub wait_for_tick_begin { 3792sub wait_for_tick_begin {
3589 return unless $TICK_WATCHER->is_active;
3590 return if $Coro::current == $Coro::main; 3793 return if tick_inhibit || $Coro::current == $Coro::main;
3591 3794
3592 my $signal = new Coro::Signal; 3795 my $signal = new Coro::Signal;
3593 push @WAIT_FOR_TICK_BEGIN, $signal; 3796 push @WAIT_FOR_TICK_BEGIN, $signal;
3594 $signal->wait; 3797 $signal->wait;
3595} 3798}
3596 3799
3597$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 3800sub tick {
3598 if ($Coro::current != $Coro::main) { 3801 if ($Coro::current != $Coro::main) {
3599 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3802 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3600 unless ++$bug_warning > 10; 3803 unless ++$bug_warning > 10;
3601 return; 3804 return;
3602 } 3805 }
3603 3806
3604 $NOW = $tick_start = EV::now;
3605
3606 cf::server_tick; # one server iteration 3807 cf::server_tick; # one server iteration
3607
3608 $RUNTIME += $TICK;
3609 $NEXT_TICK += $TICK;
3610 3808
3611 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3809 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3612 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3810 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3613 Coro::async_pool { 3811 Coro::async_pool {
3614 $Coro::current->{desc} = "runtime saver"; 3812 $Coro::current->{desc} = "runtime saver";
3615 write_runtime 3813 write_runtime_sync
3616 or warn "ERROR: unable to write runtime file: $!"; 3814 or warn "ERROR: unable to write runtime file: $!";
3617 }; 3815 };
3618 } 3816 }
3619 3817
3620 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3818 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3622 } 3820 }
3623 while (my $sig = shift @WAIT_FOR_TICK) { 3821 while (my $sig = shift @WAIT_FOR_TICK) {
3624 $sig->send; 3822 $sig->send;
3625 } 3823 }
3626 3824
3627 $LOAD = ($NOW - $tick_start) / $TICK; 3825 $LOAD = ($NOW - $TICK_START) / $TICK;
3628 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3826 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3629 3827
3630 _post_tick; 3828 if (0) {
3631}; 3829 if ($NEXT_TICK) {
3632$TICK_WATCHER->priority (EV::MAXPRI); 3830 my $jitter = $TICK_START - $NEXT_TICK;
3831 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3832 warn "jitter $JITTER\n";#d#
3833 }
3834 }
3835}
3633 3836
3634{ 3837{
3635 # configure BDB 3838 # configure BDB
3636 3839
3637 BDB::min_parallel 8; 3840 BDB::min_parallel 8;
3638 BDB::max_poll_reqs $TICK * 0.1; 3841 BDB::max_poll_reqs $TICK * 0.1;
3842 $AnyEvent::BDB::WATCHER->priority (1);
3639 3843
3640 unless ($DB_ENV) { 3844 unless ($DB_ENV) {
3641 $DB_ENV = BDB::db_env_create; 3845 $DB_ENV = BDB::db_env_create;
3642 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3846 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3643 | BDB::LOG_AUTOREMOVE, 1); 3847 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3848 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3644 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3849 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3645 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3850 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3646 3851
3647 cf::sync_job { 3852 cf::sync_job {
3648 eval { 3853 eval {
3674{ 3879{
3675 # configure IO::AIO 3880 # configure IO::AIO
3676 3881
3677 IO::AIO::min_parallel 8; 3882 IO::AIO::min_parallel 8;
3678 IO::AIO::max_poll_time $TICK * 0.1; 3883 IO::AIO::max_poll_time $TICK * 0.1;
3884 undef $AnyEvent::AIO::WATCHER;
3679} 3885}
3680 3886
3681my $_log_backtrace; 3887my $_log_backtrace;
3682 3888
3683sub _log_backtrace { 3889sub _log_backtrace {
3686 $msg =~ s/\n//; 3892 $msg =~ s/\n//;
3687 3893
3688 # limit the # of concurrent backtraces 3894 # limit the # of concurrent backtraces
3689 if ($_log_backtrace < 2) { 3895 if ($_log_backtrace < 2) {
3690 ++$_log_backtrace; 3896 ++$_log_backtrace;
3897 my $perl_bt = Carp::longmess $msg;
3691 async { 3898 async {
3692 $Coro::current->{desc} = "abt $msg"; 3899 $Coro::current->{desc} = "abt $msg";
3693 3900
3694 my @bt = fork_call { 3901 my @bt = fork_call {
3695 @addr = map { sprintf "%x", $_ } @addr; 3902 @addr = map { sprintf "%x", $_ } @addr;
3706 } 3913 }
3707 3914
3708 @funcs 3915 @funcs
3709 }; 3916 };
3710 3917
3711 LOG llevInfo, "[ABT] $msg\n"; 3918 LOG llevInfo, "[ABT] $perl_bt\n";
3919 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3712 LOG llevInfo, "[ABT] $_\n" for @bt; 3920 LOG llevInfo, "[ABT] $_\n" for @bt;
3713 --$_log_backtrace; 3921 --$_log_backtrace;
3714 }; 3922 };
3715 } else { 3923 } else {
3716 LOG llevInfo, "[ABT] $msg\n"; 3924 LOG llevInfo, "[ABT] $msg\n";
3717 LOG llevInfo, "[ABT] [suppressed]\n"; 3925 LOG llevInfo, "[ABT] [suppressed]\n";
3718 } 3926 }
3719} 3927}
3720 3928
3721# load additional modules 3929# load additional modules
3722use cf::pod; 3930eval "use cf::$_" for @EXTRA_MODULES;
3723 3931
3724END { cf::emergency_save } 3932END { cf::emergency_save }
3725 3933
37261 39341
3727 3935

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines