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.430 by root, Sun May 4 14:12:37 2008 UTC vs.
Revision 1.535 by root, Thu Apr 29 08:21: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 3.2; 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 4.50 (); 40use Coro ();
37use Coro::State; 41use Coro::State;
38use Coro::Handle; 42use Coro::Handle;
39use Coro::EV; 43use Coro::EV;
44use Coro::AnyEvent;
40use Coro::Timer; 45use Coro::Timer;
41use Coro::Signal; 46use Coro::Signal;
42use Coro::Semaphore; 47use Coro::Semaphore;
48use Coro::SemaphoreSet;
49use Coro::AnyEvent;
43use Coro::AIO; 50use Coro::AIO;
44use Coro::BDB; 51use Coro::BDB 1.6;
45use Coro::Storable; 52use Coro::Storable;
46use Coro::Util (); 53use Coro::Util ();
47 54
48use JSON::XS 2.01 (); 55use JSON::XS 2.01 ();
49use BDB (); 56use BDB ();
50use Data::Dumper; 57use Data::Dumper;
51use Digest::MD5;
52use Fcntl; 58use Fcntl;
53use YAML (); 59use YAML::XS ();
54use IO::AIO 2.51 (); 60use IO::AIO ();
55use Time::HiRes; 61use Time::HiRes;
56use Compress::LZF; 62use Compress::LZF;
57use Digest::MD5 (); 63use Digest::MD5 ();
64
65AnyEvent::detect;
58 66
59# configure various modules to our taste 67# configure various modules to our taste
60# 68#
61$Storable::canonical = 1; # reduce rsync transfers 69$Storable::canonical = 1; # reduce rsync transfers
62Coro::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";
63Compress::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
64 77
65$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" };
66 80
67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
68 82
69our %COMMAND = (); 83our %COMMAND = ();
70our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
73our %EXTCMD = (); 87our %EXTCMD = ();
74our %EXTICMD = (); 88our %EXTICMD = ();
75our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
76our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
77 91
78our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
79our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
80 96
81our $CONFDIR = confdir; 97our $CONFDIR = confdir;
82our $DATADIR = datadir; 98our $DATADIR = datadir;
83our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
84our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
85our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
86our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
87our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
89our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
90our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
91our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110
92our %RESOURCE; 111our %RESOURCE; # unused
112
113our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 1000000;
115
116our $MAX_LINKS = 32; # how many chained exits to follow
117our $VERBOSE_IO = 1;
93 118
94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
95our $AIO_POLL_WATCHER;
96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
97our $NEXT_TICK; 121our $NEXT_TICK;
98our $USE_FSYNC = 1; # use fsync to write maps - default off 122our $USE_FSYNC = 1; # use fsync to write maps - default on
99 123
100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER; 124our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER; 125our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER; 126our $BDB_TRICKLE_WATCHER;
104our $DB_ENV; 127our $DB_ENV;
105 128
129our @EXTRA_MODULES = qw(pod match mapscript);
130
106our %CFG; 131our %CFG;
107 132
108our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
109our $RUNTIME; 134our $RUNTIME;
110our $NOW; 135our $NOW;
119our $LOAD; # a number between 0 (idle) and 1 (too many objects) 144our $LOAD; # a number between 0 (idle) and 1 (too many objects)
120our $LOADAVG; # same thing, but with alpha-smoothing 145our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter 146our $JITTER; # average jitter
122our $TICK_START; # for load detecting purposes 147our $TICK_START; # for load detecting purposes
123 148
149our @POST_INIT;
150
151our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
152our $REALLY_UNLOOP; # never set to true, please :)
153
124binmode STDOUT; 154binmode STDOUT;
125binmode STDERR; 155binmode STDERR;
126 156
127# read virtual server time, if available 157# read virtual server time, if available
128unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 158unless ($RUNTIME || !-e $RUNTIMEFILE) {
129 open my $fh, "<", "$LOCALDIR/runtime" 159 open my $fh, "<", $RUNTIMEFILE
130 or die "unable to read runtime file: $!"; 160 or die "unable to read $RUNTIMEFILE file: $!";
131 $RUNTIME = <$fh> + 0.; 161 $RUNTIME = <$fh> + 0.;
132} 162}
163
164eval "sub TICK() { $TICK } 1" or die;
133 165
134mkdir $_ 166mkdir $_
135 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 167 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
136 168
137our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
138 170
139sub cf::map::normalise; 171sub cf::map::normalise;
172
173sub in_main() {
174 $Coro::current == $Coro::main
175}
176
177#############################################################################
178
179%REFLECT = ();
180for (@REFLECT) {
181 my $reflect = JSON::XS::decode_json $_;
182 $REFLECT{$reflect->{class}} = $reflect;
183}
184
185# this is decidedly evil
186$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
140 187
141############################################################################# 188#############################################################################
142 189
143=head2 GLOBAL VARIABLES 190=head2 GLOBAL VARIABLES
144 191
191returns directly I<after> the tick processing (and consequently, can only wake one process 238returns directly I<after> the tick processing (and consequently, can only wake one process
192per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 239per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
193 240
194=item @cf::INVOKE_RESULTS 241=item @cf::INVOKE_RESULTS
195 242
196This array contains the results of the last C<invoke ()> call. When 243This array contains the results of the last C<invoke ()> call. When
197C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 244C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
198that call. 245that call.
199 246
247=item %cf::REFLECT
248
249Contains, for each (C++) class name, a hash reference with information
250about object members (methods, scalars, arrays and flags) and other
251metadata, which is useful for introspection.
252
200=back 253=back
201 254
202=cut 255=cut
203 256
204BEGIN { 257sub error(@) { LOG llevError, join "", @_ }
205 *CORE::GLOBAL::warn = sub { 258sub warn (@) { LOG llevWarn , join "", @_ }
259sub info (@) { LOG llevInfo , join "", @_ }
260sub debug(@) { LOG llevDebug, join "", @_ }
261sub trace(@) { LOG llevTrace, join "", @_ }
262
263$Coro::State::WARNHOOK = sub {
206 my $msg = join "", @_; 264 my $msg = join "", @_;
207 265
208 $msg .= "\n" 266 $msg .= "\n"
209 unless $msg =~ /\n$/; 267 unless $msg =~ /\n$/;
210 268
211 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 269 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
212 270
213 LOG llevError, $msg; 271 LOG llevWarn, $msg;
214 }; 272};
215}
216 273
217$Coro::State::DIEHOOK = sub { 274$Coro::State::DIEHOOK = sub {
218 return unless $^S eq 0; # "eq", not "==" 275 return unless $^S eq 0; # "eq", not "=="
219 276
220 if ($Coro::current == $Coro::main) {#d# 277 error Carp::longmess $_[0];
278
279 if (in_main) {#d#
221 warn "DIEHOOK called in main context, Coro bug?\n";#d# 280 error "DIEHOOK called in main context, Coro bug?\n";#d#
222 return;#d# 281 return;#d#
223 }#d# 282 }#d#
224 283
225 # kill coroutine otherwise 284 # kill coroutine otherwise
226 warn Carp::longmess $_[0];
227 Coro::terminate 285 Coro::terminate
228}; 286};
229
230$SIG{__DIE__} = sub { }; #d#?
231 287
232@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 288@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
233@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 289@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
234@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 290@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
235@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 291@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
242for my $pkg (qw( 298for my $pkg (qw(
243 cf::global cf::attachable 299 cf::global cf::attachable
244 cf::object cf::object::player 300 cf::object cf::object::player
245 cf::client cf::player 301 cf::client cf::player
246 cf::arch cf::living 302 cf::arch cf::living
303 cf::map cf::mapspace
247 cf::map cf::party cf::region 304 cf::party cf::region
248)) { 305)) {
249 no strict 'refs';
250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 306 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
251} 307}
252 308
253$EV::DIED = sub { 309$EV::DIED = sub {
254 warn "error in event callback: @_"; 310 Carp::cluck "error in event callback: @_";
255}; 311};
256 312
257############################################################################# 313#############################################################################
258 314
259=head2 UTILITY FUNCTIONS 315=head2 UTILITY FUNCTIONS
296our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 352our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
297 353
298sub encode_json($) { $json_coder->encode ($_[0]) } 354sub encode_json($) { $json_coder->encode ($_[0]) }
299sub decode_json($) { $json_coder->decode ($_[0]) } 355sub decode_json($) { $json_coder->decode ($_[0]) }
300 356
357=item cf::post_init { BLOCK }
358
359Execute the given codeblock, I<after> all extensions have been (re-)loaded,
360but I<before> the server starts ticking again.
361
362The cdoeblock will have a single boolean argument to indicate whether this
363is a reload or not.
364
365=cut
366
367sub post_init(&) {
368 push @POST_INIT, shift;
369}
370
301=item cf::lock_wait $string 371=item cf::lock_wait $string
302 372
303Wait until the given lock is available. See cf::lock_acquire. 373Wait until the given lock is available. See cf::lock_acquire.
304 374
305=item my $lock = cf::lock_acquire $string 375=item my $lock = cf::lock_acquire $string
306 376
307Wait until the given lock is available and then acquires it and returns 377Wait until the given lock is available and then acquires it and returns
308a Coro::guard object. If the guard object gets destroyed (goes out of scope, 378a L<Guard> object. If the guard object gets destroyed (goes out of scope,
309for example when the coroutine gets canceled), the lock is automatically 379for example when the coroutine gets canceled), the lock is automatically
310returned. 380returned.
311 381
312Locks are *not* recursive, locking from the same coro twice results in a 382Locks are *not* recursive, locking from the same coro twice results in a
313deadlocked coro. 383deadlocked coro.
319 389
320Return true if the lock is currently active, i.e. somebody has locked it. 390Return true if the lock is currently active, i.e. somebody has locked it.
321 391
322=cut 392=cut
323 393
324our %LOCK; 394our $LOCKS = new Coro::SemaphoreSet;
325our %LOCKER;#d#
326 395
327sub lock_wait($) { 396sub lock_wait($) {
328 my ($key) = @_; 397 $LOCKS->wait ($_[0]);
329
330 if ($LOCKER{$key} == $Coro::current) {#d#
331 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
332 return;#d#
333 }#d#
334
335 # wait for lock, if any
336 while ($LOCK{$key}) {
337 push @{ $LOCK{$key} }, $Coro::current;
338 Coro::schedule;
339 }
340} 398}
341 399
342sub lock_acquire($) { 400sub lock_acquire($) {
343 my ($key) = @_; 401 $LOCKS->guard ($_[0])
344
345 # wait, to be sure we are not locked
346 lock_wait $key;
347
348 $LOCK{$key} = [];
349 $LOCKER{$key} = $Coro::current;#d#
350
351 Coro::guard {
352 delete $LOCKER{$key};#d#
353 # wake up all waiters, to be on the safe side
354 $_->ready for @{ delete $LOCK{$key} };
355 }
356} 402}
357 403
358sub lock_active($) { 404sub lock_active($) {
359 my ($key) = @_; 405 $LOCKS->count ($_[0]) < 1
360
361 ! ! $LOCK{$key}
362} 406}
363 407
364sub freeze_mainloop { 408sub freeze_mainloop {
365 tick_inhibit_inc; 409 tick_inhibit_inc;
366 410
367 Coro::guard \&tick_inhibit_dec; 411 &Guard::guard (\&tick_inhibit_dec);
368} 412}
369 413
370=item cf::periodic $interval, $cb 414=item cf::periodic $interval, $cb
371 415
372Like EV::periodic, but randomly selects a starting point so that the actions 416Like EV::periodic, but randomly selects a starting point so that the actions
373get spread over timer. 417get spread over time.
374 418
375=cut 419=cut
376 420
377sub periodic($$) { 421sub periodic($$) {
378 my ($interval, $cb) = @_; 422 my ($interval, $cb) = @_;
395 439
396=cut 440=cut
397 441
398our @SLOT_QUEUE; 442our @SLOT_QUEUE;
399our $SLOT_QUEUE; 443our $SLOT_QUEUE;
444our $SLOT_DECAY = 0.9;
400 445
401$SLOT_QUEUE->cancel if $SLOT_QUEUE; 446$SLOT_QUEUE->cancel if $SLOT_QUEUE;
402$SLOT_QUEUE = Coro::async { 447$SLOT_QUEUE = Coro::async {
403 $Coro::current->desc ("timeslot manager"); 448 $Coro::current->desc ("timeslot manager");
404 449
405 my $signal = new Coro::Signal; 450 my $signal = new Coro::Signal;
451 my $busy;
406 452
407 while () { 453 while () {
408 next_job: 454 next_job:
455
409 my $avail = cf::till_tick; 456 my $avail = cf::till_tick;
410 if ($avail > 0.01) { 457
411 for (0 .. $#SLOT_QUEUE) { 458 for (0 .. $#SLOT_QUEUE) {
412 if ($SLOT_QUEUE[$_][0] < $avail) { 459 if ($SLOT_QUEUE[$_][0] <= $avail) {
460 $busy = 0;
413 my $job = splice @SLOT_QUEUE, $_, 1, (); 461 my $job = splice @SLOT_QUEUE, $_, 1, ();
414 $job->[2]->send; 462 $job->[2]->send;
415 Coro::cede; 463 Coro::cede;
416 goto next_job; 464 goto next_job;
417 } 465 } else {
466 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
418 } 467 }
419 } 468 }
420 469
421 if (@SLOT_QUEUE) { 470 if (@SLOT_QUEUE) {
422 # we do not use wait_for_tick() as it returns immediately when tick is inactive 471 # we do not use wait_for_tick() as it returns immediately when tick is inactive
423 push @cf::WAIT_FOR_TICK, $signal; 472 push @cf::WAIT_FOR_TICK, $signal;
424 $signal->wait; 473 $signal->wait;
425 } else { 474 } else {
475 $busy = 0;
426 Coro::schedule; 476 Coro::schedule;
427 } 477 }
428 } 478 }
429}; 479};
430 480
431sub get_slot($;$$) { 481sub get_slot($;$$) {
432 return if tick_inhibit || $Coro::current == $Coro::main; 482 return if tick_inhibit || $Coro::current == $Coro::main;
433 483
434 my ($time, $pri, $name) = @_; 484 my ($time, $pri, $name) = @_;
435 485
436 $time = $TICK * .6 if $time > $TICK * .6; 486 $time = clamp $time, 0.01, $TICK * .6;
487
437 my $sig = new Coro::Signal; 488 my $sig = new Coro::Signal;
438 489
439 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 490 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
440 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 491 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
441 $SLOT_QUEUE->ready; 492 $SLOT_QUEUE->ready;
467=cut 518=cut
468 519
469sub sync_job(&) { 520sub sync_job(&) {
470 my ($job) = @_; 521 my ($job) = @_;
471 522
472 if ($Coro::current == $Coro::main) { 523 if (in_main) {
473 my $time = EV::time; 524 my $time = AE::time;
474 525
475 # this is the main coro, too bad, we have to block 526 # this is the main coro, too bad, we have to block
476 # till the operation succeeds, freezing the server :/ 527 # till the operation succeeds, freezing the server :/
477 528
478 LOG llevError, Carp::longmess "sync job";#d# 529 #LOG llevError, Carp::longmess "sync job";#d#
479 530
480 my $freeze_guard = freeze_mainloop; 531 my $freeze_guard = freeze_mainloop;
481 532
482 my $busy = 1; 533 my $busy = 1;
483 my @res; 534 my @res;
484 535
485 (async { 536 (async {
486 $Coro::current->desc ("sync job coro"); 537 $Coro::current->desc ("sync job coro");
487 @res = eval { $job->() }; 538 @res = eval { $job->() };
488 warn $@ if $@; 539 error $@ if $@;
489 undef $busy; 540 undef $busy;
490 })->prio (Coro::PRIO_MAX); 541 })->prio (Coro::PRIO_MAX);
491 542
492 while ($busy) { 543 while ($busy) {
493 if (Coro::nready) { 544 if (Coro::nready) {
495 } else { 546 } else {
496 EV::loop EV::LOOP_ONESHOT; 547 EV::loop EV::LOOP_ONESHOT;
497 } 548 }
498 } 549 }
499 550
500 my $time = EV::time - $time; 551 my $time = AE::time - $time;
501 552
502 $TICK_START += $time; # do not account sync jobs to server load 553 $TICK_START += $time; # do not account sync jobs to server load
503 554
504 wantarray ? @res : $res[0] 555 wantarray ? @res : $res[0]
505 } else { 556 } else {
549 reset_signals; 600 reset_signals;
550 &$cb 601 &$cb
551 }, @args; 602 }, @args;
552 603
553 wantarray ? @res : $res[-1] 604 wantarray ? @res : $res[-1]
605}
606
607sub objinfo {
608 (
609 "counter value" => cf::object::object_count,
610 "objects created" => cf::object::create_count,
611 "objects destroyed" => cf::object::destroy_count,
612 "freelist size" => cf::object::free_count,
613 "allocated objects" => cf::object::objects_size,
614 "active objects" => cf::object::actives_size,
615 )
554} 616}
555 617
556=item $coin = coin_from_name $name 618=item $coin = coin_from_name $name
557 619
558=cut 620=cut
595within each server. 657within each server.
596 658
597=cut 659=cut
598 660
599sub db_table($) { 661sub db_table($) {
662 cf::error "db_get called from main context"
663 if $Coro::current == $Coro::main;
664
600 my ($name) = @_; 665 my ($name) = @_;
601 my $db = BDB::db_create $DB_ENV; 666 my $db = BDB::db_create $DB_ENV;
602 667
603 eval { 668 eval {
604 $db->set_flags (BDB::CHKSUM); 669 $db->set_flags (BDB::CHKSUM);
614} 679}
615 680
616our $DB; 681our $DB;
617 682
618sub db_init { 683sub db_init {
619 cf::sync_job {
620 $DB ||= db_table "db"; 684 $DB ||= db_table "db";
621 };
622} 685}
623 686
624sub db_get($$) { 687sub db_get($$) {
625 my $key = "$_[0]/$_[1]"; 688 my $key = "$_[0]/$_[1]";
626 689
627 cf::sync_job { 690 cf::error "db_get called from main context"
691 if $Coro::current == $Coro::main;
692
628 BDB::db_get $DB, undef, $key, my $data; 693 BDB::db_get $DB, undef, $key, my $data;
629 694
630 $! ? () 695 $! ? ()
631 : $data 696 : $data
632 }
633} 697}
634 698
635sub db_put($$$) { 699sub db_put($$$) {
636 BDB::dbreq_pri 4; 700 BDB::dbreq_pri 4;
637 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 701 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
693 757
694 my $t1 = Time::HiRes::time; 758 my $t1 = Time::HiRes::time;
695 my $data = $process->(\@data); 759 my $data = $process->(\@data);
696 my $t2 = Time::HiRes::time; 760 my $t2 = Time::HiRes::time;
697 761
698 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 762 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
699 763
700 db_put cache => "$id/data", $data; 764 db_put cache => "$id/data", $data;
701 db_put cache => "$id/md5" , $md5; 765 db_put cache => "$id/md5" , $md5;
702 db_put cache => "$id/meta", $meta; 766 db_put cache => "$id/meta", $meta;
703 767
713 777
714=cut 778=cut
715 779
716sub datalog($@) { 780sub datalog($@) {
717 my ($type, %kv) = @_; 781 my ($type, %kv) = @_;
718 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 782 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
719} 783}
720 784
721=back 785=back
722 786
723=cut 787=cut
724 788
725############################################################################# 789#############################################################################
726 790
727=head2 ATTACHABLE OBJECTS 791=head2 ATTACHABLE OBJECTS
728 792
729Many objects in crossfire are so-called attachable objects. That means you can 793Many objects in deliantra are so-called attachable objects. That means you can
730attach callbacks/event handlers (a collection of which is called an "attachment") 794attach callbacks/event handlers (a collection of which is called an "attachment")
731to it. All such attachable objects support the following methods. 795to it. All such attachable objects support the following methods.
732 796
733In the following description, CLASS can be any of C<global>, C<object> 797In the following description, CLASS can be any of C<global>, C<object>
734C<player>, C<client> or C<map> (i.e. the attachable objects in 798C<player>, C<client> or C<map> (i.e. the attachable objects in
784=item cf::CLASS::attachment $name, ... 848=item cf::CLASS::attachment $name, ...
785 849
786Register an attachment by C<$name> through which attachable objects of the 850Register an attachment by C<$name> through which attachable objects of the
787given CLASS can refer to this attachment. 851given CLASS can refer to this attachment.
788 852
789Some classes such as crossfire maps and objects can specify attachments 853Some classes such as deliantra maps and objects can specify attachments
790that are attached at load/instantiate time, thus the need for a name. 854that are attached at load/instantiate time, thus the need for a name.
791 855
792These calls expect any number of the following handler/hook descriptions: 856These calls expect any number of the following handler/hook descriptions:
793 857
794=over 4 858=over 4
918 982
919 } elsif (exists $cb_id{$type}) { 983 } elsif (exists $cb_id{$type}) {
920 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 984 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
921 985
922 } elsif (ref $type) { 986 } elsif (ref $type) {
923 warn "attaching objects not supported, ignoring.\n"; 987 error "attaching objects not supported, ignoring.\n";
924 988
925 } else { 989 } else {
926 shift @arg; 990 shift @arg;
927 warn "attach argument '$type' not supported, ignoring.\n"; 991 error "attach argument '$type' not supported, ignoring.\n";
928 } 992 }
929 } 993 }
930} 994}
931 995
932sub _object_attach { 996sub _object_attach {
942 _attach $registry, $klass, @attach; 1006 _attach $registry, $klass, @attach;
943 } 1007 }
944 1008
945 $obj->{$name} = \%arg; 1009 $obj->{$name} = \%arg;
946 } else { 1010 } else {
947 warn "object uses attachment '$name' which is not available, postponing.\n"; 1011 info "object uses attachment '$name' which is not available, postponing.\n";
948 } 1012 }
949 1013
950 $obj->{_attachment}{$name} = undef; 1014 $obj->{_attachment}{$name} = undef;
951} 1015}
952 1016
1011 1075
1012 for (@$callbacks) { 1076 for (@$callbacks) {
1013 eval { &{$_->[1]} }; 1077 eval { &{$_->[1]} };
1014 1078
1015 if ($@) { 1079 if ($@) {
1016 warn "$@";
1017 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1080 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1018 override; 1081 override;
1019 } 1082 }
1020 1083
1021 return 1 if $override; 1084 return 1 if $override;
1022 } 1085 }
1085 1148
1086sub reattach { 1149sub reattach {
1087 # basically do the same as instantiate, without calling instantiate 1150 # basically do the same as instantiate, without calling instantiate
1088 my ($obj) = @_; 1151 my ($obj) = @_;
1089 1152
1153 # no longer needed after getting rid of delete_package?
1090 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1154 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1091 1155
1092 my $registry = $obj->registry; 1156 my $registry = $obj->registry;
1093 1157
1094 @$registry = (); 1158 @$registry = ();
1095 1159
1100 for (@$attach) { 1164 for (@$attach) {
1101 my ($klass, @attach) = @$_; 1165 my ($klass, @attach) = @$_;
1102 _attach $registry, $klass, @attach; 1166 _attach $registry, $klass, @attach;
1103 } 1167 }
1104 } else { 1168 } else {
1105 warn "object uses attachment '$name' that is not available, postponing.\n"; 1169 info "object uses attachment '$name' that is not available, postponing.\n";
1106 } 1170 }
1107 } 1171 }
1108} 1172}
1109 1173
1110cf::attachable->attach ( 1174cf::attachable->attach (
1137 my ($filename, $rdata, $objs) = @_; 1201 my ($filename, $rdata, $objs) = @_;
1138 1202
1139 sync_job { 1203 sync_job {
1140 if (length $$rdata) { 1204 if (length $$rdata) {
1141 utf8::decode (my $decname = $filename); 1205 utf8::decode (my $decname = $filename);
1142 warn sprintf "saving %s (%d,%d)\n", 1206 trace sprintf "saving %s (%d,%d)\n",
1143 $decname, length $$rdata, scalar @$objs; 1207 $decname, length $$rdata, scalar @$objs
1208 if $VERBOSE_IO;
1144 1209
1145 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1210 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1146 aio_chmod $fh, SAVE_MODE; 1211 aio_chmod $fh, SAVE_MODE;
1147 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1212 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1148 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 }
1149 aio_close $fh; 1217 aio_close $fh;
1150 1218
1151 if (@$objs) { 1219 if (@$objs) {
1152 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1220 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1153 aio_chmod $fh, SAVE_MODE; 1221 aio_chmod $fh, SAVE_MODE;
1154 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1222 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1155 aio_write $fh, 0, (length $data), $data, 0; 1223 aio_write $fh, 0, (length $data), $data, 0;
1156 aio_fsync $fh if $cf::USE_FSYNC; 1224 if ($cf::USE_FSYNC) {
1225 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;
1226 aio_fsync $fh;
1227 }
1157 aio_close $fh; 1228 aio_close $fh;
1158 aio_rename "$filename.pst~", "$filename.pst"; 1229 aio_rename "$filename.pst~", "$filename.pst";
1159 } 1230 }
1160 } else { 1231 } else {
1161 aio_unlink "$filename.pst"; 1232 aio_unlink "$filename.pst";
1162 } 1233 }
1163 1234
1164 aio_rename "$filename~", $filename; 1235 aio_rename "$filename~", $filename;
1236
1237 $filename =~ s%/[^/]+$%%;
1238 aio_pathsync $filename if $cf::USE_FSYNC;
1165 } else { 1239 } else {
1166 warn "FATAL: $filename~: $!\n"; 1240 error "unable to save objects: $filename~: $!\n";
1167 } 1241 }
1168 } else { 1242 } else {
1169 aio_unlink $filename; 1243 aio_unlink $filename;
1170 aio_unlink "$filename.pst"; 1244 aio_unlink "$filename.pst";
1171 } 1245 }
1195 my $st = eval { Coro::Storable::thaw $av }; 1269 my $st = eval { Coro::Storable::thaw $av };
1196 $av = $st->{objs}; 1270 $av = $st->{objs};
1197 } 1271 }
1198 1272
1199 utf8::decode (my $decname = $filename); 1273 utf8::decode (my $decname = $filename);
1200 warn sprintf "loading %s (%d,%d)\n", 1274 trace sprintf "loading %s (%d,%d)\n",
1201 $decname, length $data, scalar @{$av || []}; 1275 $decname, length $data, scalar @{$av || []}
1276 if $VERBOSE_IO;
1202 1277
1203 ($data, $av) 1278 ($data, $av)
1204} 1279}
1205 1280
1206=head2 COMMAND CALLBACKS 1281=head2 COMMAND CALLBACKS
1262 my ($name, $cb) = @_; 1337 my ($name, $cb) = @_;
1263 1338
1264 $EXTICMD{$name} = $cb; 1339 $EXTICMD{$name} = $cb;
1265} 1340}
1266 1341
1342use File::Glob ();
1343
1267cf::player->attach ( 1344cf::player->attach (
1268 on_command => sub { 1345 on_unknown_command => sub {
1269 my ($pl, $name, $params) = @_; 1346 my ($pl, $name, $params) = @_;
1270 1347
1271 my $cb = $COMMAND{$name} 1348 my $cb = $COMMAND{$name}
1272 or return; 1349 or return;
1273 1350
1296 1373
1297 $pl->ext_reply ($reply, @reply) 1374 $pl->ext_reply ($reply, @reply)
1298 if $reply; 1375 if $reply;
1299 1376
1300 } else { 1377 } else {
1301 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1378 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1302 } 1379 }
1303 1380
1304 cf::override; 1381 cf::override;
1305 }, 1382 },
1306); 1383);
1307 1384
1385# "readahead" all extensions
1386sub cache_extensions {
1387 my $grp = IO::AIO::aio_group;
1388
1389 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1390 for (grep /\.ext$/, @{$_[0]}) {
1391 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1392 }
1393 };
1394
1395 $grp
1396}
1397
1308sub load_extensions { 1398sub load_extensions {
1399 info "loading extensions...";
1400
1309 cf::sync_job { 1401 cf::sync_job {
1310 my %todo; 1402 my %todo;
1311 1403
1312 for my $path (<$LIBDIR/*.ext>) { 1404 for my $path (<$LIBDIR/*.ext>) {
1313 next unless -r $path; 1405 next unless -r $path;
1331 1423
1332 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1424 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1333 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1425 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1334 1426
1335 $ext{source} = 1427 $ext{source} =
1336 "package $pkg; use strict; use utf8;\n" 1428 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1337 . "#line 1 \"$path\"\n{\n" 1429 . "#line 1 \"$path\"\n{\n"
1338 . $source 1430 . $source
1339 . "\n};\n1"; 1431 . "\n};\n1";
1340 1432
1341 $todo{$base} = \%ext; 1433 $todo{$base} = \%ext;
1342 } 1434 }
1343 1435
1436 my $pass = 0;
1344 my %done; 1437 my %done;
1345 while (%todo) { 1438 while (%todo) {
1346 my $progress; 1439 my $progress;
1347 1440
1441 ++$pass;
1442
1443 ext:
1348 while (my ($k, $v) = each %todo) { 1444 while (my ($k, $v) = each %todo) {
1349 for (split /,\s*/, $v->{meta}{depends}) { 1445 for (split /,\s*/, $v->{meta}{depends}) {
1350 goto skip 1446 next ext
1351 unless exists $done{$_}; 1447 unless exists $done{$_};
1352 } 1448 }
1353 1449
1354 warn "... loading '$k' into '$v->{pkg}'\n"; 1450 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1355 1451
1356 unless (eval $v->{source}) { 1452 my $active = eval $v->{source};
1453
1454 if (length $@) {
1357 my $msg = $@ ? "$v->{path}: $@\n" 1455 error "$v->{path}: $@\n";
1358 : "$v->{base}: extension inactive.\n";
1359 1456
1360 if (exists $v->{meta}{mandatory}) {
1361 warn $msg;
1362 cf::cleanup "mandatory extension failed to load, exiting."; 1457 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1363 } 1458 if exists $v->{meta}{mandatory};
1364 1459
1365 warn $msg; 1460 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1461 delete $todo{$k};
1462 } else {
1463 $done{$k} = delete $todo{$k};
1464 push @EXTS, $v->{pkg};
1465 $progress = 1;
1466
1467 info "$v->{base}: extension inactive.\n"
1468 unless $active;
1366 } 1469 }
1367
1368 $done{$k} = delete $todo{$k};
1369 push @EXTS, $v->{pkg};
1370 $progress = 1;
1371 } 1470 }
1372 1471
1373 skip: 1472 unless ($progress) {
1374 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1473 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1375 unless $progress; 1474
1475 while (my ($k, $v) = each %todo) {
1476 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1477 if exists $v->{meta}{mandatory};
1478 }
1479 }
1376 } 1480 }
1377 }; 1481 };
1378} 1482}
1379 1483
1380############################################################################# 1484#############################################################################
1381 1485
1382=back 1486=back
1383 1487
1384=head2 CORE EXTENSIONS 1488=head2 CORE EXTENSIONS
1385 1489
1386Functions and methods that extend core crossfire objects. 1490Functions and methods that extend core deliantra objects.
1387 1491
1388=cut 1492=cut
1389 1493
1390package cf::player; 1494package cf::player;
1391 1495
1434 1538
1435sub exists($) { 1539sub exists($) {
1436 my ($login) = @_; 1540 my ($login) = @_;
1437 1541
1438 $cf::PLAYER{$login} 1542 $cf::PLAYER{$login}
1439 or cf::sync_job { !aio_stat path $login } 1543 or !aio_stat path $login
1440} 1544}
1441 1545
1442sub find($) { 1546sub find($) {
1443 return $cf::PLAYER{$_[0]} || do { 1547 return $cf::PLAYER{$_[0]} || do {
1444 my $login = $_[0]; 1548 my $login = $_[0];
1464 $cf::PLAYER{$login} = $pl 1568 $cf::PLAYER{$login} = $pl
1465 } 1569 }
1466 } 1570 }
1467} 1571}
1468 1572
1573cf::player->attach (
1574 on_load => sub {
1575 my ($pl, $path) = @_;
1576
1577 # restore slots saved in save, below
1578 my $slots = delete $pl->{_slots};
1579
1580 $pl->ob->current_weapon ($slots->[0]);
1581 $pl->combat_ob ($slots->[1]);
1582 $pl->ranged_ob ($slots->[2]);
1583 },
1584);
1585
1469sub save($) { 1586sub save($) {
1470 my ($pl) = @_; 1587 my ($pl) = @_;
1471 1588
1472 return if $pl->{deny_save}; 1589 return if $pl->{deny_save};
1473 1590
1478 1595
1479 aio_mkdir playerdir $pl, 0770; 1596 aio_mkdir playerdir $pl, 0770;
1480 $pl->{last_save} = $cf::RUNTIME; 1597 $pl->{last_save} = $cf::RUNTIME;
1481 1598
1482 cf::get_slot 0.01; 1599 cf::get_slot 0.01;
1600
1601 # save slots, to be restored later
1602 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1483 1603
1484 $pl->save_pl ($path); 1604 $pl->save_pl ($path);
1485 cf::cede_to_tick; 1605 cf::cede_to_tick;
1486} 1606}
1487 1607
1519 my ($pl) = @_; 1639 my ($pl) = @_;
1520 1640
1521 my $name = $pl->ob->name; 1641 my $name = $pl->ob->name;
1522 1642
1523 $pl->{deny_save} = 1; 1643 $pl->{deny_save} = 1;
1524 $pl->password ("*"); # this should lock out the player until we nuked the dir 1644 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1525 1645
1526 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1646 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1527 $pl->deactivate; 1647 $pl->deactivate;
1648 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1528 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1649 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1529 $pl->ns->destroy if $pl->ns; 1650 $pl->ns->destroy if $pl->ns;
1530 1651
1531 my $path = playerdir $pl; 1652 my $path = playerdir $pl;
1532 my $temp = "$path~$cf::RUNTIME~deleting~"; 1653 my $temp = "$path~$cf::RUNTIME~deleting~";
1587 \@logins 1708 \@logins
1588} 1709}
1589 1710
1590=item $player->maps 1711=item $player->maps
1591 1712
1713=item cf::player::maps $login
1714
1592Returns an arrayref of map paths that are private for this 1715Returns an arrayref of map paths that are private for this
1593player. May block. 1716player. May block.
1594 1717
1595=cut 1718=cut
1596 1719
1613 } 1736 }
1614 1737
1615 \@paths 1738 \@paths
1616} 1739}
1617 1740
1618=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1741=item $protocol_xml = $player->expand_cfpod ($cfpod)
1619 1742
1620Expand crossfire pod fragments into protocol xml. 1743Expand deliantra pod fragments into protocol xml.
1621
1622=cut
1623
1624use re 'eval';
1625
1626my $group;
1627my $interior; $interior = qr{
1628 # match a pod interior sequence sans C<< >>
1629 (?:
1630 \ (.*?)\ (?{ $group = $^N })
1631 | < (??{$interior}) >
1632 )
1633}x;
1634
1635sub expand_cfpod {
1636 my ($self, $pod) = @_;
1637
1638 my $xml;
1639
1640 while () {
1641 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1642 $group = $1;
1643
1644 $group =~ s/&/&amp;/g;
1645 $group =~ s/</&lt;/g;
1646
1647 $xml .= $group;
1648 } elsif ($pod =~ m%\G
1649 ([BCGHITU])
1650 <
1651 (?:
1652 ([^<>]*) (?{ $group = $^N })
1653 | < $interior >
1654 )
1655 >
1656 %gcsx
1657 ) {
1658 my ($code, $data) = ($1, $group);
1659
1660 if ($code eq "B") {
1661 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1662 } elsif ($code eq "I") {
1663 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1664 } elsif ($code eq "U") {
1665 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1666 } elsif ($code eq "C") {
1667 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1668 } elsif ($code eq "T") {
1669 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1670 } elsif ($code eq "G") {
1671 my ($male, $female) = split /\|/, $data;
1672 $data = $self->gender ? $female : $male;
1673 $xml .= expand_cfpod ($self, $data);
1674 } elsif ($code eq "H") {
1675 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1676 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1677 "")
1678 [$self->{hintmode}];
1679 } else {
1680 $xml .= "error processing '$code($data)' directive";
1681 }
1682 } else {
1683 if ($pod =~ /\G(.+)/) {
1684 warn "parse error while expanding $pod (at $1)";
1685 }
1686 last;
1687 }
1688 }
1689
1690 for ($xml) {
1691 # create single paragraphs (very hackish)
1692 s/(?<=\S)\n(?=\w)/ /g;
1693
1694 # compress some whitespace
1695 s/\s+\n/\n/g; # ws line-ends
1696 s/\n\n+/\n/g; # double lines
1697 s/^\n+//; # beginning lines
1698 s/\n+$//; # ending lines
1699 }
1700
1701 $xml
1702}
1703
1704no re 'eval';
1705
1706sub hintmode {
1707 $_[0]{hintmode} = $_[1] if @_ > 1;
1708 $_[0]{hintmode}
1709}
1710 1744
1711=item $player->ext_reply ($msgid, @msg) 1745=item $player->ext_reply ($msgid, @msg)
1712 1746
1713Sends an ext reply to the player. 1747Sends an ext reply to the player.
1714 1748
1746 1780
1747=cut 1781=cut
1748 1782
1749sub find_by_path($) { 1783sub find_by_path($) {
1750 my ($path) = @_; 1784 my ($path) = @_;
1785
1786 $path =~ s/^~[^\/]*//; # skip ~login
1751 1787
1752 my ($match, $specificity); 1788 my ($match, $specificity);
1753 1789
1754 for my $region (list) { 1790 for my $region (list) {
1755 if ($region->{match} && $path =~ $region->{match}) { 1791 if ($region->{match} && $path =~ $region->{match}) {
1787 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1823 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1788 1824
1789 # mit "rum" bekleckern, nicht 1825 # mit "rum" bekleckern, nicht
1790 $self->_create_random_map ( 1826 $self->_create_random_map (
1791 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1827 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1792 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1828 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1793 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1829 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1794 $rmp->{exit_on_final_map}, 1830 $rmp->{exit_on_final_map},
1795 $rmp->{xsize}, $rmp->{ysize}, 1831 $rmp->{xsize}, $rmp->{ysize},
1796 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1832 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1797 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1833 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1819 1855
1820 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1856 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1821} 1857}
1822 1858
1823# also paths starting with '/' 1859# also paths starting with '/'
1824$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1860$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1825 1861
1826sub thawer_merge { 1862sub thawer_merge {
1827 my ($self, $merge) = @_; 1863 my ($self, $merge) = @_;
1828 1864
1829 # we have to keep some variables in memory intact 1865 # we have to keep some variables in memory intact
1927 1963
1928 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1964 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1929 "$UNIQUEDIR/$path" 1965 "$UNIQUEDIR/$path"
1930} 1966}
1931 1967
1932# and all this just because we cannot iterate over
1933# all maps in C++...
1934sub change_all_map_light {
1935 my ($change) = @_;
1936
1937 $_->change_map_light ($change)
1938 for grep $_->outdoor, values %cf::MAP;
1939}
1940
1941sub decay_objects { 1968sub decay_objects {
1942 my ($self) = @_; 1969 my ($self) = @_;
1943 1970
1944 return if $self->{deny_reset}; 1971 return if $self->{deny_reset};
1945 1972
2027sub find { 2054sub find {
2028 my ($path, $origin) = @_; 2055 my ($path, $origin) = @_;
2029 2056
2030 $path = normalise $path, $origin && $origin->path; 2057 $path = normalise $path, $origin && $origin->path;
2031 2058
2032 cf::lock_wait "map_data:$path";#d#remove 2059 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2033 cf::lock_wait "map_find:$path"; 2060 my $guard2 = cf::lock_acquire "map_find:$path";
2034 2061
2035 $cf::MAP{$path} || do { 2062 $cf::MAP{$path} || do {
2036 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2037 my $guard2 = cf::lock_acquire "map_find:$path";
2038
2039 my $map = new_from_path cf::map $path 2063 my $map = new_from_path cf::map $path
2040 or return; 2064 or return;
2041 2065
2042 $map->{last_save} = $cf::RUNTIME; 2066 $map->{last_save} = $cf::RUNTIME;
2043 2067
2055 2079
2056 $cf::MAP{$path} = $map 2080 $cf::MAP{$path} = $map
2057 } 2081 }
2058} 2082}
2059 2083
2060sub pre_load { } 2084sub pre_load { }
2061sub post_load { } 2085#sub post_load { } # XS
2062 2086
2063sub load { 2087sub load {
2064 my ($self) = @_; 2088 my ($self) = @_;
2065 2089
2066 local $self->{deny_reset} = 1; # loading can take a long time 2090 local $self->{deny_reset} = 1; # loading can take a long time
2083 my $f = new_from_file cf::object::thawer $self->{load_path}; 2107 my $f = new_from_file cf::object::thawer $self->{load_path};
2084 $f->skip_block; 2108 $f->skip_block;
2085 $self->_load_objects ($f) 2109 $self->_load_objects ($f)
2086 or return; 2110 or return;
2087 2111
2088 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2112 $self->post_load_original
2089 if delete $self->{load_original}; 2113 if delete $self->{load_original};
2090 2114
2091 if (my $uniq = $self->uniq_path) { 2115 if (my $uniq = $self->uniq_path) {
2092 utf8::encode $uniq; 2116 utf8::encode $uniq;
2093 unless (aio_stat $uniq) { 2117 unless (aio_stat $uniq) {
2111 unless ($self->{deny_activate}) { 2135 unless ($self->{deny_activate}) {
2112 $self->decay_objects; 2136 $self->decay_objects;
2113 $self->fix_auto_apply; 2137 $self->fix_auto_apply;
2114 $self->update_buttons; 2138 $self->update_buttons;
2115 cf::cede_to_tick; 2139 cf::cede_to_tick;
2116 $self->set_darkness_map;
2117 cf::cede_to_tick;
2118 $self->activate; 2140 $self->activate;
2119 } 2141 }
2120 2142
2121 $self->{last_save} = $cf::RUNTIME; 2143 $self->{last_save} = $cf::RUNTIME;
2122 $self->last_access ($cf::RUNTIME); 2144 $self->last_access ($cf::RUNTIME);
2125 } 2147 }
2126 2148
2127 $self->post_load; 2149 $self->post_load;
2128} 2150}
2129 2151
2152# customize the map for a given player, i.e.
2153# return the _real_ map. used by e.g. per-player
2154# maps to change the path to ~playername/mappath
2130sub customise_for { 2155sub customise_for {
2131 my ($self, $ob) = @_; 2156 my ($self, $ob) = @_;
2132 2157
2133 return find "~" . $ob->name . "/" . $self->{path} 2158 return find "~" . $ob->name . "/" . $self->{path}
2134 if $self->per_player; 2159 if $self->per_player;
2150 or next; 2175 or next;
2151 $neigh = find $neigh, $map 2176 $neigh = find $neigh, $map
2152 or next; 2177 or next;
2153 $neigh->load; 2178 $neigh->load;
2154 2179
2180 # now find the diagonal neighbours
2155 push @neigh, 2181 push @neigh,
2156 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2182 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2157 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2183 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2158 } 2184 }
2159 2185
2166} 2192}
2167 2193
2168sub find_sync { 2194sub find_sync {
2169 my ($path, $origin) = @_; 2195 my ($path, $origin) = @_;
2170 2196
2171 cf::sync_job { find $path, $origin } 2197 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2198 if $Coro::current == $Coro::main;
2199
2200 find $path, $origin
2172} 2201}
2173 2202
2174sub do_load_sync { 2203sub do_load_sync {
2175 my ($map) = @_; 2204 my ($map) = @_;
2176 2205
2177 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2206 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2178 if $Coro::current == $Coro::main; 2207 if $Coro::current == $Coro::main;
2179 2208
2180 cf::sync_job { $map->load }; 2209 $map->load;
2181} 2210}
2182 2211
2183our %MAP_PREFETCH; 2212our %MAP_PREFETCH;
2184our $MAP_PREFETCHER = undef; 2213our $MAP_PREFETCHER = undef;
2185 2214
2211 $MAP_PREFETCHER->prio (6); 2240 $MAP_PREFETCHER->prio (6);
2212 2241
2213 () 2242 ()
2214} 2243}
2215 2244
2245# common code, used by both ->save and ->swapout
2216sub save { 2246sub _save {
2217 my ($self) = @_; 2247 my ($self) = @_;
2218
2219 my $lock = cf::lock_acquire "map_data:$self->{path}";
2220 2248
2221 $self->{last_save} = $cf::RUNTIME; 2249 $self->{last_save} = $cf::RUNTIME;
2222 2250
2223 return unless $self->dirty; 2251 return unless $self->dirty;
2224 2252
2244 } else { 2272 } else {
2245 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2273 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2246 } 2274 }
2247} 2275}
2248 2276
2277sub save {
2278 my ($self) = @_;
2279
2280 my $lock = cf::lock_acquire "map_data:$self->{path}";
2281
2282 $self->_save;
2283}
2284
2249sub swap_out { 2285sub swap_out {
2250 my ($self) = @_; 2286 my ($self) = @_;
2251 2287
2252 # save first because save cedes
2253 $self->save;
2254
2255 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2288 my $lock = cf::lock_acquire "map_data:$self->{path}";
2256 2289
2257 return if $self->players;
2258 return if $self->in_memory != cf::MAP_ACTIVE; 2290 return if $self->in_memory != cf::MAP_ACTIVE;
2259 return if $self->{deny_save}; 2291 return if $self->{deny_save};
2292 return if $self->players;
2260 2293
2294 # first deactivate the map and "unlink" it from the core
2295 $self->deactivate;
2296 $_->clear_links_to ($self) for values %cf::MAP;
2261 $self->in_memory (cf::MAP_SWAPPED); 2297 $self->in_memory (cf::MAP_SWAPPED);
2298
2299 # then atomically save
2300 $self->_save;
2301
2302 # then free the map
2303 $self->clear;
2304}
2305
2306sub reset_at {
2307 my ($self) = @_;
2308
2309 # TODO: safety, remove and allow resettable per-player maps
2310 return 1e99 if $self->{deny_reset};
2311
2312 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2313 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2314
2315 $time + $to
2316}
2317
2318sub should_reset {
2319 my ($self) = @_;
2320
2321 $self->reset_at <= $cf::RUNTIME
2322}
2323
2324sub reset {
2325 my ($self) = @_;
2326
2327 my $lock = cf::lock_acquire "map_data:$self->{path}";
2328
2329 return if $self->players;
2330
2331 cf::trace "resetting map ", $self->path, "\n";
2332
2333 $self->in_memory (cf::MAP_SWAPPED);
2334
2335 # need to save uniques path
2336 unless ($self->{deny_save}) {
2337 my $uniq = $self->uniq_path; utf8::encode $uniq;
2338
2339 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2340 if $uniq;
2341 }
2342
2343 delete $cf::MAP{$self->path};
2262 2344
2263 $self->deactivate; 2345 $self->deactivate;
2264 $_->clear_links_to ($self) for values %cf::MAP; 2346 $_->clear_links_to ($self) for values %cf::MAP;
2265 $self->clear; 2347 $self->clear;
2266}
2267
2268sub reset_at {
2269 my ($self) = @_;
2270
2271 # TODO: safety, remove and allow resettable per-player maps
2272 return 1e99 if $self->{deny_reset};
2273
2274 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2275 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2276
2277 $time + $to
2278}
2279
2280sub should_reset {
2281 my ($self) = @_;
2282
2283 $self->reset_at <= $cf::RUNTIME
2284}
2285
2286sub reset {
2287 my ($self) = @_;
2288
2289 my $lock = cf::lock_acquire "map_data:$self->{path}";
2290
2291 return if $self->players;
2292
2293 warn "resetting map ", $self->path;
2294
2295 $self->in_memory (cf::MAP_SWAPPED);
2296
2297 # need to save uniques path
2298 unless ($self->{deny_save}) {
2299 my $uniq = $self->uniq_path; utf8::encode $uniq;
2300
2301 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2302 if $uniq;
2303 }
2304
2305 delete $cf::MAP{$self->path};
2306
2307 $self->deactivate;
2308 $_->clear_links_to ($self) for values %cf::MAP;
2309 $self->clear;
2310 2348
2311 $self->unlink_save; 2349 $self->unlink_save;
2312 $self->destroy; 2350 $self->destroy;
2313} 2351}
2314 2352
2322 2360
2323 delete $cf::MAP{$self->path}; 2361 delete $cf::MAP{$self->path};
2324 2362
2325 $self->unlink_save; 2363 $self->unlink_save;
2326 2364
2327 bless $self, "cf::map"; 2365 bless $self, "cf::map::wrap";
2328 delete $self->{deny_reset}; 2366 delete $self->{deny_reset};
2329 $self->{deny_save} = 1; 2367 $self->{deny_save} = 1;
2330 $self->reset_timeout (1); 2368 $self->reset_timeout (1);
2331 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2369 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2332 2370
2389 : normalise $_ 2427 : normalise $_
2390 } @{ aio_readdir $UNIQUEDIR or [] } 2428 } @{ aio_readdir $UNIQUEDIR or [] }
2391 ] 2429 ]
2392} 2430}
2393 2431
2432=item cf::map::static_maps
2433
2434Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2435file in the shared directory excluding F</styles> and F</editor>). May
2436block.
2437
2438=cut
2439
2440sub static_maps() {
2441 my @dirs = "";
2442 my @maps;
2443
2444 while (@dirs) {
2445 my $dir = shift @dirs;
2446
2447 next if $dir eq "/styles" || $dir eq "/editor";
2448
2449 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2450 or return;
2451
2452 for (@$files) {
2453 s/\.map$// or next;
2454 utf8::decode $_;
2455 push @maps, "$dir/$_";
2456 }
2457
2458 push @dirs, map "$dir/$_", @$dirs;
2459 }
2460
2461 \@maps
2462}
2463
2394=back 2464=back
2395 2465
2396=head3 cf::object 2466=head3 cf::object
2397 2467
2398=cut 2468=cut
2463 2533
2464our $SAY_CHANNEL = { 2534our $SAY_CHANNEL = {
2465 id => "say", 2535 id => "say",
2466 title => "Map", 2536 title => "Map",
2467 reply => "say ", 2537 reply => "say ",
2468 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2538 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2469}; 2539};
2470 2540
2471our $CHAT_CHANNEL = { 2541our $CHAT_CHANNEL = {
2472 id => "chat", 2542 id => "chat",
2473 title => "Chat", 2543 title => "Chat",
2528 2598
2529=item $player_object->enter_link 2599=item $player_object->enter_link
2530 2600
2531Freezes the player and moves him/her to a special map (C<{link}>). 2601Freezes the player and moves him/her to a special map (C<{link}>).
2532 2602
2533The player should be reasonably safe there for short amounts of time. You 2603The player should be reasonably safe there for short amounts of time (e.g.
2534I<MUST> call C<leave_link> as soon as possible, though. 2604for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2605though, as the player cannot control the character while it is on the link
2606map.
2535 2607
2536Will never block. 2608Will never block.
2537 2609
2538=item $player_object->leave_link ($map, $x, $y) 2610=item $player_object->leave_link ($map, $x, $y)
2539 2611
2559sub cf::object::player::enter_link { 2631sub cf::object::player::enter_link {
2560 my ($self) = @_; 2632 my ($self) = @_;
2561 2633
2562 $self->deactivate_recursive; 2634 $self->deactivate_recursive;
2563 2635
2636 ++$self->{_link_recursion};
2637
2564 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2638 return if UNIVERSAL::isa $self->map, "ext::map_link";
2565 2639
2566 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2640 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2567 if $self->map && $self->map->{path} ne "{link}"; 2641 if $self->map && $self->map->{path} ne "{link}";
2568 2642
2569 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2643 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2570} 2644}
2571 2645
2572sub cf::object::player::leave_link { 2646sub cf::object::player::leave_link {
2573 my ($self, $map, $x, $y) = @_; 2647 my ($self, $map, $x, $y) = @_;
2574 2648
2591 ($x, $y) = (-1, -1) 2665 ($x, $y) = (-1, -1)
2592 unless (defined $x) && (defined $y); 2666 unless (defined $x) && (defined $y);
2593 2667
2594 # use -1 or undef as default coordinates, not 0, 0 2668 # use -1 or undef as default coordinates, not 0, 0
2595 ($x, $y) = ($map->enter_x, $map->enter_y) 2669 ($x, $y) = ($map->enter_x, $map->enter_y)
2596 if $x <=0 && $y <= 0; 2670 if $x <= 0 && $y <= 0;
2597 2671
2598 $map->load; 2672 $map->load;
2599 $map->load_neighbours; 2673 $map->load_neighbours;
2600 2674
2601 return unless $self->contr->active; 2675 return unless $self->contr->active;
2602 $self->activate_recursive;
2603 2676
2604 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2677 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2605 $self->enter_map ($map, $x, $y); 2678 if ($self->enter_map ($map, $x, $y)) {
2606} 2679 # entering was successful
2680 delete $self->{_link_recursion};
2681 # only activate afterwards, to support waiting in hooks
2682 $self->activate_recursive;
2683 }
2607 2684
2685}
2686
2608=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2687=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2609 2688
2610Moves the player to the given map-path and coordinates by first freezing 2689Moves the player to the given map-path and coordinates by first freezing
2611her, loading and preparing them map, calling the provided $check callback 2690her, loading and preparing them map, calling the provided $check callback
2612that has to return the map if sucecssful, and then unfreezes the player on 2691that has to return the map if sucecssful, and then unfreezes the player on
2613the new (success) or old (failed) map position. In either case, $done will 2692the new (success) or old (failed) map position. In either case, $done will
2614be called at the end of this process. 2693be called at the end of this process.
2615 2694
2695Note that $check will be called with a potentially non-loaded map, so if
2696it needs a loaded map it has to call C<< ->load >>.
2697
2616=cut 2698=cut
2617 2699
2618our $GOTOGEN; 2700our $GOTOGEN;
2619 2701
2620sub cf::object::player::goto { 2702sub cf::object::player::goto {
2621 my ($self, $path, $x, $y, $check, $done) = @_; 2703 my ($self, $path, $x, $y, $check, $done) = @_;
2704
2705 if ($self->{_link_recursion} >= $MAX_LINKS) {
2706 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2707 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2708 ($path, $x, $y) = @$EMERGENCY_POSITION;
2709 }
2622 2710
2623 # do generation counting so two concurrent goto's will be executed in-order 2711 # do generation counting so two concurrent goto's will be executed in-order
2624 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2712 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2625 2713
2626 $self->enter_link; 2714 $self->enter_link;
2650 my $map = eval { 2738 my $map = eval {
2651 my $map = defined $path ? cf::map::find $path : undef; 2739 my $map = defined $path ? cf::map::find $path : undef;
2652 2740
2653 if ($map) { 2741 if ($map) {
2654 $map = $map->customise_for ($self); 2742 $map = $map->customise_for ($self);
2655 $map = $check->($map) if $check && $map; 2743 $map = $check->($map, $x, $y, $self) if $check && $map;
2656 } else { 2744 } else {
2657 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2745 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2658 } 2746 }
2659 2747
2660 $map 2748 $map
2668 if ($gen == $self->{_goto_generation}) { 2756 if ($gen == $self->{_goto_generation}) {
2669 delete $self->{_goto_generation}; 2757 delete $self->{_goto_generation};
2670 $self->leave_link ($map, $x, $y); 2758 $self->leave_link ($map, $x, $y);
2671 } 2759 }
2672 2760
2673 $done->() if $done; 2761 $done->($self) if $done;
2674 })->prio (1); 2762 })->prio (1);
2675} 2763}
2676 2764
2677=item $player_object->enter_exit ($exit_object) 2765=item $player_object->enter_exit ($exit_object)
2678 2766
2766 $self->contr->savebed ($map, $x, $y) 2854 $self->contr->savebed ($map, $x, $y)
2767 if $exit->flag (cf::FLAG_DAMNED); 2855 if $exit->flag (cf::FLAG_DAMNED);
2768 2856
2769 1 2857 1
2770 }) { 2858 }) {
2771 $self->message ("Something went wrong deep within the crossfire server. " 2859 $self->message ("Something went wrong deep within the deliantra server. "
2772 . "I'll try to bring you back to the map you were before. " 2860 . "I'll try to bring you back to the map you were before. "
2773 . "Please report this to the dungeon master!", 2861 . "Please report this to the dungeon master!",
2774 cf::NDI_UNIQUE | cf::NDI_RED); 2862 cf::NDI_UNIQUE | cf::NDI_RED);
2775 2863
2776 warn "ERROR in enter_exit: $@"; 2864 error "ERROR in enter_exit: $@";
2777 $self->leave_link; 2865 $self->leave_link;
2778 } 2866 }
2779 })->prio (1); 2867 })->prio (1);
2780} 2868}
2781 2869
2793sub cf::client::send_drawinfo { 2881sub cf::client::send_drawinfo {
2794 my ($self, $text, $flags) = @_; 2882 my ($self, $text, $flags) = @_;
2795 2883
2796 utf8::encode $text; 2884 utf8::encode $text;
2797 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2885 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2886}
2887
2888=item $client->send_big_packet ($pkt)
2889
2890Like C<send_packet>, but tries to compress large packets, and fragments
2891them as required.
2892
2893=cut
2894
2895our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2896
2897sub cf::client::send_big_packet {
2898 my ($self, $pkt) = @_;
2899
2900 # try lzf for large packets
2901 $pkt = "lzf " . Compress::LZF::compress $pkt
2902 if 1024 <= length $pkt and $self->{can_lzf};
2903
2904 # split very large packets
2905 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2906 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2907 $pkt = "frag";
2908 }
2909
2910 $self->send_packet ($pkt);
2798} 2911}
2799 2912
2800=item $client->send_msg ($channel, $msg, $color, [extra...]) 2913=item $client->send_msg ($channel, $msg, $color, [extra...])
2801 2914
2802Send a drawinfo or msg packet to the client, formatting the msg for the 2915Send a drawinfo or msg packet to the client, formatting the msg for the
2806 2919
2807=cut 2920=cut
2808 2921
2809# non-persistent channels (usually the info channel) 2922# non-persistent channels (usually the info channel)
2810our %CHANNEL = ( 2923our %CHANNEL = (
2924 "c/motd" => {
2925 id => "infobox",
2926 title => "MOTD",
2927 reply => undef,
2928 tooltip => "The message of the day",
2929 },
2811 "c/identify" => { 2930 "c/identify" => {
2812 id => "infobox", 2931 id => "infobox",
2813 title => "Identify", 2932 title => "Identify",
2814 reply => undef, 2933 reply => undef,
2815 tooltip => "Items recently identified", 2934 tooltip => "Items recently identified",
2817 "c/examine" => { 2936 "c/examine" => {
2818 id => "infobox", 2937 id => "infobox",
2819 title => "Examine", 2938 title => "Examine",
2820 reply => undef, 2939 reply => undef,
2821 tooltip => "Signs and other items you examined", 2940 tooltip => "Signs and other items you examined",
2941 },
2942 "c/shopinfo" => {
2943 id => "infobox",
2944 title => "Shop Info",
2945 reply => undef,
2946 tooltip => "What your bargaining skill tells you about the shop",
2822 }, 2947 },
2823 "c/book" => { 2948 "c/book" => {
2824 id => "infobox", 2949 id => "infobox",
2825 title => "Book", 2950 title => "Book",
2826 reply => undef, 2951 reply => undef,
2842 id => "infobox", 2967 id => "infobox",
2843 title => "Body Parts", 2968 title => "Body Parts",
2844 reply => undef, 2969 reply => undef,
2845 tooltip => "Shows which body parts you posess and are available", 2970 tooltip => "Shows which body parts you posess and are available",
2846 }, 2971 },
2972 "c/statistics" => {
2973 id => "infobox",
2974 title => "Statistics",
2975 reply => undef,
2976 tooltip => "Shows your primary statistics",
2977 },
2978 "c/skills" => {
2979 id => "infobox",
2980 title => "Skills",
2981 reply => undef,
2982 tooltip => "Shows your experience per skill and item power",
2983 },
2984 "c/shopitems" => {
2985 id => "infobox",
2986 title => "Shop Items",
2987 reply => undef,
2988 tooltip => "Shows the items currently for sale in this shop",
2989 },
2990 "c/resistances" => {
2991 id => "infobox",
2992 title => "Resistances",
2993 reply => undef,
2994 tooltip => "Shows your resistances",
2995 },
2996 "c/pets" => {
2997 id => "infobox",
2998 title => "Pets",
2999 reply => undef,
3000 tooltip => "Shows information abotu your pets/a specific pet",
3001 },
3002 "c/perceiveself" => {
3003 id => "infobox",
3004 title => "Perceive Self",
3005 reply => undef,
3006 tooltip => "You gained detailed knowledge about yourself",
3007 },
2847 "c/uptime" => { 3008 "c/uptime" => {
2848 id => "infobox", 3009 id => "infobox",
2849 title => "Uptime", 3010 title => "Uptime",
2850 reply => undef, 3011 reply => undef,
2851 tooltip => "How long the server has been running since last restart", 3012 tooltip => "How long the server has been running since last restart",
2860 id => "party", 3021 id => "party",
2861 title => "Party", 3022 title => "Party",
2862 reply => "gsay ", 3023 reply => "gsay ",
2863 tooltip => "Messages and chat related to your party", 3024 tooltip => "Messages and chat related to your party",
2864 }, 3025 },
3026 "c/death" => {
3027 id => "death",
3028 title => "Death",
3029 reply => undef,
3030 tooltip => "Reason for and more info about your most recent death",
3031 },
3032 "c/say" => $SAY_CHANNEL,
3033 "c/chat" => $CHAT_CHANNEL,
2865); 3034);
2866 3035
2867sub cf::client::send_msg { 3036sub cf::client::send_msg {
2868 my ($self, $channel, $msg, $color, @extra) = @_; 3037 my ($self, $channel, $msg, $color, @extra) = @_;
2869 3038
2870 $msg = $self->pl->expand_cfpod ($msg); 3039 $msg = $self->pl->expand_cfpod ($msg)
3040 unless $color & cf::NDI_VERBATIM;
2871 3041
2872 $color &= cf::NDI_CLIENT_MASK; # just in case... 3042 $color &= cf::NDI_CLIENT_MASK; # just in case...
2873 3043
2874 # check predefined channels, for the benefit of C 3044 # check predefined channels, for the benefit of C
2875 if ($CHANNEL{$channel}) { 3045 if ($CHANNEL{$channel}) {
2876 $channel = $CHANNEL{$channel}; 3046 $channel = $CHANNEL{$channel};
2877 3047
2878 $self->ext_msg (channel_info => $channel) 3048 $self->ext_msg (channel_info => $channel);
2879 if $self->can_msg;
2880
2881 $channel = $channel->{id}; 3049 $channel = $channel->{id};
2882 3050
2883 } elsif (ref $channel) { 3051 } elsif (ref $channel) {
2884 # send meta info to client, if not yet sent 3052 # send meta info to client, if not yet sent
2885 unless (exists $self->{channel}{$channel->{id}}) { 3053 unless (exists $self->{channel}{$channel->{id}}) {
2886 $self->{channel}{$channel->{id}} = $channel; 3054 $self->{channel}{$channel->{id}} = $channel;
2887 $self->ext_msg (channel_info => $channel) 3055 $self->ext_msg (channel_info => $channel);
2888 if $self->can_msg;
2889 } 3056 }
2890 3057
2891 $channel = $channel->{id}; 3058 $channel = $channel->{id};
2892 } 3059 }
2893 3060
2894 return unless @extra || length $msg; 3061 return unless @extra || length $msg;
2895 3062
2896 if ($self->can_msg) {
2897 # default colour, mask it out 3063 # default colour, mask it out
2898 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3064 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2899 if $color & cf::NDI_DEF; 3065 if $color & cf::NDI_DEF;
2900 3066
2901 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3067 my $pkt = "msg "
3068 . $self->{json_coder}->encode (
2902 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3069 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2903 } else { 3070 );
2904 if ($color >= 0) {
2905 # replace some tags by gcfclient-compatible ones
2906 for ($msg) {
2907 1 while
2908 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2909 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2910 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2911 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2912 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2913 }
2914 3071
2915 $color &= cf::NDI_COLOR_MASK; 3072 $self->send_big_packet ($pkt);
2916
2917 utf8::encode $msg;
2918
2919 if (0 && $msg =~ /\[/) {
2920 # COMMAND/INFO
2921 $self->send_packet ("drawextinfo $color 10 8 $msg")
2922 } else {
2923 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2924 $self->send_packet ("drawinfo $color $msg")
2925 }
2926 }
2927 }
2928} 3073}
2929 3074
2930=item $client->ext_msg ($type, @msg) 3075=item $client->ext_msg ($type, @msg)
2931 3076
2932Sends an ext event to the client. 3077Sends an ext event to the client.
2935 3080
2936sub cf::client::ext_msg($$@) { 3081sub cf::client::ext_msg($$@) {
2937 my ($self, $type, @msg) = @_; 3082 my ($self, $type, @msg) = @_;
2938 3083
2939 if ($self->extcmd == 2) { 3084 if ($self->extcmd == 2) {
2940 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3085 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2941 } elsif ($self->extcmd == 1) { # TODO: remove 3086 } elsif ($self->extcmd == 1) { # TODO: remove
2942 push @msg, msgtype => "event_$type"; 3087 push @msg, msgtype => "event_$type";
2943 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3088 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2944 } 3089 }
2945} 3090}
2946 3091
2947=item $client->ext_reply ($msgid, @msg) 3092=item $client->ext_reply ($msgid, @msg)
2948 3093
2952 3097
2953sub cf::client::ext_reply($$@) { 3098sub cf::client::ext_reply($$@) {
2954 my ($self, $id, @msg) = @_; 3099 my ($self, $id, @msg) = @_;
2955 3100
2956 if ($self->extcmd == 2) { 3101 if ($self->extcmd == 2) {
2957 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3102 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2958 } elsif ($self->extcmd == 1) { 3103 } elsif ($self->extcmd == 1) {
2959 #TODO: version 1, remove 3104 #TODO: version 1, remove
2960 unshift @msg, msgtype => "reply", msgid => $id; 3105 unshift @msg, msgtype => "reply", msgid => $id;
2961 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3106 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2962 } 3107 }
2963} 3108}
2964 3109
2965=item $success = $client->query ($flags, "text", \&cb) 3110=item $success = $client->query ($flags, "text", \&cb)
2966 3111
3037 3182
3038 $ns->ext_reply ($reply, @reply) 3183 $ns->ext_reply ($reply, @reply)
3039 if $reply; 3184 if $reply;
3040 3185
3041 } else { 3186 } else {
3042 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3187 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3043 } 3188 }
3044 3189
3045 cf::override; 3190 cf::override;
3046 }, 3191 },
3047); 3192);
3067 3212
3068 $coro 3213 $coro
3069} 3214}
3070 3215
3071cf::client->attach ( 3216cf::client->attach (
3072 on_destroy => sub { 3217 on_client_destroy => sub {
3073 my ($ns) = @_; 3218 my ($ns) = @_;
3074 3219
3075 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3220 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3076 }, 3221 },
3077); 3222);
3093our $safe_hole = new Safe::Hole; 3238our $safe_hole = new Safe::Hole;
3094 3239
3095$SIG{FPE} = 'IGNORE'; 3240$SIG{FPE} = 'IGNORE';
3096 3241
3097$safe->permit_only (Opcode::opset qw( 3242$safe->permit_only (Opcode::opset qw(
3098 :base_core :base_mem :base_orig :base_math 3243 :base_core :base_mem :base_orig :base_math :base_loop
3099 grepstart grepwhile mapstart mapwhile 3244 grepstart grepwhile mapstart mapwhile
3100 sort time 3245 sort time
3101)); 3246));
3102 3247
3103# here we export the classes and methods available to script code 3248# here we export the classes and methods available to script code
3107The following functions and methods are available within a safe environment: 3252The following functions and methods are available within a safe environment:
3108 3253
3109 cf::object 3254 cf::object
3110 contr pay_amount pay_player map x y force_find force_add destroy 3255 contr pay_amount pay_player map x y force_find force_add destroy
3111 insert remove name archname title slaying race decrease split 3256 insert remove name archname title slaying race decrease split
3257 value
3112 3258
3113 cf::object::player 3259 cf::object::player
3114 player 3260 player
3115 3261
3116 cf::player 3262 cf::player
3121 3267
3122=cut 3268=cut
3123 3269
3124for ( 3270for (
3125 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3271 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3126 insert remove inv name archname title slaying race 3272 insert remove inv nrof name archname title slaying race
3127 decrease split destroy)], 3273 decrease split destroy change_exp value msg lore send_msg)],
3128 ["cf::object::player" => qw(player)], 3274 ["cf::object::player" => qw(player)],
3129 ["cf::player" => qw(peaceful)], 3275 ["cf::player" => qw(peaceful send_msg)],
3130 ["cf::map" => qw(trigger)], 3276 ["cf::map" => qw(trigger)],
3131) { 3277) {
3132 no strict 'refs'; 3278 no strict 'refs';
3133 my ($pkg, @funs) = @$_; 3279 my ($pkg, @funs) = @$_;
3134 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3280 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3152 3298
3153 my $qcode = $code; 3299 my $qcode = $code;
3154 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3300 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3155 $qcode =~ s/\n/\\n/g; 3301 $qcode =~ s/\n/\\n/g;
3156 3302
3303 %vars = (_dummy => 0) unless %vars;
3304
3305 my @res;
3157 local $_; 3306 local $_;
3158 local @safe::cf::_safe_eval_args = values %vars;
3159 3307
3160 my $eval = 3308 my $eval =
3161 "do {\n" 3309 "do {\n"
3162 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3310 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3163 . "#line 0 \"{$qcode}\"\n" 3311 . "#line 0 \"{$qcode}\"\n"
3164 . $code 3312 . $code
3165 . "\n}" 3313 . "\n}"
3166 ; 3314 ;
3167 3315
3316 if ($CFG{safe_eval}) {
3168 sub_generation_inc; 3317 sub_generation_inc;
3318 local @safe::cf::_safe_eval_args = values %vars;
3169 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3319 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3170 sub_generation_inc; 3320 sub_generation_inc;
3321 } else {
3322 local @cf::_safe_eval_args = values %vars;
3323 @res = wantarray ? eval eval : scalar eval $eval;
3324 }
3171 3325
3172 if ($@) { 3326 if ($@) {
3173 warn "$@"; 3327 warn "$@",
3174 warn "while executing safe code '$code'\n"; 3328 "while executing safe code '$code'\n",
3175 warn "with arguments " . (join " ", %vars) . "\n"; 3329 "with arguments " . (join " ", %vars) . "\n";
3176 } 3330 }
3177 3331
3178 wantarray ? @res : $res[0] 3332 wantarray ? @res : $res[0]
3179} 3333}
3180 3334
3194=cut 3348=cut
3195 3349
3196sub register_script_function { 3350sub register_script_function {
3197 my ($fun, $cb) = @_; 3351 my ($fun, $cb) = @_;
3198 3352
3199 no strict 'refs'; 3353 $fun = "safe::$fun" if $CFG{safe_eval};
3200 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3354 *$fun = $safe_hole->wrap ($cb);
3201} 3355}
3202 3356
3203=back 3357=back
3204 3358
3205=cut 3359=cut
3214 # for this (global event?) 3368 # for this (global event?)
3215 %ext::player_env::MUSIC_FACE_CACHE = (); 3369 %ext::player_env::MUSIC_FACE_CACHE = ();
3216 3370
3217 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3371 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3218 3372
3219 warn "loading facedata from $path\n"; 3373 trace "loading facedata from $path\n";
3220 3374
3221 my $facedata; 3375 my $facedata;
3222 0 < aio_load $path, $facedata 3376 0 < aio_load $path, $facedata
3223 or die "$path: $!"; 3377 or die "$path: $!";
3224 3378
3226 3380
3227 $facedata->{version} == 2 3381 $facedata->{version} == 2
3228 or cf::cleanup "$path: version mismatch, cannot proceed."; 3382 or cf::cleanup "$path: version mismatch, cannot proceed.";
3229 3383
3230 # patch in the exptable 3384 # patch in the exptable
3385 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3231 $facedata->{resource}{"res/exp_table"} = { 3386 $facedata->{resource}{"res/exp_table"} = {
3232 type => FT_RSRC, 3387 type => FT_RSRC,
3233 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3388 data => $exp_table,
3389 hash => (Digest::MD5::md5 $exp_table),
3234 }; 3390 };
3235 cf::cede_to_tick; 3391 cf::cede_to_tick;
3236 3392
3237 { 3393 {
3238 my $faces = $facedata->{faceinfo}; 3394 my $faces = $facedata->{faceinfo};
3240 while (my ($face, $info) = each %$faces) { 3396 while (my ($face, $info) = each %$faces) {
3241 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3397 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3242 3398
3243 cf::face::set_visibility $idx, $info->{visibility}; 3399 cf::face::set_visibility $idx, $info->{visibility};
3244 cf::face::set_magicmap $idx, $info->{magicmap}; 3400 cf::face::set_magicmap $idx, $info->{magicmap};
3245 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3401 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3246 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3402 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3247 3403
3248 cf::cede_to_tick; 3404 cf::cede_to_tick;
3249 } 3405 }
3250 3406
3251 while (my ($face, $info) = each %$faces) { 3407 while (my ($face, $info) = each %$faces) {
3256 3412
3257 if (my $smooth = cf::face::find $info->{smooth}) { 3413 if (my $smooth = cf::face::find $info->{smooth}) {
3258 cf::face::set_smooth $idx, $smooth; 3414 cf::face::set_smooth $idx, $smooth;
3259 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3415 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3260 } else { 3416 } else {
3261 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3417 error "smooth face '$info->{smooth}' not found for face '$face'";
3262 } 3418 }
3263 3419
3264 cf::cede_to_tick; 3420 cf::cede_to_tick;
3265 } 3421 }
3266 } 3422 }
3275 3431
3276 cf::anim::invalidate_all; # d'oh 3432 cf::anim::invalidate_all; # d'oh
3277 } 3433 }
3278 3434
3279 { 3435 {
3280 # TODO: for gcfclient pleasure, we should give resources
3281 # that gcfclient doesn't grok a >10000 face index.
3282 my $res = $facedata->{resource}; 3436 my $res = $facedata->{resource};
3283 3437
3284 while (my ($name, $info) = each %$res) { 3438 while (my ($name, $info) = each %$res) {
3285 if (defined $info->{type}) { 3439 if (defined $info->{type}) {
3286 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3440 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3287 my $data;
3288 3441
3289 if ($info->{type} & 1) { 3442 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3290 # prepend meta info
3291
3292 my $meta = $enc->encode ({
3293 name => $name,
3294 %{ $info->{meta} || {} },
3295 });
3296
3297 $data = pack "(w/a*)*", $meta, $info->{data};
3298 } else {
3299 $data = $info->{data};
3300 }
3301
3302 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3303 cf::face::set_type $idx, $info->{type}; 3443 cf::face::set_type $idx, $info->{type};
3304 } else { 3444 } else {
3305 $RESOURCE{$name} = $info; 3445 $RESOURCE{$name} = $info; # unused
3306 } 3446 }
3307 3447
3308 cf::cede_to_tick; 3448 cf::cede_to_tick;
3309 } 3449 }
3310 } 3450 }
3311 3451
3312 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3452 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3313 3453
3314 1 3454 1
3315} 3455}
3316
3317cf::global->attach (on_resource_update => sub {
3318 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3319 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3320
3321 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3322 my $sound = $soundconf->{compat}[$_]
3323 or next;
3324
3325 my $face = cf::face::find "sound/$sound->[1]";
3326 cf::sound::set $sound->[0] => $face;
3327 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3328 }
3329
3330 while (my ($k, $v) = each %{$soundconf->{event}}) {
3331 my $face = cf::face::find "sound/$v";
3332 cf::sound::set $k => $face;
3333 }
3334 }
3335});
3336 3456
3337register_exticmd fx_want => sub { 3457register_exticmd fx_want => sub {
3338 my ($ns, $want) = @_; 3458 my ($ns, $want) = @_;
3339 3459
3340 while (my ($k, $v) = each %$want) { 3460 while (my ($k, $v) = each %$want) {
3379sub reload_treasures { 3499sub reload_treasures {
3380 load_resource_file "$DATADIR/treasures" 3500 load_resource_file "$DATADIR/treasures"
3381 or die "unable to load treasurelists\n"; 3501 or die "unable to load treasurelists\n";
3382} 3502}
3383 3503
3504sub reload_sound {
3505 trace "loading sound config from $DATADIR/sound\n";
3506
3507 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3508 or die "$DATADIR/sound $!";
3509
3510 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3511
3512 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3513 my $sound = $soundconf->{compat}[$_]
3514 or next;
3515
3516 my $face = cf::face::find "sound/$sound->[1]";
3517 cf::sound::set $sound->[0] => $face;
3518 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3519 }
3520
3521 while (my ($k, $v) = each %{$soundconf->{event}}) {
3522 my $face = cf::face::find "sound/$v";
3523 cf::sound::set $k => $face;
3524 }
3525}
3526
3384sub reload_resources { 3527sub reload_resources {
3385 warn "reloading resource files...\n"; 3528 trace "reloading resource files...\n";
3386 3529
3387 reload_facedata; 3530 reload_facedata;
3531 reload_sound;
3388 reload_archetypes; 3532 reload_archetypes;
3389 reload_regions; 3533 reload_regions;
3390 reload_treasures; 3534 reload_treasures;
3391 3535
3392 warn "finished reloading resource files\n"; 3536 trace "finished reloading resource files\n";
3393}
3394
3395sub init {
3396 my $guard = freeze_mainloop;
3397
3398 reload_resources;
3399} 3537}
3400 3538
3401sub reload_config { 3539sub reload_config {
3540 trace "reloading config file...\n";
3541
3402 open my $fh, "<:utf8", "$CONFDIR/config" 3542 open my $fh, "<:utf8", "$CONFDIR/config"
3403 or return; 3543 or return;
3404 3544
3405 local $/; 3545 local $/;
3406 *CFG = YAML::Load <$fh>; 3546 *CFG = YAML::XS::Load scalar <$fh>;
3407 3547
3408 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3548 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3409 3549
3410 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3550 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3411 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3551 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3412 3552
3413 if (exists $CFG{mlockall}) { 3553 if (exists $CFG{mlockall}) {
3415 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3555 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3416 and die "WARNING: m(un)lockall failed: $!\n"; 3556 and die "WARNING: m(un)lockall failed: $!\n";
3417 }; 3557 };
3418 warn $@ if $@; 3558 warn $@ if $@;
3419 } 3559 }
3560
3561 trace "finished reloading resource files\n";
3562}
3563
3564sub pidfile() {
3565 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3566 or die "$PIDFILE: $!";
3567 flock $fh, &Fcntl::LOCK_EX
3568 or die "$PIDFILE: flock: $!";
3569 $fh
3570}
3571
3572# make sure only one server instance is running at any one time
3573sub atomic {
3574 my $fh = pidfile;
3575
3576 my $pid = <$fh>;
3577 kill 9, $pid if $pid > 0;
3578
3579 seek $fh, 0, 0;
3580 print $fh $$;
3581}
3582
3583sub main_loop {
3584 trace "EV::loop starting\n";
3585 if (1) {
3586 EV::loop;
3587 }
3588 trace "EV::loop returned\n";
3589 goto &main_loop unless $REALLY_UNLOOP;
3420} 3590}
3421 3591
3422sub main { 3592sub main {
3593 cf::init_globals; # initialise logging
3594
3595 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3596 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3597 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3598 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3599
3600 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3601
3423 # we must not ever block the main coroutine 3602 # we must not ever block the main coroutine
3424 local $Coro::idle = sub { 3603 local $Coro::idle = sub {
3425 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3604 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3426 (async { 3605 (async {
3427 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3606 $Coro::current->{desc} = "IDLE BUG HANDLER";
3428 EV::loop EV::LOOP_ONESHOT; 3607 EV::loop EV::LOOP_ONESHOT;
3429 })->prio (Coro::PRIO_MAX); 3608 })->prio (Coro::PRIO_MAX);
3430 }; 3609 };
3431 3610
3432 { 3611 evthread_start IO::AIO::poll_fileno;
3433 my $guard = freeze_mainloop; 3612
3613 cf::sync_job {
3614 cf::init_experience;
3615 cf::init_anim;
3616 cf::init_attackmess;
3617 cf::init_dynamic;
3618
3619 cf::load_settings;
3620 cf::load_materials;
3621
3622 reload_resources;
3434 reload_config; 3623 reload_config;
3435 db_init; 3624 db_init;
3625
3626 cf::init_uuid;
3627 cf::init_signals;
3628 cf::init_skills;
3629
3630 cf::init_beforeplay;
3631
3632 atomic;
3633
3436 load_extensions; 3634 load_extensions;
3437 3635
3438 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3636 utime time, time, $RUNTIMEFILE;
3439 evthread_start IO::AIO::poll_fileno; 3637
3638 # no (long-running) fork's whatsoever before this point(!)
3639 use POSIX ();
3640 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3641
3642 (pop @POST_INIT)->(0) while @POST_INIT;
3440 } 3643 };
3441 3644
3442 EV::loop; 3645 cf::object::thawer::errors_are_fatal 0;
3646 info "parse errors in files are no longer fatal from this point on.\n";
3647
3648 main_loop;
3443} 3649}
3444 3650
3445############################################################################# 3651#############################################################################
3446# initialisation and cleanup 3652# initialisation and cleanup
3447 3653
3448# install some emergency cleanup handlers 3654# install some emergency cleanup handlers
3449BEGIN { 3655BEGIN {
3450 our %SIGWATCHER = (); 3656 our %SIGWATCHER = ();
3451 for my $signal (qw(INT HUP TERM)) { 3657 for my $signal (qw(INT HUP TERM)) {
3452 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3658 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3453 cf::cleanup "SIG$signal"; 3659 cf::cleanup "SIG$signal";
3454 }; 3660 };
3455 } 3661 }
3456} 3662}
3457 3663
3458sub write_runtime_sync { 3664sub write_runtime_sync {
3459 my $runtime = "$LOCALDIR/runtime"; 3665 my $t0 = AE::time;
3460 3666
3461 # first touch the runtime file to show we are still running: 3667 # first touch the runtime file to show we are still running:
3462 # the fsync below can take a very very long time. 3668 # the fsync below can take a very very long time.
3463 3669
3464 IO::AIO::aio_utime $runtime, undef, undef; 3670 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3465 3671
3466 my $guard = cf::lock_acquire "write_runtime"; 3672 my $guard = cf::lock_acquire "write_runtime";
3467 3673
3468 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3674 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3469 or return; 3675 or return;
3470 3676
3471 my $value = $cf::RUNTIME + 90 + 10; 3677 my $value = $cf::RUNTIME + 90 + 10;
3472 # 10 is the runtime save interval, for a monotonic clock 3678 # 10 is the runtime save interval, for a monotonic clock
3473 # 60 allows for the watchdog to kill the server. 3679 # 60 allows for the watchdog to kill the server.
3483 aio_utime $fh, undef, undef; 3689 aio_utime $fh, undef, undef;
3484 3690
3485 close $fh 3691 close $fh
3486 or return; 3692 or return;
3487 3693
3488 aio_rename "$runtime~", $runtime 3694 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3489 and return; 3695 and return;
3490 3696
3491 warn "runtime file written.\n"; 3697 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3492 3698
3493 1 3699 1
3494} 3700}
3495 3701
3496our $uuid_lock; 3702our $uuid_lock;
3505 my $uuid = "$LOCALDIR/uuid"; 3711 my $uuid = "$LOCALDIR/uuid";
3506 3712
3507 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3713 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3508 or return; 3714 or return;
3509 3715
3510 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3716 my $value = uuid_seq uuid_cur;
3717
3718 unless ($value) {
3719 info "cowardly refusing to write zero uuid value!\n";
3720 return;
3721 }
3722
3723 my $value = uuid_str $value + $uuid_skip;
3511 $uuid_skip = 0; 3724 $uuid_skip = 0;
3512 3725
3513 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3726 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3514 and return; 3727 and return;
3515 3728
3521 or return; 3734 or return;
3522 3735
3523 aio_rename "$uuid~", $uuid 3736 aio_rename "$uuid~", $uuid
3524 and return; 3737 and return;
3525 3738
3526 warn "uuid file written ($value).\n"; 3739 trace "uuid file written ($value).\n";
3527 3740
3528 1 3741 1
3529 3742
3530} 3743}
3531 3744
3537} 3750}
3538 3751
3539sub emergency_save() { 3752sub emergency_save() {
3540 my $freeze_guard = cf::freeze_mainloop; 3753 my $freeze_guard = cf::freeze_mainloop;
3541 3754
3542 warn "enter emergency perl save\n"; 3755 info "emergency_perl_save: enter\n";
3756
3757 # this is a trade-off: we want to be very quick here, so
3758 # save all maps without fsync, and later call a global sync
3759 # (which in turn might be very very slow)
3760 local $USE_FSYNC = 0;
3543 3761
3544 cf::sync_job { 3762 cf::sync_job {
3763 cf::write_runtime_sync; # external watchdog should not bark
3764
3545 # use a peculiar iteration method to avoid tripping on perl 3765 # use a peculiar iteration method to avoid tripping on perl
3546 # refcount bugs in for. also avoids problems with players 3766 # refcount bugs in for. also avoids problems with players
3547 # and maps saved/destroyed asynchronously. 3767 # and maps saved/destroyed asynchronously.
3548 warn "begin emergency player save\n"; 3768 info "emergency_perl_save: begin player save\n";
3549 for my $login (keys %cf::PLAYER) { 3769 for my $login (keys %cf::PLAYER) {
3550 my $pl = $cf::PLAYER{$login} or next; 3770 my $pl = $cf::PLAYER{$login} or next;
3551 $pl->valid or next; 3771 $pl->valid or next;
3552 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3772 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3553 $pl->save; 3773 $pl->save;
3554 } 3774 }
3555 warn "end emergency player save\n"; 3775 info "emergency_perl_save: end player save\n";
3556 3776
3557 warn "begin emergency map save\n"; 3777 cf::write_runtime_sync; # external watchdog should not bark
3778
3779 info "emergency_perl_save: begin map save\n";
3558 for my $path (keys %cf::MAP) { 3780 for my $path (keys %cf::MAP) {
3559 my $map = $cf::MAP{$path} or next; 3781 my $map = $cf::MAP{$path} or next;
3560 $map->valid or next; 3782 $map->valid or next;
3561 $map->save; 3783 $map->save;
3562 } 3784 }
3563 warn "end emergency map save\n"; 3785 info "emergency_perl_save: end map save\n";
3564 3786
3565 warn "begin emergency database checkpoint\n"; 3787 cf::write_runtime_sync; # external watchdog should not bark
3788
3789 info "emergency_perl_save: begin database checkpoint\n";
3566 BDB::db_env_txn_checkpoint $DB_ENV; 3790 BDB::db_env_txn_checkpoint $DB_ENV;
3567 warn "end emergency database checkpoint\n"; 3791 info "emergency_perl_save: end database checkpoint\n";
3568 3792
3569 warn "begin write uuid\n"; 3793 info "emergency_perl_save: begin write uuid\n";
3570 write_uuid_sync 1; 3794 write_uuid_sync 1;
3571 warn "end write uuid\n"; 3795 info "emergency_perl_save: end write uuid\n";
3796
3797 cf::write_runtime_sync; # external watchdog should not bark
3798
3799 trace "emergency_perl_save: syncing database to disk";
3800 BDB::db_env_txn_checkpoint $DB_ENV;
3801
3802 info "emergency_perl_save: starting sync()\n";
3803 IO::AIO::aio_sync sub {
3804 info "emergency_perl_save: finished sync()\n";
3805 };
3806
3807 cf::write_runtime_sync; # external watchdog should not bark
3808
3809 trace "emergency_perl_save: flushing outstanding aio requests";
3810 while (IO::AIO::nreqs || BDB::nreqs) {
3811 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3812 }
3813
3814 cf::write_runtime_sync; # external watchdog should not bark
3572 }; 3815 };
3573 3816
3574 warn "leave emergency perl save\n"; 3817 info "emergency_perl_save: leave\n";
3575} 3818}
3576 3819
3577sub post_cleanup { 3820sub post_cleanup {
3578 my ($make_core) = @_; 3821 my ($make_core) = @_;
3579 3822
3823 IO::AIO::flush;
3824
3825 IO::AIO::flush;
3826
3580 warn Carp::longmess "post_cleanup backtrace" 3827 error Carp::longmess "post_cleanup backtrace"
3581 if $make_core; 3828 if $make_core;
3829
3830 my $fh = pidfile;
3831 unlink $PIDFILE if <$fh> == $$;
3832}
3833
3834# a safer delete_package, copied from Symbol
3835sub clear_package($) {
3836 my $pkg = shift;
3837
3838 # expand to full symbol table name if needed
3839 unless ($pkg =~ /^main::.*::$/) {
3840 $pkg = "main$pkg" if $pkg =~ /^::/;
3841 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3842 $pkg .= '::' unless $pkg =~ /::$/;
3843 }
3844
3845 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3846 my $stem_symtab = *{$stem}{HASH};
3847
3848 defined $stem_symtab and exists $stem_symtab->{$leaf}
3849 or return;
3850
3851 # clear all symbols
3852 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3853 for my $name (keys %$leaf_symtab) {
3854 _gv_clear *{"$pkg$name"};
3855# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3856 }
3582} 3857}
3583 3858
3584sub do_reload_perl() { 3859sub do_reload_perl() {
3585 # can/must only be called in main 3860 # can/must only be called in main
3586 if ($Coro::current != $Coro::main) { 3861 if (in_main) {
3587 warn "can only reload from main coroutine"; 3862 error "can only reload from main coroutine";
3588 return; 3863 return;
3589 } 3864 }
3590 3865
3866 return if $RELOAD++;
3867
3868 my $t1 = AE::time;
3869
3870 while ($RELOAD) {
3591 warn "reloading..."; 3871 info "reloading...";
3592 3872
3593 warn "entering sync_job"; 3873 trace "entering sync_job";
3594 3874
3595 cf::sync_job { 3875 cf::sync_job {
3596 cf::write_runtime_sync; # external watchdog should not bark
3597 cf::emergency_save; 3876 cf::emergency_save;
3598 cf::write_runtime_sync; # external watchdog should not bark
3599 3877
3600 warn "syncing database to disk";
3601 BDB::db_env_txn_checkpoint $DB_ENV;
3602
3603 # if anything goes wrong in here, we should simply crash as we already saved
3604
3605 warn "flushing outstanding aio requests";
3606 for (;;) {
3607 BDB::flush;
3608 IO::AIO::flush;
3609 Coro::cede_notself;
3610 last unless IO::AIO::nreqs || BDB::nreqs;
3611 warn "iterate...";
3612 }
3613
3614 ++$RELOAD;
3615
3616 warn "cancelling all extension coros"; 3878 trace "cancelling all extension coros";
3617 $_->cancel for values %EXT_CORO; 3879 $_->cancel for values %EXT_CORO;
3618 %EXT_CORO = (); 3880 %EXT_CORO = ();
3619 3881
3620 warn "removing commands"; 3882 trace "removing commands";
3621 %COMMAND = (); 3883 %COMMAND = ();
3622 3884
3623 warn "removing ext/exti commands"; 3885 trace "removing ext/exti commands";
3624 %EXTCMD = (); 3886 %EXTCMD = ();
3625 %EXTICMD = (); 3887 %EXTICMD = ();
3626 3888
3627 warn "unloading/nuking all extensions"; 3889 trace "unloading/nuking all extensions";
3628 for my $pkg (@EXTS) { 3890 for my $pkg (@EXTS) {
3629 warn "... unloading $pkg"; 3891 trace "... unloading $pkg";
3630 3892
3631 if (my $cb = $pkg->can ("unload")) { 3893 if (my $cb = $pkg->can ("unload")) {
3632 eval { 3894 eval {
3633 $cb->($pkg); 3895 $cb->($pkg);
3634 1 3896 1
3635 } or warn "$pkg unloaded, but with errors: $@"; 3897 } or error "$pkg unloaded, but with errors: $@";
3898 }
3899
3900 trace "... clearing $pkg";
3901 clear_package $pkg;
3636 } 3902 }
3637 3903
3638 warn "... nuking $pkg";
3639 Symbol::delete_package $pkg;
3640 }
3641
3642 warn "unloading all perl modules loaded from $LIBDIR"; 3904 trace "unloading all perl modules loaded from $LIBDIR";
3643 while (my ($k, $v) = each %INC) { 3905 while (my ($k, $v) = each %INC) {
3644 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3906 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3645 3907
3646 warn "... unloading $k"; 3908 trace "... unloading $k";
3647 delete $INC{$k}; 3909 delete $INC{$k};
3648 3910
3649 $k =~ s/\.pm$//; 3911 $k =~ s/\.pm$//;
3650 $k =~ s/\//::/g; 3912 $k =~ s/\//::/g;
3651 3913
3652 if (my $cb = $k->can ("unload_module")) { 3914 if (my $cb = $k->can ("unload_module")) {
3653 $cb->(); 3915 $cb->();
3916 }
3917
3918 clear_package $k;
3654 } 3919 }
3655 3920
3656 Symbol::delete_package $k;
3657 }
3658
3659 warn "getting rid of safe::, as good as possible"; 3921 trace "getting rid of safe::, as good as possible";
3660 Symbol::delete_package "safe::$_" 3922 clear_package "safe::$_"
3661 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3923 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3662 3924
3663 warn "unloading cf.pm \"a bit\""; 3925 trace "unloading cf.pm \"a bit\"";
3664 delete $INC{"cf.pm"}; 3926 delete $INC{"cf.pm"};
3665 delete $INC{"cf/pod.pm"}; 3927 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3666 3928
3667 # don't, removes xs symbols, too, 3929 # don't, removes xs symbols, too,
3668 # and global variables created in xs 3930 # and global variables created in xs
3669 #Symbol::delete_package __PACKAGE__; 3931 #clear_package __PACKAGE__;
3670 3932
3671 warn "unload completed, starting to reload now"; 3933 info "unload completed, starting to reload now";
3672 3934
3673 warn "reloading cf.pm"; 3935 trace "reloading cf.pm";
3674 require cf; 3936 require cf;
3675 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3937 cf::_connect_to_perl_1;
3676 3938
3677 warn "loading config and database again"; 3939 trace "loading config and database again";
3678 cf::reload_config; 3940 cf::reload_config;
3679 3941
3680 warn "loading extensions"; 3942 trace "loading extensions";
3681 cf::load_extensions; 3943 cf::load_extensions;
3682 3944
3945 if ($REATTACH_ON_RELOAD) {
3683 warn "reattaching attachments to objects/players"; 3946 trace "reattaching attachments to objects/players";
3684 _global_reattach; # objects, sockets 3947 _global_reattach; # objects, sockets
3685 warn "reattaching attachments to maps"; 3948 trace "reattaching attachments to maps";
3686 reattach $_ for values %MAP; 3949 reattach $_ for values %MAP;
3687 warn "reattaching attachments to players"; 3950 trace "reattaching attachments to players";
3688 reattach $_ for values %PLAYER; 3951 reattach $_ for values %PLAYER;
3952 }
3689 3953
3954 trace "running post_init jobs";
3955 (pop @POST_INIT)->(1) while @POST_INIT;
3956
3690 warn "leaving sync_job"; 3957 trace "leaving sync_job";
3691 3958
3692 1 3959 1
3693 } or do { 3960 } or do {
3694 warn $@; 3961 error $@;
3695 cf::cleanup "error while reloading, exiting."; 3962 cf::cleanup "error while reloading, exiting.";
3963 };
3964
3965 info "reloaded";
3966 --$RELOAD;
3696 }; 3967 }
3697 3968
3698 warn "reloaded"; 3969 $t1 = AE::time - $t1;
3970 info "reload completed in ${t1}s\n";
3699}; 3971};
3700 3972
3701our $RELOAD_WATCHER; # used only during reload 3973our $RELOAD_WATCHER; # used only during reload
3702 3974
3703sub reload_perl() { 3975sub reload_perl() {
3704 # doing reload synchronously and two reloads happen back-to-back, 3976 # doing reload synchronously and two reloads happen back-to-back,
3705 # coro crashes during coro_state_free->destroy here. 3977 # coro crashes during coro_state_free->destroy here.
3706 3978
3979 $RELOAD_WATCHER ||= cf::async {
3980 Coro::AIO::aio_wait cache_extensions;
3981
3707 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3982 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3708 do_reload_perl; 3983 do_reload_perl;
3709 undef $RELOAD_WATCHER; 3984 undef $RELOAD_WATCHER;
3985 };
3710 }; 3986 };
3711} 3987}
3712 3988
3713register_command "reload" => sub { 3989register_command "reload" => sub {
3714 my ($who, $arg) = @_; 3990 my ($who, $arg) = @_;
3728 4004
3729our @WAIT_FOR_TICK; 4005our @WAIT_FOR_TICK;
3730our @WAIT_FOR_TICK_BEGIN; 4006our @WAIT_FOR_TICK_BEGIN;
3731 4007
3732sub wait_for_tick { 4008sub wait_for_tick {
3733 return if tick_inhibit || $Coro::current == $Coro::main; 4009 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3734 4010
3735 my $signal = new Coro::Signal; 4011 my $signal = new Coro::Signal;
3736 push @WAIT_FOR_TICK, $signal; 4012 push @WAIT_FOR_TICK, $signal;
3737 $signal->wait; 4013 $signal->wait;
3738} 4014}
3739 4015
3740sub wait_for_tick_begin { 4016sub wait_for_tick_begin {
3741 return if tick_inhibit || $Coro::current == $Coro::main; 4017 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3742 4018
3743 my $signal = new Coro::Signal; 4019 my $signal = new Coro::Signal;
3744 push @WAIT_FOR_TICK_BEGIN, $signal; 4020 push @WAIT_FOR_TICK_BEGIN, $signal;
3745 $signal->wait; 4021 $signal->wait;
3746} 4022}
3752 return; 4028 return;
3753 } 4029 }
3754 4030
3755 cf::server_tick; # one server iteration 4031 cf::server_tick; # one server iteration
3756 4032
4033 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4034
3757 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4035 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3758 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4036 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3759 Coro::async_pool { 4037 Coro::async_pool {
3760 $Coro::current->{desc} = "runtime saver"; 4038 $Coro::current->{desc} = "runtime saver";
3761 write_runtime_sync 4039 write_runtime_sync
3762 or warn "ERROR: unable to write runtime file: $!"; 4040 or error "ERROR: unable to write runtime file: $!";
3763 }; 4041 };
3764 } 4042 }
3765 4043
3766 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4044 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3767 $sig->send; 4045 $sig->send;
3775 4053
3776 if (0) { 4054 if (0) {
3777 if ($NEXT_TICK) { 4055 if ($NEXT_TICK) {
3778 my $jitter = $TICK_START - $NEXT_TICK; 4056 my $jitter = $TICK_START - $NEXT_TICK;
3779 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4057 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3780 warn "jitter $JITTER\n";#d# 4058 debug "jitter $JITTER\n";#d#
3781 } 4059 }
3782 } 4060 }
3783} 4061}
3784 4062
3785{ 4063{
3786 # configure BDB 4064 # configure BDB
3787 4065
3788 BDB::min_parallel 8; 4066 BDB::min_parallel 16;
3789 BDB::max_poll_reqs $TICK * 0.1; 4067 BDB::max_poll_reqs $TICK * 0.1;
3790 $Coro::BDB::WATCHER->priority (1); 4068 $AnyEvent::BDB::WATCHER->priority (1);
3791 4069
3792 unless ($DB_ENV) { 4070 unless ($DB_ENV) {
3793 $DB_ENV = BDB::db_env_create; 4071 $DB_ENV = BDB::db_env_create;
3794 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4072 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3795 | BDB::LOG_AUTOREMOVE, 1); 4073 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4074 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3796 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4075 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3797 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4076 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3798 4077
3799 cf::sync_job { 4078 cf::sync_job {
3800 eval { 4079 eval {
3826{ 4105{
3827 # configure IO::AIO 4106 # configure IO::AIO
3828 4107
3829 IO::AIO::min_parallel 8; 4108 IO::AIO::min_parallel 8;
3830 IO::AIO::max_poll_time $TICK * 0.1; 4109 IO::AIO::max_poll_time $TICK * 0.1;
3831 $Coro::AIO::WATCHER->priority (1); 4110 undef $AnyEvent::AIO::WATCHER;
3832} 4111}
3833 4112
3834my $_log_backtrace; 4113my $_log_backtrace;
3835 4114
3836sub _log_backtrace { 4115sub _log_backtrace {
3839 $msg =~ s/\n//; 4118 $msg =~ s/\n//;
3840 4119
3841 # limit the # of concurrent backtraces 4120 # limit the # of concurrent backtraces
3842 if ($_log_backtrace < 2) { 4121 if ($_log_backtrace < 2) {
3843 ++$_log_backtrace; 4122 ++$_log_backtrace;
4123 my $perl_bt = Carp::longmess $msg;
3844 async { 4124 async {
3845 $Coro::current->{desc} = "abt $msg"; 4125 $Coro::current->{desc} = "abt $msg";
3846 4126
3847 my @bt = fork_call { 4127 my @bt = fork_call {
3848 @addr = map { sprintf "%x", $_ } @addr; 4128 @addr = map { sprintf "%x", $_ } @addr;
3859 } 4139 }
3860 4140
3861 @funcs 4141 @funcs
3862 }; 4142 };
3863 4143
3864 LOG llevInfo, "[ABT] $msg\n"; 4144 LOG llevInfo, "[ABT] $perl_bt\n";
4145 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3865 LOG llevInfo, "[ABT] $_\n" for @bt; 4146 LOG llevInfo, "[ABT] $_\n" for @bt;
3866 --$_log_backtrace; 4147 --$_log_backtrace;
3867 }; 4148 };
3868 } else { 4149 } else {
3869 LOG llevInfo, "[ABT] $msg\n"; 4150 LOG llevInfo, "[ABT] $msg\n";
3870 LOG llevInfo, "[ABT] [suppressed]\n"; 4151 LOG llevInfo, "[ABT] [suppressed]\n";
3871 } 4152 }
3872} 4153}
3873 4154
3874# load additional modules 4155# load additional modules
3875use cf::pod; 4156require "cf/$_.pm" for @EXTRA_MODULES;
4157cf::_connect_to_perl_2;
3876 4158
3877END { cf::emergency_save } 4159END { cf::emergency_save }
3878 4160
38791 41611
3880 4162

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines