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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines