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.442 by root, Sun Aug 31 09:03:31 2008 UTC vs.
Revision 1.547 by root, Sun May 9 22:51:13 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 5.10.0; 25use common::sense;
25use utf8;
26use strict "vars", "subs";
27 26
28use Symbol; 27use Symbol;
29use List::Util; 28use List::Util;
30use Socket; 29use Socket;
31use EV; 30use EV;
32use Opcode; 31use Opcode;
33use Safe; 32use Safe;
34use Safe::Hole; 33use Safe::Hole;
35use Storable (); 34use Storable ();
35use Carp ();
36 36
37use Guard ();
37use Coro (); 38use Coro ();
38use Coro::State; 39use Coro::State;
39use Coro::Handle; 40use Coro::Handle;
40use Coro::EV; 41use Coro::EV;
41use Coro::AnyEvent; 42use Coro::AnyEvent;
42use Coro::Timer; 43use Coro::Timer;
43use Coro::Signal; 44use Coro::Signal;
44use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
45use Coro::AnyEvent; 47use Coro::AnyEvent;
46use Coro::AIO; 48use Coro::AIO;
47use Coro::BDB 1.6; 49use Coro::BDB 1.6;
48use Coro::Storable; 50use Coro::Storable;
49use Coro::Util (); 51use Coro::Util ();
50 52
51use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
52use BDB (); 54use BDB ();
53use Data::Dumper; 55use Data::Dumper;
54use Digest::MD5;
55use Fcntl; 56use Fcntl;
56use YAML (); 57use YAML::XS ();
57use IO::AIO (); 58use IO::AIO ();
58use Time::HiRes; 59use Time::HiRes;
59use Compress::LZF; 60use Compress::LZF;
60use Digest::MD5 (); 61use Digest::MD5 ();
61 62
63 64
64# configure various modules to our taste 65# configure various modules to our taste
65# 66#
66$Storable::canonical = 1; # reduce rsync transfers 67$Storable::canonical = 1; # reduce rsync transfers
67Coro::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";
68Compress::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
69 75
70$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" };
71 78
72sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
73 82
74our %COMMAND = (); 83our %COMMAND = ();
75our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
76 85
77our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
78our %EXTCMD = (); 87our %EXTCMD = ();
79our %EXTICMD = (); 88our %EXTICMD = ();
80our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
81our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
82 91
83our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
84our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
85 96
86our $CONFDIR = confdir; 97our $CONFDIR = confdir;
87our $DATADIR = datadir; 98our $DATADIR = datadir;
88our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
89our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
90our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
91our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
92our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
93our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
94our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
95our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
96our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110
97our %RESOURCE; 111our %RESOURCE; # 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;
98 118
99our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
100our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
101our $NEXT_TICK; 121our $NEXT_TICK;
102our $USE_FSYNC = 1; # use fsync to write maps - default off 122our $USE_FSYNC = 1; # use fsync to write maps - default on
103 123
104our $BDB_DEADLOCK_WATCHER; 124our $BDB_DEADLOCK_WATCHER;
105our $BDB_CHECKPOINT_WATCHER; 125our $BDB_CHECKPOINT_WATCHER;
106our $BDB_TRICKLE_WATCHER; 126our $BDB_TRICKLE_WATCHER;
107our $DB_ENV; 127our $DB_ENV;
108 128
129our @EXTRA_MODULES = qw(pod match mapscript incloader);
130
109our %CFG; 131our %CFG;
110 132
111our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
112our $RUNTIME; 134our $RUNTIME;
113our $NOW; 135our $NOW;
122our $LOAD; # a number between 0 (idle) and 1 (too many objects) 144our $LOAD; # a number between 0 (idle) and 1 (too many objects)
123our $LOADAVG; # same thing, but with alpha-smoothing 145our $LOADAVG; # same thing, but with alpha-smoothing
124our $JITTER; # average jitter 146our $JITTER; # average jitter
125our $TICK_START; # for load detecting purposes 147our $TICK_START; # for load detecting purposes
126 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
127binmode STDOUT; 154binmode STDOUT;
128binmode STDERR; 155binmode STDERR;
129 156
130# read virtual server time, if available 157# read virtual server time, if available
131unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 158unless ($RUNTIME || !-e $RUNTIMEFILE) {
132 open my $fh, "<", "$LOCALDIR/runtime" 159 open my $fh, "<", $RUNTIMEFILE
133 or die "unable to read runtime file: $!"; 160 or die "unable to read $RUNTIMEFILE file: $!";
134 $RUNTIME = <$fh> + 0.; 161 $RUNTIME = <$fh> + 0.;
135} 162}
163
164eval "sub TICK() { $TICK } 1" or die;
136 165
137mkdir $_ 166mkdir $_
138 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 167 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
139 168
140our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
141 170
142sub 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::"} };
143 187
144############################################################################# 188#############################################################################
145 189
146=head2 GLOBAL VARIABLES 190=head2 GLOBAL VARIABLES
147 191
189from wherever your confdir points to. 233from wherever your confdir points to.
190 234
191=item cf::wait_for_tick, cf::wait_for_tick_begin 235=item cf::wait_for_tick, cf::wait_for_tick_begin
192 236
193These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 237These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
194returns 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 thread
195per 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.
196 240
241=cut
242
243sub wait_for_tick();
244sub wait_for_tick_begin();
245
197=item @cf::INVOKE_RESULTS 246=item @cf::INVOKE_RESULTS
198 247
199This array contains the results of the last C<invoke ()> call. When 248This array contains the results of the last C<invoke ()> call. When
200C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 249C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
201that call. 250that call.
202 251
252=item %cf::REFLECT
253
254Contains, for each (C++) class name, a hash reference with information
255about object members (methods, scalars, arrays and flags) and other
256metadata, which is useful for introspection.
257
203=back 258=back
204 259
205=cut 260=cut
206 261
207BEGIN { 262sub error(@) { LOG llevError, join "", @_ }
208 *CORE::GLOBAL::warn = sub { 263sub warn (@) { LOG llevWarn , join "", @_ }
264sub info (@) { LOG llevInfo , join "", @_ }
265sub debug(@) { LOG llevDebug, join "", @_ }
266sub trace(@) { LOG llevTrace, join "", @_ }
267
268$Coro::State::WARNHOOK = sub {
209 my $msg = join "", @_; 269 my $msg = join "", @_;
210 270
211 $msg .= "\n" 271 $msg .= "\n"
212 unless $msg =~ /\n$/; 272 unless $msg =~ /\n$/;
213 273
214 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 274 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
215 275
216 LOG llevError, $msg; 276 LOG llevWarn, $msg;
217 }; 277};
218}
219 278
220$Coro::State::DIEHOOK = sub { 279$Coro::State::DIEHOOK = sub {
221 return unless $^S eq 0; # "eq", not "==" 280 return unless $^S eq 0; # "eq", not "=="
222 281
223 if ($Coro::current == $Coro::main) {#d# 282 error Carp::longmess $_[0];
283
284 if (in_main) {#d#
224 warn "DIEHOOK called in main context, Coro bug?\n";#d# 285 error "DIEHOOK called in main context, Coro bug?\n";#d#
225 return;#d# 286 return;#d#
226 }#d# 287 }#d#
227 288
228 # kill coroutine otherwise 289 # kill coroutine otherwise
229 warn Carp::longmess $_[0];
230 Coro::terminate 290 Coro::terminate
231}; 291};
232
233$SIG{__DIE__} = sub { }; #d#?
234 292
235@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 293@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
236@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 294@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
237@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 295@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
238@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 296@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
252)) { 310)) {
253 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 311 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
254} 312}
255 313
256$EV::DIED = sub { 314$EV::DIED = sub {
257 warn "error in event callback: @_"; 315 Carp::cluck "error in event callback: @_";
258}; 316};
259 317
260############################################################################# 318#############################################################################
261 319
262=head2 UTILITY FUNCTIONS 320=head2 UTILITY FUNCTIONS
299our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 357our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
300 358
301sub encode_json($) { $json_coder->encode ($_[0]) } 359sub encode_json($) { $json_coder->encode ($_[0]) }
302sub decode_json($) { $json_coder->decode ($_[0]) } 360sub decode_json($) { $json_coder->decode ($_[0]) }
303 361
362=item cf::post_init { BLOCK }
363
364Execute the given codeblock, I<after> all extensions have been (re-)loaded,
365but I<before> the server starts ticking again.
366
367The cdoeblock will have a single boolean argument to indicate whether this
368is a reload or not.
369
370=cut
371
372sub post_init(&) {
373 push @POST_INIT, shift;
374}
375
304=item cf::lock_wait $string 376=item cf::lock_wait $string
305 377
306Wait until the given lock is available. See cf::lock_acquire. 378Wait until the given lock is available. See cf::lock_acquire.
307 379
308=item my $lock = cf::lock_acquire $string 380=item my $lock = cf::lock_acquire $string
309 381
310Wait until the given lock is available and then acquires it and returns 382Wait until the given lock is available and then acquires it and returns
311a Coro::guard object. If the guard object gets destroyed (goes out of scope, 383a L<Guard> object. If the guard object gets destroyed (goes out of scope,
312for example when the coroutine gets canceled), the lock is automatically 384for example when the coroutine gets canceled), the lock is automatically
313returned. 385returned.
314 386
315Locks are *not* recursive, locking from the same coro twice results in a 387Locks are *not* recursive, locking from the same coro twice results in a
316deadlocked coro. 388deadlocked coro.
322 394
323Return true if the lock is currently active, i.e. somebody has locked it. 395Return true if the lock is currently active, i.e. somebody has locked it.
324 396
325=cut 397=cut
326 398
327our %LOCK; 399our $LOCKS = new Coro::SemaphoreSet;
328our %LOCKER;#d#
329 400
330sub lock_wait($) { 401sub lock_wait($) {
331 my ($key) = @_; 402 $LOCKS->wait ($_[0]);
332
333 if ($LOCKER{$key} == $Coro::current) {#d#
334 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
335 return;#d#
336 }#d#
337
338 # wait for lock, if any
339 while ($LOCK{$key}) {
340 push @{ $LOCK{$key} }, $Coro::current;
341 Coro::schedule;
342 }
343} 403}
344 404
345sub lock_acquire($) { 405sub lock_acquire($) {
346 my ($key) = @_; 406 $LOCKS->guard ($_[0])
347
348 # wait, to be sure we are not locked
349 lock_wait $key;
350
351 $LOCK{$key} = [];
352 $LOCKER{$key} = $Coro::current;#d#
353
354 Coro::guard {
355 delete $LOCKER{$key};#d#
356 # wake up all waiters, to be on the safe side
357 $_->ready for @{ delete $LOCK{$key} };
358 }
359} 407}
360 408
361sub lock_active($) { 409sub lock_active($) {
362 my ($key) = @_; 410 $LOCKS->count ($_[0]) < 1
363
364 ! ! $LOCK{$key}
365} 411}
366 412
367sub freeze_mainloop { 413sub freeze_mainloop {
368 tick_inhibit_inc; 414 tick_inhibit_inc;
369 415
370 Coro::guard \&tick_inhibit_dec; 416 &Guard::guard (\&tick_inhibit_dec);
371} 417}
372 418
373=item cf::periodic $interval, $cb 419=item cf::periodic $interval, $cb
374 420
375Like EV::periodic, but randomly selects a starting point so that the actions 421Like EV::periodic, but randomly selects a starting point so that the actions
376get spread over timer. 422get spread over time.
377 423
378=cut 424=cut
379 425
380sub periodic($$) { 426sub periodic($$) {
381 my ($interval, $cb) = @_; 427 my ($interval, $cb) = @_;
398 444
399=cut 445=cut
400 446
401our @SLOT_QUEUE; 447our @SLOT_QUEUE;
402our $SLOT_QUEUE; 448our $SLOT_QUEUE;
449our $SLOT_DECAY = 0.9;
403 450
404$SLOT_QUEUE->cancel if $SLOT_QUEUE; 451$SLOT_QUEUE->cancel if $SLOT_QUEUE;
405$SLOT_QUEUE = Coro::async { 452$SLOT_QUEUE = Coro::async {
406 $Coro::current->desc ("timeslot manager"); 453 $Coro::current->desc ("timeslot manager");
407 454
408 my $signal = new Coro::Signal; 455 my $signal = new Coro::Signal;
456 my $busy;
409 457
410 while () { 458 while () {
411 next_job: 459 next_job:
460
412 my $avail = cf::till_tick; 461 my $avail = cf::till_tick;
413 if ($avail > 0.01) { 462
414 for (0 .. $#SLOT_QUEUE) { 463 for (0 .. $#SLOT_QUEUE) {
415 if ($SLOT_QUEUE[$_][0] < $avail) { 464 if ($SLOT_QUEUE[$_][0] <= $avail) {
465 $busy = 0;
416 my $job = splice @SLOT_QUEUE, $_, 1, (); 466 my $job = splice @SLOT_QUEUE, $_, 1, ();
417 $job->[2]->send; 467 $job->[2]->send;
418 Coro::cede; 468 Coro::cede;
419 goto next_job; 469 goto next_job;
420 } 470 } else {
471 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
421 } 472 }
422 } 473 }
423 474
424 if (@SLOT_QUEUE) { 475 if (@SLOT_QUEUE) {
425 # we do not use wait_for_tick() as it returns immediately when tick is inactive 476 # we do not use wait_for_tick() as it returns immediately when tick is inactive
426 push @cf::WAIT_FOR_TICK, $signal; 477 push @cf::WAIT_FOR_TICK, $signal;
427 $signal->wait; 478 $signal->wait;
428 } else { 479 } else {
480 $busy = 0;
429 Coro::schedule; 481 Coro::schedule;
430 } 482 }
431 } 483 }
432}; 484};
433 485
434sub get_slot($;$$) { 486sub get_slot($;$$) {
435 return if tick_inhibit || $Coro::current == $Coro::main; 487 return if tick_inhibit || $Coro::current == $Coro::main;
436 488
437 my ($time, $pri, $name) = @_; 489 my ($time, $pri, $name) = @_;
438 490
439 $time = $TICK * .6 if $time > $TICK * .6; 491 $time = clamp $time, 0.01, $TICK * .6;
492
440 my $sig = new Coro::Signal; 493 my $sig = new Coro::Signal;
441 494
442 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 495 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
443 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 496 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
444 $SLOT_QUEUE->ready; 497 $SLOT_QUEUE->ready;
470=cut 523=cut
471 524
472sub sync_job(&) { 525sub sync_job(&) {
473 my ($job) = @_; 526 my ($job) = @_;
474 527
475 if ($Coro::current == $Coro::main) { 528 if (in_main) {
476 my $time = EV::time; 529 my $time = AE::time;
477 530
478 # this is the main coro, too bad, we have to block 531 # this is the main coro, too bad, we have to block
479 # till the operation succeeds, freezing the server :/ 532 # till the operation succeeds, freezing the server :/
480 533
481 LOG llevError, Carp::longmess "sync job";#d# 534 #LOG llevError, Carp::longmess "sync job";#d#
482 535
483 my $freeze_guard = freeze_mainloop; 536 my $freeze_guard = freeze_mainloop;
484 537
485 my $busy = 1; 538 my $busy = 1;
486 my @res; 539 my @res;
487 540
488 (async { 541 (async {
489 $Coro::current->desc ("sync job coro"); 542 $Coro::current->desc ("sync job coro");
490 @res = eval { $job->() }; 543 @res = eval { $job->() };
491 warn $@ if $@; 544 error $@ if $@;
492 undef $busy; 545 undef $busy;
493 })->prio (Coro::PRIO_MAX); 546 })->prio (Coro::PRIO_MAX);
494 547
495 while ($busy) { 548 while ($busy) {
496 if (Coro::nready) { 549 if (Coro::nready) {
498 } else { 551 } else {
499 EV::loop EV::LOOP_ONESHOT; 552 EV::loop EV::LOOP_ONESHOT;
500 } 553 }
501 } 554 }
502 555
503 my $time = EV::time - $time; 556 my $time = AE::time - $time;
504 557
505 $TICK_START += $time; # do not account sync jobs to server load 558 $TICK_START += $time; # do not account sync jobs to server load
506 559
507 wantarray ? @res : $res[0] 560 wantarray ? @res : $res[0]
508 } else { 561 } else {
539Coro::Storable. May, of course, block. Note that the executed sub may 592Coro::Storable. May, of course, block. Note that the executed sub may
540never block itself or use any form of event handling. 593never block itself or use any form of event handling.
541 594
542=cut 595=cut
543 596
597sub post_fork {
598 reset_signals;
599}
600
544sub fork_call(&@) { 601sub fork_call(&@) {
545 my ($cb, @args) = @_; 602 my ($cb, @args) = @_;
546 603
547 # we seemingly have to make a local copy of the whole thing, 604 # we seemingly have to make a local copy of the whole thing,
548 # otherwise perl prematurely frees the stuff :/ 605 # otherwise perl prematurely frees the stuff :/
549 # TODO: investigate and fix (likely this will be rather laborious) 606 # TODO: investigate and fix (likely this will be rather laborious)
550 607
551 my @res = Coro::Util::fork_eval { 608 my @res = Coro::Util::fork_eval {
552 reset_signals; 609 cf::post_fork;
553 &$cb 610 &$cb
554 }, @args; 611 }, @args;
555 612
556 wantarray ? @res : $res[-1] 613 wantarray ? @res : $res[-1]
614}
615
616sub objinfo {
617 (
618 "counter value" => cf::object::object_count,
619 "objects created" => cf::object::create_count,
620 "objects destroyed" => cf::object::destroy_count,
621 "freelist size" => cf::object::free_count,
622 "allocated objects" => cf::object::objects_size,
623 "active objects" => cf::object::actives_size,
624 )
557} 625}
558 626
559=item $coin = coin_from_name $name 627=item $coin = coin_from_name $name
560 628
561=cut 629=cut
598within each server. 666within each server.
599 667
600=cut 668=cut
601 669
602sub db_table($) { 670sub db_table($) {
671 cf::error "db_get called from main context"
672 if $Coro::current == $Coro::main;
673
603 my ($name) = @_; 674 my ($name) = @_;
604 my $db = BDB::db_create $DB_ENV; 675 my $db = BDB::db_create $DB_ENV;
605 676
606 eval { 677 eval {
607 $db->set_flags (BDB::CHKSUM); 678 $db->set_flags (BDB::CHKSUM);
617} 688}
618 689
619our $DB; 690our $DB;
620 691
621sub db_init { 692sub db_init {
622 cf::sync_job {
623 $DB ||= db_table "db"; 693 $DB ||= db_table "db";
624 };
625} 694}
626 695
627sub db_get($$) { 696sub db_get($$) {
628 my $key = "$_[0]/$_[1]"; 697 my $key = "$_[0]/$_[1]";
629 698
630 cf::sync_job { 699 cf::error "db_get called from main context"
700 if $Coro::current == $Coro::main;
701
631 BDB::db_get $DB, undef, $key, my $data; 702 BDB::db_get $DB, undef, $key, my $data;
632 703
633 $! ? () 704 $! ? ()
634 : $data 705 : $data
635 }
636} 706}
637 707
638sub db_put($$$) { 708sub db_put($$$) {
639 BDB::dbreq_pri 4; 709 BDB::dbreq_pri 4;
640 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 710 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
696 766
697 my $t1 = Time::HiRes::time; 767 my $t1 = Time::HiRes::time;
698 my $data = $process->(\@data); 768 my $data = $process->(\@data);
699 my $t2 = Time::HiRes::time; 769 my $t2 = Time::HiRes::time;
700 770
701 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 771 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
702 772
703 db_put cache => "$id/data", $data; 773 db_put cache => "$id/data", $data;
704 db_put cache => "$id/md5" , $md5; 774 db_put cache => "$id/md5" , $md5;
705 db_put cache => "$id/meta", $meta; 775 db_put cache => "$id/meta", $meta;
706 776
716 786
717=cut 787=cut
718 788
719sub datalog($@) { 789sub datalog($@) {
720 my ($type, %kv) = @_; 790 my ($type, %kv) = @_;
721 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 791 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
722} 792}
723 793
724=back 794=back
725 795
726=cut 796=cut
727 797
728############################################################################# 798#############################################################################
729 799
730=head2 ATTACHABLE OBJECTS 800=head2 ATTACHABLE OBJECTS
731 801
732Many objects in crossfire are so-called attachable objects. That means you can 802Many objects in deliantra are so-called attachable objects. That means you can
733attach callbacks/event handlers (a collection of which is called an "attachment") 803attach callbacks/event handlers (a collection of which is called an "attachment")
734to it. All such attachable objects support the following methods. 804to it. All such attachable objects support the following methods.
735 805
736In the following description, CLASS can be any of C<global>, C<object> 806In the following description, CLASS can be any of C<global>, C<object>
737C<player>, C<client> or C<map> (i.e. the attachable objects in 807C<player>, C<client> or C<map> (i.e. the attachable objects in
787=item cf::CLASS::attachment $name, ... 857=item cf::CLASS::attachment $name, ...
788 858
789Register an attachment by C<$name> through which attachable objects of the 859Register an attachment by C<$name> through which attachable objects of the
790given CLASS can refer to this attachment. 860given CLASS can refer to this attachment.
791 861
792Some classes such as crossfire maps and objects can specify attachments 862Some classes such as deliantra maps and objects can specify attachments
793that are attached at load/instantiate time, thus the need for a name. 863that are attached at load/instantiate time, thus the need for a name.
794 864
795These calls expect any number of the following handler/hook descriptions: 865These calls expect any number of the following handler/hook descriptions:
796 866
797=over 4 867=over 4
921 991
922 } elsif (exists $cb_id{$type}) { 992 } elsif (exists $cb_id{$type}) {
923 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 993 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
924 994
925 } elsif (ref $type) { 995 } elsif (ref $type) {
926 warn "attaching objects not supported, ignoring.\n"; 996 error "attaching objects not supported, ignoring.\n";
927 997
928 } else { 998 } else {
929 shift @arg; 999 shift @arg;
930 warn "attach argument '$type' not supported, ignoring.\n"; 1000 error "attach argument '$type' not supported, ignoring.\n";
931 } 1001 }
932 } 1002 }
933} 1003}
934 1004
935sub _object_attach { 1005sub _object_attach {
945 _attach $registry, $klass, @attach; 1015 _attach $registry, $klass, @attach;
946 } 1016 }
947 1017
948 $obj->{$name} = \%arg; 1018 $obj->{$name} = \%arg;
949 } else { 1019 } else {
950 warn "object uses attachment '$name' which is not available, postponing.\n"; 1020 info "object uses attachment '$name' which is not available, postponing.\n";
951 } 1021 }
952 1022
953 $obj->{_attachment}{$name} = undef; 1023 $obj->{_attachment}{$name} = undef;
954} 1024}
955 1025
1014 1084
1015 for (@$callbacks) { 1085 for (@$callbacks) {
1016 eval { &{$_->[1]} }; 1086 eval { &{$_->[1]} };
1017 1087
1018 if ($@) { 1088 if ($@) {
1019 warn "$@";
1020 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1089 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1021 override; 1090 override;
1022 } 1091 }
1023 1092
1024 return 1 if $override; 1093 return 1 if $override;
1025 } 1094 }
1104 for (@$attach) { 1173 for (@$attach) {
1105 my ($klass, @attach) = @$_; 1174 my ($klass, @attach) = @$_;
1106 _attach $registry, $klass, @attach; 1175 _attach $registry, $klass, @attach;
1107 } 1176 }
1108 } else { 1177 } else {
1109 warn "object uses attachment '$name' that is not available, postponing.\n"; 1178 info "object uses attachment '$name' that is not available, postponing.\n";
1110 } 1179 }
1111 } 1180 }
1112} 1181}
1113 1182
1114cf::attachable->attach ( 1183cf::attachable->attach (
1141 my ($filename, $rdata, $objs) = @_; 1210 my ($filename, $rdata, $objs) = @_;
1142 1211
1143 sync_job { 1212 sync_job {
1144 if (length $$rdata) { 1213 if (length $$rdata) {
1145 utf8::decode (my $decname = $filename); 1214 utf8::decode (my $decname = $filename);
1146 warn sprintf "saving %s (%d,%d)\n", 1215 trace sprintf "saving %s (%d,%d)\n",
1147 $decname, length $$rdata, scalar @$objs; 1216 $decname, length $$rdata, scalar @$objs
1217 if $VERBOSE_IO;
1148 1218
1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1219 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1150 aio_chmod $fh, SAVE_MODE; 1220 aio_chmod $fh, SAVE_MODE;
1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1221 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1152 aio_fsync $fh if $cf::USE_FSYNC; 1222 if ($cf::USE_FSYNC) {
1223 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;
1224 aio_fsync $fh;
1225 }
1153 aio_close $fh; 1226 aio_close $fh;
1154 1227
1155 if (@$objs) { 1228 if (@$objs) {
1156 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1229 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1157 aio_chmod $fh, SAVE_MODE; 1230 aio_chmod $fh, SAVE_MODE;
1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1231 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1159 aio_write $fh, 0, (length $data), $data, 0; 1232 aio_write $fh, 0, (length $data), $data, 0;
1160 aio_fsync $fh if $cf::USE_FSYNC; 1233 if ($cf::USE_FSYNC) {
1234 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;
1235 aio_fsync $fh;
1236 }
1161 aio_close $fh; 1237 aio_close $fh;
1162 aio_rename "$filename.pst~", "$filename.pst"; 1238 aio_rename "$filename.pst~", "$filename.pst";
1163 } 1239 }
1164 } else { 1240 } else {
1165 aio_unlink "$filename.pst"; 1241 aio_unlink "$filename.pst";
1166 } 1242 }
1167 1243
1168 aio_rename "$filename~", $filename; 1244 aio_rename "$filename~", $filename;
1245
1246 $filename =~ s%/[^/]+$%%;
1247 aio_pathsync $filename if $cf::USE_FSYNC;
1169 } else { 1248 } else {
1170 warn "FATAL: $filename~: $!\n"; 1249 error "unable to save objects: $filename~: $!\n";
1171 } 1250 }
1172 } else { 1251 } else {
1173 aio_unlink $filename; 1252 aio_unlink $filename;
1174 aio_unlink "$filename.pst"; 1253 aio_unlink "$filename.pst";
1175 } 1254 }
1199 my $st = eval { Coro::Storable::thaw $av }; 1278 my $st = eval { Coro::Storable::thaw $av };
1200 $av = $st->{objs}; 1279 $av = $st->{objs};
1201 } 1280 }
1202 1281
1203 utf8::decode (my $decname = $filename); 1282 utf8::decode (my $decname = $filename);
1204 warn sprintf "loading %s (%d,%d)\n", 1283 trace sprintf "loading %s (%d,%d)\n",
1205 $decname, length $data, scalar @{$av || []}; 1284 $decname, length $data, scalar @{$av || []}
1285 if $VERBOSE_IO;
1206 1286
1207 ($data, $av) 1287 ($data, $av)
1208} 1288}
1209 1289
1210=head2 COMMAND CALLBACKS 1290=head2 COMMAND CALLBACKS
1266 my ($name, $cb) = @_; 1346 my ($name, $cb) = @_;
1267 1347
1268 $EXTICMD{$name} = $cb; 1348 $EXTICMD{$name} = $cb;
1269} 1349}
1270 1350
1351use File::Glob ();
1352
1271cf::player->attach ( 1353cf::player->attach (
1272 on_command => sub { 1354 on_unknown_command => sub {
1273 my ($pl, $name, $params) = @_; 1355 my ($pl, $name, $params) = @_;
1274 1356
1275 my $cb = $COMMAND{$name} 1357 my $cb = $COMMAND{$name}
1276 or return; 1358 or return;
1277 1359
1300 1382
1301 $pl->ext_reply ($reply, @reply) 1383 $pl->ext_reply ($reply, @reply)
1302 if $reply; 1384 if $reply;
1303 1385
1304 } else { 1386 } else {
1305 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1387 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1306 } 1388 }
1307 1389
1308 cf::override; 1390 cf::override;
1309 }, 1391 },
1310); 1392);
1311 1393
1394# "readahead" all extensions
1395sub cache_extensions {
1396 my $grp = IO::AIO::aio_group;
1397
1398 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1399 for (grep /\.ext$/, @{$_[0]}) {
1400 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1401 }
1402 };
1403
1404 $grp
1405}
1406
1312sub load_extensions { 1407sub load_extensions {
1408 info "loading extensions...";
1409
1313 cf::sync_job { 1410 cf::sync_job {
1314 my %todo; 1411 my %todo;
1315 1412
1316 for my $path (<$LIBDIR/*.ext>) { 1413 for my $path (<$LIBDIR/*.ext>) {
1317 next unless -r $path; 1414 next unless -r $path;
1335 1432
1336 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1433 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1337 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1434 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1338 1435
1339 $ext{source} = 1436 $ext{source} =
1340 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1437 "package $pkg; use common::sense;\n"
1341 . "#line 1 \"$path\"\n{\n" 1438 . "#line 1 \"$path\"\n{\n"
1342 . $source 1439 . $source
1343 . "\n};\n1"; 1440 . "\n};\n1";
1344 1441
1345 $todo{$base} = \%ext; 1442 $todo{$base} = \%ext;
1346 } 1443 }
1347 1444
1445 my $pass = 0;
1348 my %done; 1446 my %done;
1349 while (%todo) { 1447 while (%todo) {
1350 my $progress; 1448 my $progress;
1351 1449
1450 ++$pass;
1451
1452 ext:
1352 while (my ($k, $v) = each %todo) { 1453 while (my ($k, $v) = each %todo) {
1353 for (split /,\s*/, $v->{meta}{depends}) { 1454 for (split /,\s*/, $v->{meta}{depends}) {
1354 goto skip 1455 next ext
1355 unless exists $done{$_}; 1456 unless exists $done{$_};
1356 } 1457 }
1357 1458
1358 warn "... loading '$k' into '$v->{pkg}'\n"; 1459 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1359 1460
1360 unless (eval $v->{source}) { 1461 my $active = eval $v->{source};
1462
1463 if (length $@) {
1361 my $msg = $@ ? "$v->{path}: $@\n" 1464 error "$v->{path}: $@\n";
1362 : "$v->{base}: extension inactive.\n";
1363 1465
1364 if (exists $v->{meta}{mandatory}) {
1365 warn $msg;
1366 cf::cleanup "mandatory extension failed to load, exiting."; 1466 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1367 } 1467 if exists $v->{meta}{mandatory};
1368 1468
1369 warn $msg; 1469 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1470 delete $todo{$k};
1471 } else {
1472 $done{$k} = delete $todo{$k};
1473 push @EXTS, $v->{pkg};
1474 $progress = 1;
1475
1476 info "$v->{base}: extension inactive.\n"
1477 unless $active;
1370 } 1478 }
1371
1372 $done{$k} = delete $todo{$k};
1373 push @EXTS, $v->{pkg};
1374 $progress = 1;
1375 } 1479 }
1376 1480
1377 skip: 1481 unless ($progress) {
1378 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1482 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1379 unless $progress; 1483
1484 while (my ($k, $v) = each %todo) {
1485 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1486 if exists $v->{meta}{mandatory};
1487 }
1488 }
1380 } 1489 }
1381 }; 1490 };
1382} 1491}
1383 1492
1384############################################################################# 1493#############################################################################
1385 1494
1386=back 1495=back
1387 1496
1388=head2 CORE EXTENSIONS 1497=head2 CORE EXTENSIONS
1389 1498
1390Functions and methods that extend core crossfire objects. 1499Functions and methods that extend core deliantra objects.
1391 1500
1392=cut 1501=cut
1393 1502
1394package cf::player; 1503package cf::player;
1395 1504
1438 1547
1439sub exists($) { 1548sub exists($) {
1440 my ($login) = @_; 1549 my ($login) = @_;
1441 1550
1442 $cf::PLAYER{$login} 1551 $cf::PLAYER{$login}
1443 or cf::sync_job { !aio_stat path $login } 1552 or !aio_stat path $login
1444} 1553}
1445 1554
1446sub find($) { 1555sub find($) {
1447 return $cf::PLAYER{$_[0]} || do { 1556 return $cf::PLAYER{$_[0]} || do {
1448 my $login = $_[0]; 1557 my $login = $_[0];
1468 $cf::PLAYER{$login} = $pl 1577 $cf::PLAYER{$login} = $pl
1469 } 1578 }
1470 } 1579 }
1471} 1580}
1472 1581
1582cf::player->attach (
1583 on_load => sub {
1584 my ($pl, $path) = @_;
1585
1586 # restore slots saved in save, below
1587 my $slots = delete $pl->{_slots};
1588
1589 $pl->ob->current_weapon ($slots->[0]);
1590 $pl->combat_ob ($slots->[1]);
1591 $pl->ranged_ob ($slots->[2]);
1592 },
1593);
1594
1473sub save($) { 1595sub save($) {
1474 my ($pl) = @_; 1596 my ($pl) = @_;
1475 1597
1476 return if $pl->{deny_save}; 1598 return if $pl->{deny_save};
1477 1599
1482 1604
1483 aio_mkdir playerdir $pl, 0770; 1605 aio_mkdir playerdir $pl, 0770;
1484 $pl->{last_save} = $cf::RUNTIME; 1606 $pl->{last_save} = $cf::RUNTIME;
1485 1607
1486 cf::get_slot 0.01; 1608 cf::get_slot 0.01;
1609
1610 # save slots, to be restored later
1611 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1487 1612
1488 $pl->save_pl ($path); 1613 $pl->save_pl ($path);
1489 cf::cede_to_tick; 1614 cf::cede_to_tick;
1490} 1615}
1491 1616
1523 my ($pl) = @_; 1648 my ($pl) = @_;
1524 1649
1525 my $name = $pl->ob->name; 1650 my $name = $pl->ob->name;
1526 1651
1527 $pl->{deny_save} = 1; 1652 $pl->{deny_save} = 1;
1528 $pl->password ("*"); # this should lock out the player until we nuked the dir 1653 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1529 1654
1530 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1655 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1531 $pl->deactivate; 1656 $pl->deactivate;
1657
1532 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1658 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1533 $pl->ob->check_score; 1659 ext::highscore::check ($pl->ob);
1660
1534 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1661 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1535 $pl->ns->destroy if $pl->ns; 1662 $pl->ns->destroy if $pl->ns;
1536 1663
1537 my $path = playerdir $pl; 1664 my $path = playerdir $pl;
1538 my $temp = "$path~$cf::RUNTIME~deleting~"; 1665 my $temp = "$path~$cf::RUNTIME~deleting~";
1593 \@logins 1720 \@logins
1594} 1721}
1595 1722
1596=item $player->maps 1723=item $player->maps
1597 1724
1725=item cf::player::maps $login
1726
1598Returns an arrayref of map paths that are private for this 1727Returns an arrayref of map paths that are private for this
1599player. May block. 1728player. May block.
1600 1729
1601=cut 1730=cut
1602 1731
1619 } 1748 }
1620 1749
1621 \@paths 1750 \@paths
1622} 1751}
1623 1752
1624=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1753=item $protocol_xml = $player->expand_cfpod ($cfpod)
1625 1754
1626Expand crossfire pod fragments into protocol xml. 1755Expand deliantra pod fragments into protocol xml.
1627
1628=cut
1629
1630sub expand_cfpod {
1631 my ($self, $pod) = @_;
1632
1633 my @nest = [qr<\G$>, undef, ""];
1634 my $xml;
1635
1636 for ($pod) {
1637 while () {
1638 if (/\G( (?: [^BCEGHITUZ&>\n\ ]+ | [BCEGHITUZ](?!<) | \ (?!>) )+ )/xgcs) {
1639 $xml .= $1;
1640 } elsif (/\G\n(?=\S)/xgcs) {
1641 $xml .= " ";
1642 } elsif (/\G\n/xgcs) {
1643 $xml .= "\n";
1644 } elsif (/\G ([BCEGHITUZ]) (< (?: <+\ | (?!<) ) )/xgcs) {
1645 my ($code, $delim) = ($1, scalar reverse $2);
1646 $delim =~ y/</>/; # delim now contains the stop sequence
1647 $delim = qr{\G\Q$delim};
1648
1649 my $cb;
1650
1651 if ($code eq "B") {
1652 $cb = sub { "<b>$_[0]</b>" };
1653 } elsif ($code eq "C") {
1654 $cb = sub { "<tt>$_[0]</tt>" };
1655 } elsif ($code eq "E") {
1656 $cb = sub { warn "E<$_[0]>\n";"&$_[0];" };
1657 } elsif ($code eq "G") {
1658 $cb = sub {
1659 my ($male, $female) = split /\|/, $_[0];
1660 $self->gender ? $female : $male
1661 };
1662 } elsif ($code eq "H") {
1663 $cb = sub {
1664 (
1665 "<fg name=\"lightblue\">[$_[0] (Use hintmode to suppress hints)]</fg>",
1666 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1667 "",
1668 )[$self->{hintmode}];
1669 };
1670 } elsif ($code eq "I") {
1671 $cb = sub { "<i>$_[0]</i>" };
1672 } elsif ($code eq "T") {
1673 $cb = sub { "<big><b>$_[0]</b></big>" };
1674 } elsif ($code eq "U") {
1675 $cb = sub { "<u>$_[0]</u>" };
1676 } elsif ($code eq "Z") {
1677 $cb = sub { };
1678 } else {
1679 die "FATAL error in expand_cfpod";
1680 }
1681
1682 push @nest, [$delim, $cb, $xml];
1683 undef $xml;
1684
1685 } elsif ($_ =~ /$nest[-1][0]/gcs) {
1686 my $nest = pop @nest;
1687
1688 if ($nest->[1]) {
1689 $xml = $nest->[2] . $nest->[1]->($xml);
1690 } else {
1691 last;
1692 }
1693 } elsif (/\G</xgcs) {
1694 $xml .= "&lt;";
1695 } elsif (/\G&/xgcs) {
1696 $xml .= "&amp;";
1697 } elsif (/\G>/xgcs) {
1698 $xml .= ">";
1699 } else {
1700 if ($pod =~ /\G(.+)/xgcs) {
1701 warn "parse error (at $1)($nest[-1][0]) while expanding cfpod:\n$pod";
1702 last;
1703 } else {
1704 warn "parse error (unclosed interior sequence at end of cfpod) while expanding cfpod:\n$pod";
1705 return "<b>Sorry, the server encountered an internal error when formatting this message, please report this.</b>";
1706 }
1707 }
1708 }
1709 }
1710
1711 $xml
1712}
1713
1714sub hintmode {
1715 $_[0]{hintmode} = $_[1] if @_ > 1;
1716 $_[0]{hintmode}
1717}
1718 1756
1719=item $player->ext_reply ($msgid, @msg) 1757=item $player->ext_reply ($msgid, @msg)
1720 1758
1721Sends an ext reply to the player. 1759Sends an ext reply to the player.
1722 1760
1754 1792
1755=cut 1793=cut
1756 1794
1757sub find_by_path($) { 1795sub find_by_path($) {
1758 my ($path) = @_; 1796 my ($path) = @_;
1797
1798 $path =~ s/^~[^\/]*//; # skip ~login
1759 1799
1760 my ($match, $specificity); 1800 my ($match, $specificity);
1761 1801
1762 for my $region (list) { 1802 for my $region (list) {
1763 if ($region->{match} && $path =~ $region->{match}) { 1803 if ($region->{match} && $path =~ $region->{match}) {
1795 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1835 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1796 1836
1797 # mit "rum" bekleckern, nicht 1837 # mit "rum" bekleckern, nicht
1798 $self->_create_random_map ( 1838 $self->_create_random_map (
1799 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1839 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1800 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1840 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1801 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1841 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1802 $rmp->{exit_on_final_map}, 1842 $rmp->{exit_on_final_map},
1803 $rmp->{xsize}, $rmp->{ysize}, 1843 $rmp->{xsize}, $rmp->{ysize},
1804 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1844 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1805 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1845 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1820 1860
1821sub register { 1861sub register {
1822 my (undef, $regex, $prio) = @_; 1862 my (undef, $regex, $prio) = @_;
1823 my $pkg = caller; 1863 my $pkg = caller;
1824 1864
1825 no strict;
1826 push @{"$pkg\::ISA"}, __PACKAGE__; 1865 push @{"$pkg\::ISA"}, __PACKAGE__;
1827 1866
1828 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1867 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1829} 1868}
1830 1869
1831# also paths starting with '/' 1870# also paths starting with '/'
1832$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1871$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1833 1872
1834sub thawer_merge { 1873sub thawer_merge {
1835 my ($self, $merge) = @_; 1874 my ($self, $merge) = @_;
1836 1875
1837 # we have to keep some variables in memory intact 1876 # we have to keep some variables in memory intact
1842} 1881}
1843 1882
1844sub normalise { 1883sub normalise {
1845 my ($path, $base) = @_; 1884 my ($path, $base) = @_;
1846 1885
1847 $path = "$path"; # make sure its a string 1886 $path = "$path"; # make sure it's a string
1848 1887
1849 $path =~ s/\.map$//; 1888 $path =~ s/\.map$//;
1850 1889
1851 # map plan: 1890 # map plan:
1852 # 1891 #
1891 $self->init; # pass $1 etc. 1930 $self->init; # pass $1 etc.
1892 return $self; 1931 return $self;
1893 } 1932 }
1894 } 1933 }
1895 1934
1896 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1935 Carp::cluck "unable to resolve path '$path' (base '$base')";
1897 () 1936 ()
1898} 1937}
1899 1938
1900sub init { 1939sub init {
1901 my ($self) = @_; 1940 my ($self) = @_;
1933sub uniq_path { 1972sub uniq_path {
1934 my ($self) = @_; 1973 my ($self) = @_;
1935 1974
1936 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1975 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1937 "$UNIQUEDIR/$path" 1976 "$UNIQUEDIR/$path"
1938}
1939
1940# and all this just because we cannot iterate over
1941# all maps in C++...
1942sub change_all_map_light {
1943 my ($change) = @_;
1944
1945 $_->change_map_light ($change)
1946 for grep $_->outdoor, values %cf::MAP;
1947} 1977}
1948 1978
1949sub decay_objects { 1979sub decay_objects {
1950 my ($self) = @_; 1980 my ($self) = @_;
1951 1981
2033 2063
2034sub find; 2064sub find;
2035sub find { 2065sub find {
2036 my ($path, $origin) = @_; 2066 my ($path, $origin) = @_;
2037 2067
2068 cf::cede_to_tick;
2069
2038 $path = normalise $path, $origin && $origin->path; 2070 $path = normalise $path, $origin && $origin->path;
2039 2071
2040 cf::lock_wait "map_data:$path";#d#remove 2072 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2041 cf::lock_wait "map_find:$path"; 2073 my $guard2 = cf::lock_acquire "map_find:$path";
2042 2074
2043 $cf::MAP{$path} || do { 2075 $cf::MAP{$path} || do {
2044 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2045 my $guard2 = cf::lock_acquire "map_find:$path";
2046
2047 my $map = new_from_path cf::map $path 2076 my $map = new_from_path cf::map $path
2048 or return; 2077 or return;
2049 2078
2050 $map->{last_save} = $cf::RUNTIME; 2079 $map->{last_save} = $cf::RUNTIME;
2051 2080
2063 2092
2064 $cf::MAP{$path} = $map 2093 $cf::MAP{$path} = $map
2065 } 2094 }
2066} 2095}
2067 2096
2068sub pre_load { } 2097sub pre_load { }
2069sub post_load { } 2098#sub post_load { } # XS
2070 2099
2071sub load { 2100sub load {
2072 my ($self) = @_; 2101 my ($self) = @_;
2073 2102
2074 local $self->{deny_reset} = 1; # loading can take a long time 2103 local $self->{deny_reset} = 1; # loading can take a long time
2119 unless ($self->{deny_activate}) { 2148 unless ($self->{deny_activate}) {
2120 $self->decay_objects; 2149 $self->decay_objects;
2121 $self->fix_auto_apply; 2150 $self->fix_auto_apply;
2122 $self->update_buttons; 2151 $self->update_buttons;
2123 cf::cede_to_tick; 2152 cf::cede_to_tick;
2124 $self->set_darkness_map;
2125 cf::cede_to_tick;
2126 $self->activate; 2153 $self->activate;
2127 } 2154 }
2128 2155
2129 $self->{last_save} = $cf::RUNTIME; 2156 $self->{last_save} = $cf::RUNTIME;
2130 $self->last_access ($cf::RUNTIME); 2157 $self->last_access ($cf::RUNTIME);
2133 } 2160 }
2134 2161
2135 $self->post_load; 2162 $self->post_load;
2136} 2163}
2137 2164
2165# customize the map for a given player, i.e.
2166# return the _real_ map. used by e.g. per-player
2167# maps to change the path to ~playername/mappath
2138sub customise_for { 2168sub customise_for {
2139 my ($self, $ob) = @_; 2169 my ($self, $ob) = @_;
2140 2170
2141 return find "~" . $ob->name . "/" . $self->{path} 2171 return find "~" . $ob->name . "/" . $self->{path}
2142 if $self->per_player; 2172 if $self->per_player;
2158 or next; 2188 or next;
2159 $neigh = find $neigh, $map 2189 $neigh = find $neigh, $map
2160 or next; 2190 or next;
2161 $neigh->load; 2191 $neigh->load;
2162 2192
2193 # now find the diagonal neighbours
2163 push @neigh, 2194 push @neigh,
2164 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2195 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2165 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2196 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2166 } 2197 }
2167 2198
2174} 2205}
2175 2206
2176sub find_sync { 2207sub find_sync {
2177 my ($path, $origin) = @_; 2208 my ($path, $origin) = @_;
2178 2209
2179 cf::sync_job { find $path, $origin } 2210 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2211 if $Coro::current == $Coro::main;
2212
2213 find $path, $origin
2180} 2214}
2181 2215
2182sub do_load_sync { 2216sub do_load_sync {
2183 my ($map) = @_; 2217 my ($map) = @_;
2184 2218
2185 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2219 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2186 if $Coro::current == $Coro::main; 2220 if $Coro::current == $Coro::main;
2187 2221
2188 cf::sync_job { $map->load }; 2222 $map->load;
2189} 2223}
2190 2224
2191our %MAP_PREFETCH; 2225our %MAP_PREFETCH;
2192our $MAP_PREFETCHER = undef; 2226our $MAP_PREFETCHER = undef;
2193 2227
2219 $MAP_PREFETCHER->prio (6); 2253 $MAP_PREFETCHER->prio (6);
2220 2254
2221 () 2255 ()
2222} 2256}
2223 2257
2258# common code, used by both ->save and ->swapout
2224sub save { 2259sub _save {
2225 my ($self) = @_; 2260 my ($self) = @_;
2226
2227 my $lock = cf::lock_acquire "map_data:$self->{path}";
2228 2261
2229 $self->{last_save} = $cf::RUNTIME; 2262 $self->{last_save} = $cf::RUNTIME;
2230 2263
2231 return unless $self->dirty; 2264 return unless $self->dirty;
2232 2265
2252 } else { 2285 } else {
2253 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2286 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2254 } 2287 }
2255} 2288}
2256 2289
2290sub save {
2291 my ($self) = @_;
2292
2293 my $lock = cf::lock_acquire "map_data:$self->{path}";
2294
2295 $self->_save;
2296}
2297
2257sub swap_out { 2298sub swap_out {
2258 my ($self) = @_; 2299 my ($self) = @_;
2259 2300
2260 # save first because save cedes
2261 $self->save;
2262
2263 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2301 my $lock = cf::lock_acquire "map_data:$self->{path}";
2264 2302
2265 return if $self->players;
2266 return if $self->in_memory != cf::MAP_ACTIVE; 2303 return if $self->in_memory != cf::MAP_ACTIVE;
2267 return if $self->{deny_save}; 2304 return if $self->{deny_save};
2305 return if $self->players;
2268 2306
2307 # first deactivate the map and "unlink" it from the core
2308 $self->deactivate;
2309 $_->clear_links_to ($self) for values %cf::MAP;
2269 $self->in_memory (cf::MAP_SWAPPED); 2310 $self->in_memory (cf::MAP_SWAPPED);
2311
2312 # then atomically save
2313 $self->_save;
2314
2315 # then free the map
2316 $self->clear;
2317}
2318
2319sub reset_at {
2320 my ($self) = @_;
2321
2322 # TODO: safety, remove and allow resettable per-player maps
2323 return 1e99 if $self->{deny_reset};
2324
2325 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2326 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2327
2328 $time + $to
2329}
2330
2331sub should_reset {
2332 my ($self) = @_;
2333
2334 $self->reset_at <= $cf::RUNTIME
2335}
2336
2337sub reset {
2338 my ($self) = @_;
2339
2340 my $lock = cf::lock_acquire "map_data:$self->{path}";
2341
2342 return if $self->players;
2343
2344 cf::trace "resetting map ", $self->path, "\n";
2345
2346 $self->in_memory (cf::MAP_SWAPPED);
2347
2348 # need to save uniques path
2349 unless ($self->{deny_save}) {
2350 my $uniq = $self->uniq_path; utf8::encode $uniq;
2351
2352 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2353 if $uniq;
2354 }
2355
2356 delete $cf::MAP{$self->path};
2270 2357
2271 $self->deactivate; 2358 $self->deactivate;
2272 $_->clear_links_to ($self) for values %cf::MAP; 2359 $_->clear_links_to ($self) for values %cf::MAP;
2273 $self->clear; 2360 $self->clear;
2274}
2275
2276sub reset_at {
2277 my ($self) = @_;
2278
2279 # TODO: safety, remove and allow resettable per-player maps
2280 return 1e99 if $self->{deny_reset};
2281
2282 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2283 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2284
2285 $time + $to
2286}
2287
2288sub should_reset {
2289 my ($self) = @_;
2290
2291 $self->reset_at <= $cf::RUNTIME
2292}
2293
2294sub reset {
2295 my ($self) = @_;
2296
2297 my $lock = cf::lock_acquire "map_data:$self->{path}";
2298
2299 return if $self->players;
2300
2301 warn "resetting map ", $self->path;
2302
2303 $self->in_memory (cf::MAP_SWAPPED);
2304
2305 # need to save uniques path
2306 unless ($self->{deny_save}) {
2307 my $uniq = $self->uniq_path; utf8::encode $uniq;
2308
2309 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2310 if $uniq;
2311 }
2312
2313 delete $cf::MAP{$self->path};
2314
2315 $self->deactivate;
2316 $_->clear_links_to ($self) for values %cf::MAP;
2317 $self->clear;
2318 2361
2319 $self->unlink_save; 2362 $self->unlink_save;
2320 $self->destroy; 2363 $self->destroy;
2321} 2364}
2322 2365
2330 2373
2331 delete $cf::MAP{$self->path}; 2374 delete $cf::MAP{$self->path};
2332 2375
2333 $self->unlink_save; 2376 $self->unlink_save;
2334 2377
2335 bless $self, "cf::map"; 2378 bless $self, "cf::map::wrap";
2336 delete $self->{deny_reset}; 2379 delete $self->{deny_reset};
2337 $self->{deny_save} = 1; 2380 $self->{deny_save} = 1;
2338 $self->reset_timeout (1); 2381 $self->reset_timeout (1);
2339 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2382 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2340 2383
2397 : normalise $_ 2440 : normalise $_
2398 } @{ aio_readdir $UNIQUEDIR or [] } 2441 } @{ aio_readdir $UNIQUEDIR or [] }
2399 ] 2442 ]
2400} 2443}
2401 2444
2445=item cf::map::static_maps
2446
2447Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2448file in the shared directory excluding F</styles> and F</editor>). May
2449block.
2450
2451=cut
2452
2453sub static_maps() {
2454 my @dirs = "";
2455 my @maps;
2456
2457 while (@dirs) {
2458 my $dir = shift @dirs;
2459
2460 next if $dir eq "/styles" || $dir eq "/editor";
2461
2462 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2463 or return;
2464
2465 for (@$files) {
2466 s/\.map$// or next;
2467 utf8::decode $_;
2468 push @maps, "$dir/$_";
2469 }
2470
2471 push @dirs, map "$dir/$_", @$dirs;
2472 }
2473
2474 \@maps
2475}
2476
2402=back 2477=back
2403 2478
2404=head3 cf::object 2479=head3 cf::object
2405 2480
2406=cut 2481=cut
2471 2546
2472our $SAY_CHANNEL = { 2547our $SAY_CHANNEL = {
2473 id => "say", 2548 id => "say",
2474 title => "Map", 2549 title => "Map",
2475 reply => "say ", 2550 reply => "say ",
2476 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2551 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2477}; 2552};
2478 2553
2479our $CHAT_CHANNEL = { 2554our $CHAT_CHANNEL = {
2480 id => "chat", 2555 id => "chat",
2481 title => "Chat", 2556 title => "Chat",
2536 2611
2537=item $player_object->enter_link 2612=item $player_object->enter_link
2538 2613
2539Freezes the player and moves him/her to a special map (C<{link}>). 2614Freezes the player and moves him/her to a special map (C<{link}>).
2540 2615
2541The player should be reasonably safe there for short amounts of time. You 2616The player should be reasonably safe there for short amounts of time (e.g.
2542I<MUST> call C<leave_link> as soon as possible, though. 2617for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2618though, as the player cannot control the character while it is on the link
2619map.
2543 2620
2544Will never block. 2621Will never block.
2545 2622
2546=item $player_object->leave_link ($map, $x, $y) 2623=item $player_object->leave_link ($map, $x, $y)
2547 2624
2567sub cf::object::player::enter_link { 2644sub cf::object::player::enter_link {
2568 my ($self) = @_; 2645 my ($self) = @_;
2569 2646
2570 $self->deactivate_recursive; 2647 $self->deactivate_recursive;
2571 2648
2649 ++$self->{_link_recursion};
2650
2572 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2651 return if UNIVERSAL::isa $self->map, "ext::map_link";
2573 2652
2574 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2653 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2575 if $self->map && $self->map->{path} ne "{link}"; 2654 if $self->map && $self->map->{path} ne "{link}";
2576 2655
2577 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2656 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2578} 2657}
2579 2658
2580sub cf::object::player::leave_link { 2659sub cf::object::player::leave_link {
2581 my ($self, $map, $x, $y) = @_; 2660 my ($self, $map, $x, $y) = @_;
2582 2661
2599 ($x, $y) = (-1, -1) 2678 ($x, $y) = (-1, -1)
2600 unless (defined $x) && (defined $y); 2679 unless (defined $x) && (defined $y);
2601 2680
2602 # use -1 or undef as default coordinates, not 0, 0 2681 # use -1 or undef as default coordinates, not 0, 0
2603 ($x, $y) = ($map->enter_x, $map->enter_y) 2682 ($x, $y) = ($map->enter_x, $map->enter_y)
2604 if $x <=0 && $y <= 0; 2683 if $x <= 0 && $y <= 0;
2605 2684
2606 $map->load; 2685 $map->load;
2607 $map->load_neighbours; 2686 $map->load_neighbours;
2608 2687
2609 return unless $self->contr->active; 2688 return unless $self->contr->active;
2610 $self->activate_recursive;
2611 2689
2612 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2690 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2613 $self->enter_map ($map, $x, $y); 2691 if ($self->enter_map ($map, $x, $y)) {
2614} 2692 # entering was successful
2693 delete $self->{_link_recursion};
2694 # only activate afterwards, to support waiting in hooks
2695 $self->activate_recursive;
2696 }
2615 2697
2698}
2699
2616=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2700=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2617 2701
2618Moves the player to the given map-path and coordinates by first freezing 2702Moves the player to the given map-path and coordinates by first freezing
2619her, loading and preparing them map, calling the provided $check callback 2703her, loading and preparing them map, calling the provided $check callback
2620that has to return the map if sucecssful, and then unfreezes the player on 2704that has to return the map if sucecssful, and then unfreezes the player on
2621the new (success) or old (failed) map position. In either case, $done will 2705the new (success) or old (failed) map position. In either case, $done will
2628 2712
2629our $GOTOGEN; 2713our $GOTOGEN;
2630 2714
2631sub cf::object::player::goto { 2715sub cf::object::player::goto {
2632 my ($self, $path, $x, $y, $check, $done) = @_; 2716 my ($self, $path, $x, $y, $check, $done) = @_;
2717
2718 if ($self->{_link_recursion} >= $MAX_LINKS) {
2719 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2720 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2721 ($path, $x, $y) = @$EMERGENCY_POSITION;
2722 }
2633 2723
2634 # do generation counting so two concurrent goto's will be executed in-order 2724 # do generation counting so two concurrent goto's will be executed in-order
2635 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2725 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2636 2726
2637 $self->enter_link; 2727 $self->enter_link;
2661 my $map = eval { 2751 my $map = eval {
2662 my $map = defined $path ? cf::map::find $path : undef; 2752 my $map = defined $path ? cf::map::find $path : undef;
2663 2753
2664 if ($map) { 2754 if ($map) {
2665 $map = $map->customise_for ($self); 2755 $map = $map->customise_for ($self);
2666 $map = $check->($map) if $check && $map; 2756 $map = $check->($map, $x, $y, $self) if $check && $map;
2667 } else { 2757 } else {
2668 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2758 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2669 } 2759 }
2670 2760
2671 $map 2761 $map
2679 if ($gen == $self->{_goto_generation}) { 2769 if ($gen == $self->{_goto_generation}) {
2680 delete $self->{_goto_generation}; 2770 delete $self->{_goto_generation};
2681 $self->leave_link ($map, $x, $y); 2771 $self->leave_link ($map, $x, $y);
2682 } 2772 }
2683 2773
2684 $done->() if $done; 2774 $done->($self) if $done;
2685 })->prio (1); 2775 })->prio (1);
2686} 2776}
2687 2777
2688=item $player_object->enter_exit ($exit_object) 2778=item $player_object->enter_exit ($exit_object)
2689 2779
2777 $self->contr->savebed ($map, $x, $y) 2867 $self->contr->savebed ($map, $x, $y)
2778 if $exit->flag (cf::FLAG_DAMNED); 2868 if $exit->flag (cf::FLAG_DAMNED);
2779 2869
2780 1 2870 1
2781 }) { 2871 }) {
2782 $self->message ("Something went wrong deep within the crossfire server. " 2872 $self->message ("Something went wrong deep within the deliantra server. "
2783 . "I'll try to bring you back to the map you were before. " 2873 . "I'll try to bring you back to the map you were before. "
2784 . "Please report this to the dungeon master!", 2874 . "Please report this to the dungeon master!",
2785 cf::NDI_UNIQUE | cf::NDI_RED); 2875 cf::NDI_UNIQUE | cf::NDI_RED);
2786 2876
2787 warn "ERROR in enter_exit: $@"; 2877 error "ERROR in enter_exit: $@";
2788 $self->leave_link; 2878 $self->leave_link;
2789 } 2879 }
2790 })->prio (1); 2880 })->prio (1);
2791} 2881}
2792 2882
2804sub cf::client::send_drawinfo { 2894sub cf::client::send_drawinfo {
2805 my ($self, $text, $flags) = @_; 2895 my ($self, $text, $flags) = @_;
2806 2896
2807 utf8::encode $text; 2897 utf8::encode $text;
2808 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2898 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2899}
2900
2901=item $client->send_big_packet ($pkt)
2902
2903Like C<send_packet>, but tries to compress large packets, and fragments
2904them as required.
2905
2906=cut
2907
2908our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2909
2910sub cf::client::send_big_packet {
2911 my ($self, $pkt) = @_;
2912
2913 # try lzf for large packets
2914 $pkt = "lzf " . Compress::LZF::compress $pkt
2915 if 1024 <= length $pkt and $self->{can_lzf};
2916
2917 # split very large packets
2918 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2919 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2920 $pkt = "frag";
2921 }
2922
2923 $self->send_packet ($pkt);
2809} 2924}
2810 2925
2811=item $client->send_msg ($channel, $msg, $color, [extra...]) 2926=item $client->send_msg ($channel, $msg, $color, [extra...])
2812 2927
2813Send a drawinfo or msg packet to the client, formatting the msg for the 2928Send a drawinfo or msg packet to the client, formatting the msg for the
2817 2932
2818=cut 2933=cut
2819 2934
2820# non-persistent channels (usually the info channel) 2935# non-persistent channels (usually the info channel)
2821our %CHANNEL = ( 2936our %CHANNEL = (
2937 "c/motd" => {
2938 id => "infobox",
2939 title => "MOTD",
2940 reply => undef,
2941 tooltip => "The message of the day",
2942 },
2822 "c/identify" => { 2943 "c/identify" => {
2823 id => "infobox", 2944 id => "infobox",
2824 title => "Identify", 2945 title => "Identify",
2825 reply => undef, 2946 reply => undef,
2826 tooltip => "Items recently identified", 2947 tooltip => "Items recently identified",
2828 "c/examine" => { 2949 "c/examine" => {
2829 id => "infobox", 2950 id => "infobox",
2830 title => "Examine", 2951 title => "Examine",
2831 reply => undef, 2952 reply => undef,
2832 tooltip => "Signs and other items you examined", 2953 tooltip => "Signs and other items you examined",
2954 },
2955 "c/shopinfo" => {
2956 id => "infobox",
2957 title => "Shop Info",
2958 reply => undef,
2959 tooltip => "What your bargaining skill tells you about the shop",
2833 }, 2960 },
2834 "c/book" => { 2961 "c/book" => {
2835 id => "infobox", 2962 id => "infobox",
2836 title => "Book", 2963 title => "Book",
2837 reply => undef, 2964 reply => undef,
2853 id => "infobox", 2980 id => "infobox",
2854 title => "Body Parts", 2981 title => "Body Parts",
2855 reply => undef, 2982 reply => undef,
2856 tooltip => "Shows which body parts you posess and are available", 2983 tooltip => "Shows which body parts you posess and are available",
2857 }, 2984 },
2985 "c/statistics" => {
2986 id => "infobox",
2987 title => "Statistics",
2988 reply => undef,
2989 tooltip => "Shows your primary statistics",
2990 },
2991 "c/skills" => {
2992 id => "infobox",
2993 title => "Skills",
2994 reply => undef,
2995 tooltip => "Shows your experience per skill and item power",
2996 },
2997 "c/shopitems" => {
2998 id => "infobox",
2999 title => "Shop Items",
3000 reply => undef,
3001 tooltip => "Shows the items currently for sale in this shop",
3002 },
3003 "c/resistances" => {
3004 id => "infobox",
3005 title => "Resistances",
3006 reply => undef,
3007 tooltip => "Shows your resistances",
3008 },
3009 "c/pets" => {
3010 id => "infobox",
3011 title => "Pets",
3012 reply => undef,
3013 tooltip => "Shows information abotu your pets/a specific pet",
3014 },
3015 "c/perceiveself" => {
3016 id => "infobox",
3017 title => "Perceive Self",
3018 reply => undef,
3019 tooltip => "You gained detailed knowledge about yourself",
3020 },
2858 "c/uptime" => { 3021 "c/uptime" => {
2859 id => "infobox", 3022 id => "infobox",
2860 title => "Uptime", 3023 title => "Uptime",
2861 reply => undef, 3024 reply => undef,
2862 tooltip => "How long the server has been running since last restart", 3025 tooltip => "How long the server has been running since last restart",
2871 id => "party", 3034 id => "party",
2872 title => "Party", 3035 title => "Party",
2873 reply => "gsay ", 3036 reply => "gsay ",
2874 tooltip => "Messages and chat related to your party", 3037 tooltip => "Messages and chat related to your party",
2875 }, 3038 },
3039 "c/death" => {
3040 id => "death",
3041 title => "Death",
3042 reply => undef,
3043 tooltip => "Reason for and more info about your most recent death",
3044 },
3045 "c/say" => $SAY_CHANNEL,
3046 "c/chat" => $CHAT_CHANNEL,
2876); 3047);
2877 3048
2878sub cf::client::send_msg { 3049sub cf::client::send_msg {
2879 my ($self, $channel, $msg, $color, @extra) = @_; 3050 my ($self, $channel, $msg, $color, @extra) = @_;
2880 3051
2881 $msg = $self->pl->expand_cfpod ($msg); 3052 $msg = $self->pl->expand_cfpod ($msg)
3053 unless $color & cf::NDI_VERBATIM;
2882 3054
2883 $color &= cf::NDI_CLIENT_MASK; # just in case... 3055 $color &= cf::NDI_CLIENT_MASK; # just in case...
2884 3056
2885 # check predefined channels, for the benefit of C 3057 # check predefined channels, for the benefit of C
2886 if ($CHANNEL{$channel}) { 3058 if ($CHANNEL{$channel}) {
2887 $channel = $CHANNEL{$channel}; 3059 $channel = $CHANNEL{$channel};
2888 3060
2889 $self->ext_msg (channel_info => $channel) 3061 $self->ext_msg (channel_info => $channel);
2890 if $self->can_msg;
2891
2892 $channel = $channel->{id}; 3062 $channel = $channel->{id};
2893 3063
2894 } elsif (ref $channel) { 3064 } elsif (ref $channel) {
2895 # send meta info to client, if not yet sent 3065 # send meta info to client, if not yet sent
2896 unless (exists $self->{channel}{$channel->{id}}) { 3066 unless (exists $self->{channel}{$channel->{id}}) {
2897 $self->{channel}{$channel->{id}} = $channel; 3067 $self->{channel}{$channel->{id}} = $channel;
2898 $self->ext_msg (channel_info => $channel) 3068 $self->ext_msg (channel_info => $channel);
2899 if $self->can_msg;
2900 } 3069 }
2901 3070
2902 $channel = $channel->{id}; 3071 $channel = $channel->{id};
2903 } 3072 }
2904 3073
2905 return unless @extra || length $msg; 3074 return unless @extra || length $msg;
2906 3075
2907 if ($self->can_msg) {
2908 # default colour, mask it out 3076 # default colour, mask it out
2909 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3077 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2910 if $color & cf::NDI_DEF; 3078 if $color & cf::NDI_DEF;
2911 3079
2912 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3080 my $pkt = "msg "
3081 . $self->{json_coder}->encode (
2913 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3082 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2914 } else { 3083 );
2915 if ($color >= 0) {
2916 # replace some tags by gcfclient-compatible ones
2917 for ($msg) {
2918 1 while
2919 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2920 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2921 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2922 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2923 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2924 }
2925 3084
2926 $color &= cf::NDI_COLOR_MASK; 3085 $self->send_big_packet ($pkt);
2927
2928 utf8::encode $msg;
2929
2930 if (0 && $msg =~ /\[/) {
2931 # COMMAND/INFO
2932 $self->send_packet ("drawextinfo $color 10 8 $msg")
2933 } else {
2934 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2935 $self->send_packet ("drawinfo $color $msg")
2936 }
2937 }
2938 }
2939} 3086}
2940 3087
2941=item $client->ext_msg ($type, @msg) 3088=item $client->ext_msg ($type, @msg)
2942 3089
2943Sends an ext event to the client. 3090Sends an ext event to the client.
2946 3093
2947sub cf::client::ext_msg($$@) { 3094sub cf::client::ext_msg($$@) {
2948 my ($self, $type, @msg) = @_; 3095 my ($self, $type, @msg) = @_;
2949 3096
2950 if ($self->extcmd == 2) { 3097 if ($self->extcmd == 2) {
2951 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3098 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2952 } elsif ($self->extcmd == 1) { # TODO: remove 3099 } elsif ($self->extcmd == 1) { # TODO: remove
2953 push @msg, msgtype => "event_$type"; 3100 push @msg, msgtype => "event_$type";
2954 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3101 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2955 } 3102 }
2956} 3103}
2957 3104
2958=item $client->ext_reply ($msgid, @msg) 3105=item $client->ext_reply ($msgid, @msg)
2959 3106
2963 3110
2964sub cf::client::ext_reply($$@) { 3111sub cf::client::ext_reply($$@) {
2965 my ($self, $id, @msg) = @_; 3112 my ($self, $id, @msg) = @_;
2966 3113
2967 if ($self->extcmd == 2) { 3114 if ($self->extcmd == 2) {
2968 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3115 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2969 } elsif ($self->extcmd == 1) { 3116 } elsif ($self->extcmd == 1) {
2970 #TODO: version 1, remove 3117 #TODO: version 1, remove
2971 unshift @msg, msgtype => "reply", msgid => $id; 3118 unshift @msg, msgtype => "reply", msgid => $id;
2972 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3119 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2973 } 3120 }
2974} 3121}
2975 3122
2976=item $success = $client->query ($flags, "text", \&cb) 3123=item $success = $client->query ($flags, "text", \&cb)
2977 3124
3048 3195
3049 $ns->ext_reply ($reply, @reply) 3196 $ns->ext_reply ($reply, @reply)
3050 if $reply; 3197 if $reply;
3051 3198
3052 } else { 3199 } else {
3053 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3200 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3054 } 3201 }
3055 3202
3056 cf::override; 3203 cf::override;
3057 }, 3204 },
3058); 3205);
3078 3225
3079 $coro 3226 $coro
3080} 3227}
3081 3228
3082cf::client->attach ( 3229cf::client->attach (
3083 on_destroy => sub { 3230 on_client_destroy => sub {
3084 my ($ns) = @_; 3231 my ($ns) = @_;
3085 3232
3086 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3233 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3087 }, 3234 },
3088); 3235);
3104our $safe_hole = new Safe::Hole; 3251our $safe_hole = new Safe::Hole;
3105 3252
3106$SIG{FPE} = 'IGNORE'; 3253$SIG{FPE} = 'IGNORE';
3107 3254
3108$safe->permit_only (Opcode::opset qw( 3255$safe->permit_only (Opcode::opset qw(
3109 :base_core :base_mem :base_orig :base_math 3256 :base_core :base_mem :base_orig :base_math :base_loop
3110 grepstart grepwhile mapstart mapwhile 3257 grepstart grepwhile mapstart mapwhile
3111 sort time 3258 sort time
3112)); 3259));
3113 3260
3114# here we export the classes and methods available to script code 3261# here we export the classes and methods available to script code
3118The following functions and methods are available within a safe environment: 3265The following functions and methods are available within a safe environment:
3119 3266
3120 cf::object 3267 cf::object
3121 contr pay_amount pay_player map x y force_find force_add destroy 3268 contr pay_amount pay_player map x y force_find force_add destroy
3122 insert remove name archname title slaying race decrease split 3269 insert remove name archname title slaying race decrease split
3270 value
3123 3271
3124 cf::object::player 3272 cf::object::player
3125 player 3273 player
3126 3274
3127 cf::player 3275 cf::player
3133=cut 3281=cut
3134 3282
3135for ( 3283for (
3136 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3284 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3137 insert remove inv nrof name archname title slaying race 3285 insert remove inv nrof name archname title slaying race
3138 decrease split destroy change_exp)], 3286 decrease split destroy change_exp value msg lore send_msg)],
3139 ["cf::object::player" => qw(player)], 3287 ["cf::object::player" => qw(player)],
3140 ["cf::player" => qw(peaceful)], 3288 ["cf::player" => qw(peaceful send_msg)],
3141 ["cf::map" => qw(trigger)], 3289 ["cf::map" => qw(trigger)],
3142) { 3290) {
3143 no strict 'refs';
3144 my ($pkg, @funs) = @$_; 3291 my ($pkg, @funs) = @$_;
3145 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3292 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3146 for @funs; 3293 for @funs;
3147} 3294}
3148 3295
3163 3310
3164 my $qcode = $code; 3311 my $qcode = $code;
3165 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3312 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3166 $qcode =~ s/\n/\\n/g; 3313 $qcode =~ s/\n/\\n/g;
3167 3314
3315 %vars = (_dummy => 0) unless %vars;
3316
3317 my @res;
3168 local $_; 3318 local $_;
3169 local @safe::cf::_safe_eval_args = values %vars;
3170 3319
3171 my $eval = 3320 my $eval =
3172 "do {\n" 3321 "do {\n"
3173 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3322 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3174 . "#line 0 \"{$qcode}\"\n" 3323 . "#line 0 \"{$qcode}\"\n"
3175 . $code 3324 . $code
3176 . "\n}" 3325 . "\n}"
3177 ; 3326 ;
3178 3327
3328 if ($CFG{safe_eval}) {
3179 sub_generation_inc; 3329 sub_generation_inc;
3330 local @safe::cf::_safe_eval_args = values %vars;
3180 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3331 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3181 sub_generation_inc; 3332 sub_generation_inc;
3333 } else {
3334 local @cf::_safe_eval_args = values %vars;
3335 @res = wantarray ? eval eval : scalar eval $eval;
3336 }
3182 3337
3183 if ($@) { 3338 if ($@) {
3184 warn "$@"; 3339 warn "$@",
3185 warn "while executing safe code '$code'\n"; 3340 "while executing safe code '$code'\n",
3186 warn "with arguments " . (join " ", %vars) . "\n"; 3341 "with arguments " . (join " ", %vars) . "\n";
3187 } 3342 }
3188 3343
3189 wantarray ? @res : $res[0] 3344 wantarray ? @res : $res[0]
3190} 3345}
3191 3346
3205=cut 3360=cut
3206 3361
3207sub register_script_function { 3362sub register_script_function {
3208 my ($fun, $cb) = @_; 3363 my ($fun, $cb) = @_;
3209 3364
3210 no strict 'refs'; 3365 $fun = "safe::$fun" if $CFG{safe_eval};
3211 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3366 *$fun = $safe_hole->wrap ($cb);
3212} 3367}
3213 3368
3214=back 3369=back
3215 3370
3216=cut 3371=cut
3225 # for this (global event?) 3380 # for this (global event?)
3226 %ext::player_env::MUSIC_FACE_CACHE = (); 3381 %ext::player_env::MUSIC_FACE_CACHE = ();
3227 3382
3228 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3383 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3229 3384
3230 warn "loading facedata from $path\n"; 3385 trace "loading facedata from $path\n";
3231 3386
3232 my $facedata;
3233 0 < aio_load $path, $facedata 3387 0 < aio_load $path, my $facedata
3234 or die "$path: $!"; 3388 or die "$path: $!";
3235 3389
3236 $facedata = Coro::Storable::thaw $facedata; 3390 $facedata = Coro::Storable::thaw $facedata;
3237 3391
3238 $facedata->{version} == 2 3392 $facedata->{version} == 2
3239 or cf::cleanup "$path: version mismatch, cannot proceed."; 3393 or cf::cleanup "$path: version mismatch, cannot proceed.";
3240 3394
3241 # patch in the exptable 3395 # patch in the exptable
3396 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3242 $facedata->{resource}{"res/exp_table"} = { 3397 $facedata->{resource}{"res/exp_table"} = {
3243 type => FT_RSRC, 3398 type => FT_RSRC,
3244 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3399 data => $exp_table,
3400 hash => (Digest::MD5::md5 $exp_table),
3245 }; 3401 };
3246 cf::cede_to_tick; 3402 cf::cede_to_tick;
3247 3403
3248 { 3404 {
3249 my $faces = $facedata->{faceinfo}; 3405 my $faces = $facedata->{faceinfo};
3251 while (my ($face, $info) = each %$faces) { 3407 while (my ($face, $info) = each %$faces) {
3252 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3408 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3253 3409
3254 cf::face::set_visibility $idx, $info->{visibility}; 3410 cf::face::set_visibility $idx, $info->{visibility};
3255 cf::face::set_magicmap $idx, $info->{magicmap}; 3411 cf::face::set_magicmap $idx, $info->{magicmap};
3256 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3412 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3257 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3413 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3258 3414
3259 cf::cede_to_tick; 3415 cf::cede_to_tick;
3260 } 3416 }
3261 3417
3262 while (my ($face, $info) = each %$faces) { 3418 while (my ($face, $info) = each %$faces) {
3267 3423
3268 if (my $smooth = cf::face::find $info->{smooth}) { 3424 if (my $smooth = cf::face::find $info->{smooth}) {
3269 cf::face::set_smooth $idx, $smooth; 3425 cf::face::set_smooth $idx, $smooth;
3270 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3426 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3271 } else { 3427 } else {
3272 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3428 error "smooth face '$info->{smooth}' not found for face '$face'";
3273 } 3429 }
3274 3430
3275 cf::cede_to_tick; 3431 cf::cede_to_tick;
3276 } 3432 }
3277 } 3433 }
3286 3442
3287 cf::anim::invalidate_all; # d'oh 3443 cf::anim::invalidate_all; # d'oh
3288 } 3444 }
3289 3445
3290 { 3446 {
3291 # TODO: for gcfclient pleasure, we should give resources
3292 # that gcfclient doesn't grok a >10000 face index.
3293 my $res = $facedata->{resource}; 3447 my $res = $facedata->{resource};
3294 3448
3295 while (my ($name, $info) = each %$res) { 3449 while (my ($name, $info) = each %$res) {
3296 if (defined $info->{type}) { 3450 if (defined $info->{type}) {
3297 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3451 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3298 my $data;
3299 3452
3300 if ($info->{type} & 1) { 3453 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3301 # prepend meta info
3302
3303 my $meta = $enc->encode ({
3304 name => $name,
3305 %{ $info->{meta} || {} },
3306 });
3307
3308 $data = pack "(w/a*)*", $meta, $info->{data};
3309 } else {
3310 $data = $info->{data};
3311 }
3312
3313 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3314 cf::face::set_type $idx, $info->{type}; 3454 cf::face::set_type $idx, $info->{type};
3315 } else { 3455 } else {
3316 $RESOURCE{$name} = $info; 3456 $RESOURCE{$name} = $info; # unused
3317 } 3457 }
3318 3458
3319 cf::cede_to_tick; 3459 cf::cede_to_tick;
3320 } 3460 }
3321 } 3461 }
3322 3462
3323 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3463 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3324 3464
3325 1 3465 1
3326} 3466}
3327
3328cf::global->attach (on_resource_update => sub {
3329 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3330 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3331
3332 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3333 my $sound = $soundconf->{compat}[$_]
3334 or next;
3335
3336 my $face = cf::face::find "sound/$sound->[1]";
3337 cf::sound::set $sound->[0] => $face;
3338 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3339 }
3340
3341 while (my ($k, $v) = each %{$soundconf->{event}}) {
3342 my $face = cf::face::find "sound/$v";
3343 cf::sound::set $k => $face;
3344 }
3345 }
3346});
3347 3467
3348register_exticmd fx_want => sub { 3468register_exticmd fx_want => sub {
3349 my ($ns, $want) = @_; 3469 my ($ns, $want) = @_;
3350 3470
3351 while (my ($k, $v) = each %$want) { 3471 while (my ($k, $v) = each %$want) {
3390sub reload_treasures { 3510sub reload_treasures {
3391 load_resource_file "$DATADIR/treasures" 3511 load_resource_file "$DATADIR/treasures"
3392 or die "unable to load treasurelists\n"; 3512 or die "unable to load treasurelists\n";
3393} 3513}
3394 3514
3515sub reload_sound {
3516 trace "loading sound config from $DATADIR/sound\n";
3517
3518 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3519 or die "$DATADIR/sound $!";
3520
3521 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3522
3523 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3524 my $sound = $soundconf->{compat}[$_]
3525 or next;
3526
3527 my $face = cf::face::find "sound/$sound->[1]";
3528 cf::sound::set $sound->[0] => $face;
3529 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3530 }
3531
3532 while (my ($k, $v) = each %{$soundconf->{event}}) {
3533 my $face = cf::face::find "sound/$v";
3534 cf::sound::set $k => $face;
3535 }
3536}
3537
3395sub reload_resources { 3538sub reload_resources {
3396 warn "reloading resource files...\n"; 3539 trace "reloading resource files...\n";
3397 3540
3541 reload_exp_table;
3542 reload_materials;
3398 reload_facedata; 3543 reload_facedata;
3544 reload_sound;
3399 reload_archetypes; 3545 reload_archetypes;
3400 reload_regions; 3546 reload_regions;
3401 reload_treasures; 3547 reload_treasures;
3402 3548
3403 warn "finished reloading resource files\n"; 3549 trace "finished reloading resource files\n";
3404}
3405
3406sub init {
3407 my $guard = freeze_mainloop;
3408
3409 evthread_start IO::AIO::poll_fileno;
3410
3411 reload_resources;
3412} 3550}
3413 3551
3414sub reload_config { 3552sub reload_config {
3415 open my $fh, "<:utf8", "$CONFDIR/config" 3553 trace "reloading config file...\n";
3416 or return;
3417 3554
3418 local $/; 3555 0 < aio_load "$CONFDIR/config", my $config
3556 or die "$CONFDIR/config: $!";
3557
3558 utf8::decode $config;
3559
3560 cf::get_slot 0.1, 10, "reload_config"; # yaml might be slow...
3419 *CFG = YAML::Load <$fh>; 3561 *CFG = YAML::XS::Load $config;
3420 3562
3421 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3563 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3422 3564
3423 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3565 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3424 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3566 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3425 3567
3426 if (exists $CFG{mlockall}) { 3568 if (exists $CFG{mlockall}) {
3430 }; 3572 };
3431 warn $@ if $@; 3573 warn $@ if $@;
3432 } 3574 }
3433} 3575}
3434 3576
3577sub pidfile() {
3578 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3579 or die "$PIDFILE: $!";
3580 flock $fh, &Fcntl::LOCK_EX
3581 or die "$PIDFILE: flock: $!";
3582 $fh
3583}
3584
3585# make sure only one server instance is running at any one time
3586sub atomic {
3587 my $fh = pidfile;
3588
3589 my $pid = <$fh>;
3590 kill 9, $pid if $pid > 0;
3591
3592 seek $fh, 0, 0;
3593 print $fh $$;
3594}
3595
3596sub main_loop {
3597 trace "EV::loop starting\n";
3598 if (1) {
3599 EV::loop;
3600 }
3601 trace "EV::loop returned\n";
3602 goto &main_loop unless $REALLY_UNLOOP;
3603}
3604
3435sub main { 3605sub main {
3606 cf::init_globals; # initialise logging
3607
3608 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3609 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3610 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3611 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3612
3613 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3614
3436 # we must not ever block the main coroutine 3615 # we must not ever block the main coroutine
3437 local $Coro::idle = sub { 3616 local $Coro::idle = sub {
3438 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3617 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3439 (async { 3618 (async {
3440 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3619 $Coro::current->{desc} = "IDLE BUG HANDLER";
3441 EV::loop EV::LOOP_ONESHOT; 3620 EV::loop EV::LOOP_ONESHOT;
3442 })->prio (Coro::PRIO_MAX); 3621 })->prio (Coro::PRIO_MAX);
3443 }; 3622 };
3444 3623
3445 { 3624 evthread_start IO::AIO::poll_fileno;
3446 my $guard = freeze_mainloop; 3625
3626 cf::sync_job {
3627 cf::incloader::init ();
3628
3629 cf::init_anim;
3630 cf::init_attackmess;
3631 cf::init_dynamic;
3632
3633 cf::load_settings;
3634
3635 reload_resources;
3447 reload_config; 3636 reload_config;
3448 db_init; 3637 db_init;
3638
3639 cf::init_uuid;
3640 cf::init_signals;
3641 cf::init_skills;
3642
3643 cf::init_beforeplay;
3644
3645 atomic;
3646
3449 load_extensions; 3647 load_extensions;
3450 3648
3451 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3649 utime time, time, $RUNTIMEFILE;
3650
3651 # no (long-running) fork's whatsoever before this point(!)
3652 use POSIX ();
3653 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3654
3655 (pop @POST_INIT)->(0) while @POST_INIT;
3452 } 3656 };
3453 3657
3454 EV::loop; 3658 cf::object::thawer::errors_are_fatal 0;
3659 info "parse errors in files are no longer fatal from this point on.\n";
3660
3661 my $free_main; $free_main = EV::idle sub {
3662 undef $free_main;
3663 undef &main; # free gobs of memory :)
3664 };
3665
3666 goto &main_loop;
3455} 3667}
3456 3668
3457############################################################################# 3669#############################################################################
3458# initialisation and cleanup 3670# initialisation and cleanup
3459 3671
3460# install some emergency cleanup handlers 3672# install some emergency cleanup handlers
3461BEGIN { 3673BEGIN {
3462 our %SIGWATCHER = (); 3674 our %SIGWATCHER = ();
3463 for my $signal (qw(INT HUP TERM)) { 3675 for my $signal (qw(INT HUP TERM)) {
3464 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3676 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3465 cf::cleanup "SIG$signal"; 3677 cf::cleanup "SIG$signal";
3466 }; 3678 };
3467 } 3679 }
3468} 3680}
3469 3681
3470sub write_runtime_sync { 3682sub write_runtime_sync {
3471 my $runtime = "$LOCALDIR/runtime"; 3683 my $t0 = AE::time;
3472 3684
3473 # first touch the runtime file to show we are still running: 3685 # first touch the runtime file to show we are still running:
3474 # the fsync below can take a very very long time. 3686 # the fsync below can take a very very long time.
3475 3687
3476 IO::AIO::aio_utime $runtime, undef, undef; 3688 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3477 3689
3478 my $guard = cf::lock_acquire "write_runtime"; 3690 my $guard = cf::lock_acquire "write_runtime";
3479 3691
3480 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3692 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3481 or return; 3693 or return;
3482 3694
3483 my $value = $cf::RUNTIME + 90 + 10; 3695 my $value = $cf::RUNTIME + 90 + 10;
3484 # 10 is the runtime save interval, for a monotonic clock 3696 # 10 is the runtime save interval, for a monotonic clock
3485 # 60 allows for the watchdog to kill the server. 3697 # 60 allows for the watchdog to kill the server.
3495 aio_utime $fh, undef, undef; 3707 aio_utime $fh, undef, undef;
3496 3708
3497 close $fh 3709 close $fh
3498 or return; 3710 or return;
3499 3711
3500 aio_rename "$runtime~", $runtime 3712 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3501 and return; 3713 and return;
3502 3714
3503 warn "runtime file written.\n"; 3715 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3504 3716
3505 1 3717 1
3506} 3718}
3507 3719
3508our $uuid_lock; 3720our $uuid_lock;
3517 my $uuid = "$LOCALDIR/uuid"; 3729 my $uuid = "$LOCALDIR/uuid";
3518 3730
3519 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3731 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3520 or return; 3732 or return;
3521 3733
3522 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3734 my $value = uuid_seq uuid_cur;
3735
3736 unless ($value) {
3737 info "cowardly refusing to write zero uuid value!\n";
3738 return;
3739 }
3740
3741 my $value = uuid_str $value + $uuid_skip;
3523 $uuid_skip = 0; 3742 $uuid_skip = 0;
3524 3743
3525 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3744 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3526 and return; 3745 and return;
3527 3746
3533 or return; 3752 or return;
3534 3753
3535 aio_rename "$uuid~", $uuid 3754 aio_rename "$uuid~", $uuid
3536 and return; 3755 and return;
3537 3756
3538 warn "uuid file written ($value).\n"; 3757 trace "uuid file written ($value).\n";
3539 3758
3540 1 3759 1
3541 3760
3542} 3761}
3543 3762
3549} 3768}
3550 3769
3551sub emergency_save() { 3770sub emergency_save() {
3552 my $freeze_guard = cf::freeze_mainloop; 3771 my $freeze_guard = cf::freeze_mainloop;
3553 3772
3554 warn "enter emergency perl save\n"; 3773 info "emergency_perl_save: enter\n";
3774
3775 # this is a trade-off: we want to be very quick here, so
3776 # save all maps without fsync, and later call a global sync
3777 # (which in turn might be very very slow)
3778 local $USE_FSYNC = 0;
3555 3779
3556 cf::sync_job { 3780 cf::sync_job {
3781 cf::write_runtime_sync; # external watchdog should not bark
3782
3557 # use a peculiar iteration method to avoid tripping on perl 3783 # use a peculiar iteration method to avoid tripping on perl
3558 # refcount bugs in for. also avoids problems with players 3784 # refcount bugs in for. also avoids problems with players
3559 # and maps saved/destroyed asynchronously. 3785 # and maps saved/destroyed asynchronously.
3560 warn "begin emergency player save\n"; 3786 info "emergency_perl_save: begin player save\n";
3561 for my $login (keys %cf::PLAYER) { 3787 for my $login (keys %cf::PLAYER) {
3562 my $pl = $cf::PLAYER{$login} or next; 3788 my $pl = $cf::PLAYER{$login} or next;
3563 $pl->valid or next; 3789 $pl->valid or next;
3564 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3790 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3565 $pl->save; 3791 $pl->save;
3566 } 3792 }
3567 warn "end emergency player save\n"; 3793 info "emergency_perl_save: end player save\n";
3568 3794
3569 warn "begin emergency map save\n"; 3795 cf::write_runtime_sync; # external watchdog should not bark
3796
3797 info "emergency_perl_save: begin map save\n";
3570 for my $path (keys %cf::MAP) { 3798 for my $path (keys %cf::MAP) {
3571 my $map = $cf::MAP{$path} or next; 3799 my $map = $cf::MAP{$path} or next;
3572 $map->valid or next; 3800 $map->valid or next;
3573 $map->save; 3801 $map->save;
3574 } 3802 }
3575 warn "end emergency map save\n"; 3803 info "emergency_perl_save: end map save\n";
3576 3804
3577 warn "begin emergency database checkpoint\n"; 3805 cf::write_runtime_sync; # external watchdog should not bark
3806
3807 info "emergency_perl_save: begin database checkpoint\n";
3578 BDB::db_env_txn_checkpoint $DB_ENV; 3808 BDB::db_env_txn_checkpoint $DB_ENV;
3579 warn "end emergency database checkpoint\n"; 3809 info "emergency_perl_save: end database checkpoint\n";
3580 3810
3581 warn "begin write uuid\n"; 3811 info "emergency_perl_save: begin write uuid\n";
3582 write_uuid_sync 1; 3812 write_uuid_sync 1;
3583 warn "end write uuid\n"; 3813 info "emergency_perl_save: end write uuid\n";
3814
3815 cf::write_runtime_sync; # external watchdog should not bark
3816
3817 trace "emergency_perl_save: syncing database to disk";
3818 BDB::db_env_txn_checkpoint $DB_ENV;
3819
3820 info "emergency_perl_save: starting sync\n";
3821 IO::AIO::aio_sync sub {
3822 info "emergency_perl_save: finished sync\n";
3823 };
3824
3825 cf::write_runtime_sync; # external watchdog should not bark
3826
3827 trace "emergency_perl_save: flushing outstanding aio requests";
3828 while (IO::AIO::nreqs || BDB::nreqs) {
3829 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3830 }
3831
3832 cf::write_runtime_sync; # external watchdog should not bark
3584 }; 3833 };
3585 3834
3586 warn "leave emergency perl save\n"; 3835 info "emergency_perl_save: leave\n";
3587} 3836}
3588 3837
3589sub post_cleanup { 3838sub post_cleanup {
3590 my ($make_core) = @_; 3839 my ($make_core) = @_;
3591 3840
3841 IO::AIO::flush;
3842
3592 warn Carp::longmess "post_cleanup backtrace" 3843 error Carp::longmess "post_cleanup backtrace"
3593 if $make_core; 3844 if $make_core;
3845
3846 my $fh = pidfile;
3847 unlink $PIDFILE if <$fh> == $$;
3594} 3848}
3595 3849
3596# a safer delete_package, copied from Symbol 3850# a safer delete_package, copied from Symbol
3597sub clear_package($) { 3851sub clear_package($) {
3598 my $pkg = shift; 3852 my $pkg = shift;
3614 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3868 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3615 for my $name (keys %$leaf_symtab) { 3869 for my $name (keys %$leaf_symtab) {
3616 _gv_clear *{"$pkg$name"}; 3870 _gv_clear *{"$pkg$name"};
3617# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3871# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3618 } 3872 }
3619 warn "cleared package #$pkg\n";#d#
3620} 3873}
3621
3622our $RELOAD; # how many times to reload
3623 3874
3624sub do_reload_perl() { 3875sub do_reload_perl() {
3625 # can/must only be called in main 3876 # can/must only be called in main
3626 if ($Coro::current != $Coro::main) { 3877 unless (in_main) {
3627 warn "can only reload from main coroutine"; 3878 error "can only reload from main coroutine";
3628 return; 3879 return;
3629 } 3880 }
3630 3881
3631 return if $RELOAD++; 3882 return if $RELOAD++;
3632 3883
3884 my $t1 = AE::time;
3885
3633 while ($RELOAD) { 3886 while ($RELOAD) {
3887 cf::get_slot 0.1, -1, "reload_perl";
3634 warn "reloading..."; 3888 info "reloading...";
3635 3889
3636 warn "entering sync_job"; 3890 trace "entering sync_job";
3637 3891
3638 cf::sync_job { 3892 cf::sync_job {
3639 cf::write_runtime_sync; # external watchdog should not bark
3640 cf::emergency_save; 3893 #cf::emergency_save;
3641 cf::write_runtime_sync; # external watchdog should not bark
3642 3894
3643 warn "syncing database to disk";
3644 BDB::db_env_txn_checkpoint $DB_ENV;
3645
3646 # if anything goes wrong in here, we should simply crash as we already saved
3647
3648 warn "flushing outstanding aio requests";
3649 while (IO::AIO::nreqs || BDB::nreqs) {
3650 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3651 }
3652
3653 warn "cancelling all extension coros"; 3895 trace "cancelling all extension coros";
3654 $_->cancel for values %EXT_CORO; 3896 $_->cancel for values %EXT_CORO;
3655 %EXT_CORO = (); 3897 %EXT_CORO = ();
3656 3898
3657 warn "removing commands"; 3899 trace "removing commands";
3658 %COMMAND = (); 3900 %COMMAND = ();
3659 3901
3660 warn "removing ext/exti commands"; 3902 trace "removing ext/exti commands";
3661 %EXTCMD = (); 3903 %EXTCMD = ();
3662 %EXTICMD = (); 3904 %EXTICMD = ();
3663 3905
3664 warn "unloading/nuking all extensions"; 3906 trace "unloading/nuking all extensions";
3665 for my $pkg (@EXTS) { 3907 for my $pkg (@EXTS) {
3666 warn "... unloading $pkg"; 3908 trace "... unloading $pkg";
3667 3909
3668 if (my $cb = $pkg->can ("unload")) { 3910 if (my $cb = $pkg->can ("unload")) {
3669 eval { 3911 eval {
3670 $cb->($pkg); 3912 $cb->($pkg);
3671 1 3913 1
3672 } or warn "$pkg unloaded, but with errors: $@"; 3914 } or error "$pkg unloaded, but with errors: $@";
3673 } 3915 }
3674 3916
3675 warn "... clearing $pkg"; 3917 trace "... clearing $pkg";
3676 clear_package $pkg; 3918 clear_package $pkg;
3677 } 3919 }
3678 3920
3679 warn "unloading all perl modules loaded from $LIBDIR"; 3921 trace "unloading all perl modules loaded from $LIBDIR";
3680 while (my ($k, $v) = each %INC) { 3922 while (my ($k, $v) = each %INC) {
3681 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3923 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3682 3924
3683 warn "... unloading $k"; 3925 trace "... unloading $k";
3684 delete $INC{$k}; 3926 delete $INC{$k};
3685 3927
3686 $k =~ s/\.pm$//; 3928 $k =~ s/\.pm$//;
3687 $k =~ s/\//::/g; 3929 $k =~ s/\//::/g;
3688 3930
3691 } 3933 }
3692 3934
3693 clear_package $k; 3935 clear_package $k;
3694 } 3936 }
3695 3937
3696 warn "getting rid of safe::, as good as possible"; 3938 trace "getting rid of safe::, as good as possible";
3697 clear_package "safe::$_" 3939 clear_package "safe::$_"
3698 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3940 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3699 3941
3700 warn "unloading cf.pm \"a bit\""; 3942 trace "unloading cf.pm \"a bit\"";
3701 delete $INC{"cf.pm"}; 3943 delete $INC{"cf.pm"};
3702 delete $INC{"cf/pod.pm"}; 3944 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3703 3945
3704 # don't, removes xs symbols, too, 3946 # don't, removes xs symbols, too,
3705 # and global variables created in xs 3947 # and global variables created in xs
3706 #clear_package __PACKAGE__; 3948 #clear_package __PACKAGE__;
3707 3949
3708 warn "unload completed, starting to reload now"; 3950 info "unload completed, starting to reload now";
3709 3951
3710 warn "reloading cf.pm"; 3952 trace "reloading cf.pm";
3711 require cf; 3953 require cf;
3712 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3954 cf::_connect_to_perl_1;
3713 3955
3714 warn "loading config and database again"; 3956 trace "loading config and database again";
3715 cf::reload_config; 3957 cf::reload_config;
3716 3958
3717 warn "loading extensions"; 3959 trace "loading extensions";
3718 cf::load_extensions; 3960 cf::load_extensions;
3719 3961
3962 if ($REATTACH_ON_RELOAD) {
3720 warn "reattaching attachments to objects/players"; 3963 trace "reattaching attachments to objects/players";
3721 _global_reattach; # objects, sockets 3964 _global_reattach; # objects, sockets
3722 warn "reattaching attachments to maps"; 3965 trace "reattaching attachments to maps";
3723 reattach $_ for values %MAP; 3966 reattach $_ for values %MAP;
3724 warn "reattaching attachments to players"; 3967 trace "reattaching attachments to players";
3725 reattach $_ for values %PLAYER; 3968 reattach $_ for values %PLAYER;
3969 }
3726 3970
3971 trace "running post_init jobs";
3972 (pop @POST_INIT)->(1) while @POST_INIT;
3973
3727 warn "leaving sync_job"; 3974 trace "leaving sync_job";
3728 3975
3729 1 3976 1
3730 } or do { 3977 } or do {
3731 warn $@; 3978 error $@;
3732 cf::cleanup "error while reloading, exiting."; 3979 cf::cleanup "error while reloading, exiting.";
3733 }; 3980 };
3734 3981
3735 warn "reloaded"; 3982 info "reloaded";
3736 --$RELOAD; 3983 --$RELOAD;
3737 } 3984 }
3985
3986 $t1 = AE::time - $t1;
3987 info "reload completed in ${t1}s\n";
3738}; 3988};
3739 3989
3740our $RELOAD_WATCHER; # used only during reload 3990our $RELOAD_WATCHER; # used only during reload
3741 3991
3742sub reload_perl() { 3992sub reload_perl() {
3743 # doing reload synchronously and two reloads happen back-to-back, 3993 # doing reload synchronously and two reloads happen back-to-back,
3744 # coro crashes during coro_state_free->destroy here. 3994 # coro crashes during coro_state_free->destroy here.
3745 3995
3996 $RELOAD_WATCHER ||= cf::async {
3997 Coro::AIO::aio_wait cache_extensions;
3998
3746 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3999 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3747 do_reload_perl; 4000 do_reload_perl;
3748 undef $RELOAD_WATCHER; 4001 undef $RELOAD_WATCHER;
4002 };
3749 }; 4003 };
3750} 4004}
3751 4005
3752register_command "reload" => sub { 4006register_command "reload" => sub {
3753 my ($who, $arg) = @_; 4007 my ($who, $arg) = @_;
3759 reload_perl; 4013 reload_perl;
3760 }; 4014 };
3761 } 4015 }
3762}; 4016};
3763 4017
3764unshift @INC, $LIBDIR; 4018#############################################################################
3765 4019
3766my $bug_warning = 0; 4020my $bug_warning = 0;
3767 4021
3768our @WAIT_FOR_TICK; 4022our @WAIT_FOR_TICK;
3769our @WAIT_FOR_TICK_BEGIN; 4023our @WAIT_FOR_TICK_BEGIN;
3770 4024
3771sub wait_for_tick { 4025sub wait_for_tick() {
3772 return if tick_inhibit || $Coro::current == $Coro::main; 4026 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3773 4027
3774 my $signal = new Coro::Signal; 4028 my $signal = new Coro::Signal;
3775 push @WAIT_FOR_TICK, $signal; 4029 push @WAIT_FOR_TICK, $signal;
3776 $signal->wait; 4030 $signal->wait;
3777} 4031}
3778 4032
3779sub wait_for_tick_begin { 4033sub wait_for_tick_begin() {
3780 return if tick_inhibit || $Coro::current == $Coro::main; 4034 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3781 4035
3782 my $signal = new Coro::Signal; 4036 my $signal = new Coro::Signal;
3783 push @WAIT_FOR_TICK_BEGIN, $signal; 4037 push @WAIT_FOR_TICK_BEGIN, $signal;
3784 $signal->wait; 4038 $signal->wait;
3785} 4039}
3791 return; 4045 return;
3792 } 4046 }
3793 4047
3794 cf::server_tick; # one server iteration 4048 cf::server_tick; # one server iteration
3795 4049
4050 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4051
3796 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4052 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3797 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4053 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3798 Coro::async_pool { 4054 Coro::async_pool {
3799 $Coro::current->{desc} = "runtime saver"; 4055 $Coro::current->{desc} = "runtime saver";
3800 write_runtime_sync 4056 write_runtime_sync
3801 or warn "ERROR: unable to write runtime file: $!"; 4057 or error "ERROR: unable to write runtime file: $!";
3802 }; 4058 };
3803 } 4059 }
3804 4060
3805 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4061 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3806 $sig->send; 4062 $sig->send;
3814 4070
3815 if (0) { 4071 if (0) {
3816 if ($NEXT_TICK) { 4072 if ($NEXT_TICK) {
3817 my $jitter = $TICK_START - $NEXT_TICK; 4073 my $jitter = $TICK_START - $NEXT_TICK;
3818 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4074 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3819 warn "jitter $JITTER\n";#d# 4075 debug "jitter $JITTER\n";#d#
3820 } 4076 }
3821 } 4077 }
3822} 4078}
3823 4079
3824{ 4080{
3825 # configure BDB 4081 # configure BDB
3826 4082
3827 BDB::min_parallel 8; 4083 BDB::min_parallel 16;
3828 BDB::max_poll_reqs $TICK * 0.1; 4084 BDB::max_poll_reqs $TICK * 0.1;
3829 $AnyEvent::BDB::WATCHER->priority (1); 4085 $AnyEvent::BDB::WATCHER->priority (1);
3830 4086
3831 unless ($DB_ENV) { 4087 unless ($DB_ENV) {
3832 $DB_ENV = BDB::db_env_create; 4088 $DB_ENV = BDB::db_env_create;
3879 $msg =~ s/\n//; 4135 $msg =~ s/\n//;
3880 4136
3881 # limit the # of concurrent backtraces 4137 # limit the # of concurrent backtraces
3882 if ($_log_backtrace < 2) { 4138 if ($_log_backtrace < 2) {
3883 ++$_log_backtrace; 4139 ++$_log_backtrace;
4140 my $perl_bt = Carp::longmess $msg;
3884 async { 4141 async {
3885 $Coro::current->{desc} = "abt $msg"; 4142 $Coro::current->{desc} = "abt $msg";
3886 4143
3887 my @bt = fork_call { 4144 my @bt = fork_call {
3888 @addr = map { sprintf "%x", $_ } @addr; 4145 @addr = map { sprintf "%x", $_ } @addr;
3899 } 4156 }
3900 4157
3901 @funcs 4158 @funcs
3902 }; 4159 };
3903 4160
3904 LOG llevInfo, "[ABT] $msg\n"; 4161 LOG llevInfo, "[ABT] $perl_bt\n";
4162 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3905 LOG llevInfo, "[ABT] $_\n" for @bt; 4163 LOG llevInfo, "[ABT] $_\n" for @bt;
3906 --$_log_backtrace; 4164 --$_log_backtrace;
3907 }; 4165 };
3908 } else { 4166 } else {
3909 LOG llevInfo, "[ABT] $msg\n"; 4167 LOG llevInfo, "[ABT] $msg\n";
3910 LOG llevInfo, "[ABT] [suppressed]\n"; 4168 LOG llevInfo, "[ABT] [suppressed]\n";
3911 } 4169 }
3912} 4170}
3913 4171
3914# load additional modules 4172# load additional modules
3915use cf::pod; 4173require "cf/$_.pm" for @EXTRA_MODULES;
4174cf::_connect_to_perl_2;
3916 4175
3917END { cf::emergency_save } 4176END { cf::emergency_save }
3918 4177
39191 41781
3920 4179

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines