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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines