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.434 by root, Thu May 29 03:27:37 2008 UTC vs.
Revision 1.510 by root, Tue Apr 6 22:59:28 2010 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
18# 19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
25use 5.10.0;
24use utf8; 26use utf8;
25use strict; 27use strict qw(vars subs);
26 28
27use Symbol; 29use Symbol;
28use List::Util; 30use List::Util;
29use Socket; 31use Socket;
30use EV; 32use EV;
31use Opcode; 33use Opcode;
32use Safe; 34use Safe;
33use Safe::Hole; 35use Safe::Hole;
34use Storable (); 36use Storable ();
37use Carp ();
35 38
39use Guard ();
36use Coro (); 40use Coro ();
37use Coro::State; 41use Coro::State;
38use Coro::Handle; 42use Coro::Handle;
43use Coro::EV;
39use Coro::AnyEvent; 44use Coro::AnyEvent;
40use Coro::Timer; 45use Coro::Timer;
41use Coro::Signal; 46use Coro::Signal;
42use Coro::Semaphore; 47use Coro::Semaphore;
48use Coro::SemaphoreSet;
43use Coro::AnyEvent; 49use Coro::AnyEvent;
44use Coro::AIO; 50use Coro::AIO;
45use Coro::BDB; 51use Coro::BDB 1.6;
46use Coro::Storable; 52use Coro::Storable;
47use Coro::Util (); 53use Coro::Util ();
48 54
49use JSON::XS 2.01 (); 55use JSON::XS 2.01 ();
50use BDB (); 56use BDB ();
51use Data::Dumper; 57use Data::Dumper;
52use Digest::MD5;
53use Fcntl; 58use Fcntl;
54use YAML (); 59use YAML::XS ();
55use IO::AIO (); 60use IO::AIO ();
56use Time::HiRes; 61use Time::HiRes;
57use Compress::LZF; 62use Compress::LZF;
58use Digest::MD5 (); 63use Digest::MD5 ();
59 64
60AnyEvent::detect; 65AnyEvent::detect;
61 66
62IO::AIO::max_poll_reqs 1;#d#
63
64# configure various modules to our taste 67# configure various modules to our taste
65# 68#
66$Storable::canonical = 1; # reduce rsync transfers 69$Storable::canonical = 1; # reduce rsync transfers
67Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 70Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
71
72$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
73
74# make sure c-lzf reinitialises itself
75Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
68Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 76Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
69 77
70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 78# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
71 80
72sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
73 82
74our %COMMAND = (); 83our %COMMAND = ();
75our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
78our %EXTCMD = (); 87our %EXTCMD = ();
79our %EXTICMD = (); 88our %EXTICMD = ();
80our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
81our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
82 91
83our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
84our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
85 96
86our $CONFDIR = confdir; 97our $CONFDIR = confdir;
87our $DATADIR = datadir; 98our $DATADIR = datadir;
88our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
89our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
90our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
91our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
92our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
93our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
94our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
95our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
96our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110
97our %RESOURCE; 111our %RESOURCE;
98 112
99our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 113our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
100our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 114our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
101our $NEXT_TICK; 115our $NEXT_TICK;
102our $USE_FSYNC = 1; # use fsync to write maps - default off 116our $USE_FSYNC = 1; # use fsync to write maps - default on
103 117
104our $BDB_DEADLOCK_WATCHER; 118our $BDB_DEADLOCK_WATCHER;
105our $BDB_CHECKPOINT_WATCHER; 119our $BDB_CHECKPOINT_WATCHER;
106our $BDB_TRICKLE_WATCHER; 120our $BDB_TRICKLE_WATCHER;
107our $DB_ENV; 121our $DB_ENV;
108 122
123our @EXTRA_MODULES = qw(pod match mapscript);
124
109our %CFG; 125our %CFG;
110 126
111our $UPTIME; $UPTIME ||= time; 127our $UPTIME; $UPTIME ||= time;
112our $RUNTIME; 128our $RUNTIME;
113our $NOW; 129our $NOW;
122our $LOAD; # a number between 0 (idle) and 1 (too many objects) 138our $LOAD; # a number between 0 (idle) and 1 (too many objects)
123our $LOADAVG; # same thing, but with alpha-smoothing 139our $LOADAVG; # same thing, but with alpha-smoothing
124our $JITTER; # average jitter 140our $JITTER; # average jitter
125our $TICK_START; # for load detecting purposes 141our $TICK_START; # for load detecting purposes
126 142
143our @POST_INIT;
144
145our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
146our $REALLY_UNLOOP; # never set to true, please :)
147
127binmode STDOUT; 148binmode STDOUT;
128binmode STDERR; 149binmode STDERR;
129 150
130# read virtual server time, if available 151# read virtual server time, if available
131unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 152unless ($RUNTIME || !-e $RUNTIMEFILE) {
132 open my $fh, "<", "$LOCALDIR/runtime" 153 open my $fh, "<", $RUNTIMEFILE
133 or die "unable to read runtime file: $!"; 154 or die "unable to read $RUNTIMEFILE file: $!";
134 $RUNTIME = <$fh> + 0.; 155 $RUNTIME = <$fh> + 0.;
135} 156}
157
158eval "sub TICK() { $TICK } 1" or die;
136 159
137mkdir $_ 160mkdir $_
138 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 161 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
139 162
140our $EMERGENCY_POSITION; 163our $EMERGENCY_POSITION;
141 164
142sub cf::map::normalise; 165sub cf::map::normalise;
166
167#############################################################################
168
169%REFLECT = ();
170for (@REFLECT) {
171 my $reflect = JSON::XS::decode_json $_;
172 $REFLECT{$reflect->{class}} = $reflect;
173}
174
175# this is decidedly evil
176$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
143 177
144############################################################################# 178#############################################################################
145 179
146=head2 GLOBAL VARIABLES 180=head2 GLOBAL VARIABLES
147 181
194returns directly I<after> the tick processing (and consequently, can only wake one process 228returns directly I<after> the tick processing (and consequently, can only wake one process
195per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 229per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
196 230
197=item @cf::INVOKE_RESULTS 231=item @cf::INVOKE_RESULTS
198 232
199This array contains the results of the last C<invoke ()> call. When 233This array contains the results of the last C<invoke ()> call. When
200C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 234C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
201that call. 235that call.
202 236
237=item %cf::REFLECT
238
239Contains, for each (C++) class name, a hash reference with information
240about object members (methods, scalars, arrays and flags) and other
241metadata, which is useful for introspection.
242
203=back 243=back
204 244
205=cut 245=cut
206 246
207BEGIN { 247$Coro::State::WARNHOOK = sub {
208 *CORE::GLOBAL::warn = sub {
209 my $msg = join "", @_; 248 my $msg = join "", @_;
210 249
211 $msg .= "\n" 250 $msg .= "\n"
212 unless $msg =~ /\n$/; 251 unless $msg =~ /\n$/;
213 252
214 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 253 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
215 254
216 LOG llevError, $msg; 255 LOG llevError, $msg;
217 }; 256};
218}
219 257
220$Coro::State::DIEHOOK = sub { 258$Coro::State::DIEHOOK = sub {
221 return unless $^S eq 0; # "eq", not "==" 259 return unless $^S eq 0; # "eq", not "=="
260
261 warn Carp::longmess $_[0];
222 262
223 if ($Coro::current == $Coro::main) {#d# 263 if ($Coro::current == $Coro::main) {#d#
224 warn "DIEHOOK called in main context, Coro bug?\n";#d# 264 warn "DIEHOOK called in main context, Coro bug?\n";#d#
225 return;#d# 265 return;#d#
226 }#d# 266 }#d#
227 267
228 # kill coroutine otherwise 268 # kill coroutine otherwise
229 warn Carp::longmess $_[0];
230 Coro::terminate 269 Coro::terminate
231}; 270};
232
233$SIG{__DIE__} = sub { }; #d#?
234 271
235@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 272@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
236@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 273@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
237@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 274@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
238@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 275@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
245for my $pkg (qw( 282for my $pkg (qw(
246 cf::global cf::attachable 283 cf::global cf::attachable
247 cf::object cf::object::player 284 cf::object cf::object::player
248 cf::client cf::player 285 cf::client cf::player
249 cf::arch cf::living 286 cf::arch cf::living
287 cf::map cf::mapspace
250 cf::map cf::party cf::region 288 cf::party cf::region
251)) { 289)) {
252 no strict 'refs';
253 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 290 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
254} 291}
255 292
256$EV::DIED = sub { 293$EV::DIED = sub {
257 warn "error in event callback: @_"; 294 Carp::cluck "error in event callback: @_";
258}; 295};
259 296
260############################################################################# 297#############################################################################
261 298
262=head2 UTILITY FUNCTIONS 299=head2 UTILITY FUNCTIONS
299our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 336our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
300 337
301sub encode_json($) { $json_coder->encode ($_[0]) } 338sub encode_json($) { $json_coder->encode ($_[0]) }
302sub decode_json($) { $json_coder->decode ($_[0]) } 339sub decode_json($) { $json_coder->decode ($_[0]) }
303 340
341=item cf::post_init { BLOCK }
342
343Execute the given codeblock, I<after> all extensions have been (re-)loaded,
344but I<before> the server starts ticking again.
345
346The cdoeblock will have a single boolean argument to indicate whether this
347is a reload or not.
348
349=cut
350
351sub post_init(&) {
352 push @POST_INIT, shift;
353}
354
304=item cf::lock_wait $string 355=item cf::lock_wait $string
305 356
306Wait until the given lock is available. See cf::lock_acquire. 357Wait until the given lock is available. See cf::lock_acquire.
307 358
308=item my $lock = cf::lock_acquire $string 359=item my $lock = cf::lock_acquire $string
309 360
310Wait until the given lock is available and then acquires it and returns 361Wait until the given lock is available and then acquires it and returns
311a Coro::guard object. If the guard object gets destroyed (goes out of scope, 362a L<Guard> object. If the guard object gets destroyed (goes out of scope,
312for example when the coroutine gets canceled), the lock is automatically 363for example when the coroutine gets canceled), the lock is automatically
313returned. 364returned.
314 365
315Locks are *not* recursive, locking from the same coro twice results in a 366Locks are *not* recursive, locking from the same coro twice results in a
316deadlocked coro. 367deadlocked coro.
322 373
323Return true if the lock is currently active, i.e. somebody has locked it. 374Return true if the lock is currently active, i.e. somebody has locked it.
324 375
325=cut 376=cut
326 377
327our %LOCK; 378our $LOCKS = new Coro::SemaphoreSet;
328our %LOCKER;#d#
329 379
330sub lock_wait($) { 380sub lock_wait($) {
331 my ($key) = @_; 381 $LOCKS->wait ($_[0]);
332
333 if ($LOCKER{$key} == $Coro::current) {#d#
334 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
335 return;#d#
336 }#d#
337
338 # wait for lock, if any
339 while ($LOCK{$key}) {
340 push @{ $LOCK{$key} }, $Coro::current;
341 Coro::schedule;
342 }
343} 382}
344 383
345sub lock_acquire($) { 384sub lock_acquire($) {
346 my ($key) = @_; 385 $LOCKS->guard ($_[0])
347
348 # wait, to be sure we are not locked
349 lock_wait $key;
350
351 $LOCK{$key} = [];
352 $LOCKER{$key} = $Coro::current;#d#
353
354 Coro::guard {
355 delete $LOCKER{$key};#d#
356 # wake up all waiters, to be on the safe side
357 $_->ready for @{ delete $LOCK{$key} };
358 }
359} 386}
360 387
361sub lock_active($) { 388sub lock_active($) {
362 my ($key) = @_; 389 $LOCKS->count ($_[0]) < 1
363
364 ! ! $LOCK{$key}
365} 390}
366 391
367sub freeze_mainloop { 392sub freeze_mainloop {
368 tick_inhibit_inc; 393 tick_inhibit_inc;
369 394
370 Coro::guard \&tick_inhibit_dec; 395 &Guard::guard (\&tick_inhibit_dec);
371} 396}
372 397
373=item cf::periodic $interval, $cb 398=item cf::periodic $interval, $cb
374 399
375Like EV::periodic, but randomly selects a starting point so that the actions 400Like EV::periodic, but randomly selects a starting point so that the actions
398 423
399=cut 424=cut
400 425
401our @SLOT_QUEUE; 426our @SLOT_QUEUE;
402our $SLOT_QUEUE; 427our $SLOT_QUEUE;
428our $SLOT_DECAY = 0.9;
403 429
404$SLOT_QUEUE->cancel if $SLOT_QUEUE; 430$SLOT_QUEUE->cancel if $SLOT_QUEUE;
405$SLOT_QUEUE = Coro::async { 431$SLOT_QUEUE = Coro::async {
406 $Coro::current->desc ("timeslot manager"); 432 $Coro::current->desc ("timeslot manager");
407 433
408 my $signal = new Coro::Signal; 434 my $signal = new Coro::Signal;
435 my $busy;
409 436
410 while () { 437 while () {
411 next_job: 438 next_job:
439
412 my $avail = cf::till_tick; 440 my $avail = cf::till_tick;
413 if ($avail > 0.01) { 441
414 for (0 .. $#SLOT_QUEUE) { 442 for (0 .. $#SLOT_QUEUE) {
415 if ($SLOT_QUEUE[$_][0] < $avail) { 443 if ($SLOT_QUEUE[$_][0] <= $avail) {
444 $busy = 0;
416 my $job = splice @SLOT_QUEUE, $_, 1, (); 445 my $job = splice @SLOT_QUEUE, $_, 1, ();
417 $job->[2]->send; 446 $job->[2]->send;
418 Coro::cede; 447 Coro::cede;
419 goto next_job; 448 goto next_job;
420 } 449 } else {
450 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
421 } 451 }
422 } 452 }
423 453
424 if (@SLOT_QUEUE) { 454 if (@SLOT_QUEUE) {
425 # we do not use wait_for_tick() as it returns immediately when tick is inactive 455 # we do not use wait_for_tick() as it returns immediately when tick is inactive
426 push @cf::WAIT_FOR_TICK, $signal; 456 push @cf::WAIT_FOR_TICK, $signal;
427 $signal->wait; 457 $signal->wait;
428 } else { 458 } else {
459 $busy = 0;
429 Coro::schedule; 460 Coro::schedule;
430 } 461 }
431 } 462 }
432}; 463};
433 464
434sub get_slot($;$$) { 465sub get_slot($;$$) {
435 return if tick_inhibit || $Coro::current == $Coro::main; 466 return if tick_inhibit || $Coro::current == $Coro::main;
436 467
437 my ($time, $pri, $name) = @_; 468 my ($time, $pri, $name) = @_;
438 469
439 $time = $TICK * .6 if $time > $TICK * .6; 470 $time = clamp $time, 0.01, $TICK * .6;
471
440 my $sig = new Coro::Signal; 472 my $sig = new Coro::Signal;
441 473
442 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 474 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
443 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 475 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
444 $SLOT_QUEUE->ready; 476 $SLOT_QUEUE->ready;
727 759
728############################################################################# 760#############################################################################
729 761
730=head2 ATTACHABLE OBJECTS 762=head2 ATTACHABLE OBJECTS
731 763
732Many objects in crossfire are so-called attachable objects. That means you can 764Many objects in deliantra are so-called attachable objects. That means you can
733attach callbacks/event handlers (a collection of which is called an "attachment") 765attach callbacks/event handlers (a collection of which is called an "attachment")
734to it. All such attachable objects support the following methods. 766to it. All such attachable objects support the following methods.
735 767
736In the following description, CLASS can be any of C<global>, C<object> 768In the following description, CLASS can be any of C<global>, C<object>
737C<player>, C<client> or C<map> (i.e. the attachable objects in 769C<player>, C<client> or C<map> (i.e. the attachable objects in
787=item cf::CLASS::attachment $name, ... 819=item cf::CLASS::attachment $name, ...
788 820
789Register an attachment by C<$name> through which attachable objects of the 821Register an attachment by C<$name> through which attachable objects of the
790given CLASS can refer to this attachment. 822given CLASS can refer to this attachment.
791 823
792Some classes such as crossfire maps and objects can specify attachments 824Some classes such as deliantra maps and objects can specify attachments
793that are attached at load/instantiate time, thus the need for a name. 825that are attached at load/instantiate time, thus the need for a name.
794 826
795These calls expect any number of the following handler/hook descriptions: 827These calls expect any number of the following handler/hook descriptions:
796 828
797=over 4 829=over 4
1088 1120
1089sub reattach { 1121sub reattach {
1090 # basically do the same as instantiate, without calling instantiate 1122 # basically do the same as instantiate, without calling instantiate
1091 my ($obj) = @_; 1123 my ($obj) = @_;
1092 1124
1125 # no longer needed after getting rid of delete_package?
1093 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1126 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1094 1127
1095 my $registry = $obj->registry; 1128 my $registry = $obj->registry;
1096 1129
1097 @$registry = (); 1130 @$registry = ();
1098 1131
1146 $decname, length $$rdata, scalar @$objs; 1179 $decname, length $$rdata, scalar @$objs;
1147 1180
1148 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1181 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1149 aio_chmod $fh, SAVE_MODE; 1182 aio_chmod $fh, SAVE_MODE;
1150 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1183 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1151 aio_fsync $fh if $cf::USE_FSYNC; 1184 if ($cf::USE_FSYNC) {
1185 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1186 aio_fsync $fh;
1187 }
1152 aio_close $fh; 1188 aio_close $fh;
1153 1189
1154 if (@$objs) { 1190 if (@$objs) {
1155 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1191 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1156 aio_chmod $fh, SAVE_MODE; 1192 aio_chmod $fh, SAVE_MODE;
1157 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1193 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1158 aio_write $fh, 0, (length $data), $data, 0; 1194 aio_write $fh, 0, (length $data), $data, 0;
1159 aio_fsync $fh if $cf::USE_FSYNC; 1195 if ($cf::USE_FSYNC) {
1196 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1197 aio_fsync $fh;
1198 }
1160 aio_close $fh; 1199 aio_close $fh;
1161 aio_rename "$filename.pst~", "$filename.pst"; 1200 aio_rename "$filename.pst~", "$filename.pst";
1162 } 1201 }
1163 } else { 1202 } else {
1164 aio_unlink "$filename.pst"; 1203 aio_unlink "$filename.pst";
1165 } 1204 }
1166 1205
1167 aio_rename "$filename~", $filename; 1206 aio_rename "$filename~", $filename;
1207
1208 $filename =~ s%/[^/]+$%%;
1209 aio_pathsync $filename if $cf::USE_FSYNC;
1168 } else { 1210 } else {
1169 warn "FATAL: $filename~: $!\n"; 1211 warn "unable to save objects: $filename~: $!\n";
1170 } 1212 }
1171 } else { 1213 } else {
1172 aio_unlink $filename; 1214 aio_unlink $filename;
1173 aio_unlink "$filename.pst"; 1215 aio_unlink "$filename.pst";
1174 } 1216 }
1265 my ($name, $cb) = @_; 1307 my ($name, $cb) = @_;
1266 1308
1267 $EXTICMD{$name} = $cb; 1309 $EXTICMD{$name} = $cb;
1268} 1310}
1269 1311
1312use File::Glob ();
1313
1270cf::player->attach ( 1314cf::player->attach (
1271 on_command => sub { 1315 on_unknown_command => sub {
1272 my ($pl, $name, $params) = @_; 1316 my ($pl, $name, $params) = @_;
1273 1317
1274 my $cb = $COMMAND{$name} 1318 my $cb = $COMMAND{$name}
1275 or return; 1319 or return;
1276 1320
1306 1350
1307 cf::override; 1351 cf::override;
1308 }, 1352 },
1309); 1353);
1310 1354
1355# "readahead" all extensions
1356sub cache_extensions {
1357 my $grp = IO::AIO::aio_group;
1358
1359 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1360 for (grep /\.ext$/, @{$_[0]}) {
1361 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1362 }
1363 };
1364
1365 $grp
1366}
1367
1311sub load_extensions { 1368sub load_extensions {
1312 cf::sync_job { 1369 cf::sync_job {
1313 my %todo; 1370 my %todo;
1314 1371
1315 for my $path (<$LIBDIR/*.ext>) { 1372 for my $path (<$LIBDIR/*.ext>) {
1334 1391
1335 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1392 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1336 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1393 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1337 1394
1338 $ext{source} = 1395 $ext{source} =
1339 "package $pkg; use strict; use utf8;\n" 1396 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1340 . "#line 1 \"$path\"\n{\n" 1397 . "#line 1 \"$path\"\n{\n"
1341 . $source 1398 . $source
1342 . "\n};\n1"; 1399 . "\n};\n1";
1343 1400
1344 $todo{$base} = \%ext; 1401 $todo{$base} = \%ext;
1345 } 1402 }
1346 1403
1404 my $pass = 0;
1347 my %done; 1405 my %done;
1348 while (%todo) { 1406 while (%todo) {
1349 my $progress; 1407 my $progress;
1350 1408
1409 ++$pass;
1410
1411 ext:
1351 while (my ($k, $v) = each %todo) { 1412 while (my ($k, $v) = each %todo) {
1352 for (split /,\s*/, $v->{meta}{depends}) { 1413 for (split /,\s*/, $v->{meta}{depends}) {
1353 goto skip 1414 next ext
1354 unless exists $done{$_}; 1415 unless exists $done{$_};
1355 } 1416 }
1356 1417
1357 warn "... loading '$k' into '$v->{pkg}'\n"; 1418 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1358 1419
1359 unless (eval $v->{source}) { 1420 my $active = eval $v->{source};
1421
1422 if (length $@) {
1360 my $msg = $@ ? "$v->{path}: $@\n" 1423 warn "$v->{path}: $@\n";
1361 : "$v->{base}: extension inactive.\n";
1362 1424
1363 if (exists $v->{meta}{mandatory}) {
1364 warn $msg;
1365 cf::cleanup "mandatory extension failed to load, exiting."; 1425 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1366 } 1426 if exists $v->{meta}{mandatory};
1367 1427 } else {
1368 warn $msg; 1428 $done{$k} = delete $todo{$k};
1429 push @EXTS, $v->{pkg};
1430 $progress = 1;
1431
1432 warn "$v->{base}: extension inactive.\n"
1433 unless $active;
1369 } 1434 }
1370
1371 $done{$k} = delete $todo{$k};
1372 push @EXTS, $v->{pkg};
1373 $progress = 1;
1374 } 1435 }
1375 1436
1376 skip: 1437 unless ($progress) {
1377 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1438 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1378 unless $progress; 1439
1440 while (my ($k, $v) = each %todo) {
1441 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1442 if exists $v->{meta}{mandatory};
1443 }
1444 }
1379 } 1445 }
1380 }; 1446 };
1381} 1447}
1382 1448
1383############################################################################# 1449#############################################################################
1384 1450
1385=back 1451=back
1386 1452
1387=head2 CORE EXTENSIONS 1453=head2 CORE EXTENSIONS
1388 1454
1389Functions and methods that extend core crossfire objects. 1455Functions and methods that extend core deliantra objects.
1390 1456
1391=cut 1457=cut
1392 1458
1393package cf::player; 1459package cf::player;
1394 1460
1437 1503
1438sub exists($) { 1504sub exists($) {
1439 my ($login) = @_; 1505 my ($login) = @_;
1440 1506
1441 $cf::PLAYER{$login} 1507 $cf::PLAYER{$login}
1442 or cf::sync_job { !aio_stat path $login } 1508 or !aio_stat path $login
1443} 1509}
1444 1510
1445sub find($) { 1511sub find($) {
1446 return $cf::PLAYER{$_[0]} || do { 1512 return $cf::PLAYER{$_[0]} || do {
1447 my $login = $_[0]; 1513 my $login = $_[0];
1522 my ($pl) = @_; 1588 my ($pl) = @_;
1523 1589
1524 my $name = $pl->ob->name; 1590 my $name = $pl->ob->name;
1525 1591
1526 $pl->{deny_save} = 1; 1592 $pl->{deny_save} = 1;
1527 $pl->password ("*"); # this should lock out the player until we nuked the dir 1593 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1528 1594
1529 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1595 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1530 $pl->deactivate; 1596 $pl->deactivate;
1531 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1597 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1532 $pl->ob->check_score; 1598 $pl->ob->check_score;
1618 } 1684 }
1619 1685
1620 \@paths 1686 \@paths
1621} 1687}
1622 1688
1623=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1689=item $protocol_xml = $player->expand_cfpod ($cfpod)
1624 1690
1625Expand crossfire pod fragments into protocol xml. 1691Expand deliantra pod fragments into protocol xml.
1626
1627=cut
1628
1629use re 'eval';
1630
1631my $group;
1632my $interior; $interior = qr{
1633 # match a pod interior sequence sans C<< >>
1634 (?:
1635 \ (.*?)\ (?{ $group = $^N })
1636 | < (??{$interior}) >
1637 )
1638}x;
1639
1640sub expand_cfpod {
1641 my ($self, $pod) = @_;
1642
1643 my $xml;
1644
1645 while () {
1646 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1647 $group = $1;
1648
1649 $group =~ s/&/&amp;/g;
1650 $group =~ s/</&lt;/g;
1651
1652 $xml .= $group;
1653 } elsif ($pod =~ m%\G
1654 ([BCGHITU])
1655 <
1656 (?:
1657 ([^<>]*) (?{ $group = $^N })
1658 | < $interior >
1659 )
1660 >
1661 %gcsx
1662 ) {
1663 my ($code, $data) = ($1, $group);
1664
1665 if ($code eq "B") {
1666 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1667 } elsif ($code eq "I") {
1668 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1669 } elsif ($code eq "U") {
1670 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1671 } elsif ($code eq "C") {
1672 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1673 } elsif ($code eq "T") {
1674 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1675 } elsif ($code eq "G") {
1676 my ($male, $female) = split /\|/, $data;
1677 $data = $self->gender ? $female : $male;
1678 $xml .= expand_cfpod ($self, $data);
1679 } elsif ($code eq "H") {
1680 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1681 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1682 "")
1683 [$self->{hintmode}];
1684 } else {
1685 $xml .= "error processing '$code($data)' directive";
1686 }
1687 } else {
1688 if ($pod =~ /\G(.+)/) {
1689 warn "parse error while expanding $pod (at $1)";
1690 }
1691 last;
1692 }
1693 }
1694
1695 for ($xml) {
1696 # create single paragraphs (very hackish)
1697 s/(?<=\S)\n(?=\w)/ /g;
1698
1699 # compress some whitespace
1700 s/\s+\n/\n/g; # ws line-ends
1701 s/\n\n+/\n/g; # double lines
1702 s/^\n+//; # beginning lines
1703 s/\n+$//; # ending lines
1704 }
1705
1706 $xml
1707}
1708
1709no re 'eval';
1710
1711sub hintmode {
1712 $_[0]{hintmode} = $_[1] if @_ > 1;
1713 $_[0]{hintmode}
1714}
1715 1692
1716=item $player->ext_reply ($msgid, @msg) 1693=item $player->ext_reply ($msgid, @msg)
1717 1694
1718Sends an ext reply to the player. 1695Sends an ext reply to the player.
1719 1696
1792 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1769 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1793 1770
1794 # mit "rum" bekleckern, nicht 1771 # mit "rum" bekleckern, nicht
1795 $self->_create_random_map ( 1772 $self->_create_random_map (
1796 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1773 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1797 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1774 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1798 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1775 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1799 $rmp->{exit_on_final_map}, 1776 $rmp->{exit_on_final_map},
1800 $rmp->{xsize}, $rmp->{ysize}, 1777 $rmp->{xsize}, $rmp->{ysize},
1801 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1778 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1802 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1779 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1932 1909
1933 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1910 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1934 "$UNIQUEDIR/$path" 1911 "$UNIQUEDIR/$path"
1935} 1912}
1936 1913
1937# and all this just because we cannot iterate over
1938# all maps in C++...
1939sub change_all_map_light {
1940 my ($change) = @_;
1941
1942 $_->change_map_light ($change)
1943 for grep $_->outdoor, values %cf::MAP;
1944}
1945
1946sub decay_objects { 1914sub decay_objects {
1947 my ($self) = @_; 1915 my ($self) = @_;
1948 1916
1949 return if $self->{deny_reset}; 1917 return if $self->{deny_reset};
1950 1918
2032sub find { 2000sub find {
2033 my ($path, $origin) = @_; 2001 my ($path, $origin) = @_;
2034 2002
2035 $path = normalise $path, $origin && $origin->path; 2003 $path = normalise $path, $origin && $origin->path;
2036 2004
2037 cf::lock_wait "map_data:$path";#d#remove 2005 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2038 cf::lock_wait "map_find:$path"; 2006 my $guard2 = cf::lock_acquire "map_find:$path";
2039 2007
2040 $cf::MAP{$path} || do { 2008 $cf::MAP{$path} || do {
2041 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2042 my $guard2 = cf::lock_acquire "map_find:$path";
2043
2044 my $map = new_from_path cf::map $path 2009 my $map = new_from_path cf::map $path
2045 or return; 2010 or return;
2046 2011
2047 $map->{last_save} = $cf::RUNTIME; 2012 $map->{last_save} = $cf::RUNTIME;
2048 2013
2060 2025
2061 $cf::MAP{$path} = $map 2026 $cf::MAP{$path} = $map
2062 } 2027 }
2063} 2028}
2064 2029
2065sub pre_load { } 2030sub pre_load { }
2066sub post_load { } 2031#sub post_load { } # XS
2067 2032
2068sub load { 2033sub load {
2069 my ($self) = @_; 2034 my ($self) = @_;
2070 2035
2071 local $self->{deny_reset} = 1; # loading can take a long time 2036 local $self->{deny_reset} = 1; # loading can take a long time
2088 my $f = new_from_file cf::object::thawer $self->{load_path}; 2053 my $f = new_from_file cf::object::thawer $self->{load_path};
2089 $f->skip_block; 2054 $f->skip_block;
2090 $self->_load_objects ($f) 2055 $self->_load_objects ($f)
2091 or return; 2056 or return;
2092 2057
2093 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2058 $self->post_load_original
2094 if delete $self->{load_original}; 2059 if delete $self->{load_original};
2095 2060
2096 if (my $uniq = $self->uniq_path) { 2061 if (my $uniq = $self->uniq_path) {
2097 utf8::encode $uniq; 2062 utf8::encode $uniq;
2098 unless (aio_stat $uniq) { 2063 unless (aio_stat $uniq) {
2116 unless ($self->{deny_activate}) { 2081 unless ($self->{deny_activate}) {
2117 $self->decay_objects; 2082 $self->decay_objects;
2118 $self->fix_auto_apply; 2083 $self->fix_auto_apply;
2119 $self->update_buttons; 2084 $self->update_buttons;
2120 cf::cede_to_tick; 2085 cf::cede_to_tick;
2121 $self->set_darkness_map;
2122 cf::cede_to_tick;
2123 $self->activate; 2086 $self->activate;
2124 } 2087 }
2125 2088
2126 $self->{last_save} = $cf::RUNTIME; 2089 $self->{last_save} = $cf::RUNTIME;
2127 $self->last_access ($cf::RUNTIME); 2090 $self->last_access ($cf::RUNTIME);
2130 } 2093 }
2131 2094
2132 $self->post_load; 2095 $self->post_load;
2133} 2096}
2134 2097
2098# customize the map for a given player, i.e.
2099# return the _real_ map. used by e.g. per-player
2100# maps to change the path to ~playername/mappath
2135sub customise_for { 2101sub customise_for {
2136 my ($self, $ob) = @_; 2102 my ($self, $ob) = @_;
2137 2103
2138 return find "~" . $ob->name . "/" . $self->{path} 2104 return find "~" . $ob->name . "/" . $self->{path}
2139 if $self->per_player; 2105 if $self->per_player;
2293 2259
2294 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2260 my $lock = cf::lock_acquire "map_data:$self->{path}";
2295 2261
2296 return if $self->players; 2262 return if $self->players;
2297 2263
2298 warn "resetting map ", $self->path; 2264 warn "resetting map ", $self->path, "\n";
2299 2265
2300 $self->in_memory (cf::MAP_SWAPPED); 2266 $self->in_memory (cf::MAP_SWAPPED);
2301 2267
2302 # need to save uniques path 2268 # need to save uniques path
2303 unless ($self->{deny_save}) { 2269 unless ($self->{deny_save}) {
2394 : normalise $_ 2360 : normalise $_
2395 } @{ aio_readdir $UNIQUEDIR or [] } 2361 } @{ aio_readdir $UNIQUEDIR or [] }
2396 ] 2362 ]
2397} 2363}
2398 2364
2365=item cf::map::static_maps
2366
2367Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2368file in the shared directory excluding F</styles> and F</editor>). May
2369block.
2370
2371=cut
2372
2373sub static_maps() {
2374 my @dirs = "";
2375 my @maps;
2376
2377 while (@dirs) {
2378 my $dir = shift @dirs;
2379
2380 next if $dir eq "/styles" || $dir eq "/editor";
2381
2382 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2383 or return;
2384
2385 for (@$files) {
2386 s/\.map$// or next;
2387 utf8::decode $_;
2388 push @maps, "$dir/$_";
2389 }
2390
2391 push @dirs, map "$dir/$_", @$dirs;
2392 }
2393
2394 \@maps
2395}
2396
2399=back 2397=back
2400 2398
2401=head3 cf::object 2399=head3 cf::object
2402 2400
2403=cut 2401=cut
2468 2466
2469our $SAY_CHANNEL = { 2467our $SAY_CHANNEL = {
2470 id => "say", 2468 id => "say",
2471 title => "Map", 2469 title => "Map",
2472 reply => "say ", 2470 reply => "say ",
2473 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2471 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2474}; 2472};
2475 2473
2476our $CHAT_CHANNEL = { 2474our $CHAT_CHANNEL = {
2477 id => "chat", 2475 id => "chat",
2478 title => "Chat", 2476 title => "Chat",
2533 2531
2534=item $player_object->enter_link 2532=item $player_object->enter_link
2535 2533
2536Freezes the player and moves him/her to a special map (C<{link}>). 2534Freezes the player and moves him/her to a special map (C<{link}>).
2537 2535
2538The player should be reasonably safe there for short amounts of time. You 2536The player should be reasonably safe there for short amounts of time (e.g.
2539I<MUST> call C<leave_link> as soon as possible, though. 2537for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2538though, as the palyer cannot control the character while it is on the link
2539map.
2540 2540
2541Will never block. 2541Will never block.
2542 2542
2543=item $player_object->leave_link ($map, $x, $y) 2543=item $player_object->leave_link ($map, $x, $y)
2544 2544
2596 ($x, $y) = (-1, -1) 2596 ($x, $y) = (-1, -1)
2597 unless (defined $x) && (defined $y); 2597 unless (defined $x) && (defined $y);
2598 2598
2599 # use -1 or undef as default coordinates, not 0, 0 2599 # use -1 or undef as default coordinates, not 0, 0
2600 ($x, $y) = ($map->enter_x, $map->enter_y) 2600 ($x, $y) = ($map->enter_x, $map->enter_y)
2601 if $x <=0 && $y <= 0; 2601 if $x <= 0 && $y <= 0;
2602 2602
2603 $map->load; 2603 $map->load;
2604 $map->load_neighbours; 2604 $map->load_neighbours;
2605 2605
2606 return unless $self->contr->active; 2606 return unless $self->contr->active;
2607 $self->activate_recursive;
2608 2607
2609 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2608 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2610 $self->enter_map ($map, $x, $y); 2609 $self->enter_map ($map, $x, $y);
2610
2611 # only activate afterwards, to support waiting in hooks
2612 $self->activate_recursive;
2611} 2613}
2612 2614
2613=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2615=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2614 2616
2615Moves the player to the given map-path and coordinates by first freezing 2617Moves the player to the given map-path and coordinates by first freezing
2616her, loading and preparing them map, calling the provided $check callback 2618her, loading and preparing them map, calling the provided $check callback
2617that has to return the map if sucecssful, and then unfreezes the player on 2619that has to return the map if sucecssful, and then unfreezes the player on
2618the new (success) or old (failed) map position. In either case, $done will 2620the new (success) or old (failed) map position. In either case, $done will
2619be called at the end of this process. 2621be called at the end of this process.
2622
2623Note that $check will be called with a potentially non-loaded map, so if
2624it needs a loaded map it has to call C<< ->load >>.
2620 2625
2621=cut 2626=cut
2622 2627
2623our $GOTOGEN; 2628our $GOTOGEN;
2624 2629
2771 $self->contr->savebed ($map, $x, $y) 2776 $self->contr->savebed ($map, $x, $y)
2772 if $exit->flag (cf::FLAG_DAMNED); 2777 if $exit->flag (cf::FLAG_DAMNED);
2773 2778
2774 1 2779 1
2775 }) { 2780 }) {
2776 $self->message ("Something went wrong deep within the crossfire server. " 2781 $self->message ("Something went wrong deep within the deliantra server. "
2777 . "I'll try to bring you back to the map you were before. " 2782 . "I'll try to bring you back to the map you were before. "
2778 . "Please report this to the dungeon master!", 2783 . "Please report this to the dungeon master!",
2779 cf::NDI_UNIQUE | cf::NDI_RED); 2784 cf::NDI_UNIQUE | cf::NDI_RED);
2780 2785
2781 warn "ERROR in enter_exit: $@"; 2786 warn "ERROR in enter_exit: $@";
2798sub cf::client::send_drawinfo { 2803sub cf::client::send_drawinfo {
2799 my ($self, $text, $flags) = @_; 2804 my ($self, $text, $flags) = @_;
2800 2805
2801 utf8::encode $text; 2806 utf8::encode $text;
2802 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2807 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2808}
2809
2810=item $client->send_big_packet ($pkt)
2811
2812Like C<send_packet>, but tries to compress large packets, and fragments
2813them as required.
2814
2815=cut
2816
2817our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2818
2819sub cf::client::send_big_packet {
2820 my ($self, $pkt) = @_;
2821
2822 # try lzf for large packets
2823 $pkt = "lzf " . Compress::LZF::compress $pkt
2824 if 1024 <= length $pkt and $self->{can_lzf};
2825
2826 # split very large packets
2827 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2828 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2829 $pkt = "frag";
2830 }
2831
2832 $self->send_packet ($pkt);
2803} 2833}
2804 2834
2805=item $client->send_msg ($channel, $msg, $color, [extra...]) 2835=item $client->send_msg ($channel, $msg, $color, [extra...])
2806 2836
2807Send a drawinfo or msg packet to the client, formatting the msg for the 2837Send a drawinfo or msg packet to the client, formatting the msg for the
2811 2841
2812=cut 2842=cut
2813 2843
2814# non-persistent channels (usually the info channel) 2844# non-persistent channels (usually the info channel)
2815our %CHANNEL = ( 2845our %CHANNEL = (
2846 "c/motd" => {
2847 id => "infobox",
2848 title => "MOTD",
2849 reply => undef,
2850 tooltip => "The message of the day",
2851 },
2816 "c/identify" => { 2852 "c/identify" => {
2817 id => "infobox", 2853 id => "infobox",
2818 title => "Identify", 2854 title => "Identify",
2819 reply => undef, 2855 reply => undef,
2820 tooltip => "Items recently identified", 2856 tooltip => "Items recently identified",
2822 "c/examine" => { 2858 "c/examine" => {
2823 id => "infobox", 2859 id => "infobox",
2824 title => "Examine", 2860 title => "Examine",
2825 reply => undef, 2861 reply => undef,
2826 tooltip => "Signs and other items you examined", 2862 tooltip => "Signs and other items you examined",
2863 },
2864 "c/shopinfo" => {
2865 id => "infobox",
2866 title => "Shop Info",
2867 reply => undef,
2868 tooltip => "What your bargaining skill tells you about the shop",
2827 }, 2869 },
2828 "c/book" => { 2870 "c/book" => {
2829 id => "infobox", 2871 id => "infobox",
2830 title => "Book", 2872 title => "Book",
2831 reply => undef, 2873 reply => undef,
2847 id => "infobox", 2889 id => "infobox",
2848 title => "Body Parts", 2890 title => "Body Parts",
2849 reply => undef, 2891 reply => undef,
2850 tooltip => "Shows which body parts you posess and are available", 2892 tooltip => "Shows which body parts you posess and are available",
2851 }, 2893 },
2894 "c/statistics" => {
2895 id => "infobox",
2896 title => "Statistics",
2897 reply => undef,
2898 tooltip => "Shows your primary statistics",
2899 },
2900 "c/skills" => {
2901 id => "infobox",
2902 title => "Skills",
2903 reply => undef,
2904 tooltip => "Shows your experience per skill and item power",
2905 },
2906 "c/shopitems" => {
2907 id => "infobox",
2908 title => "Shop Items",
2909 reply => undef,
2910 tooltip => "Shows the items currently for sale in this shop",
2911 },
2912 "c/resistances" => {
2913 id => "infobox",
2914 title => "Resistances",
2915 reply => undef,
2916 tooltip => "Shows your resistances",
2917 },
2918 "c/pets" => {
2919 id => "infobox",
2920 title => "Pets",
2921 reply => undef,
2922 tooltip => "Shows information abotu your pets/a specific pet",
2923 },
2924 "c/perceiveself" => {
2925 id => "infobox",
2926 title => "Perceive Self",
2927 reply => undef,
2928 tooltip => "You gained detailed knowledge about yourself",
2929 },
2852 "c/uptime" => { 2930 "c/uptime" => {
2853 id => "infobox", 2931 id => "infobox",
2854 title => "Uptime", 2932 title => "Uptime",
2855 reply => undef, 2933 reply => undef,
2856 tooltip => "How long the server has been running since last restart", 2934 tooltip => "How long the server has been running since last restart",
2865 id => "party", 2943 id => "party",
2866 title => "Party", 2944 title => "Party",
2867 reply => "gsay ", 2945 reply => "gsay ",
2868 tooltip => "Messages and chat related to your party", 2946 tooltip => "Messages and chat related to your party",
2869 }, 2947 },
2948 "c/death" => {
2949 id => "death",
2950 title => "Death",
2951 reply => undef,
2952 tooltip => "Reason for and more info about your most recent death",
2953 },
2954 "c/say" => $SAY_CHANNEL,
2955 "c/chat" => $CHAT_CHANNEL,
2870); 2956);
2871 2957
2872sub cf::client::send_msg { 2958sub cf::client::send_msg {
2873 my ($self, $channel, $msg, $color, @extra) = @_; 2959 my ($self, $channel, $msg, $color, @extra) = @_;
2874 2960
2875 $msg = $self->pl->expand_cfpod ($msg); 2961 $msg = $self->pl->expand_cfpod ($msg)
2962 unless $color & cf::NDI_VERBATIM;
2876 2963
2877 $color &= cf::NDI_CLIENT_MASK; # just in case... 2964 $color &= cf::NDI_CLIENT_MASK; # just in case...
2878 2965
2879 # check predefined channels, for the benefit of C 2966 # check predefined channels, for the benefit of C
2880 if ($CHANNEL{$channel}) { 2967 if ($CHANNEL{$channel}) {
2881 $channel = $CHANNEL{$channel}; 2968 $channel = $CHANNEL{$channel};
2882 2969
2883 $self->ext_msg (channel_info => $channel) 2970 $self->ext_msg (channel_info => $channel);
2884 if $self->can_msg;
2885
2886 $channel = $channel->{id}; 2971 $channel = $channel->{id};
2887 2972
2888 } elsif (ref $channel) { 2973 } elsif (ref $channel) {
2889 # send meta info to client, if not yet sent 2974 # send meta info to client, if not yet sent
2890 unless (exists $self->{channel}{$channel->{id}}) { 2975 unless (exists $self->{channel}{$channel->{id}}) {
2891 $self->{channel}{$channel->{id}} = $channel; 2976 $self->{channel}{$channel->{id}} = $channel;
2892 $self->ext_msg (channel_info => $channel) 2977 $self->ext_msg (channel_info => $channel);
2893 if $self->can_msg;
2894 } 2978 }
2895 2979
2896 $channel = $channel->{id}; 2980 $channel = $channel->{id};
2897 } 2981 }
2898 2982
2899 return unless @extra || length $msg; 2983 return unless @extra || length $msg;
2900 2984
2901 if ($self->can_msg) {
2902 # default colour, mask it out 2985 # default colour, mask it out
2903 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2986 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2904 if $color & cf::NDI_DEF; 2987 if $color & cf::NDI_DEF;
2905 2988
2906 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2989 my $pkt = "msg "
2990 . $self->{json_coder}->encode (
2907 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2991 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2908 } else { 2992 );
2909 if ($color >= 0) {
2910 # replace some tags by gcfclient-compatible ones
2911 for ($msg) {
2912 1 while
2913 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2914 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2915 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2916 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2917 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2918 }
2919 2993
2920 $color &= cf::NDI_COLOR_MASK; 2994 $self->send_big_packet ($pkt);
2921
2922 utf8::encode $msg;
2923
2924 if (0 && $msg =~ /\[/) {
2925 # COMMAND/INFO
2926 $self->send_packet ("drawextinfo $color 10 8 $msg")
2927 } else {
2928 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2929 $self->send_packet ("drawinfo $color $msg")
2930 }
2931 }
2932 }
2933} 2995}
2934 2996
2935=item $client->ext_msg ($type, @msg) 2997=item $client->ext_msg ($type, @msg)
2936 2998
2937Sends an ext event to the client. 2999Sends an ext event to the client.
2940 3002
2941sub cf::client::ext_msg($$@) { 3003sub cf::client::ext_msg($$@) {
2942 my ($self, $type, @msg) = @_; 3004 my ($self, $type, @msg) = @_;
2943 3005
2944 if ($self->extcmd == 2) { 3006 if ($self->extcmd == 2) {
2945 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3007 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2946 } elsif ($self->extcmd == 1) { # TODO: remove 3008 } elsif ($self->extcmd == 1) { # TODO: remove
2947 push @msg, msgtype => "event_$type"; 3009 push @msg, msgtype => "event_$type";
2948 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3010 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2949 } 3011 }
2950} 3012}
2951 3013
2952=item $client->ext_reply ($msgid, @msg) 3014=item $client->ext_reply ($msgid, @msg)
2953 3015
2957 3019
2958sub cf::client::ext_reply($$@) { 3020sub cf::client::ext_reply($$@) {
2959 my ($self, $id, @msg) = @_; 3021 my ($self, $id, @msg) = @_;
2960 3022
2961 if ($self->extcmd == 2) { 3023 if ($self->extcmd == 2) {
2962 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3024 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2963 } elsif ($self->extcmd == 1) { 3025 } elsif ($self->extcmd == 1) {
2964 #TODO: version 1, remove 3026 #TODO: version 1, remove
2965 unshift @msg, msgtype => "reply", msgid => $id; 3027 unshift @msg, msgtype => "reply", msgid => $id;
2966 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3028 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2967 } 3029 }
2968} 3030}
2969 3031
2970=item $success = $client->query ($flags, "text", \&cb) 3032=item $success = $client->query ($flags, "text", \&cb)
2971 3033
3072 3134
3073 $coro 3135 $coro
3074} 3136}
3075 3137
3076cf::client->attach ( 3138cf::client->attach (
3077 on_destroy => sub { 3139 on_client_destroy => sub {
3078 my ($ns) = @_; 3140 my ($ns) = @_;
3079 3141
3080 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3142 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3081 }, 3143 },
3082); 3144);
3098our $safe_hole = new Safe::Hole; 3160our $safe_hole = new Safe::Hole;
3099 3161
3100$SIG{FPE} = 'IGNORE'; 3162$SIG{FPE} = 'IGNORE';
3101 3163
3102$safe->permit_only (Opcode::opset qw( 3164$safe->permit_only (Opcode::opset qw(
3103 :base_core :base_mem :base_orig :base_math 3165 :base_core :base_mem :base_orig :base_math :base_loop
3104 grepstart grepwhile mapstart mapwhile 3166 grepstart grepwhile mapstart mapwhile
3105 sort time 3167 sort time
3106)); 3168));
3107 3169
3108# here we export the classes and methods available to script code 3170# here we export the classes and methods available to script code
3112The following functions and methods are available within a safe environment: 3174The following functions and methods are available within a safe environment:
3113 3175
3114 cf::object 3176 cf::object
3115 contr pay_amount pay_player map x y force_find force_add destroy 3177 contr pay_amount pay_player map x y force_find force_add destroy
3116 insert remove name archname title slaying race decrease split 3178 insert remove name archname title slaying race decrease split
3179 value
3117 3180
3118 cf::object::player 3181 cf::object::player
3119 player 3182 player
3120 3183
3121 cf::player 3184 cf::player
3127=cut 3190=cut
3128 3191
3129for ( 3192for (
3130 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3193 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3131 insert remove inv nrof name archname title slaying race 3194 insert remove inv nrof name archname title slaying race
3132 decrease split destroy)], 3195 decrease split destroy change_exp value msg lore send_msg)],
3133 ["cf::object::player" => qw(player)], 3196 ["cf::object::player" => qw(player)],
3134 ["cf::player" => qw(peaceful)], 3197 ["cf::player" => qw(peaceful send_msg)],
3135 ["cf::map" => qw(trigger)], 3198 ["cf::map" => qw(trigger)],
3136) { 3199) {
3137 no strict 'refs'; 3200 no strict 'refs';
3138 my ($pkg, @funs) = @$_; 3201 my ($pkg, @funs) = @$_;
3139 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3202 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3157 3220
3158 my $qcode = $code; 3221 my $qcode = $code;
3159 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3222 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3160 $qcode =~ s/\n/\\n/g; 3223 $qcode =~ s/\n/\\n/g;
3161 3224
3225 %vars = (_dummy => 0) unless %vars;
3226
3227 my @res;
3162 local $_; 3228 local $_;
3163 local @safe::cf::_safe_eval_args = values %vars;
3164 3229
3165 my $eval = 3230 my $eval =
3166 "do {\n" 3231 "do {\n"
3167 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3232 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3168 . "#line 0 \"{$qcode}\"\n" 3233 . "#line 0 \"{$qcode}\"\n"
3169 . $code 3234 . $code
3170 . "\n}" 3235 . "\n}"
3171 ; 3236 ;
3172 3237
3238 if ($CFG{safe_eval}) {
3173 sub_generation_inc; 3239 sub_generation_inc;
3240 local @safe::cf::_safe_eval_args = values %vars;
3174 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3241 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3175 sub_generation_inc; 3242 sub_generation_inc;
3243 } else {
3244 local @cf::_safe_eval_args = values %vars;
3245 @res = wantarray ? eval eval : scalar eval $eval;
3246 }
3176 3247
3177 if ($@) { 3248 if ($@) {
3178 warn "$@"; 3249 warn "$@";
3179 warn "while executing safe code '$code'\n"; 3250 warn "while executing safe code '$code'\n";
3180 warn "with arguments " . (join " ", %vars) . "\n"; 3251 warn "with arguments " . (join " ", %vars) . "\n";
3199=cut 3270=cut
3200 3271
3201sub register_script_function { 3272sub register_script_function {
3202 my ($fun, $cb) = @_; 3273 my ($fun, $cb) = @_;
3203 3274
3204 no strict 'refs'; 3275 $fun = "safe::$fun" if $CFG{safe_eval};
3205 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3276 *$fun = $safe_hole->wrap ($cb);
3206} 3277}
3207 3278
3208=back 3279=back
3209 3280
3210=cut 3281=cut
3231 3302
3232 $facedata->{version} == 2 3303 $facedata->{version} == 2
3233 or cf::cleanup "$path: version mismatch, cannot proceed."; 3304 or cf::cleanup "$path: version mismatch, cannot proceed.";
3234 3305
3235 # patch in the exptable 3306 # patch in the exptable
3307 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3236 $facedata->{resource}{"res/exp_table"} = { 3308 $facedata->{resource}{"res/exp_table"} = {
3237 type => FT_RSRC, 3309 type => FT_RSRC,
3238 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3310 data => $exp_table,
3311 hash => (Digest::MD5::md5 $exp_table),
3239 }; 3312 };
3240 cf::cede_to_tick; 3313 cf::cede_to_tick;
3241 3314
3242 { 3315 {
3243 my $faces = $facedata->{faceinfo}; 3316 my $faces = $facedata->{faceinfo};
3245 while (my ($face, $info) = each %$faces) { 3318 while (my ($face, $info) = each %$faces) {
3246 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3319 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3247 3320
3248 cf::face::set_visibility $idx, $info->{visibility}; 3321 cf::face::set_visibility $idx, $info->{visibility};
3249 cf::face::set_magicmap $idx, $info->{magicmap}; 3322 cf::face::set_magicmap $idx, $info->{magicmap};
3250 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3323 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3251 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3324 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3252 3325
3253 cf::cede_to_tick; 3326 cf::cede_to_tick;
3254 } 3327 }
3255 3328
3256 while (my ($face, $info) = each %$faces) { 3329 while (my ($face, $info) = each %$faces) {
3280 3353
3281 cf::anim::invalidate_all; # d'oh 3354 cf::anim::invalidate_all; # d'oh
3282 } 3355 }
3283 3356
3284 { 3357 {
3285 # TODO: for gcfclient pleasure, we should give resources
3286 # that gcfclient doesn't grok a >10000 face index.
3287 my $res = $facedata->{resource}; 3358 my $res = $facedata->{resource};
3288 3359
3289 while (my ($name, $info) = each %$res) { 3360 while (my ($name, $info) = each %$res) {
3290 if (defined $info->{type}) { 3361 if (defined $info->{type}) {
3291 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3362 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3292 my $data;
3293 3363
3294 if ($info->{type} & 1) { 3364 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3295 # prepend meta info
3296
3297 my $meta = $enc->encode ({
3298 name => $name,
3299 %{ $info->{meta} || {} },
3300 });
3301
3302 $data = pack "(w/a*)*", $meta, $info->{data};
3303 } else {
3304 $data = $info->{data};
3305 }
3306
3307 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3308 cf::face::set_type $idx, $info->{type}; 3365 cf::face::set_type $idx, $info->{type};
3309 } else { 3366 } else {
3310 $RESOURCE{$name} = $info; 3367 $RESOURCE{$name} = $info;
3311 } 3368 }
3312 3369
3395 reload_treasures; 3452 reload_treasures;
3396 3453
3397 warn "finished reloading resource files\n"; 3454 warn "finished reloading resource files\n";
3398} 3455}
3399 3456
3400sub init {
3401 my $guard = freeze_mainloop;
3402
3403 reload_resources;
3404}
3405
3406sub reload_config { 3457sub reload_config {
3458 warn "reloading config file...\n";
3459
3407 open my $fh, "<:utf8", "$CONFDIR/config" 3460 open my $fh, "<:utf8", "$CONFDIR/config"
3408 or return; 3461 or return;
3409 3462
3410 local $/; 3463 local $/;
3411 *CFG = YAML::Load <$fh>; 3464 *CFG = YAML::XS::Load scalar <$fh>;
3412 3465
3413 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3466 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3414 3467
3415 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3468 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3416 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3469 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3420 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3473 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3421 and die "WARNING: m(un)lockall failed: $!\n"; 3474 and die "WARNING: m(un)lockall failed: $!\n";
3422 }; 3475 };
3423 warn $@ if $@; 3476 warn $@ if $@;
3424 } 3477 }
3478
3479 warn "finished reloading resource files\n";
3480}
3481
3482sub pidfile() {
3483 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3484 or die "$PIDFILE: $!";
3485 flock $fh, &Fcntl::LOCK_EX
3486 or die "$PIDFILE: flock: $!";
3487 $fh
3488}
3489
3490# make sure only one server instance is running at any one time
3491sub atomic {
3492 my $fh = pidfile;
3493
3494 my $pid = <$fh>;
3495 kill 9, $pid if $pid > 0;
3496
3497 seek $fh, 0, 0;
3498 print $fh $$;
3499}
3500
3501sub main_loop {
3502 warn "EV::loop starting\n";
3503 if (1) {
3504 EV::loop;
3505 }
3506 warn "EV::loop returned\n";
3507 goto &main_loop unless $REALLY_UNLOOP;
3425} 3508}
3426 3509
3427sub main { 3510sub main {
3511 cf::init_globals; # initialise logging
3512
3513 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3514 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3515 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3516 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3517
3518 cf::init_experience;
3519 cf::init_anim;
3520 cf::init_attackmess;
3521 cf::init_dynamic;
3522
3523 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3524
3428 # we must not ever block the main coroutine 3525 # we must not ever block the main coroutine
3429 local $Coro::idle = sub { 3526 local $Coro::idle = sub {
3430 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3527 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3431 (async { 3528 (async {
3432 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3529 $Coro::current->{desc} = "IDLE BUG HANDLER";
3433 EV::loop EV::LOOP_ONESHOT; 3530 EV::loop EV::LOOP_ONESHOT;
3434 })->prio (Coro::PRIO_MAX); 3531 })->prio (Coro::PRIO_MAX);
3435 }; 3532 };
3436 3533
3437 { 3534 evthread_start IO::AIO::poll_fileno;
3438 my $guard = freeze_mainloop; 3535
3536 cf::sync_job {
3537 cf::load_settings;
3538 cf::load_materials;
3539
3540 reload_resources;
3439 reload_config; 3541 reload_config;
3440 db_init; 3542 db_init;
3543
3544 cf::init_uuid;
3545 cf::init_signals;
3546 cf::init_skills;
3547
3548 cf::init_beforeplay;
3549
3550 atomic;
3551
3441 load_extensions; 3552 load_extensions;
3442 3553
3443 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3554 utime time, time, $RUNTIMEFILE;
3555
3556 # no (long-running) fork's whatsoever before this point(!)
3557 use POSIX ();
3558 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3559
3560 (pop @POST_INIT)->(0) while @POST_INIT;
3444 } 3561 };
3445 3562
3446 EV::loop; 3563 main_loop;
3447} 3564}
3448 3565
3449############################################################################# 3566#############################################################################
3450# initialisation and cleanup 3567# initialisation and cleanup
3451 3568
3458 }; 3575 };
3459 } 3576 }
3460} 3577}
3461 3578
3462sub write_runtime_sync { 3579sub write_runtime_sync {
3463 my $runtime = "$LOCALDIR/runtime"; 3580 my $t0 = EV::time;
3464 3581
3465 # first touch the runtime file to show we are still running: 3582 # first touch the runtime file to show we are still running:
3466 # the fsync below can take a very very long time. 3583 # the fsync below can take a very very long time.
3467 3584
3468 IO::AIO::aio_utime $runtime, undef, undef; 3585 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3469 3586
3470 my $guard = cf::lock_acquire "write_runtime"; 3587 my $guard = cf::lock_acquire "write_runtime";
3471 3588
3472 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3589 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3473 or return; 3590 or return;
3474 3591
3475 my $value = $cf::RUNTIME + 90 + 10; 3592 my $value = $cf::RUNTIME + 90 + 10;
3476 # 10 is the runtime save interval, for a monotonic clock 3593 # 10 is the runtime save interval, for a monotonic clock
3477 # 60 allows for the watchdog to kill the server. 3594 # 60 allows for the watchdog to kill the server.
3487 aio_utime $fh, undef, undef; 3604 aio_utime $fh, undef, undef;
3488 3605
3489 close $fh 3606 close $fh
3490 or return; 3607 or return;
3491 3608
3492 aio_rename "$runtime~", $runtime 3609 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3493 and return; 3610 and return;
3494 3611
3495 warn "runtime file written.\n"; 3612 warn sprintf "runtime file written (%gs).\n", EV::time - $t0;
3496 3613
3497 1 3614 1
3498} 3615}
3499 3616
3500our $uuid_lock; 3617our $uuid_lock;
3509 my $uuid = "$LOCALDIR/uuid"; 3626 my $uuid = "$LOCALDIR/uuid";
3510 3627
3511 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3628 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3512 or return; 3629 or return;
3513 3630
3514 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3631 my $value = uuid_seq uuid_cur;
3632
3633 unless ($value) {
3634 warn "cowardly refusing to write zero uuid value!\n";
3635 return;
3636 }
3637
3638 my $value = uuid_str $value + $uuid_skip;
3515 $uuid_skip = 0; 3639 $uuid_skip = 0;
3516 3640
3517 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3641 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3518 and return; 3642 and return;
3519 3643
3541} 3665}
3542 3666
3543sub emergency_save() { 3667sub emergency_save() {
3544 my $freeze_guard = cf::freeze_mainloop; 3668 my $freeze_guard = cf::freeze_mainloop;
3545 3669
3546 warn "enter emergency perl save\n"; 3670 warn "emergency_perl_save: enter\n";
3547 3671
3548 cf::sync_job { 3672 cf::sync_job {
3673 # this is a trade-off: we want to be very quick here, so
3674 # save all maps without fsync, and later call a global sync
3675 # (which in turn might be very very slow)
3676 local $USE_FSYNC = 0;
3677
3549 # use a peculiar iteration method to avoid tripping on perl 3678 # use a peculiar iteration method to avoid tripping on perl
3550 # refcount bugs in for. also avoids problems with players 3679 # refcount bugs in for. also avoids problems with players
3551 # and maps saved/destroyed asynchronously. 3680 # and maps saved/destroyed asynchronously.
3552 warn "begin emergency player save\n"; 3681 warn "emergency_perl_save: begin player save\n";
3553 for my $login (keys %cf::PLAYER) { 3682 for my $login (keys %cf::PLAYER) {
3554 my $pl = $cf::PLAYER{$login} or next; 3683 my $pl = $cf::PLAYER{$login} or next;
3555 $pl->valid or next; 3684 $pl->valid or next;
3556 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3685 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3557 $pl->save; 3686 $pl->save;
3558 } 3687 }
3559 warn "end emergency player save\n"; 3688 warn "emergency_perl_save: end player save\n";
3560 3689
3561 warn "begin emergency map save\n"; 3690 warn "emergency_perl_save: begin map save\n";
3562 for my $path (keys %cf::MAP) { 3691 for my $path (keys %cf::MAP) {
3563 my $map = $cf::MAP{$path} or next; 3692 my $map = $cf::MAP{$path} or next;
3564 $map->valid or next; 3693 $map->valid or next;
3565 $map->save; 3694 $map->save;
3566 } 3695 }
3567 warn "end emergency map save\n"; 3696 warn "emergency_perl_save: end map save\n";
3568 3697
3569 warn "begin emergency database checkpoint\n"; 3698 warn "emergency_perl_save: begin database checkpoint\n";
3570 BDB::db_env_txn_checkpoint $DB_ENV; 3699 BDB::db_env_txn_checkpoint $DB_ENV;
3571 warn "end emergency database checkpoint\n"; 3700 warn "emergency_perl_save: end database checkpoint\n";
3572 3701
3573 warn "begin write uuid\n"; 3702 warn "emergency_perl_save: begin write uuid\n";
3574 write_uuid_sync 1; 3703 write_uuid_sync 1;
3575 warn "end write uuid\n"; 3704 warn "emergency_perl_save: end write uuid\n";
3576 }; 3705 };
3577 3706
3707 warn "emergency_perl_save: starting sync()\n";
3708 IO::AIO::aio_sync sub {
3709 warn "emergency_perl_save: finished sync()\n";
3710 };
3711
3578 warn "leave emergency perl save\n"; 3712 warn "emergency_perl_save: leave\n";
3579} 3713}
3580 3714
3581sub post_cleanup { 3715sub post_cleanup {
3582 my ($make_core) = @_; 3716 my ($make_core) = @_;
3583 3717
3584 warn Carp::longmess "post_cleanup backtrace" 3718 warn Carp::longmess "post_cleanup backtrace"
3585 if $make_core; 3719 if $make_core;
3720
3721 my $fh = pidfile;
3722 unlink $PIDFILE if <$fh> == $$;
3723}
3724
3725# a safer delete_package, copied from Symbol
3726sub clear_package($) {
3727 my $pkg = shift;
3728
3729 # expand to full symbol table name if needed
3730 unless ($pkg =~ /^main::.*::$/) {
3731 $pkg = "main$pkg" if $pkg =~ /^::/;
3732 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3733 $pkg .= '::' unless $pkg =~ /::$/;
3734 }
3735
3736 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3737 my $stem_symtab = *{$stem}{HASH};
3738
3739 defined $stem_symtab and exists $stem_symtab->{$leaf}
3740 or return;
3741
3742 # clear all symbols
3743 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3744 for my $name (keys %$leaf_symtab) {
3745 _gv_clear *{"$pkg$name"};
3746# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3747 }
3748 warn "cleared package $pkg\n";#d#
3586} 3749}
3587 3750
3588sub do_reload_perl() { 3751sub do_reload_perl() {
3589 # can/must only be called in main 3752 # can/must only be called in main
3590 if ($Coro::current != $Coro::main) { 3753 if ($Coro::current != $Coro::main) {
3591 warn "can only reload from main coroutine"; 3754 warn "can only reload from main coroutine";
3592 return; 3755 return;
3593 } 3756 }
3594 3757
3758 return if $RELOAD++;
3759
3760 my $t1 = EV::time;
3761
3762 while ($RELOAD) {
3595 warn "reloading..."; 3763 warn "reloading...";
3596 3764
3597 warn "entering sync_job"; 3765 warn "entering sync_job";
3598 3766
3599 cf::sync_job { 3767 cf::sync_job {
3600 cf::write_runtime_sync; # external watchdog should not bark 3768 cf::write_runtime_sync; # external watchdog should not bark
3601 cf::emergency_save; 3769 cf::emergency_save;
3602 cf::write_runtime_sync; # external watchdog should not bark 3770 cf::write_runtime_sync; # external watchdog should not bark
3603 3771
3604 warn "syncing database to disk"; 3772 warn "syncing database to disk";
3605 BDB::db_env_txn_checkpoint $DB_ENV; 3773 BDB::db_env_txn_checkpoint $DB_ENV;
3606 3774
3607 # if anything goes wrong in here, we should simply crash as we already saved 3775 # if anything goes wrong in here, we should simply crash as we already saved
3608 3776
3609 warn "flushing outstanding aio requests"; 3777 warn "flushing outstanding aio requests";
3610 for (;;) {
3611 BDB::flush;
3612 IO::AIO::flush;
3613 Coro::cede_notself;
3614 last unless IO::AIO::nreqs || BDB::nreqs; 3778 while (IO::AIO::nreqs || BDB::nreqs) {
3615 warn "iterate..."; 3779 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3616 }
3617
3618 ++$RELOAD;
3619
3620 warn "cancelling all extension coros";
3621 $_->cancel for values %EXT_CORO;
3622 %EXT_CORO = ();
3623
3624 warn "removing commands";
3625 %COMMAND = ();
3626
3627 warn "removing ext/exti commands";
3628 %EXTCMD = ();
3629 %EXTICMD = ();
3630
3631 warn "unloading/nuking all extensions";
3632 for my $pkg (@EXTS) {
3633 warn "... unloading $pkg";
3634
3635 if (my $cb = $pkg->can ("unload")) {
3636 eval {
3637 $cb->($pkg);
3638 1
3639 } or warn "$pkg unloaded, but with errors: $@";
3640 } 3780 }
3641 3781
3642 warn "... nuking $pkg"; 3782 warn "cancelling all extension coros";
3643 Symbol::delete_package $pkg; 3783 $_->cancel for values %EXT_CORO;
3644 } 3784 %EXT_CORO = ();
3645 3785
3646 warn "unloading all perl modules loaded from $LIBDIR"; 3786 warn "removing commands";
3647 while (my ($k, $v) = each %INC) { 3787 %COMMAND = ();
3648 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3649 3788
3789 warn "removing ext/exti commands";
3790 %EXTCMD = ();
3791 %EXTICMD = ();
3792
3793 warn "unloading/nuking all extensions";
3794 for my $pkg (@EXTS) {
3650 warn "... unloading $k"; 3795 warn "... unloading $pkg";
3651 delete $INC{$k};
3652 3796
3653 $k =~ s/\.pm$//;
3654 $k =~ s/\//::/g;
3655
3656 if (my $cb = $k->can ("unload_module")) { 3797 if (my $cb = $pkg->can ("unload")) {
3798 eval {
3657 $cb->(); 3799 $cb->($pkg);
3800 1
3801 } or warn "$pkg unloaded, but with errors: $@";
3802 }
3803
3804 warn "... clearing $pkg";
3805 clear_package $pkg;
3658 } 3806 }
3659 3807
3660 Symbol::delete_package $k; 3808 warn "unloading all perl modules loaded from $LIBDIR";
3809 while (my ($k, $v) = each %INC) {
3810 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3811
3812 warn "... unloading $k";
3813 delete $INC{$k};
3814
3815 $k =~ s/\.pm$//;
3816 $k =~ s/\//::/g;
3817
3818 if (my $cb = $k->can ("unload_module")) {
3819 $cb->();
3820 }
3821
3822 clear_package $k;
3661 } 3823 }
3662 3824
3663 warn "getting rid of safe::, as good as possible"; 3825 warn "getting rid of safe::, as good as possible";
3664 Symbol::delete_package "safe::$_" 3826 clear_package "safe::$_"
3665 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3827 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3666 3828
3667 warn "unloading cf.pm \"a bit\""; 3829 warn "unloading cf.pm \"a bit\"";
3668 delete $INC{"cf.pm"}; 3830 delete $INC{"cf.pm"};
3669 delete $INC{"cf/pod.pm"}; 3831 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3670 3832
3671 # don't, removes xs symbols, too, 3833 # don't, removes xs symbols, too,
3672 # and global variables created in xs 3834 # and global variables created in xs
3673 #Symbol::delete_package __PACKAGE__; 3835 #clear_package __PACKAGE__;
3674 3836
3675 warn "unload completed, starting to reload now"; 3837 warn "unload completed, starting to reload now";
3676 3838
3677 warn "reloading cf.pm"; 3839 warn "reloading cf.pm";
3678 require cf; 3840 require cf;
3679 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3841 cf::_connect_to_perl_1;
3680 3842
3681 warn "loading config and database again"; 3843 warn "loading config and database again";
3682 cf::reload_config; 3844 cf::reload_config;
3683 3845
3684 warn "loading extensions"; 3846 warn "loading extensions";
3685 cf::load_extensions; 3847 cf::load_extensions;
3686 3848
3849 if ($REATTACH_ON_RELOAD) {
3687 warn "reattaching attachments to objects/players"; 3850 warn "reattaching attachments to objects/players";
3688 _global_reattach; # objects, sockets 3851 _global_reattach; # objects, sockets
3689 warn "reattaching attachments to maps"; 3852 warn "reattaching attachments to maps";
3690 reattach $_ for values %MAP; 3853 reattach $_ for values %MAP;
3691 warn "reattaching attachments to players"; 3854 warn "reattaching attachments to players";
3692 reattach $_ for values %PLAYER; 3855 reattach $_ for values %PLAYER;
3856 }
3693 3857
3858 warn "running post_init jobs";
3859 (pop @POST_INIT)->(1) while @POST_INIT;
3860
3694 warn "leaving sync_job"; 3861 warn "leaving sync_job";
3695 3862
3696 1 3863 1
3697 } or do { 3864 } or do {
3698 warn $@; 3865 warn $@;
3699 cf::cleanup "error while reloading, exiting."; 3866 cf::cleanup "error while reloading, exiting.";
3700 }; 3867 };
3701 3868
3702 warn "reloaded"; 3869 warn "reloaded";
3870 --$RELOAD;
3871 }
3872
3873 $t1 = EV::time - $t1;
3874 warn "reload completed in ${t1}s\n";
3703}; 3875};
3704 3876
3705our $RELOAD_WATCHER; # used only during reload 3877our $RELOAD_WATCHER; # used only during reload
3706 3878
3707sub reload_perl() { 3879sub reload_perl() {
3708 # doing reload synchronously and two reloads happen back-to-back, 3880 # doing reload synchronously and two reloads happen back-to-back,
3709 # coro crashes during coro_state_free->destroy here. 3881 # coro crashes during coro_state_free->destroy here.
3710 3882
3883 $RELOAD_WATCHER ||= cf::async {
3884 Coro::AIO::aio_wait cache_extensions;
3885
3711 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3886 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3712 do_reload_perl; 3887 do_reload_perl;
3713 undef $RELOAD_WATCHER; 3888 undef $RELOAD_WATCHER;
3889 };
3714 }; 3890 };
3715} 3891}
3716 3892
3717register_command "reload" => sub { 3893register_command "reload" => sub {
3718 my ($who, $arg) = @_; 3894 my ($who, $arg) = @_;
3732 3908
3733our @WAIT_FOR_TICK; 3909our @WAIT_FOR_TICK;
3734our @WAIT_FOR_TICK_BEGIN; 3910our @WAIT_FOR_TICK_BEGIN;
3735 3911
3736sub wait_for_tick { 3912sub wait_for_tick {
3737 return if tick_inhibit || $Coro::current == $Coro::main; 3913 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3738 3914
3739 my $signal = new Coro::Signal; 3915 my $signal = new Coro::Signal;
3740 push @WAIT_FOR_TICK, $signal; 3916 push @WAIT_FOR_TICK, $signal;
3741 $signal->wait; 3917 $signal->wait;
3742} 3918}
3743 3919
3744sub wait_for_tick_begin { 3920sub wait_for_tick_begin {
3745 return if tick_inhibit || $Coro::current == $Coro::main; 3921 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3746 3922
3747 my $signal = new Coro::Signal; 3923 my $signal = new Coro::Signal;
3748 push @WAIT_FOR_TICK_BEGIN, $signal; 3924 push @WAIT_FOR_TICK_BEGIN, $signal;
3749 $signal->wait; 3925 $signal->wait;
3750} 3926}
3755 unless ++$bug_warning > 10; 3931 unless ++$bug_warning > 10;
3756 return; 3932 return;
3757 } 3933 }
3758 3934
3759 cf::server_tick; # one server iteration 3935 cf::server_tick; # one server iteration
3936
3937 #for(1..3e6){} EV::now_update; $NOW=EV::now; # generate load #d#
3760 3938
3761 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3939 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3762 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3940 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3763 Coro::async_pool { 3941 Coro::async_pool {
3764 $Coro::current->{desc} = "runtime saver"; 3942 $Coro::current->{desc} = "runtime saver";
3787} 3965}
3788 3966
3789{ 3967{
3790 # configure BDB 3968 # configure BDB
3791 3969
3792 BDB::min_parallel 8; 3970 BDB::min_parallel 16;
3793 BDB::max_poll_reqs $TICK * 0.1; 3971 BDB::max_poll_reqs $TICK * 0.1;
3794 $AnyEvent::BDB::WATCHER->priority (1); 3972 $AnyEvent::BDB::WATCHER->priority (1);
3795 3973
3796 unless ($DB_ENV) { 3974 unless ($DB_ENV) {
3797 $DB_ENV = BDB::db_env_create; 3975 $DB_ENV = BDB::db_env_create;
3798 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3976 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3799 | BDB::LOG_AUTOREMOVE, 1); 3977 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3978 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3800 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3979 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3801 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3980 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3802 3981
3803 cf::sync_job { 3982 cf::sync_job {
3804 eval { 3983 eval {
3830{ 4009{
3831 # configure IO::AIO 4010 # configure IO::AIO
3832 4011
3833 IO::AIO::min_parallel 8; 4012 IO::AIO::min_parallel 8;
3834 IO::AIO::max_poll_time $TICK * 0.1; 4013 IO::AIO::max_poll_time $TICK * 0.1;
3835 #undef $AnyEvent::AIO::WATCHER; 4014 undef $AnyEvent::AIO::WATCHER;
3836} 4015}
3837 4016
3838my $_log_backtrace; 4017my $_log_backtrace;
3839 4018
3840sub _log_backtrace { 4019sub _log_backtrace {
3843 $msg =~ s/\n//; 4022 $msg =~ s/\n//;
3844 4023
3845 # limit the # of concurrent backtraces 4024 # limit the # of concurrent backtraces
3846 if ($_log_backtrace < 2) { 4025 if ($_log_backtrace < 2) {
3847 ++$_log_backtrace; 4026 ++$_log_backtrace;
4027 my $perl_bt = Carp::longmess $msg;
3848 async { 4028 async {
3849 $Coro::current->{desc} = "abt $msg"; 4029 $Coro::current->{desc} = "abt $msg";
3850 4030
3851 my @bt = fork_call { 4031 my @bt = fork_call {
3852 @addr = map { sprintf "%x", $_ } @addr; 4032 @addr = map { sprintf "%x", $_ } @addr;
3863 } 4043 }
3864 4044
3865 @funcs 4045 @funcs
3866 }; 4046 };
3867 4047
3868 LOG llevInfo, "[ABT] $msg\n"; 4048 LOG llevInfo, "[ABT] $perl_bt\n";
4049 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3869 LOG llevInfo, "[ABT] $_\n" for @bt; 4050 LOG llevInfo, "[ABT] $_\n" for @bt;
3870 --$_log_backtrace; 4051 --$_log_backtrace;
3871 }; 4052 };
3872 } else { 4053 } else {
3873 LOG llevInfo, "[ABT] $msg\n"; 4054 LOG llevInfo, "[ABT] $msg\n";
3874 LOG llevInfo, "[ABT] [suppressed]\n"; 4055 LOG llevInfo, "[ABT] [suppressed]\n";
3875 } 4056 }
3876} 4057}
3877 4058
3878# load additional modules 4059# load additional modules
3879use cf::pod; 4060require "cf/$_.pm" for @EXTRA_MODULES;
4061cf::_connect_to_perl_2;
3880 4062
3881END { cf::emergency_save } 4063END { cf::emergency_save }
3882 4064
3883evthread_start IO::AIO::poll_fileno;
3884
38851 40651
3886 4066

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines