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.436 by root, Sun Jun 15 20:32:51 2008 UTC vs.
Revision 1.522 by root, Sat Apr 17 02:22:14 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
61 66
62# configure various modules to our taste 67# configure various modules to our taste
63# 68#
64$Storable::canonical = 1; # reduce rsync transfers 69$Storable::canonical = 1; # reduce rsync transfers
65Coro::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";
66Compress::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
67 77
68$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" };
69 80
70sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
71 82
72our %COMMAND = (); 83our %COMMAND = ();
73our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
76our %EXTCMD = (); 87our %EXTCMD = ();
77our %EXTICMD = (); 88our %EXTICMD = ();
78our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
79our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
80 91
81our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
82our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
83 96
84our $CONFDIR = confdir; 97our $CONFDIR = confdir;
85our $DATADIR = datadir; 98our $DATADIR = datadir;
86our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
87our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
88our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
89our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
90our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
91our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
92our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
93our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
94our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110
95our %RESOURCE; 111our %RESOURCE;
112
113our $OUTPUT_RATE_MIN = 4000;
114our $OUTPUT_RATE_MAX = 100000;
96 115
97our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 116our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
98our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 117our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
99our $NEXT_TICK; 118our $NEXT_TICK;
100our $USE_FSYNC = 1; # use fsync to write maps - default off 119our $USE_FSYNC = 1; # use fsync to write maps - default on
101 120
102our $BDB_DEADLOCK_WATCHER; 121our $BDB_DEADLOCK_WATCHER;
103our $BDB_CHECKPOINT_WATCHER; 122our $BDB_CHECKPOINT_WATCHER;
104our $BDB_TRICKLE_WATCHER; 123our $BDB_TRICKLE_WATCHER;
105our $DB_ENV; 124our $DB_ENV;
106 125
126our @EXTRA_MODULES = qw(pod match mapscript);
127
107our %CFG; 128our %CFG;
108 129
109our $UPTIME; $UPTIME ||= time; 130our $UPTIME; $UPTIME ||= time;
110our $RUNTIME; 131our $RUNTIME;
111our $NOW; 132our $NOW;
120our $LOAD; # a number between 0 (idle) and 1 (too many objects) 141our $LOAD; # a number between 0 (idle) and 1 (too many objects)
121our $LOADAVG; # same thing, but with alpha-smoothing 142our $LOADAVG; # same thing, but with alpha-smoothing
122our $JITTER; # average jitter 143our $JITTER; # average jitter
123our $TICK_START; # for load detecting purposes 144our $TICK_START; # for load detecting purposes
124 145
146our @POST_INIT;
147
148our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
149our $REALLY_UNLOOP; # never set to true, please :)
150
125binmode STDOUT; 151binmode STDOUT;
126binmode STDERR; 152binmode STDERR;
127 153
128# read virtual server time, if available 154# read virtual server time, if available
129unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 155unless ($RUNTIME || !-e $RUNTIMEFILE) {
130 open my $fh, "<", "$LOCALDIR/runtime" 156 open my $fh, "<", $RUNTIMEFILE
131 or die "unable to read runtime file: $!"; 157 or die "unable to read $RUNTIMEFILE file: $!";
132 $RUNTIME = <$fh> + 0.; 158 $RUNTIME = <$fh> + 0.;
133} 159}
160
161eval "sub TICK() { $TICK } 1" or die;
134 162
135mkdir $_ 163mkdir $_
136 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 164 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
137 165
138our $EMERGENCY_POSITION; 166our $EMERGENCY_POSITION;
139 167
140sub cf::map::normalise; 168sub cf::map::normalise;
169
170sub in_main() {
171 $Coro::current == $Coro::main
172}
173
174#############################################################################
175
176%REFLECT = ();
177for (@REFLECT) {
178 my $reflect = JSON::XS::decode_json $_;
179 $REFLECT{$reflect->{class}} = $reflect;
180}
181
182# this is decidedly evil
183$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
141 184
142############################################################################# 185#############################################################################
143 186
144=head2 GLOBAL VARIABLES 187=head2 GLOBAL VARIABLES
145 188
192returns directly I<after> the tick processing (and consequently, can only wake one process 235returns directly I<after> the tick processing (and consequently, can only wake one process
193per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 236per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
194 237
195=item @cf::INVOKE_RESULTS 238=item @cf::INVOKE_RESULTS
196 239
197This array contains the results of the last C<invoke ()> call. When 240This array contains the results of the last C<invoke ()> call. When
198C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 241C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
199that call. 242that call.
200 243
244=item %cf::REFLECT
245
246Contains, for each (C++) class name, a hash reference with information
247about object members (methods, scalars, arrays and flags) and other
248metadata, which is useful for introspection.
249
201=back 250=back
202 251
203=cut 252=cut
204 253
205BEGIN { 254$Coro::State::WARNHOOK = sub {
206 *CORE::GLOBAL::warn = sub {
207 my $msg = join "", @_; 255 my $msg = join "", @_;
208 256
209 $msg .= "\n" 257 $msg .= "\n"
210 unless $msg =~ /\n$/; 258 unless $msg =~ /\n$/;
211 259
212 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 260 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
213 261
214 LOG llevError, $msg; 262 LOG llevError, $msg;
215 }; 263};
216}
217 264
218$Coro::State::DIEHOOK = sub { 265$Coro::State::DIEHOOK = sub {
219 return unless $^S eq 0; # "eq", not "==" 266 return unless $^S eq 0; # "eq", not "=="
220 267
221 if ($Coro::current == $Coro::main) {#d# 268 warn Carp::longmess $_[0];
269
270 if (in_main) {#d#
222 warn "DIEHOOK called in main context, Coro bug?\n";#d# 271 warn "DIEHOOK called in main context, Coro bug?\n";#d#
223 return;#d# 272 return;#d#
224 }#d# 273 }#d#
225 274
226 # kill coroutine otherwise 275 # kill coroutine otherwise
227 warn Carp::longmess $_[0];
228 Coro::terminate 276 Coro::terminate
229}; 277};
230
231$SIG{__DIE__} = sub { }; #d#?
232 278
233@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 279@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
234@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 280@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
235@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 281@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
236@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 282@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
243for my $pkg (qw( 289for my $pkg (qw(
244 cf::global cf::attachable 290 cf::global cf::attachable
245 cf::object cf::object::player 291 cf::object cf::object::player
246 cf::client cf::player 292 cf::client cf::player
247 cf::arch cf::living 293 cf::arch cf::living
294 cf::map cf::mapspace
248 cf::map cf::party cf::region 295 cf::party cf::region
249)) { 296)) {
250 no strict 'refs';
251 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 297 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
252} 298}
253 299
254$EV::DIED = sub { 300$EV::DIED = sub {
255 warn "error in event callback: @_"; 301 Carp::cluck "error in event callback: @_";
256}; 302};
257 303
258############################################################################# 304#############################################################################
259 305
260=head2 UTILITY FUNCTIONS 306=head2 UTILITY FUNCTIONS
297our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 343our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
298 344
299sub encode_json($) { $json_coder->encode ($_[0]) } 345sub encode_json($) { $json_coder->encode ($_[0]) }
300sub decode_json($) { $json_coder->decode ($_[0]) } 346sub decode_json($) { $json_coder->decode ($_[0]) }
301 347
348=item cf::post_init { BLOCK }
349
350Execute the given codeblock, I<after> all extensions have been (re-)loaded,
351but I<before> the server starts ticking again.
352
353The cdoeblock will have a single boolean argument to indicate whether this
354is a reload or not.
355
356=cut
357
358sub post_init(&) {
359 push @POST_INIT, shift;
360}
361
302=item cf::lock_wait $string 362=item cf::lock_wait $string
303 363
304Wait until the given lock is available. See cf::lock_acquire. 364Wait until the given lock is available. See cf::lock_acquire.
305 365
306=item my $lock = cf::lock_acquire $string 366=item my $lock = cf::lock_acquire $string
307 367
308Wait until the given lock is available and then acquires it and returns 368Wait until the given lock is available and then acquires it and returns
309a Coro::guard object. If the guard object gets destroyed (goes out of scope, 369a L<Guard> object. If the guard object gets destroyed (goes out of scope,
310for example when the coroutine gets canceled), the lock is automatically 370for example when the coroutine gets canceled), the lock is automatically
311returned. 371returned.
312 372
313Locks are *not* recursive, locking from the same coro twice results in a 373Locks are *not* recursive, locking from the same coro twice results in a
314deadlocked coro. 374deadlocked coro.
320 380
321Return true if the lock is currently active, i.e. somebody has locked it. 381Return true if the lock is currently active, i.e. somebody has locked it.
322 382
323=cut 383=cut
324 384
325our %LOCK; 385our $LOCKS = new Coro::SemaphoreSet;
326our %LOCKER;#d#
327 386
328sub lock_wait($) { 387sub lock_wait($) {
329 my ($key) = @_; 388 $LOCKS->wait ($_[0]);
330
331 if ($LOCKER{$key} == $Coro::current) {#d#
332 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
333 return;#d#
334 }#d#
335
336 # wait for lock, if any
337 while ($LOCK{$key}) {
338 push @{ $LOCK{$key} }, $Coro::current;
339 Coro::schedule;
340 }
341} 389}
342 390
343sub lock_acquire($) { 391sub lock_acquire($) {
344 my ($key) = @_; 392 $LOCKS->guard ($_[0])
345
346 # wait, to be sure we are not locked
347 lock_wait $key;
348
349 $LOCK{$key} = [];
350 $LOCKER{$key} = $Coro::current;#d#
351
352 Coro::guard {
353 delete $LOCKER{$key};#d#
354 # wake up all waiters, to be on the safe side
355 $_->ready for @{ delete $LOCK{$key} };
356 }
357} 393}
358 394
359sub lock_active($) { 395sub lock_active($) {
360 my ($key) = @_; 396 $LOCKS->count ($_[0]) < 1
361
362 ! ! $LOCK{$key}
363} 397}
364 398
365sub freeze_mainloop { 399sub freeze_mainloop {
366 tick_inhibit_inc; 400 tick_inhibit_inc;
367 401
368 Coro::guard \&tick_inhibit_dec; 402 &Guard::guard (\&tick_inhibit_dec);
369} 403}
370 404
371=item cf::periodic $interval, $cb 405=item cf::periodic $interval, $cb
372 406
373Like EV::periodic, but randomly selects a starting point so that the actions 407Like EV::periodic, but randomly selects a starting point so that the actions
374get spread over timer. 408get spread over time.
375 409
376=cut 410=cut
377 411
378sub periodic($$) { 412sub periodic($$) {
379 my ($interval, $cb) = @_; 413 my ($interval, $cb) = @_;
396 430
397=cut 431=cut
398 432
399our @SLOT_QUEUE; 433our @SLOT_QUEUE;
400our $SLOT_QUEUE; 434our $SLOT_QUEUE;
435our $SLOT_DECAY = 0.9;
401 436
402$SLOT_QUEUE->cancel if $SLOT_QUEUE; 437$SLOT_QUEUE->cancel if $SLOT_QUEUE;
403$SLOT_QUEUE = Coro::async { 438$SLOT_QUEUE = Coro::async {
404 $Coro::current->desc ("timeslot manager"); 439 $Coro::current->desc ("timeslot manager");
405 440
406 my $signal = new Coro::Signal; 441 my $signal = new Coro::Signal;
442 my $busy;
407 443
408 while () { 444 while () {
409 next_job: 445 next_job:
446
410 my $avail = cf::till_tick; 447 my $avail = cf::till_tick;
411 if ($avail > 0.01) { 448
412 for (0 .. $#SLOT_QUEUE) { 449 for (0 .. $#SLOT_QUEUE) {
413 if ($SLOT_QUEUE[$_][0] < $avail) { 450 if ($SLOT_QUEUE[$_][0] <= $avail) {
451 $busy = 0;
414 my $job = splice @SLOT_QUEUE, $_, 1, (); 452 my $job = splice @SLOT_QUEUE, $_, 1, ();
415 $job->[2]->send; 453 $job->[2]->send;
416 Coro::cede; 454 Coro::cede;
417 goto next_job; 455 goto next_job;
418 } 456 } else {
457 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
419 } 458 }
420 } 459 }
421 460
422 if (@SLOT_QUEUE) { 461 if (@SLOT_QUEUE) {
423 # we do not use wait_for_tick() as it returns immediately when tick is inactive 462 # we do not use wait_for_tick() as it returns immediately when tick is inactive
424 push @cf::WAIT_FOR_TICK, $signal; 463 push @cf::WAIT_FOR_TICK, $signal;
425 $signal->wait; 464 $signal->wait;
426 } else { 465 } else {
466 $busy = 0;
427 Coro::schedule; 467 Coro::schedule;
428 } 468 }
429 } 469 }
430}; 470};
431 471
432sub get_slot($;$$) { 472sub get_slot($;$$) {
433 return if tick_inhibit || $Coro::current == $Coro::main; 473 return if tick_inhibit || $Coro::current == $Coro::main;
434 474
435 my ($time, $pri, $name) = @_; 475 my ($time, $pri, $name) = @_;
436 476
437 $time = $TICK * .6 if $time > $TICK * .6; 477 $time = clamp $time, 0.01, $TICK * .6;
478
438 my $sig = new Coro::Signal; 479 my $sig = new Coro::Signal;
439 480
440 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 481 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
441 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 482 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
442 $SLOT_QUEUE->ready; 483 $SLOT_QUEUE->ready;
469 510
470sub sync_job(&) { 511sub sync_job(&) {
471 my ($job) = @_; 512 my ($job) = @_;
472 513
473 if ($Coro::current == $Coro::main) { 514 if ($Coro::current == $Coro::main) {
474 my $time = EV::time; 515 my $time = AE::time;
475 516
476 # this is the main coro, too bad, we have to block 517 # this is the main coro, too bad, we have to block
477 # till the operation succeeds, freezing the server :/ 518 # till the operation succeeds, freezing the server :/
478 519
479 LOG llevError, Carp::longmess "sync job";#d# 520 LOG llevError, Carp::longmess "sync job";#d#
496 } else { 537 } else {
497 EV::loop EV::LOOP_ONESHOT; 538 EV::loop EV::LOOP_ONESHOT;
498 } 539 }
499 } 540 }
500 541
501 my $time = EV::time - $time; 542 my $time = AE::time - $time;
502 543
503 $TICK_START += $time; # do not account sync jobs to server load 544 $TICK_START += $time; # do not account sync jobs to server load
504 545
505 wantarray ? @res : $res[0] 546 wantarray ? @res : $res[0]
506 } else { 547 } else {
550 reset_signals; 591 reset_signals;
551 &$cb 592 &$cb
552 }, @args; 593 }, @args;
553 594
554 wantarray ? @res : $res[-1] 595 wantarray ? @res : $res[-1]
596}
597
598sub objinfo {
599 (
600 "counter value" => cf::object::object_count,
601 "objects created" => cf::object::create_count,
602 "objects destroyed" => cf::object::destroy_count,
603 "freelist size" => cf::object::free_count,
604 "allocated objects" => cf::object::objects_size,
605 "active objects" => cf::object::actives_size,
606 )
555} 607}
556 608
557=item $coin = coin_from_name $name 609=item $coin = coin_from_name $name
558 610
559=cut 611=cut
725 777
726############################################################################# 778#############################################################################
727 779
728=head2 ATTACHABLE OBJECTS 780=head2 ATTACHABLE OBJECTS
729 781
730Many objects in crossfire are so-called attachable objects. That means you can 782Many objects in deliantra are so-called attachable objects. That means you can
731attach callbacks/event handlers (a collection of which is called an "attachment") 783attach callbacks/event handlers (a collection of which is called an "attachment")
732to it. All such attachable objects support the following methods. 784to it. All such attachable objects support the following methods.
733 785
734In the following description, CLASS can be any of C<global>, C<object> 786In the following description, CLASS can be any of C<global>, C<object>
735C<player>, C<client> or C<map> (i.e. the attachable objects in 787C<player>, C<client> or C<map> (i.e. the attachable objects in
785=item cf::CLASS::attachment $name, ... 837=item cf::CLASS::attachment $name, ...
786 838
787Register an attachment by C<$name> through which attachable objects of the 839Register an attachment by C<$name> through which attachable objects of the
788given CLASS can refer to this attachment. 840given CLASS can refer to this attachment.
789 841
790Some classes such as crossfire maps and objects can specify attachments 842Some classes such as deliantra maps and objects can specify attachments
791that are attached at load/instantiate time, thus the need for a name. 843that are attached at load/instantiate time, thus the need for a name.
792 844
793These calls expect any number of the following handler/hook descriptions: 845These calls expect any number of the following handler/hook descriptions:
794 846
795=over 4 847=over 4
1086 1138
1087sub reattach { 1139sub reattach {
1088 # basically do the same as instantiate, without calling instantiate 1140 # basically do the same as instantiate, without calling instantiate
1089 my ($obj) = @_; 1141 my ($obj) = @_;
1090 1142
1143 # no longer needed after getting rid of delete_package?
1091 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1144 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1092 1145
1093 my $registry = $obj->registry; 1146 my $registry = $obj->registry;
1094 1147
1095 @$registry = (); 1148 @$registry = ();
1096 1149
1144 $decname, length $$rdata, scalar @$objs; 1197 $decname, length $$rdata, scalar @$objs;
1145 1198
1146 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1199 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1147 aio_chmod $fh, SAVE_MODE; 1200 aio_chmod $fh, SAVE_MODE;
1148 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1201 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1149 aio_fsync $fh if $cf::USE_FSYNC; 1202 if ($cf::USE_FSYNC) {
1203 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;
1204 aio_fsync $fh;
1205 }
1150 aio_close $fh; 1206 aio_close $fh;
1151 1207
1152 if (@$objs) { 1208 if (@$objs) {
1153 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1209 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1154 aio_chmod $fh, SAVE_MODE; 1210 aio_chmod $fh, SAVE_MODE;
1155 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1211 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1156 aio_write $fh, 0, (length $data), $data, 0; 1212 aio_write $fh, 0, (length $data), $data, 0;
1157 aio_fsync $fh if $cf::USE_FSYNC; 1213 if ($cf::USE_FSYNC) {
1214 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;
1215 aio_fsync $fh;
1216 }
1158 aio_close $fh; 1217 aio_close $fh;
1159 aio_rename "$filename.pst~", "$filename.pst"; 1218 aio_rename "$filename.pst~", "$filename.pst";
1160 } 1219 }
1161 } else { 1220 } else {
1162 aio_unlink "$filename.pst"; 1221 aio_unlink "$filename.pst";
1163 } 1222 }
1164 1223
1165 aio_rename "$filename~", $filename; 1224 aio_rename "$filename~", $filename;
1225
1226 $filename =~ s%/[^/]+$%%;
1227 aio_pathsync $filename if $cf::USE_FSYNC;
1166 } else { 1228 } else {
1167 warn "FATAL: $filename~: $!\n"; 1229 warn "unable to save objects: $filename~: $!\n";
1168 } 1230 }
1169 } else { 1231 } else {
1170 aio_unlink $filename; 1232 aio_unlink $filename;
1171 aio_unlink "$filename.pst"; 1233 aio_unlink "$filename.pst";
1172 } 1234 }
1263 my ($name, $cb) = @_; 1325 my ($name, $cb) = @_;
1264 1326
1265 $EXTICMD{$name} = $cb; 1327 $EXTICMD{$name} = $cb;
1266} 1328}
1267 1329
1330use File::Glob ();
1331
1268cf::player->attach ( 1332cf::player->attach (
1269 on_command => sub { 1333 on_unknown_command => sub {
1270 my ($pl, $name, $params) = @_; 1334 my ($pl, $name, $params) = @_;
1271 1335
1272 my $cb = $COMMAND{$name} 1336 my $cb = $COMMAND{$name}
1273 or return; 1337 or return;
1274 1338
1304 1368
1305 cf::override; 1369 cf::override;
1306 }, 1370 },
1307); 1371);
1308 1372
1373# "readahead" all extensions
1374sub cache_extensions {
1375 my $grp = IO::AIO::aio_group;
1376
1377 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1378 for (grep /\.ext$/, @{$_[0]}) {
1379 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1380 }
1381 };
1382
1383 $grp
1384}
1385
1309sub load_extensions { 1386sub load_extensions {
1310 cf::sync_job { 1387 cf::sync_job {
1311 my %todo; 1388 my %todo;
1312 1389
1313 for my $path (<$LIBDIR/*.ext>) { 1390 for my $path (<$LIBDIR/*.ext>) {
1332 1409
1333 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1410 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1334 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1411 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1335 1412
1336 $ext{source} = 1413 $ext{source} =
1337 "package $pkg; use strict; use utf8;\n" 1414 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1338 . "#line 1 \"$path\"\n{\n" 1415 . "#line 1 \"$path\"\n{\n"
1339 . $source 1416 . $source
1340 . "\n};\n1"; 1417 . "\n};\n1";
1341 1418
1342 $todo{$base} = \%ext; 1419 $todo{$base} = \%ext;
1343 } 1420 }
1344 1421
1422 my $pass = 0;
1345 my %done; 1423 my %done;
1346 while (%todo) { 1424 while (%todo) {
1347 my $progress; 1425 my $progress;
1348 1426
1427 ++$pass;
1428
1429 ext:
1349 while (my ($k, $v) = each %todo) { 1430 while (my ($k, $v) = each %todo) {
1350 for (split /,\s*/, $v->{meta}{depends}) { 1431 for (split /,\s*/, $v->{meta}{depends}) {
1351 goto skip 1432 next ext
1352 unless exists $done{$_}; 1433 unless exists $done{$_};
1353 } 1434 }
1354 1435
1355 warn "... loading '$k' into '$v->{pkg}'\n"; 1436 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1356 1437
1357 unless (eval $v->{source}) { 1438 my $active = eval $v->{source};
1439
1440 if (length $@) {
1358 my $msg = $@ ? "$v->{path}: $@\n" 1441 warn "$v->{path}: $@\n";
1359 : "$v->{base}: extension inactive.\n";
1360 1442
1361 if (exists $v->{meta}{mandatory}) {
1362 warn $msg;
1363 cf::cleanup "mandatory extension failed to load, exiting."; 1443 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1364 } 1444 if exists $v->{meta}{mandatory};
1365 1445
1366 warn $msg; 1446 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1447 delete $todo{$k};
1448 } else {
1449 $done{$k} = delete $todo{$k};
1450 push @EXTS, $v->{pkg};
1451 $progress = 1;
1452
1453 warn "$v->{base}: extension inactive.\n"
1454 unless $active;
1367 } 1455 }
1368
1369 $done{$k} = delete $todo{$k};
1370 push @EXTS, $v->{pkg};
1371 $progress = 1;
1372 } 1456 }
1373 1457
1374 skip: 1458 unless ($progress) {
1375 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1459 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1376 unless $progress; 1460
1461 while (my ($k, $v) = each %todo) {
1462 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1463 if exists $v->{meta}{mandatory};
1464 }
1465 }
1377 } 1466 }
1378 }; 1467 };
1379} 1468}
1380 1469
1381############################################################################# 1470#############################################################################
1382 1471
1383=back 1472=back
1384 1473
1385=head2 CORE EXTENSIONS 1474=head2 CORE EXTENSIONS
1386 1475
1387Functions and methods that extend core crossfire objects. 1476Functions and methods that extend core deliantra objects.
1388 1477
1389=cut 1478=cut
1390 1479
1391package cf::player; 1480package cf::player;
1392 1481
1435 1524
1436sub exists($) { 1525sub exists($) {
1437 my ($login) = @_; 1526 my ($login) = @_;
1438 1527
1439 $cf::PLAYER{$login} 1528 $cf::PLAYER{$login}
1440 or cf::sync_job { !aio_stat path $login } 1529 or !aio_stat path $login
1441} 1530}
1442 1531
1443sub find($) { 1532sub find($) {
1444 return $cf::PLAYER{$_[0]} || do { 1533 return $cf::PLAYER{$_[0]} || do {
1445 my $login = $_[0]; 1534 my $login = $_[0];
1465 $cf::PLAYER{$login} = $pl 1554 $cf::PLAYER{$login} = $pl
1466 } 1555 }
1467 } 1556 }
1468} 1557}
1469 1558
1559cf::player->attach (
1560 on_load => sub {
1561 my ($pl, $path) = @_;
1562
1563 # restore slots saved in save, below
1564 my $slots = delete $pl->{_slots};
1565
1566 $pl->ob->current_weapon ($slots->[0]);
1567 $pl->combat_ob ($slots->[1]);
1568 $pl->ranged_ob ($slots->[2]);
1569 },
1570);
1571
1470sub save($) { 1572sub save($) {
1471 my ($pl) = @_; 1573 my ($pl) = @_;
1472 1574
1473 return if $pl->{deny_save}; 1575 return if $pl->{deny_save};
1474 1576
1479 1581
1480 aio_mkdir playerdir $pl, 0770; 1582 aio_mkdir playerdir $pl, 0770;
1481 $pl->{last_save} = $cf::RUNTIME; 1583 $pl->{last_save} = $cf::RUNTIME;
1482 1584
1483 cf::get_slot 0.01; 1585 cf::get_slot 0.01;
1586
1587 # save slots, to be restored later
1588 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1484 1589
1485 $pl->save_pl ($path); 1590 $pl->save_pl ($path);
1486 cf::cede_to_tick; 1591 cf::cede_to_tick;
1487} 1592}
1488 1593
1520 my ($pl) = @_; 1625 my ($pl) = @_;
1521 1626
1522 my $name = $pl->ob->name; 1627 my $name = $pl->ob->name;
1523 1628
1524 $pl->{deny_save} = 1; 1629 $pl->{deny_save} = 1;
1525 $pl->password ("*"); # this should lock out the player until we nuked the dir 1630 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1526 1631
1527 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1632 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1528 $pl->deactivate; 1633 $pl->deactivate;
1529 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1634 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1530 $pl->ob->check_score; 1635 $pl->ob->check_score;
1616 } 1721 }
1617 1722
1618 \@paths 1723 \@paths
1619} 1724}
1620 1725
1621=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1726=item $protocol_xml = $player->expand_cfpod ($cfpod)
1622 1727
1623Expand crossfire pod fragments into protocol xml. 1728Expand deliantra pod fragments into protocol xml.
1624
1625=cut
1626
1627use re 'eval';
1628
1629my $group;
1630my $interior; $interior = qr{
1631 # match a pod interior sequence sans C<< >>
1632 (?:
1633 \ (.*?)\ (?{ $group = $^N })
1634 | < (??{$interior}) >
1635 )
1636}x;
1637
1638sub expand_cfpod {
1639 my ($self, $pod) = @_;
1640
1641 my $xml;
1642
1643 while () {
1644 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1645 $group = $1;
1646
1647 $group =~ s/&/&amp;/g;
1648 $group =~ s/</&lt;/g;
1649
1650 $xml .= $group;
1651 } elsif ($pod =~ m%\G
1652 ([BCGHITU])
1653 <
1654 (?:
1655 ([^<>]*) (?{ $group = $^N })
1656 | < $interior >
1657 )
1658 >
1659 %gcsx
1660 ) {
1661 my ($code, $data) = ($1, $group);
1662
1663 if ($code eq "B") {
1664 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1665 } elsif ($code eq "I") {
1666 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1667 } elsif ($code eq "U") {
1668 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1669 } elsif ($code eq "C") {
1670 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1671 } elsif ($code eq "T") {
1672 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1673 } elsif ($code eq "G") {
1674 my ($male, $female) = split /\|/, $data;
1675 $data = $self->gender ? $female : $male;
1676 $xml .= expand_cfpod ($self, $data);
1677 } elsif ($code eq "H") {
1678 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1679 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1680 "")
1681 [$self->{hintmode}];
1682 } else {
1683 $xml .= "error processing '$code($data)' directive";
1684 }
1685 } else {
1686 if ($pod =~ /\G(.+)/) {
1687 warn "parse error while expanding $pod (at $1)";
1688 }
1689 last;
1690 }
1691 }
1692
1693 for ($xml) {
1694 # create single paragraphs (very hackish)
1695 s/(?<=\S)\n(?=\w)/ /g;
1696
1697 # compress some whitespace
1698 s/\s+\n/\n/g; # ws line-ends
1699 s/\n\n+/\n/g; # double lines
1700 s/^\n+//; # beginning lines
1701 s/\n+$//; # ending lines
1702 }
1703
1704 $xml
1705}
1706
1707no re 'eval';
1708
1709sub hintmode {
1710 $_[0]{hintmode} = $_[1] if @_ > 1;
1711 $_[0]{hintmode}
1712}
1713 1729
1714=item $player->ext_reply ($msgid, @msg) 1730=item $player->ext_reply ($msgid, @msg)
1715 1731
1716Sends an ext reply to the player. 1732Sends an ext reply to the player.
1717 1733
1790 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1806 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1791 1807
1792 # mit "rum" bekleckern, nicht 1808 # mit "rum" bekleckern, nicht
1793 $self->_create_random_map ( 1809 $self->_create_random_map (
1794 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1810 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1795 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1811 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1796 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1812 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1797 $rmp->{exit_on_final_map}, 1813 $rmp->{exit_on_final_map},
1798 $rmp->{xsize}, $rmp->{ysize}, 1814 $rmp->{xsize}, $rmp->{ysize},
1799 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1815 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1800 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1816 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1930 1946
1931 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1947 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1932 "$UNIQUEDIR/$path" 1948 "$UNIQUEDIR/$path"
1933} 1949}
1934 1950
1935# and all this just because we cannot iterate over
1936# all maps in C++...
1937sub change_all_map_light {
1938 my ($change) = @_;
1939
1940 $_->change_map_light ($change)
1941 for grep $_->outdoor, values %cf::MAP;
1942}
1943
1944sub decay_objects { 1951sub decay_objects {
1945 my ($self) = @_; 1952 my ($self) = @_;
1946 1953
1947 return if $self->{deny_reset}; 1954 return if $self->{deny_reset};
1948 1955
2030sub find { 2037sub find {
2031 my ($path, $origin) = @_; 2038 my ($path, $origin) = @_;
2032 2039
2033 $path = normalise $path, $origin && $origin->path; 2040 $path = normalise $path, $origin && $origin->path;
2034 2041
2035 cf::lock_wait "map_data:$path";#d#remove 2042 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2036 cf::lock_wait "map_find:$path"; 2043 my $guard2 = cf::lock_acquire "map_find:$path";
2037 2044
2038 $cf::MAP{$path} || do { 2045 $cf::MAP{$path} || do {
2039 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2040 my $guard2 = cf::lock_acquire "map_find:$path";
2041
2042 my $map = new_from_path cf::map $path 2046 my $map = new_from_path cf::map $path
2043 or return; 2047 or return;
2044 2048
2045 $map->{last_save} = $cf::RUNTIME; 2049 $map->{last_save} = $cf::RUNTIME;
2046 2050
2058 2062
2059 $cf::MAP{$path} = $map 2063 $cf::MAP{$path} = $map
2060 } 2064 }
2061} 2065}
2062 2066
2063sub pre_load { } 2067sub pre_load { }
2064sub post_load { } 2068#sub post_load { } # XS
2065 2069
2066sub load { 2070sub load {
2067 my ($self) = @_; 2071 my ($self) = @_;
2068 2072
2069 local $self->{deny_reset} = 1; # loading can take a long time 2073 local $self->{deny_reset} = 1; # loading can take a long time
2086 my $f = new_from_file cf::object::thawer $self->{load_path}; 2090 my $f = new_from_file cf::object::thawer $self->{load_path};
2087 $f->skip_block; 2091 $f->skip_block;
2088 $self->_load_objects ($f) 2092 $self->_load_objects ($f)
2089 or return; 2093 or return;
2090 2094
2091 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2095 $self->post_load_original
2092 if delete $self->{load_original}; 2096 if delete $self->{load_original};
2093 2097
2094 if (my $uniq = $self->uniq_path) { 2098 if (my $uniq = $self->uniq_path) {
2095 utf8::encode $uniq; 2099 utf8::encode $uniq;
2096 unless (aio_stat $uniq) { 2100 unless (aio_stat $uniq) {
2114 unless ($self->{deny_activate}) { 2118 unless ($self->{deny_activate}) {
2115 $self->decay_objects; 2119 $self->decay_objects;
2116 $self->fix_auto_apply; 2120 $self->fix_auto_apply;
2117 $self->update_buttons; 2121 $self->update_buttons;
2118 cf::cede_to_tick; 2122 cf::cede_to_tick;
2119 $self->set_darkness_map;
2120 cf::cede_to_tick;
2121 $self->activate; 2123 $self->activate;
2122 } 2124 }
2123 2125
2124 $self->{last_save} = $cf::RUNTIME; 2126 $self->{last_save} = $cf::RUNTIME;
2125 $self->last_access ($cf::RUNTIME); 2127 $self->last_access ($cf::RUNTIME);
2128 } 2130 }
2129 2131
2130 $self->post_load; 2132 $self->post_load;
2131} 2133}
2132 2134
2135# customize the map for a given player, i.e.
2136# return the _real_ map. used by e.g. per-player
2137# maps to change the path to ~playername/mappath
2133sub customise_for { 2138sub customise_for {
2134 my ($self, $ob) = @_; 2139 my ($self, $ob) = @_;
2135 2140
2136 return find "~" . $ob->name . "/" . $self->{path} 2141 return find "~" . $ob->name . "/" . $self->{path}
2137 if $self->per_player; 2142 if $self->per_player;
2214 $MAP_PREFETCHER->prio (6); 2219 $MAP_PREFETCHER->prio (6);
2215 2220
2216 () 2221 ()
2217} 2222}
2218 2223
2224# common code, used by both ->save and ->swapout
2219sub save { 2225sub _save {
2220 my ($self) = @_; 2226 my ($self) = @_;
2221
2222 my $lock = cf::lock_acquire "map_data:$self->{path}";
2223 2227
2224 $self->{last_save} = $cf::RUNTIME; 2228 $self->{last_save} = $cf::RUNTIME;
2225 2229
2226 return unless $self->dirty; 2230 return unless $self->dirty;
2227 2231
2247 } else { 2251 } else {
2248 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2252 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2249 } 2253 }
2250} 2254}
2251 2255
2256sub save {
2257 my ($self) = @_;
2258
2259 my $lock = cf::lock_acquire "map_data:$self->{path}";
2260
2261 $self->_save;
2262}
2263
2252sub swap_out { 2264sub swap_out {
2253 my ($self) = @_; 2265 my ($self) = @_;
2254 2266
2255 # save first because save cedes
2256 $self->save;
2257
2258 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2267 my $lock = cf::lock_acquire "map_data:$self->{path}";
2259 2268
2260 return if $self->players;
2261 return if $self->in_memory != cf::MAP_ACTIVE; 2269 return if $self->in_memory != cf::MAP_ACTIVE;
2262 return if $self->{deny_save}; 2270 return if $self->{deny_save};
2271 return if $self->players;
2263 2272
2264 $self->in_memory (cf::MAP_SWAPPED); 2273 # first deactivate the map and "unlink" it from the core
2265
2266 $self->deactivate; 2274 $self->deactivate;
2267 $_->clear_links_to ($self) for values %cf::MAP; 2275 $_->clear_links_to ($self) for values %cf::MAP;
2276 $self->in_memory (cf::MAP_SWAPPED);
2277
2278 # then atomically save
2279 $self->_save;
2280
2281 # then free the map
2268 $self->clear; 2282 $self->clear;
2269} 2283}
2270 2284
2271sub reset_at { 2285sub reset_at {
2272 my ($self) = @_; 2286 my ($self) = @_;
2291 2305
2292 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2306 my $lock = cf::lock_acquire "map_data:$self->{path}";
2293 2307
2294 return if $self->players; 2308 return if $self->players;
2295 2309
2296 warn "resetting map ", $self->path; 2310 warn "resetting map ", $self->path, "\n";
2297 2311
2298 $self->in_memory (cf::MAP_SWAPPED); 2312 $self->in_memory (cf::MAP_SWAPPED);
2299 2313
2300 # need to save uniques path 2314 # need to save uniques path
2301 unless ($self->{deny_save}) { 2315 unless ($self->{deny_save}) {
2392 : normalise $_ 2406 : normalise $_
2393 } @{ aio_readdir $UNIQUEDIR or [] } 2407 } @{ aio_readdir $UNIQUEDIR or [] }
2394 ] 2408 ]
2395} 2409}
2396 2410
2411=item cf::map::static_maps
2412
2413Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2414file in the shared directory excluding F</styles> and F</editor>). May
2415block.
2416
2417=cut
2418
2419sub static_maps() {
2420 my @dirs = "";
2421 my @maps;
2422
2423 while (@dirs) {
2424 my $dir = shift @dirs;
2425
2426 next if $dir eq "/styles" || $dir eq "/editor";
2427
2428 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2429 or return;
2430
2431 for (@$files) {
2432 s/\.map$// or next;
2433 utf8::decode $_;
2434 push @maps, "$dir/$_";
2435 }
2436
2437 push @dirs, map "$dir/$_", @$dirs;
2438 }
2439
2440 \@maps
2441}
2442
2397=back 2443=back
2398 2444
2399=head3 cf::object 2445=head3 cf::object
2400 2446
2401=cut 2447=cut
2466 2512
2467our $SAY_CHANNEL = { 2513our $SAY_CHANNEL = {
2468 id => "say", 2514 id => "say",
2469 title => "Map", 2515 title => "Map",
2470 reply => "say ", 2516 reply => "say ",
2471 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2517 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2472}; 2518};
2473 2519
2474our $CHAT_CHANNEL = { 2520our $CHAT_CHANNEL = {
2475 id => "chat", 2521 id => "chat",
2476 title => "Chat", 2522 title => "Chat",
2531 2577
2532=item $player_object->enter_link 2578=item $player_object->enter_link
2533 2579
2534Freezes the player and moves him/her to a special map (C<{link}>). 2580Freezes the player and moves him/her to a special map (C<{link}>).
2535 2581
2536The player should be reasonably safe there for short amounts of time. You 2582The player should be reasonably safe there for short amounts of time (e.g.
2537I<MUST> call C<leave_link> as soon as possible, though. 2583for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2584though, as the palyer cannot control the character while it is on the link
2585map.
2538 2586
2539Will never block. 2587Will never block.
2540 2588
2541=item $player_object->leave_link ($map, $x, $y) 2589=item $player_object->leave_link ($map, $x, $y)
2542 2590
2567 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2615 return if UNIVERSAL::isa $self->map, "ext::map_link";
2568 2616
2569 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2617 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2570 if $self->map && $self->map->{path} ne "{link}"; 2618 if $self->map && $self->map->{path} ne "{link}";
2571 2619
2572 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2620 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2573} 2621}
2574 2622
2575sub cf::object::player::leave_link { 2623sub cf::object::player::leave_link {
2576 my ($self, $map, $x, $y) = @_; 2624 my ($self, $map, $x, $y) = @_;
2577 2625
2594 ($x, $y) = (-1, -1) 2642 ($x, $y) = (-1, -1)
2595 unless (defined $x) && (defined $y); 2643 unless (defined $x) && (defined $y);
2596 2644
2597 # use -1 or undef as default coordinates, not 0, 0 2645 # use -1 or undef as default coordinates, not 0, 0
2598 ($x, $y) = ($map->enter_x, $map->enter_y) 2646 ($x, $y) = ($map->enter_x, $map->enter_y)
2599 if $x <=0 && $y <= 0; 2647 if $x <= 0 && $y <= 0;
2600 2648
2601 $map->load; 2649 $map->load;
2602 $map->load_neighbours; 2650 $map->load_neighbours;
2603 2651
2604 return unless $self->contr->active; 2652 return unless $self->contr->active;
2605 $self->activate_recursive;
2606 2653
2607 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2654 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2608 $self->enter_map ($map, $x, $y); 2655 $self->enter_map ($map, $x, $y);
2656
2657 # only activate afterwards, to support waiting in hooks
2658 $self->activate_recursive;
2609} 2659}
2610 2660
2611=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2661=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2612 2662
2613Moves the player to the given map-path and coordinates by first freezing 2663Moves the player to the given map-path and coordinates by first freezing
2772 $self->contr->savebed ($map, $x, $y) 2822 $self->contr->savebed ($map, $x, $y)
2773 if $exit->flag (cf::FLAG_DAMNED); 2823 if $exit->flag (cf::FLAG_DAMNED);
2774 2824
2775 1 2825 1
2776 }) { 2826 }) {
2777 $self->message ("Something went wrong deep within the crossfire server. " 2827 $self->message ("Something went wrong deep within the deliantra server. "
2778 . "I'll try to bring you back to the map you were before. " 2828 . "I'll try to bring you back to the map you were before. "
2779 . "Please report this to the dungeon master!", 2829 . "Please report this to the dungeon master!",
2780 cf::NDI_UNIQUE | cf::NDI_RED); 2830 cf::NDI_UNIQUE | cf::NDI_RED);
2781 2831
2782 warn "ERROR in enter_exit: $@"; 2832 warn "ERROR in enter_exit: $@";
2799sub cf::client::send_drawinfo { 2849sub cf::client::send_drawinfo {
2800 my ($self, $text, $flags) = @_; 2850 my ($self, $text, $flags) = @_;
2801 2851
2802 utf8::encode $text; 2852 utf8::encode $text;
2803 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2853 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2854}
2855
2856=item $client->send_big_packet ($pkt)
2857
2858Like C<send_packet>, but tries to compress large packets, and fragments
2859them as required.
2860
2861=cut
2862
2863our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2864
2865sub cf::client::send_big_packet {
2866 my ($self, $pkt) = @_;
2867
2868 # try lzf for large packets
2869 $pkt = "lzf " . Compress::LZF::compress $pkt
2870 if 1024 <= length $pkt and $self->{can_lzf};
2871
2872 # split very large packets
2873 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2874 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2875 $pkt = "frag";
2876 }
2877
2878 $self->send_packet ($pkt);
2804} 2879}
2805 2880
2806=item $client->send_msg ($channel, $msg, $color, [extra...]) 2881=item $client->send_msg ($channel, $msg, $color, [extra...])
2807 2882
2808Send a drawinfo or msg packet to the client, formatting the msg for the 2883Send a drawinfo or msg packet to the client, formatting the msg for the
2812 2887
2813=cut 2888=cut
2814 2889
2815# non-persistent channels (usually the info channel) 2890# non-persistent channels (usually the info channel)
2816our %CHANNEL = ( 2891our %CHANNEL = (
2892 "c/motd" => {
2893 id => "infobox",
2894 title => "MOTD",
2895 reply => undef,
2896 tooltip => "The message of the day",
2897 },
2817 "c/identify" => { 2898 "c/identify" => {
2818 id => "infobox", 2899 id => "infobox",
2819 title => "Identify", 2900 title => "Identify",
2820 reply => undef, 2901 reply => undef,
2821 tooltip => "Items recently identified", 2902 tooltip => "Items recently identified",
2823 "c/examine" => { 2904 "c/examine" => {
2824 id => "infobox", 2905 id => "infobox",
2825 title => "Examine", 2906 title => "Examine",
2826 reply => undef, 2907 reply => undef,
2827 tooltip => "Signs and other items you examined", 2908 tooltip => "Signs and other items you examined",
2909 },
2910 "c/shopinfo" => {
2911 id => "infobox",
2912 title => "Shop Info",
2913 reply => undef,
2914 tooltip => "What your bargaining skill tells you about the shop",
2828 }, 2915 },
2829 "c/book" => { 2916 "c/book" => {
2830 id => "infobox", 2917 id => "infobox",
2831 title => "Book", 2918 title => "Book",
2832 reply => undef, 2919 reply => undef,
2848 id => "infobox", 2935 id => "infobox",
2849 title => "Body Parts", 2936 title => "Body Parts",
2850 reply => undef, 2937 reply => undef,
2851 tooltip => "Shows which body parts you posess and are available", 2938 tooltip => "Shows which body parts you posess and are available",
2852 }, 2939 },
2940 "c/statistics" => {
2941 id => "infobox",
2942 title => "Statistics",
2943 reply => undef,
2944 tooltip => "Shows your primary statistics",
2945 },
2946 "c/skills" => {
2947 id => "infobox",
2948 title => "Skills",
2949 reply => undef,
2950 tooltip => "Shows your experience per skill and item power",
2951 },
2952 "c/shopitems" => {
2953 id => "infobox",
2954 title => "Shop Items",
2955 reply => undef,
2956 tooltip => "Shows the items currently for sale in this shop",
2957 },
2958 "c/resistances" => {
2959 id => "infobox",
2960 title => "Resistances",
2961 reply => undef,
2962 tooltip => "Shows your resistances",
2963 },
2964 "c/pets" => {
2965 id => "infobox",
2966 title => "Pets",
2967 reply => undef,
2968 tooltip => "Shows information abotu your pets/a specific pet",
2969 },
2970 "c/perceiveself" => {
2971 id => "infobox",
2972 title => "Perceive Self",
2973 reply => undef,
2974 tooltip => "You gained detailed knowledge about yourself",
2975 },
2853 "c/uptime" => { 2976 "c/uptime" => {
2854 id => "infobox", 2977 id => "infobox",
2855 title => "Uptime", 2978 title => "Uptime",
2856 reply => undef, 2979 reply => undef,
2857 tooltip => "How long the server has been running since last restart", 2980 tooltip => "How long the server has been running since last restart",
2866 id => "party", 2989 id => "party",
2867 title => "Party", 2990 title => "Party",
2868 reply => "gsay ", 2991 reply => "gsay ",
2869 tooltip => "Messages and chat related to your party", 2992 tooltip => "Messages and chat related to your party",
2870 }, 2993 },
2994 "c/death" => {
2995 id => "death",
2996 title => "Death",
2997 reply => undef,
2998 tooltip => "Reason for and more info about your most recent death",
2999 },
3000 "c/say" => $SAY_CHANNEL,
3001 "c/chat" => $CHAT_CHANNEL,
2871); 3002);
2872 3003
2873sub cf::client::send_msg { 3004sub cf::client::send_msg {
2874 my ($self, $channel, $msg, $color, @extra) = @_; 3005 my ($self, $channel, $msg, $color, @extra) = @_;
2875 3006
2876 $msg = $self->pl->expand_cfpod ($msg); 3007 $msg = $self->pl->expand_cfpod ($msg)
3008 unless $color & cf::NDI_VERBATIM;
2877 3009
2878 $color &= cf::NDI_CLIENT_MASK; # just in case... 3010 $color &= cf::NDI_CLIENT_MASK; # just in case...
2879 3011
2880 # check predefined channels, for the benefit of C 3012 # check predefined channels, for the benefit of C
2881 if ($CHANNEL{$channel}) { 3013 if ($CHANNEL{$channel}) {
2882 $channel = $CHANNEL{$channel}; 3014 $channel = $CHANNEL{$channel};
2883 3015
2884 $self->ext_msg (channel_info => $channel) 3016 $self->ext_msg (channel_info => $channel);
2885 if $self->can_msg;
2886
2887 $channel = $channel->{id}; 3017 $channel = $channel->{id};
2888 3018
2889 } elsif (ref $channel) { 3019 } elsif (ref $channel) {
2890 # send meta info to client, if not yet sent 3020 # send meta info to client, if not yet sent
2891 unless (exists $self->{channel}{$channel->{id}}) { 3021 unless (exists $self->{channel}{$channel->{id}}) {
2892 $self->{channel}{$channel->{id}} = $channel; 3022 $self->{channel}{$channel->{id}} = $channel;
2893 $self->ext_msg (channel_info => $channel) 3023 $self->ext_msg (channel_info => $channel);
2894 if $self->can_msg;
2895 } 3024 }
2896 3025
2897 $channel = $channel->{id}; 3026 $channel = $channel->{id};
2898 } 3027 }
2899 3028
2900 return unless @extra || length $msg; 3029 return unless @extra || length $msg;
2901 3030
2902 if ($self->can_msg) {
2903 # default colour, mask it out 3031 # default colour, mask it out
2904 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3032 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2905 if $color & cf::NDI_DEF; 3033 if $color & cf::NDI_DEF;
2906 3034
2907 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3035 my $pkt = "msg "
3036 . $self->{json_coder}->encode (
2908 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3037 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2909 } else { 3038 );
2910 if ($color >= 0) {
2911 # replace some tags by gcfclient-compatible ones
2912 for ($msg) {
2913 1 while
2914 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2915 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2916 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2917 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2918 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2919 }
2920 3039
2921 $color &= cf::NDI_COLOR_MASK; 3040 $self->send_big_packet ($pkt);
2922
2923 utf8::encode $msg;
2924
2925 if (0 && $msg =~ /\[/) {
2926 # COMMAND/INFO
2927 $self->send_packet ("drawextinfo $color 10 8 $msg")
2928 } else {
2929 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2930 $self->send_packet ("drawinfo $color $msg")
2931 }
2932 }
2933 }
2934} 3041}
2935 3042
2936=item $client->ext_msg ($type, @msg) 3043=item $client->ext_msg ($type, @msg)
2937 3044
2938Sends an ext event to the client. 3045Sends an ext event to the client.
2941 3048
2942sub cf::client::ext_msg($$@) { 3049sub cf::client::ext_msg($$@) {
2943 my ($self, $type, @msg) = @_; 3050 my ($self, $type, @msg) = @_;
2944 3051
2945 if ($self->extcmd == 2) { 3052 if ($self->extcmd == 2) {
2946 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3053 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2947 } elsif ($self->extcmd == 1) { # TODO: remove 3054 } elsif ($self->extcmd == 1) { # TODO: remove
2948 push @msg, msgtype => "event_$type"; 3055 push @msg, msgtype => "event_$type";
2949 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3056 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2950 } 3057 }
2951} 3058}
2952 3059
2953=item $client->ext_reply ($msgid, @msg) 3060=item $client->ext_reply ($msgid, @msg)
2954 3061
2958 3065
2959sub cf::client::ext_reply($$@) { 3066sub cf::client::ext_reply($$@) {
2960 my ($self, $id, @msg) = @_; 3067 my ($self, $id, @msg) = @_;
2961 3068
2962 if ($self->extcmd == 2) { 3069 if ($self->extcmd == 2) {
2963 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3070 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2964 } elsif ($self->extcmd == 1) { 3071 } elsif ($self->extcmd == 1) {
2965 #TODO: version 1, remove 3072 #TODO: version 1, remove
2966 unshift @msg, msgtype => "reply", msgid => $id; 3073 unshift @msg, msgtype => "reply", msgid => $id;
2967 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3074 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2968 } 3075 }
2969} 3076}
2970 3077
2971=item $success = $client->query ($flags, "text", \&cb) 3078=item $success = $client->query ($flags, "text", \&cb)
2972 3079
3073 3180
3074 $coro 3181 $coro
3075} 3182}
3076 3183
3077cf::client->attach ( 3184cf::client->attach (
3078 on_destroy => sub { 3185 on_client_destroy => sub {
3079 my ($ns) = @_; 3186 my ($ns) = @_;
3080 3187
3081 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3188 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3082 }, 3189 },
3083); 3190);
3099our $safe_hole = new Safe::Hole; 3206our $safe_hole = new Safe::Hole;
3100 3207
3101$SIG{FPE} = 'IGNORE'; 3208$SIG{FPE} = 'IGNORE';
3102 3209
3103$safe->permit_only (Opcode::opset qw( 3210$safe->permit_only (Opcode::opset qw(
3104 :base_core :base_mem :base_orig :base_math 3211 :base_core :base_mem :base_orig :base_math :base_loop
3105 grepstart grepwhile mapstart mapwhile 3212 grepstart grepwhile mapstart mapwhile
3106 sort time 3213 sort time
3107)); 3214));
3108 3215
3109# here we export the classes and methods available to script code 3216# here we export the classes and methods available to script code
3113The following functions and methods are available within a safe environment: 3220The following functions and methods are available within a safe environment:
3114 3221
3115 cf::object 3222 cf::object
3116 contr pay_amount pay_player map x y force_find force_add destroy 3223 contr pay_amount pay_player map x y force_find force_add destroy
3117 insert remove name archname title slaying race decrease split 3224 insert remove name archname title slaying race decrease split
3225 value
3118 3226
3119 cf::object::player 3227 cf::object::player
3120 player 3228 player
3121 3229
3122 cf::player 3230 cf::player
3128=cut 3236=cut
3129 3237
3130for ( 3238for (
3131 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3239 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3132 insert remove inv nrof name archname title slaying race 3240 insert remove inv nrof name archname title slaying race
3133 decrease split destroy)], 3241 decrease split destroy change_exp value msg lore send_msg)],
3134 ["cf::object::player" => qw(player)], 3242 ["cf::object::player" => qw(player)],
3135 ["cf::player" => qw(peaceful)], 3243 ["cf::player" => qw(peaceful send_msg)],
3136 ["cf::map" => qw(trigger)], 3244 ["cf::map" => qw(trigger)],
3137) { 3245) {
3138 no strict 'refs'; 3246 no strict 'refs';
3139 my ($pkg, @funs) = @$_; 3247 my ($pkg, @funs) = @$_;
3140 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3248 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3158 3266
3159 my $qcode = $code; 3267 my $qcode = $code;
3160 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3268 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3161 $qcode =~ s/\n/\\n/g; 3269 $qcode =~ s/\n/\\n/g;
3162 3270
3271 %vars = (_dummy => 0) unless %vars;
3272
3273 my @res;
3163 local $_; 3274 local $_;
3164 local @safe::cf::_safe_eval_args = values %vars;
3165 3275
3166 my $eval = 3276 my $eval =
3167 "do {\n" 3277 "do {\n"
3168 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3278 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3169 . "#line 0 \"{$qcode}\"\n" 3279 . "#line 0 \"{$qcode}\"\n"
3170 . $code 3280 . $code
3171 . "\n}" 3281 . "\n}"
3172 ; 3282 ;
3173 3283
3284 if ($CFG{safe_eval}) {
3174 sub_generation_inc; 3285 sub_generation_inc;
3286 local @safe::cf::_safe_eval_args = values %vars;
3175 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3287 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3176 sub_generation_inc; 3288 sub_generation_inc;
3289 } else {
3290 local @cf::_safe_eval_args = values %vars;
3291 @res = wantarray ? eval eval : scalar eval $eval;
3292 }
3177 3293
3178 if ($@) { 3294 if ($@) {
3179 warn "$@"; 3295 warn "$@";
3180 warn "while executing safe code '$code'\n"; 3296 warn "while executing safe code '$code'\n";
3181 warn "with arguments " . (join " ", %vars) . "\n"; 3297 warn "with arguments " . (join " ", %vars) . "\n";
3200=cut 3316=cut
3201 3317
3202sub register_script_function { 3318sub register_script_function {
3203 my ($fun, $cb) = @_; 3319 my ($fun, $cb) = @_;
3204 3320
3205 no strict 'refs'; 3321 $fun = "safe::$fun" if $CFG{safe_eval};
3206 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3322 *$fun = $safe_hole->wrap ($cb);
3207} 3323}
3208 3324
3209=back 3325=back
3210 3326
3211=cut 3327=cut
3232 3348
3233 $facedata->{version} == 2 3349 $facedata->{version} == 2
3234 or cf::cleanup "$path: version mismatch, cannot proceed."; 3350 or cf::cleanup "$path: version mismatch, cannot proceed.";
3235 3351
3236 # patch in the exptable 3352 # patch in the exptable
3353 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3237 $facedata->{resource}{"res/exp_table"} = { 3354 $facedata->{resource}{"res/exp_table"} = {
3238 type => FT_RSRC, 3355 type => FT_RSRC,
3239 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3356 data => $exp_table,
3357 hash => (Digest::MD5::md5 $exp_table),
3240 }; 3358 };
3241 cf::cede_to_tick; 3359 cf::cede_to_tick;
3242 3360
3243 { 3361 {
3244 my $faces = $facedata->{faceinfo}; 3362 my $faces = $facedata->{faceinfo};
3246 while (my ($face, $info) = each %$faces) { 3364 while (my ($face, $info) = each %$faces) {
3247 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3365 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3248 3366
3249 cf::face::set_visibility $idx, $info->{visibility}; 3367 cf::face::set_visibility $idx, $info->{visibility};
3250 cf::face::set_magicmap $idx, $info->{magicmap}; 3368 cf::face::set_magicmap $idx, $info->{magicmap};
3251 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3369 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3252 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3370 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3253 3371
3254 cf::cede_to_tick; 3372 cf::cede_to_tick;
3255 } 3373 }
3256 3374
3257 while (my ($face, $info) = each %$faces) { 3375 while (my ($face, $info) = each %$faces) {
3281 3399
3282 cf::anim::invalidate_all; # d'oh 3400 cf::anim::invalidate_all; # d'oh
3283 } 3401 }
3284 3402
3285 { 3403 {
3286 # TODO: for gcfclient pleasure, we should give resources
3287 # that gcfclient doesn't grok a >10000 face index.
3288 my $res = $facedata->{resource}; 3404 my $res = $facedata->{resource};
3289 3405
3290 while (my ($name, $info) = each %$res) { 3406 while (my ($name, $info) = each %$res) {
3291 if (defined $info->{type}) { 3407 if (defined $info->{type}) {
3292 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3408 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3293 my $data;
3294 3409
3295 if ($info->{type} & 1) { 3410 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3296 # prepend meta info
3297
3298 my $meta = $enc->encode ({
3299 name => $name,
3300 %{ $info->{meta} || {} },
3301 });
3302
3303 $data = pack "(w/a*)*", $meta, $info->{data};
3304 } else {
3305 $data = $info->{data};
3306 }
3307
3308 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3309 cf::face::set_type $idx, $info->{type}; 3411 cf::face::set_type $idx, $info->{type};
3310 } else { 3412 } else {
3311 $RESOURCE{$name} = $info; 3413 $RESOURCE{$name} = $info;
3312 } 3414 }
3313 3415
3396 reload_treasures; 3498 reload_treasures;
3397 3499
3398 warn "finished reloading resource files\n"; 3500 warn "finished reloading resource files\n";
3399} 3501}
3400 3502
3401sub init {
3402 my $guard = freeze_mainloop;
3403
3404 evthread_start IO::AIO::poll_fileno;
3405
3406 reload_resources;
3407}
3408
3409sub reload_config { 3503sub reload_config {
3504 warn "reloading config file...\n";
3505
3410 open my $fh, "<:utf8", "$CONFDIR/config" 3506 open my $fh, "<:utf8", "$CONFDIR/config"
3411 or return; 3507 or return;
3412 3508
3413 local $/; 3509 local $/;
3414 *CFG = YAML::Load <$fh>; 3510 *CFG = YAML::XS::Load scalar <$fh>;
3415 3511
3416 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3512 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3417 3513
3418 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3514 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3419 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3515 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3423 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3519 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3424 and die "WARNING: m(un)lockall failed: $!\n"; 3520 and die "WARNING: m(un)lockall failed: $!\n";
3425 }; 3521 };
3426 warn $@ if $@; 3522 warn $@ if $@;
3427 } 3523 }
3524
3525 warn "finished reloading resource files\n";
3526}
3527
3528sub pidfile() {
3529 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3530 or die "$PIDFILE: $!";
3531 flock $fh, &Fcntl::LOCK_EX
3532 or die "$PIDFILE: flock: $!";
3533 $fh
3534}
3535
3536# make sure only one server instance is running at any one time
3537sub atomic {
3538 my $fh = pidfile;
3539
3540 my $pid = <$fh>;
3541 kill 9, $pid if $pid > 0;
3542
3543 seek $fh, 0, 0;
3544 print $fh $$;
3545}
3546
3547sub main_loop {
3548 warn "EV::loop starting\n";
3549 if (1) {
3550 EV::loop;
3551 }
3552 warn "EV::loop returned\n";
3553 goto &main_loop unless $REALLY_UNLOOP;
3428} 3554}
3429 3555
3430sub main { 3556sub main {
3557 cf::init_globals; # initialise logging
3558
3559 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3560 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3561 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3562 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3563
3564 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3565
3431 # we must not ever block the main coroutine 3566 # we must not ever block the main coroutine
3432 local $Coro::idle = sub { 3567 local $Coro::idle = sub {
3433 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3568 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3434 (async { 3569 (async {
3435 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3570 $Coro::current->{desc} = "IDLE BUG HANDLER";
3436 EV::loop EV::LOOP_ONESHOT; 3571 EV::loop EV::LOOP_ONESHOT;
3437 })->prio (Coro::PRIO_MAX); 3572 })->prio (Coro::PRIO_MAX);
3438 }; 3573 };
3439 3574
3440 { 3575 evthread_start IO::AIO::poll_fileno;
3441 my $guard = freeze_mainloop; 3576
3577 cf::sync_job {
3578 cf::init_experience;
3579 cf::init_anim;
3580 cf::init_attackmess;
3581 cf::init_dynamic;
3582
3583 cf::load_settings;
3584 cf::load_materials;
3585
3586 reload_resources;
3442 reload_config; 3587 reload_config;
3443 db_init; 3588 db_init;
3589
3590 cf::init_uuid;
3591 cf::init_signals;
3592 cf::init_skills;
3593
3594 cf::init_beforeplay;
3595
3596 atomic;
3597
3444 load_extensions; 3598 load_extensions;
3445 3599
3446 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3600 utime time, time, $RUNTIMEFILE;
3601
3602 # no (long-running) fork's whatsoever before this point(!)
3603 use POSIX ();
3604 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3605
3606 (pop @POST_INIT)->(0) while @POST_INIT;
3447 } 3607 };
3448 3608
3449 EV::loop; 3609 cf::object::thawer::errors_are_fatal 0;
3610 warn "parse errors in files are no longer fatal from this point on.\n";
3611
3612 main_loop;
3450} 3613}
3451 3614
3452############################################################################# 3615#############################################################################
3453# initialisation and cleanup 3616# initialisation and cleanup
3454 3617
3455# install some emergency cleanup handlers 3618# install some emergency cleanup handlers
3456BEGIN { 3619BEGIN {
3457 our %SIGWATCHER = (); 3620 our %SIGWATCHER = ();
3458 for my $signal (qw(INT HUP TERM)) { 3621 for my $signal (qw(INT HUP TERM)) {
3459 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3622 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3460 cf::cleanup "SIG$signal"; 3623 cf::cleanup "SIG$signal";
3461 }; 3624 };
3462 } 3625 }
3463} 3626}
3464 3627
3465sub write_runtime_sync { 3628sub write_runtime_sync {
3466 my $runtime = "$LOCALDIR/runtime"; 3629 my $t0 = AE::time;
3467 3630
3468 # first touch the runtime file to show we are still running: 3631 # first touch the runtime file to show we are still running:
3469 # the fsync below can take a very very long time. 3632 # the fsync below can take a very very long time.
3470 3633
3471 IO::AIO::aio_utime $runtime, undef, undef; 3634 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3472 3635
3473 my $guard = cf::lock_acquire "write_runtime"; 3636 my $guard = cf::lock_acquire "write_runtime";
3474 3637
3475 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3638 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3476 or return; 3639 or return;
3477 3640
3478 my $value = $cf::RUNTIME + 90 + 10; 3641 my $value = $cf::RUNTIME + 90 + 10;
3479 # 10 is the runtime save interval, for a monotonic clock 3642 # 10 is the runtime save interval, for a monotonic clock
3480 # 60 allows for the watchdog to kill the server. 3643 # 60 allows for the watchdog to kill the server.
3490 aio_utime $fh, undef, undef; 3653 aio_utime $fh, undef, undef;
3491 3654
3492 close $fh 3655 close $fh
3493 or return; 3656 or return;
3494 3657
3495 aio_rename "$runtime~", $runtime 3658 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3496 and return; 3659 and return;
3497 3660
3498 warn "runtime file written.\n"; 3661 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3499 3662
3500 1 3663 1
3501} 3664}
3502 3665
3503our $uuid_lock; 3666our $uuid_lock;
3512 my $uuid = "$LOCALDIR/uuid"; 3675 my $uuid = "$LOCALDIR/uuid";
3513 3676
3514 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3677 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3515 or return; 3678 or return;
3516 3679
3517 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3680 my $value = uuid_seq uuid_cur;
3681
3682 unless ($value) {
3683 warn "cowardly refusing to write zero uuid value!\n";
3684 return;
3685 }
3686
3687 my $value = uuid_str $value + $uuid_skip;
3518 $uuid_skip = 0; 3688 $uuid_skip = 0;
3519 3689
3520 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3690 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3521 and return; 3691 and return;
3522 3692
3544} 3714}
3545 3715
3546sub emergency_save() { 3716sub emergency_save() {
3547 my $freeze_guard = cf::freeze_mainloop; 3717 my $freeze_guard = cf::freeze_mainloop;
3548 3718
3549 warn "enter emergency perl save\n"; 3719 warn "emergency_perl_save: enter\n";
3550 3720
3551 cf::sync_job { 3721 cf::sync_job {
3722 # this is a trade-off: we want to be very quick here, so
3723 # save all maps without fsync, and later call a global sync
3724 # (which in turn might be very very slow)
3725 local $USE_FSYNC = 0;
3726
3552 # use a peculiar iteration method to avoid tripping on perl 3727 # use a peculiar iteration method to avoid tripping on perl
3553 # refcount bugs in for. also avoids problems with players 3728 # refcount bugs in for. also avoids problems with players
3554 # and maps saved/destroyed asynchronously. 3729 # and maps saved/destroyed asynchronously.
3555 warn "begin emergency player save\n"; 3730 warn "emergency_perl_save: begin player save\n";
3556 for my $login (keys %cf::PLAYER) { 3731 for my $login (keys %cf::PLAYER) {
3557 my $pl = $cf::PLAYER{$login} or next; 3732 my $pl = $cf::PLAYER{$login} or next;
3558 $pl->valid or next; 3733 $pl->valid or next;
3559 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3734 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3560 $pl->save; 3735 $pl->save;
3561 } 3736 }
3562 warn "end emergency player save\n"; 3737 warn "emergency_perl_save: end player save\n";
3563 3738
3564 warn "begin emergency map save\n"; 3739 warn "emergency_perl_save: begin map save\n";
3565 for my $path (keys %cf::MAP) { 3740 for my $path (keys %cf::MAP) {
3566 my $map = $cf::MAP{$path} or next; 3741 my $map = $cf::MAP{$path} or next;
3567 $map->valid or next; 3742 $map->valid or next;
3568 $map->save; 3743 $map->save;
3569 } 3744 }
3570 warn "end emergency map save\n"; 3745 warn "emergency_perl_save: end map save\n";
3571 3746
3572 warn "begin emergency database checkpoint\n"; 3747 warn "emergency_perl_save: begin database checkpoint\n";
3573 BDB::db_env_txn_checkpoint $DB_ENV; 3748 BDB::db_env_txn_checkpoint $DB_ENV;
3574 warn "end emergency database checkpoint\n"; 3749 warn "emergency_perl_save: end database checkpoint\n";
3575 3750
3576 warn "begin write uuid\n"; 3751 warn "emergency_perl_save: begin write uuid\n";
3577 write_uuid_sync 1; 3752 write_uuid_sync 1;
3578 warn "end write uuid\n"; 3753 warn "emergency_perl_save: end write uuid\n";
3579 }; 3754 };
3580 3755
3756 warn "emergency_perl_save: starting sync()\n";
3757 IO::AIO::aio_sync sub {
3758 warn "emergency_perl_save: finished sync()\n";
3759 };
3760
3581 warn "leave emergency perl save\n"; 3761 warn "emergency_perl_save: leave\n";
3582} 3762}
3583 3763
3584sub post_cleanup { 3764sub post_cleanup {
3585 my ($make_core) = @_; 3765 my ($make_core) = @_;
3586 3766
3587 warn Carp::longmess "post_cleanup backtrace" 3767 warn Carp::longmess "post_cleanup backtrace"
3588 if $make_core; 3768 if $make_core;
3769
3770 my $fh = pidfile;
3771 unlink $PIDFILE if <$fh> == $$;
3772}
3773
3774# a safer delete_package, copied from Symbol
3775sub clear_package($) {
3776 my $pkg = shift;
3777
3778 # expand to full symbol table name if needed
3779 unless ($pkg =~ /^main::.*::$/) {
3780 $pkg = "main$pkg" if $pkg =~ /^::/;
3781 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3782 $pkg .= '::' unless $pkg =~ /::$/;
3783 }
3784
3785 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3786 my $stem_symtab = *{$stem}{HASH};
3787
3788 defined $stem_symtab and exists $stem_symtab->{$leaf}
3789 or return;
3790
3791 # clear all symbols
3792 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3793 for my $name (keys %$leaf_symtab) {
3794 _gv_clear *{"$pkg$name"};
3795# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3796 }
3589} 3797}
3590 3798
3591sub do_reload_perl() { 3799sub do_reload_perl() {
3592 # can/must only be called in main 3800 # can/must only be called in main
3593 if ($Coro::current != $Coro::main) { 3801 if (in_main) {
3594 warn "can only reload from main coroutine"; 3802 warn "can only reload from main coroutine";
3595 return; 3803 return;
3596 } 3804 }
3597 3805
3806 return if $RELOAD++;
3807
3808 my $t1 = AE::time;
3809
3810 while ($RELOAD) {
3598 warn "reloading..."; 3811 warn "reloading...";
3599 3812
3600 warn "entering sync_job"; 3813 warn "entering sync_job";
3601 3814
3602 cf::sync_job { 3815 cf::sync_job {
3603 cf::write_runtime_sync; # external watchdog should not bark 3816 cf::write_runtime_sync; # external watchdog should not bark
3604 cf::emergency_save; 3817 cf::emergency_save;
3605 cf::write_runtime_sync; # external watchdog should not bark 3818 cf::write_runtime_sync; # external watchdog should not bark
3606 3819
3607 warn "syncing database to disk"; 3820 warn "syncing database to disk";
3608 BDB::db_env_txn_checkpoint $DB_ENV; 3821 BDB::db_env_txn_checkpoint $DB_ENV;
3609 3822
3610 # if anything goes wrong in here, we should simply crash as we already saved 3823 # if anything goes wrong in here, we should simply crash as we already saved
3611 3824
3612 warn "flushing outstanding aio requests"; 3825 warn "flushing outstanding aio requests";
3613 for (;;) {
3614 BDB::flush;
3615 IO::AIO::flush;
3616 Coro::cede_notself;
3617 last unless IO::AIO::nreqs || BDB::nreqs; 3826 while (IO::AIO::nreqs || BDB::nreqs) {
3618 warn "iterate..."; 3827 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3619 }
3620
3621 ++$RELOAD;
3622
3623 warn "cancelling all extension coros";
3624 $_->cancel for values %EXT_CORO;
3625 %EXT_CORO = ();
3626
3627 warn "removing commands";
3628 %COMMAND = ();
3629
3630 warn "removing ext/exti commands";
3631 %EXTCMD = ();
3632 %EXTICMD = ();
3633
3634 warn "unloading/nuking all extensions";
3635 for my $pkg (@EXTS) {
3636 warn "... unloading $pkg";
3637
3638 if (my $cb = $pkg->can ("unload")) {
3639 eval {
3640 $cb->($pkg);
3641 1
3642 } or warn "$pkg unloaded, but with errors: $@";
3643 } 3828 }
3644 3829
3645 warn "... nuking $pkg"; 3830 warn "cancelling all extension coros";
3646 Symbol::delete_package $pkg; 3831 $_->cancel for values %EXT_CORO;
3647 } 3832 %EXT_CORO = ();
3648 3833
3649 warn "unloading all perl modules loaded from $LIBDIR"; 3834 warn "removing commands";
3650 while (my ($k, $v) = each %INC) { 3835 %COMMAND = ();
3651 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3652 3836
3837 warn "removing ext/exti commands";
3838 %EXTCMD = ();
3839 %EXTICMD = ();
3840
3841 warn "unloading/nuking all extensions";
3842 for my $pkg (@EXTS) {
3653 warn "... unloading $k"; 3843 warn "... unloading $pkg";
3654 delete $INC{$k};
3655 3844
3656 $k =~ s/\.pm$//;
3657 $k =~ s/\//::/g;
3658
3659 if (my $cb = $k->can ("unload_module")) { 3845 if (my $cb = $pkg->can ("unload")) {
3846 eval {
3660 $cb->(); 3847 $cb->($pkg);
3848 1
3849 } or warn "$pkg unloaded, but with errors: $@";
3850 }
3851
3852 warn "... clearing $pkg";
3853 clear_package $pkg;
3661 } 3854 }
3662 3855
3663 Symbol::delete_package $k; 3856 warn "unloading all perl modules loaded from $LIBDIR";
3857 while (my ($k, $v) = each %INC) {
3858 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3859
3860 warn "... unloading $k";
3861 delete $INC{$k};
3862
3863 $k =~ s/\.pm$//;
3864 $k =~ s/\//::/g;
3865
3866 if (my $cb = $k->can ("unload_module")) {
3867 $cb->();
3868 }
3869
3870 clear_package $k;
3664 } 3871 }
3665 3872
3666 warn "getting rid of safe::, as good as possible"; 3873 warn "getting rid of safe::, as good as possible";
3667 Symbol::delete_package "safe::$_" 3874 clear_package "safe::$_"
3668 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3875 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3669 3876
3670 warn "unloading cf.pm \"a bit\""; 3877 warn "unloading cf.pm \"a bit\"";
3671 delete $INC{"cf.pm"}; 3878 delete $INC{"cf.pm"};
3672 delete $INC{"cf/pod.pm"}; 3879 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3673 3880
3674 # don't, removes xs symbols, too, 3881 # don't, removes xs symbols, too,
3675 # and global variables created in xs 3882 # and global variables created in xs
3676 #Symbol::delete_package __PACKAGE__; 3883 #clear_package __PACKAGE__;
3677 3884
3678 warn "unload completed, starting to reload now"; 3885 warn "unload completed, starting to reload now";
3679 3886
3680 warn "reloading cf.pm"; 3887 warn "reloading cf.pm";
3681 require cf; 3888 require cf;
3682 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3889 cf::_connect_to_perl_1;
3683 3890
3684 warn "loading config and database again"; 3891 warn "loading config and database again";
3685 cf::reload_config; 3892 cf::reload_config;
3686 3893
3687 warn "loading extensions"; 3894 warn "loading extensions";
3688 cf::load_extensions; 3895 cf::load_extensions;
3689 3896
3897 if ($REATTACH_ON_RELOAD) {
3690 warn "reattaching attachments to objects/players"; 3898 warn "reattaching attachments to objects/players";
3691 _global_reattach; # objects, sockets 3899 _global_reattach; # objects, sockets
3692 warn "reattaching attachments to maps"; 3900 warn "reattaching attachments to maps";
3693 reattach $_ for values %MAP; 3901 reattach $_ for values %MAP;
3694 warn "reattaching attachments to players"; 3902 warn "reattaching attachments to players";
3695 reattach $_ for values %PLAYER; 3903 reattach $_ for values %PLAYER;
3904 }
3696 3905
3906 warn "running post_init jobs";
3907 (pop @POST_INIT)->(1) while @POST_INIT;
3908
3697 warn "leaving sync_job"; 3909 warn "leaving sync_job";
3698 3910
3699 1 3911 1
3700 } or do { 3912 } or do {
3701 warn $@; 3913 warn $@;
3702 cf::cleanup "error while reloading, exiting."; 3914 cf::cleanup "error while reloading, exiting.";
3703 }; 3915 };
3704 3916
3705 warn "reloaded"; 3917 warn "reloaded";
3918 --$RELOAD;
3919 }
3920
3921 $t1 = AE::time - $t1;
3922 warn "reload completed in ${t1}s\n";
3706}; 3923};
3707 3924
3708our $RELOAD_WATCHER; # used only during reload 3925our $RELOAD_WATCHER; # used only during reload
3709 3926
3710sub reload_perl() { 3927sub reload_perl() {
3711 # doing reload synchronously and two reloads happen back-to-back, 3928 # doing reload synchronously and two reloads happen back-to-back,
3712 # coro crashes during coro_state_free->destroy here. 3929 # coro crashes during coro_state_free->destroy here.
3713 3930
3931 $RELOAD_WATCHER ||= cf::async {
3932 Coro::AIO::aio_wait cache_extensions;
3933
3714 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3934 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3715 do_reload_perl; 3935 do_reload_perl;
3716 undef $RELOAD_WATCHER; 3936 undef $RELOAD_WATCHER;
3937 };
3717 }; 3938 };
3718} 3939}
3719 3940
3720register_command "reload" => sub { 3941register_command "reload" => sub {
3721 my ($who, $arg) = @_; 3942 my ($who, $arg) = @_;
3735 3956
3736our @WAIT_FOR_TICK; 3957our @WAIT_FOR_TICK;
3737our @WAIT_FOR_TICK_BEGIN; 3958our @WAIT_FOR_TICK_BEGIN;
3738 3959
3739sub wait_for_tick { 3960sub wait_for_tick {
3740 return if tick_inhibit || $Coro::current == $Coro::main; 3961 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3741 3962
3742 my $signal = new Coro::Signal; 3963 my $signal = new Coro::Signal;
3743 push @WAIT_FOR_TICK, $signal; 3964 push @WAIT_FOR_TICK, $signal;
3744 $signal->wait; 3965 $signal->wait;
3745} 3966}
3746 3967
3747sub wait_for_tick_begin { 3968sub wait_for_tick_begin {
3748 return if tick_inhibit || $Coro::current == $Coro::main; 3969 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3749 3970
3750 my $signal = new Coro::Signal; 3971 my $signal = new Coro::Signal;
3751 push @WAIT_FOR_TICK_BEGIN, $signal; 3972 push @WAIT_FOR_TICK_BEGIN, $signal;
3752 $signal->wait; 3973 $signal->wait;
3753} 3974}
3758 unless ++$bug_warning > 10; 3979 unless ++$bug_warning > 10;
3759 return; 3980 return;
3760 } 3981 }
3761 3982
3762 cf::server_tick; # one server iteration 3983 cf::server_tick; # one server iteration
3984
3985 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3763 3986
3764 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3987 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3765 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3988 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3766 Coro::async_pool { 3989 Coro::async_pool {
3767 $Coro::current->{desc} = "runtime saver"; 3990 $Coro::current->{desc} = "runtime saver";
3790} 4013}
3791 4014
3792{ 4015{
3793 # configure BDB 4016 # configure BDB
3794 4017
3795 BDB::min_parallel 8; 4018 BDB::min_parallel 16;
3796 BDB::max_poll_reqs $TICK * 0.1; 4019 BDB::max_poll_reqs $TICK * 0.1;
3797 $AnyEvent::BDB::WATCHER->priority (1); 4020 $AnyEvent::BDB::WATCHER->priority (1);
3798 4021
3799 unless ($DB_ENV) { 4022 unless ($DB_ENV) {
3800 $DB_ENV = BDB::db_env_create; 4023 $DB_ENV = BDB::db_env_create;
3801 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4024 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3802 | BDB::LOG_AUTOREMOVE, 1); 4025 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4026 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3803 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4027 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3804 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4028 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3805 4029
3806 cf::sync_job { 4030 cf::sync_job {
3807 eval { 4031 eval {
3846 $msg =~ s/\n//; 4070 $msg =~ s/\n//;
3847 4071
3848 # limit the # of concurrent backtraces 4072 # limit the # of concurrent backtraces
3849 if ($_log_backtrace < 2) { 4073 if ($_log_backtrace < 2) {
3850 ++$_log_backtrace; 4074 ++$_log_backtrace;
4075 my $perl_bt = Carp::longmess $msg;
3851 async { 4076 async {
3852 $Coro::current->{desc} = "abt $msg"; 4077 $Coro::current->{desc} = "abt $msg";
3853 4078
3854 my @bt = fork_call { 4079 my @bt = fork_call {
3855 @addr = map { sprintf "%x", $_ } @addr; 4080 @addr = map { sprintf "%x", $_ } @addr;
3866 } 4091 }
3867 4092
3868 @funcs 4093 @funcs
3869 }; 4094 };
3870 4095
3871 LOG llevInfo, "[ABT] $msg\n"; 4096 LOG llevInfo, "[ABT] $perl_bt\n";
4097 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3872 LOG llevInfo, "[ABT] $_\n" for @bt; 4098 LOG llevInfo, "[ABT] $_\n" for @bt;
3873 --$_log_backtrace; 4099 --$_log_backtrace;
3874 }; 4100 };
3875 } else { 4101 } else {
3876 LOG llevInfo, "[ABT] $msg\n"; 4102 LOG llevInfo, "[ABT] $msg\n";
3877 LOG llevInfo, "[ABT] [suppressed]\n"; 4103 LOG llevInfo, "[ABT] [suppressed]\n";
3878 } 4104 }
3879} 4105}
3880 4106
3881# load additional modules 4107# load additional modules
3882use cf::pod; 4108require "cf/$_.pm" for @EXTRA_MODULES;
4109cf::_connect_to_perl_2;
3883 4110
3884END { cf::emergency_save } 4111END { cf::emergency_save }
3885 4112
38861 41131
3887 4114

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines