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.441 by root, Sat Aug 30 05:19:03 2008 UTC vs.
Revision 1.550 by root, Fri May 14 22:56:47 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 $ref = cf::yaml_load $scalar
363
364Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
365
366=cut
367
368sub fork_call(&@);
369
370sub yaml_load($) {
371 fork_call { YAML::XS::Load $_[0] } @_
372}
373
374=item cf::post_init { BLOCK }
375
376Execute the given codeblock, I<after> all extensions have been (re-)loaded,
377but I<before> the server starts ticking again.
378
379The codeblock will have a single boolean argument to indicate whether this
380is a reload or not.
381
382=cut
383
384sub post_init(&) {
385 push @POST_INIT, shift;
386}
387
388sub _post_init {
389 trace "running post_init jobs";
390
391 # run them in parallel...
392
393 my @join;
394
395 while () {
396 push @join, map &Coro::async ($_, 0), @POST_INIT;
397 @POST_INIT = ();
398
399 @join or last;
400
401 (pop @join)->join;
402 }
403}
404
304=item cf::lock_wait $string 405=item cf::lock_wait $string
305 406
306Wait until the given lock is available. See cf::lock_acquire. 407Wait until the given lock is available. See cf::lock_acquire.
307 408
308=item my $lock = cf::lock_acquire $string 409=item my $lock = cf::lock_acquire $string
309 410
310Wait until the given lock is available and then acquires it and returns 411Wait 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, 412a L<Guard> object. If the guard object gets destroyed (goes out of scope,
312for example when the coroutine gets canceled), the lock is automatically 413for example when the coroutine gets canceled), the lock is automatically
313returned. 414returned.
314 415
315Locks are *not* recursive, locking from the same coro twice results in a 416Locks are *not* recursive, locking from the same coro twice results in a
316deadlocked coro. 417deadlocked coro.
… …
322 423
323Return true if the lock is currently active, i.e. somebody has locked it. 424Return true if the lock is currently active, i.e. somebody has locked it.
324 425
325=cut 426=cut
326 427
327our %LOCK; 428our $LOCKS = new Coro::SemaphoreSet;
328our %LOCKER;#d#
329 429
330sub lock_wait($) { 430sub lock_wait($) {
331 my ($key) = @_; 431 $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} 432}
344 433
345sub lock_acquire($) { 434sub lock_acquire($) {
346 my ($key) = @_; 435 $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} 436}
360 437
361sub lock_active($) { 438sub lock_active($) {
362 my ($key) = @_; 439 $LOCKS->count ($_[0]) < 1
363
364 ! ! $LOCK{$key}
365} 440}
366 441
367sub freeze_mainloop { 442sub freeze_mainloop {
368 tick_inhibit_inc; 443 tick_inhibit_inc;
369 444
370 Coro::guard \&tick_inhibit_dec; 445 &Guard::guard (\&tick_inhibit_dec);
371} 446}
372 447
373=item cf::periodic $interval, $cb 448=item cf::periodic $interval, $cb
374 449
375Like EV::periodic, but randomly selects a starting point so that the actions 450Like EV::periodic, but randomly selects a starting point so that the actions
376get spread over timer. 451get spread over time.
377 452
378=cut 453=cut
379 454
380sub periodic($$) { 455sub periodic($$) {
381 my ($interval, $cb) = @_; 456 my ($interval, $cb) = @_;
… …
398 473
399=cut 474=cut
400 475
401our @SLOT_QUEUE; 476our @SLOT_QUEUE;
402our $SLOT_QUEUE; 477our $SLOT_QUEUE;
478our $SLOT_DECAY = 0.9;
403 479
404$SLOT_QUEUE->cancel if $SLOT_QUEUE; 480$SLOT_QUEUE->cancel if $SLOT_QUEUE;
405$SLOT_QUEUE = Coro::async { 481$SLOT_QUEUE = Coro::async {
406 $Coro::current->desc ("timeslot manager"); 482 $Coro::current->desc ("timeslot manager");
407 483
408 my $signal = new Coro::Signal; 484 my $signal = new Coro::Signal;
485 my $busy;
409 486
410 while () { 487 while () {
411 next_job: 488 next_job:
489
412 my $avail = cf::till_tick; 490 my $avail = cf::till_tick;
413 if ($avail > 0.01) { 491
414 for (0 .. $#SLOT_QUEUE) { 492 for (0 .. $#SLOT_QUEUE) {
415 if ($SLOT_QUEUE[$_][0] < $avail) { 493 if ($SLOT_QUEUE[$_][0] <= $avail) {
494 $busy = 0;
416 my $job = splice @SLOT_QUEUE, $_, 1, (); 495 my $job = splice @SLOT_QUEUE, $_, 1, ();
417 $job->[2]->send; 496 $job->[2]->send;
418 Coro::cede; 497 Coro::cede;
419 goto next_job; 498 goto next_job;
420 } 499 } else {
500 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
421 } 501 }
422 } 502 }
423 503
424 if (@SLOT_QUEUE) { 504 if (@SLOT_QUEUE) {
425 # we do not use wait_for_tick() as it returns immediately when tick is inactive 505 # we do not use wait_for_tick() as it returns immediately when tick is inactive
426 push @cf::WAIT_FOR_TICK, $signal; 506 push @cf::WAIT_FOR_TICK, $signal;
427 $signal->wait; 507 $signal->wait;
428 } else { 508 } else {
509 $busy = 0;
429 Coro::schedule; 510 Coro::schedule;
430 } 511 }
431 } 512 }
432}; 513};
433 514
434sub get_slot($;$$) { 515sub get_slot($;$$) {
435 return if tick_inhibit || $Coro::current == $Coro::main; 516 return if tick_inhibit || $Coro::current == $Coro::main;
436 517
437 my ($time, $pri, $name) = @_; 518 my ($time, $pri, $name) = @_;
438 519
439 $time = $TICK * .6 if $time > $TICK * .6; 520 $time = clamp $time, 0.01, $TICK * .6;
521
440 my $sig = new Coro::Signal; 522 my $sig = new Coro::Signal;
441 523
442 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 524 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
443 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 525 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
444 $SLOT_QUEUE->ready; 526 $SLOT_QUEUE->ready;
… …
470=cut 552=cut
471 553
472sub sync_job(&) { 554sub sync_job(&) {
473 my ($job) = @_; 555 my ($job) = @_;
474 556
475 if ($Coro::current == $Coro::main) { 557 if (in_main) {
476 my $time = EV::time; 558 my $time = AE::time;
477 559
478 # this is the main coro, too bad, we have to block 560 # this is the main coro, too bad, we have to block
479 # till the operation succeeds, freezing the server :/ 561 # till the operation succeeds, freezing the server :/
480 562
481 LOG llevError, Carp::longmess "sync job";#d# 563 #LOG llevError, Carp::longmess "sync job";#d#
482 564
483 my $freeze_guard = freeze_mainloop; 565 my $freeze_guard = freeze_mainloop;
484 566
485 my $busy = 1; 567 my $busy = 1;
486 my @res; 568 my @res;
487 569
488 (async { 570 (async {
489 $Coro::current->desc ("sync job coro"); 571 $Coro::current->desc ("sync job coro");
490 @res = eval { $job->() }; 572 @res = eval { $job->() };
491 warn $@ if $@; 573 error $@ if $@;
492 undef $busy; 574 undef $busy;
493 })->prio (Coro::PRIO_MAX); 575 })->prio (Coro::PRIO_MAX);
494 576
495 while ($busy) { 577 while ($busy) {
496 if (Coro::nready) { 578 if (Coro::nready) {
… …
498 } else { 580 } else {
499 EV::loop EV::LOOP_ONESHOT; 581 EV::loop EV::LOOP_ONESHOT;
500 } 582 }
501 } 583 }
502 584
503 my $time = EV::time - $time; 585 my $time = AE::time - $time;
504 586
505 $TICK_START += $time; # do not account sync jobs to server load 587 $TICK_START += $time; # do not account sync jobs to server load
506 588
507 wantarray ? @res : $res[0] 589 wantarray ? @res : $res[0]
508 } else { 590 } else {
… …
530 $EXT_CORO{$coro+0} = $coro; 612 $EXT_CORO{$coro+0} = $coro;
531 613
532 $coro 614 $coro
533} 615}
534 616
535=item fork_call { }, $args 617=item fork_call { }, @args
536 618
537Executes the given code block with the given arguments in a seperate 619Executes the given code block with the given arguments in a seperate
538process, returning the results. Everything must be serialisable with 620process, returning the results. Everything must be serialisable with
539Coro::Storable. May, of course, block. Note that the executed sub may 621Coro::Storable. May, of course, block. Note that the executed sub may
540never block itself or use any form of event handling. 622never block itself or use any form of event handling.
541 623
542=cut 624=cut
543 625
626sub post_fork {
627 reset_signals;
628}
629
544sub fork_call(&@) { 630sub fork_call(&@) {
545 my ($cb, @args) = @_; 631 my ($cb, @args) = @_;
546 632
547 # we seemingly have to make a local copy of the whole thing, 633 # we seemingly have to make a local copy of the whole thing,
548 # otherwise perl prematurely frees the stuff :/ 634 # otherwise perl prematurely frees the stuff :/
549 # TODO: investigate and fix (likely this will be rather laborious) 635 # TODO: investigate and fix (likely this will be rather laborious)
550 636
551 my @res = Coro::Util::fork_eval { 637 my @res = Coro::Util::fork_eval {
552 reset_signals; 638 cf::post_fork;
553 &$cb 639 &$cb
554 }, @args; 640 } @args;
555 641
556 wantarray ? @res : $res[-1] 642 wantarray ? @res : $res[-1]
643}
644
645sub objinfo {
646 (
647 "counter value" => cf::object::object_count,
648 "objects created" => cf::object::create_count,
649 "objects destroyed" => cf::object::destroy_count,
650 "freelist size" => cf::object::free_count,
651 "allocated objects" => cf::object::objects_size,
652 "active objects" => cf::object::actives_size,
653 )
557} 654}
558 655
559=item $coin = coin_from_name $name 656=item $coin = coin_from_name $name
560 657
561=cut 658=cut
… …
598within each server. 695within each server.
599 696
600=cut 697=cut
601 698
602sub db_table($) { 699sub db_table($) {
700 cf::error "db_get called from main context"
701 if $Coro::current == $Coro::main;
702
603 my ($name) = @_; 703 my ($name) = @_;
604 my $db = BDB::db_create $DB_ENV; 704 my $db = BDB::db_create $DB_ENV;
605 705
606 eval { 706 eval {
607 $db->set_flags (BDB::CHKSUM); 707 $db->set_flags (BDB::CHKSUM);
… …
617} 717}
618 718
619our $DB; 719our $DB;
620 720
621sub db_init { 721sub db_init {
622 cf::sync_job {
623 $DB ||= db_table "db"; 722 $DB ||= db_table "db";
624 };
625} 723}
626 724
627sub db_get($$) { 725sub db_get($$) {
628 my $key = "$_[0]/$_[1]"; 726 my $key = "$_[0]/$_[1]";
629 727
630 cf::sync_job { 728 cf::error "db_get called from main context"
729 if $Coro::current == $Coro::main;
730
631 BDB::db_get $DB, undef, $key, my $data; 731 BDB::db_get $DB, undef, $key, my $data;
632 732
633 $! ? () 733 $! ? ()
634 : $data 734 : $data
635 }
636} 735}
637 736
638sub db_put($$$) { 737sub db_put($$$) {
639 BDB::dbreq_pri 4; 738 BDB::dbreq_pri 4;
640 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 739 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
696 795
697 my $t1 = Time::HiRes::time; 796 my $t1 = Time::HiRes::time;
698 my $data = $process->(\@data); 797 my $data = $process->(\@data);
699 my $t2 = Time::HiRes::time; 798 my $t2 = Time::HiRes::time;
700 799
701 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 800 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
702 801
703 db_put cache => "$id/data", $data; 802 db_put cache => "$id/data", $data;
704 db_put cache => "$id/md5" , $md5; 803 db_put cache => "$id/md5" , $md5;
705 db_put cache => "$id/meta", $meta; 804 db_put cache => "$id/meta", $meta;
706 805
… …
716 815
717=cut 816=cut
718 817
719sub datalog($@) { 818sub datalog($@) {
720 my ($type, %kv) = @_; 819 my ($type, %kv) = @_;
721 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 820 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
722} 821}
723 822
724=back 823=back
725 824
726=cut 825=cut
727 826
728############################################################################# 827#############################################################################
729 828
730=head2 ATTACHABLE OBJECTS 829=head2 ATTACHABLE OBJECTS
731 830
732Many objects in crossfire are so-called attachable objects. That means you can 831Many objects in deliantra are so-called attachable objects. That means you can
733attach callbacks/event handlers (a collection of which is called an "attachment") 832attach callbacks/event handlers (a collection of which is called an "attachment")
734to it. All such attachable objects support the following methods. 833to it. All such attachable objects support the following methods.
735 834
736In the following description, CLASS can be any of C<global>, C<object> 835In 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 836C<player>, C<client> or C<map> (i.e. the attachable objects in
… …
787=item cf::CLASS::attachment $name, ... 886=item cf::CLASS::attachment $name, ...
788 887
789Register an attachment by C<$name> through which attachable objects of the 888Register an attachment by C<$name> through which attachable objects of the
790given CLASS can refer to this attachment. 889given CLASS can refer to this attachment.
791 890
792Some classes such as crossfire maps and objects can specify attachments 891Some classes such as deliantra maps and objects can specify attachments
793that are attached at load/instantiate time, thus the need for a name. 892that are attached at load/instantiate time, thus the need for a name.
794 893
795These calls expect any number of the following handler/hook descriptions: 894These calls expect any number of the following handler/hook descriptions:
796 895
797=over 4 896=over 4
… …
921 1020
922 } elsif (exists $cb_id{$type}) { 1021 } elsif (exists $cb_id{$type}) {
923 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1022 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
924 1023
925 } elsif (ref $type) { 1024 } elsif (ref $type) {
926 warn "attaching objects not supported, ignoring.\n"; 1025 error "attaching objects not supported, ignoring.\n";
927 1026
928 } else { 1027 } else {
929 shift @arg; 1028 shift @arg;
930 warn "attach argument '$type' not supported, ignoring.\n"; 1029 error "attach argument '$type' not supported, ignoring.\n";
931 } 1030 }
932 } 1031 }
933} 1032}
934 1033
935sub _object_attach { 1034sub _object_attach {
… …
945 _attach $registry, $klass, @attach; 1044 _attach $registry, $klass, @attach;
946 } 1045 }
947 1046
948 $obj->{$name} = \%arg; 1047 $obj->{$name} = \%arg;
949 } else { 1048 } else {
950 warn "object uses attachment '$name' which is not available, postponing.\n"; 1049 info "object uses attachment '$name' which is not available, postponing.\n";
951 } 1050 }
952 1051
953 $obj->{_attachment}{$name} = undef; 1052 $obj->{_attachment}{$name} = undef;
954} 1053}
955 1054
… …
1014 1113
1015 for (@$callbacks) { 1114 for (@$callbacks) {
1016 eval { &{$_->[1]} }; 1115 eval { &{$_->[1]} };
1017 1116
1018 if ($@) { 1117 if ($@) {
1019 warn "$@";
1020 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1118 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1021 override; 1119 override;
1022 } 1120 }
1023 1121
1024 return 1 if $override; 1122 return 1 if $override;
1025 } 1123 }
… …
1104 for (@$attach) { 1202 for (@$attach) {
1105 my ($klass, @attach) = @$_; 1203 my ($klass, @attach) = @$_;
1106 _attach $registry, $klass, @attach; 1204 _attach $registry, $klass, @attach;
1107 } 1205 }
1108 } else { 1206 } else {
1109 warn "object uses attachment '$name' that is not available, postponing.\n"; 1207 info "object uses attachment '$name' that is not available, postponing.\n";
1110 } 1208 }
1111 } 1209 }
1112} 1210}
1113 1211
1114cf::attachable->attach ( 1212cf::attachable->attach (
… …
1141 my ($filename, $rdata, $objs) = @_; 1239 my ($filename, $rdata, $objs) = @_;
1142 1240
1143 sync_job { 1241 sync_job {
1144 if (length $$rdata) { 1242 if (length $$rdata) {
1145 utf8::decode (my $decname = $filename); 1243 utf8::decode (my $decname = $filename);
1146 warn sprintf "saving %s (%d,%d)\n", 1244 trace sprintf "saving %s (%d,%d)\n",
1147 $decname, length $$rdata, scalar @$objs; 1245 $decname, length $$rdata, scalar @$objs
1246 if $VERBOSE_IO;
1148 1247
1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1248 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1150 aio_chmod $fh, SAVE_MODE; 1249 aio_chmod $fh, SAVE_MODE;
1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1250 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1152 aio_fsync $fh if $cf::USE_FSYNC; 1251 if ($cf::USE_FSYNC) {
1252 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;
1253 aio_fsync $fh;
1254 }
1153 aio_close $fh; 1255 aio_close $fh;
1154 1256
1155 if (@$objs) { 1257 if (@$objs) {
1156 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1258 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1157 aio_chmod $fh, SAVE_MODE; 1259 aio_chmod $fh, SAVE_MODE;
1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1260 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1159 aio_write $fh, 0, (length $data), $data, 0; 1261 aio_write $fh, 0, (length $data), $data, 0;
1160 aio_fsync $fh if $cf::USE_FSYNC; 1262 if ($cf::USE_FSYNC) {
1263 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;
1264 aio_fsync $fh;
1265 }
1161 aio_close $fh; 1266 aio_close $fh;
1162 aio_rename "$filename.pst~", "$filename.pst"; 1267 aio_rename "$filename.pst~", "$filename.pst";
1163 } 1268 }
1164 } else { 1269 } else {
1165 aio_unlink "$filename.pst"; 1270 aio_unlink "$filename.pst";
1166 } 1271 }
1167 1272
1168 aio_rename "$filename~", $filename; 1273 aio_rename "$filename~", $filename;
1274
1275 $filename =~ s%/[^/]+$%%;
1276 aio_pathsync $filename if $cf::USE_FSYNC;
1169 } else { 1277 } else {
1170 warn "FATAL: $filename~: $!\n"; 1278 error "unable to save objects: $filename~: $!\n";
1171 } 1279 }
1172 } else { 1280 } else {
1173 aio_unlink $filename; 1281 aio_unlink $filename;
1174 aio_unlink "$filename.pst"; 1282 aio_unlink "$filename.pst";
1175 } 1283 }
… …
1199 my $st = eval { Coro::Storable::thaw $av }; 1307 my $st = eval { Coro::Storable::thaw $av };
1200 $av = $st->{objs}; 1308 $av = $st->{objs};
1201 } 1309 }
1202 1310
1203 utf8::decode (my $decname = $filename); 1311 utf8::decode (my $decname = $filename);
1204 warn sprintf "loading %s (%d,%d)\n", 1312 trace sprintf "loading %s (%d,%d)\n",
1205 $decname, length $data, scalar @{$av || []}; 1313 $decname, length $data, scalar @{$av || []}
1314 if $VERBOSE_IO;
1206 1315
1207 ($data, $av) 1316 ($data, $av)
1208} 1317}
1209 1318
1210=head2 COMMAND CALLBACKS 1319=head2 COMMAND CALLBACKS
… …
1266 my ($name, $cb) = @_; 1375 my ($name, $cb) = @_;
1267 1376
1268 $EXTICMD{$name} = $cb; 1377 $EXTICMD{$name} = $cb;
1269} 1378}
1270 1379
1380use File::Glob ();
1381
1271cf::player->attach ( 1382cf::player->attach (
1272 on_command => sub { 1383 on_unknown_command => sub {
1273 my ($pl, $name, $params) = @_; 1384 my ($pl, $name, $params) = @_;
1274 1385
1275 my $cb = $COMMAND{$name} 1386 my $cb = $COMMAND{$name}
1276 or return; 1387 or return;
1277 1388
… …
1300 1411
1301 $pl->ext_reply ($reply, @reply) 1412 $pl->ext_reply ($reply, @reply)
1302 if $reply; 1413 if $reply;
1303 1414
1304 } else { 1415 } else {
1305 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1416 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1306 } 1417 }
1307 1418
1308 cf::override; 1419 cf::override;
1309 }, 1420 },
1310); 1421);
1311 1422
1423# "readahead" all extensions
1424sub cache_extensions {
1425 my $grp = IO::AIO::aio_group;
1426
1427 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1428 for (grep /\.ext$/, @{$_[0]}) {
1429 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1430 }
1431 };
1432
1433 $grp
1434}
1435
1312sub load_extensions { 1436sub load_extensions {
1437 info "loading extensions...";
1438
1313 cf::sync_job { 1439 cf::sync_job {
1314 my %todo; 1440 my %todo;
1315 1441
1316 for my $path (<$LIBDIR/*.ext>) { 1442 for my $path (<$LIBDIR/*.ext>) {
1317 next unless -r $path; 1443 next unless -r $path;
… …
1335 1461
1336 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1462 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1337 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1463 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1338 1464
1339 $ext{source} = 1465 $ext{source} =
1340 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1466 "package $pkg; use common::sense;\n"
1341 . "#line 1 \"$path\"\n{\n" 1467 . "#line 1 \"$path\"\n{\n"
1342 . $source 1468 . $source
1343 . "\n};\n1"; 1469 . "\n};\n1";
1344 1470
1345 $todo{$base} = \%ext; 1471 $todo{$base} = \%ext;
1346 } 1472 }
1347 1473
1474 my $pass = 0;
1348 my %done; 1475 my %done;
1349 while (%todo) { 1476 while (%todo) {
1350 my $progress; 1477 my $progress;
1351 1478
1479 ++$pass;
1480
1481 ext:
1352 while (my ($k, $v) = each %todo) { 1482 while (my ($k, $v) = each %todo) {
1353 for (split /,\s*/, $v->{meta}{depends}) { 1483 for (split /,\s*/, $v->{meta}{depends}) {
1354 goto skip 1484 next ext
1355 unless exists $done{$_}; 1485 unless exists $done{$_};
1356 } 1486 }
1357 1487
1358 warn "... loading '$k' into '$v->{pkg}'\n"; 1488 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1359 1489
1360 unless (eval $v->{source}) { 1490 my $active = eval $v->{source};
1491
1492 if (length $@) {
1361 my $msg = $@ ? "$v->{path}: $@\n" 1493 error "$v->{path}: $@\n";
1362 : "$v->{base}: extension inactive.\n";
1363 1494
1364 if (exists $v->{meta}{mandatory}) {
1365 warn $msg;
1366 cf::cleanup "mandatory extension failed to load, exiting."; 1495 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1367 } 1496 if exists $v->{meta}{mandatory};
1368 1497
1369 warn $msg; 1498 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1499 delete $todo{$k};
1500 } else {
1501 $done{$k} = delete $todo{$k};
1502 push @EXTS, $v->{pkg};
1503 $progress = 1;
1504
1505 info "$v->{base}: extension inactive.\n"
1506 unless $active;
1370 } 1507 }
1371
1372 $done{$k} = delete $todo{$k};
1373 push @EXTS, $v->{pkg};
1374 $progress = 1;
1375 } 1508 }
1376 1509
1377 skip: 1510 unless ($progress) {
1378 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1511 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1379 unless $progress; 1512
1513 while (my ($k, $v) = each %todo) {
1514 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1515 if exists $v->{meta}{mandatory};
1516 }
1517 }
1380 } 1518 }
1381 }; 1519 };
1382} 1520}
1383 1521
1384############################################################################# 1522#############################################################################
1385 1523
1386=back 1524=back
1387 1525
1388=head2 CORE EXTENSIONS 1526=head2 CORE EXTENSIONS
1389 1527
1390Functions and methods that extend core crossfire objects. 1528Functions and methods that extend core deliantra objects.
1391 1529
1392=cut 1530=cut
1393 1531
1394package cf::player; 1532package cf::player;
1395 1533
… …
1438 1576
1439sub exists($) { 1577sub exists($) {
1440 my ($login) = @_; 1578 my ($login) = @_;
1441 1579
1442 $cf::PLAYER{$login} 1580 $cf::PLAYER{$login}
1443 or cf::sync_job { !aio_stat path $login } 1581 or !aio_stat path $login
1444} 1582}
1445 1583
1446sub find($) { 1584sub find($) {
1447 return $cf::PLAYER{$_[0]} || do { 1585 return $cf::PLAYER{$_[0]} || do {
1448 my $login = $_[0]; 1586 my $login = $_[0];
… …
1468 $cf::PLAYER{$login} = $pl 1606 $cf::PLAYER{$login} = $pl
1469 } 1607 }
1470 } 1608 }
1471} 1609}
1472 1610
1611cf::player->attach (
1612 on_load => sub {
1613 my ($pl, $path) = @_;
1614
1615 # restore slots saved in save, below
1616 my $slots = delete $pl->{_slots};
1617
1618 $pl->ob->current_weapon ($slots->[0]);
1619 $pl->combat_ob ($slots->[1]);
1620 $pl->ranged_ob ($slots->[2]);
1621 },
1622);
1623
1473sub save($) { 1624sub save($) {
1474 my ($pl) = @_; 1625 my ($pl) = @_;
1475 1626
1476 return if $pl->{deny_save}; 1627 return if $pl->{deny_save};
1477 1628
… …
1482 1633
1483 aio_mkdir playerdir $pl, 0770; 1634 aio_mkdir playerdir $pl, 0770;
1484 $pl->{last_save} = $cf::RUNTIME; 1635 $pl->{last_save} = $cf::RUNTIME;
1485 1636
1486 cf::get_slot 0.01; 1637 cf::get_slot 0.01;
1638
1639 # save slots, to be restored later
1640 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1487 1641
1488 $pl->save_pl ($path); 1642 $pl->save_pl ($path);
1489 cf::cede_to_tick; 1643 cf::cede_to_tick;
1490} 1644}
1491 1645
… …
1523 my ($pl) = @_; 1677 my ($pl) = @_;
1524 1678
1525 my $name = $pl->ob->name; 1679 my $name = $pl->ob->name;
1526 1680
1527 $pl->{deny_save} = 1; 1681 $pl->{deny_save} = 1;
1528 $pl->password ("*"); # this should lock out the player until we nuked the dir 1682 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1529 1683
1530 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1684 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1531 $pl->deactivate; 1685 $pl->deactivate;
1686
1532 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1687 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1533 $pl->ob->check_score;
1534 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1688 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1689 ext::highscore::check ($pl->ob);
1690
1535 $pl->ns->destroy if $pl->ns; 1691 $pl->ns->destroy if $pl->ns;
1536 1692
1537 my $path = playerdir $pl; 1693 my $path = playerdir $pl;
1538 my $temp = "$path~$cf::RUNTIME~deleting~"; 1694 my $temp = "$path~$cf::RUNTIME~deleting~";
1539 aio_rename $path, $temp; 1695 aio_rename $path, $temp;
… …
1593 \@logins 1749 \@logins
1594} 1750}
1595 1751
1596=item $player->maps 1752=item $player->maps
1597 1753
1754=item cf::player::maps $login
1755
1598Returns an arrayref of map paths that are private for this 1756Returns an arrayref of map paths that are private for this
1599player. May block. 1757player. May block.
1600 1758
1601=cut 1759=cut
1602 1760
… …
1619 } 1777 }
1620 1778
1621 \@paths 1779 \@paths
1622} 1780}
1623 1781
1624=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1782=item $protocol_xml = $player->expand_cfpod ($cfpod)
1625 1783
1626Expand crossfire pod fragments into protocol xml. 1784Expand deliantra pod fragments into protocol xml.
1627
1628=cut
1629
1630use re 'eval';
1631
1632my $group;
1633my $interior; $interior = qr{
1634 # match a pod interior sequence sans C<< >>
1635 (?:
1636 \ (.*?)\ (?{ $group = $^N })
1637 | < (??{$interior}) >
1638 )
1639}x;
1640
1641sub expand_cfpod {
1642 my ($self, $pod) = @_;
1643
1644 my $xml;
1645
1646 while () {
1647 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1648 $group = $1;
1649
1650 $group =~ s/&/&amp;/g;
1651 $group =~ s/</&lt;/g;
1652
1653 $xml .= $group;
1654 } elsif ($pod =~ m%\G
1655 ([BCGHITU])
1656 <
1657 (?:
1658 ([^<>]*) (?{ $group = $^N })
1659 | < $interior >
1660 )
1661 >
1662 %gcsx
1663 ) {
1664 my ($code, $data) = ($1, $group);
1665
1666 if ($code eq "B") {
1667 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1668 } elsif ($code eq "I") {
1669 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1670 } elsif ($code eq "U") {
1671 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1672 } elsif ($code eq "C") {
1673 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1674 } elsif ($code eq "T") {
1675 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1676 } elsif ($code eq "G") {
1677 my ($male, $female) = split /\|/, $data;
1678 $data = $self->gender ? $female : $male;
1679 $xml .= expand_cfpod ($self, $data);
1680 } elsif ($code eq "H") {
1681 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1682 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1683 "")
1684 [$self->{hintmode}];
1685 } else {
1686 $xml .= "error processing '$code($data)' directive";
1687 }
1688 } else {
1689 if ($pod =~ /\G(.+)/) {
1690 warn "parse error while expanding $pod (at $1)";
1691 }
1692 last;
1693 }
1694 }
1695
1696 for ($xml) {
1697 # create single paragraphs (very hackish)
1698 s/(?<=\S)\n(?=\w)/ /g;
1699
1700 # compress some whitespace
1701 s/\s+\n/\n/g; # ws line-ends
1702 s/\n\n+/\n/g; # double lines
1703 s/^\n+//; # beginning lines
1704 s/\n+$//; # ending lines
1705 }
1706
1707 $xml
1708}
1709
1710no re 'eval';
1711
1712sub hintmode {
1713 $_[0]{hintmode} = $_[1] if @_ > 1;
1714 $_[0]{hintmode}
1715}
1716 1785
1717=item $player->ext_reply ($msgid, @msg) 1786=item $player->ext_reply ($msgid, @msg)
1718 1787
1719Sends an ext reply to the player. 1788Sends an ext reply to the player.
1720 1789
… …
1752 1821
1753=cut 1822=cut
1754 1823
1755sub find_by_path($) { 1824sub find_by_path($) {
1756 my ($path) = @_; 1825 my ($path) = @_;
1826
1827 $path =~ s/^~[^\/]*//; # skip ~login
1757 1828
1758 my ($match, $specificity); 1829 my ($match, $specificity);
1759 1830
1760 for my $region (list) { 1831 for my $region (list) {
1761 if ($region->{match} && $path =~ $region->{match}) { 1832 if ($region->{match} && $path =~ $region->{match}) {
… …
1793 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1864 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1794 1865
1795 # mit "rum" bekleckern, nicht 1866 # mit "rum" bekleckern, nicht
1796 $self->_create_random_map ( 1867 $self->_create_random_map (
1797 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1868 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1798 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1869 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1799 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1870 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1800 $rmp->{exit_on_final_map}, 1871 $rmp->{exit_on_final_map},
1801 $rmp->{xsize}, $rmp->{ysize}, 1872 $rmp->{xsize}, $rmp->{ysize},
1802 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1873 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1803 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1874 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
1818 1889
1819sub register { 1890sub register {
1820 my (undef, $regex, $prio) = @_; 1891 my (undef, $regex, $prio) = @_;
1821 my $pkg = caller; 1892 my $pkg = caller;
1822 1893
1823 no strict;
1824 push @{"$pkg\::ISA"}, __PACKAGE__; 1894 push @{"$pkg\::ISA"}, __PACKAGE__;
1825 1895
1826 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1896 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1827} 1897}
1828 1898
1829# also paths starting with '/' 1899# also paths starting with '/'
1830$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1900$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1831 1901
1832sub thawer_merge { 1902sub thawer_merge {
1833 my ($self, $merge) = @_; 1903 my ($self, $merge) = @_;
1834 1904
1835 # we have to keep some variables in memory intact 1905 # we have to keep some variables in memory intact
… …
1840} 1910}
1841 1911
1842sub normalise { 1912sub normalise {
1843 my ($path, $base) = @_; 1913 my ($path, $base) = @_;
1844 1914
1845 $path = "$path"; # make sure its a string 1915 $path = "$path"; # make sure it's a string
1846 1916
1847 $path =~ s/\.map$//; 1917 $path =~ s/\.map$//;
1848 1918
1849 # map plan: 1919 # map plan:
1850 # 1920 #
… …
1889 $self->init; # pass $1 etc. 1959 $self->init; # pass $1 etc.
1890 return $self; 1960 return $self;
1891 } 1961 }
1892 } 1962 }
1893 1963
1894 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1964 Carp::cluck "unable to resolve path '$path' (base '$base')";
1895 () 1965 ()
1896} 1966}
1897 1967
1898sub init { 1968sub init {
1899 my ($self) = @_; 1969 my ($self) = @_;
… …
1931sub uniq_path { 2001sub uniq_path {
1932 my ($self) = @_; 2002 my ($self) = @_;
1933 2003
1934 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 2004 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1935 "$UNIQUEDIR/$path" 2005 "$UNIQUEDIR/$path"
1936}
1937
1938# and all this just because we cannot iterate over
1939# all maps in C++...
1940sub change_all_map_light {
1941 my ($change) = @_;
1942
1943 $_->change_map_light ($change)
1944 for grep $_->outdoor, values %cf::MAP;
1945} 2006}
1946 2007
1947sub decay_objects { 2008sub decay_objects {
1948 my ($self) = @_; 2009 my ($self) = @_;
1949 2010
… …
2031 2092
2032sub find; 2093sub find;
2033sub find { 2094sub find {
2034 my ($path, $origin) = @_; 2095 my ($path, $origin) = @_;
2035 2096
2097 cf::cede_to_tick;
2098
2036 $path = normalise $path, $origin && $origin->path; 2099 $path = normalise $path, $origin && $origin->path;
2037 2100
2038 cf::lock_wait "map_data:$path";#d#remove 2101 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2039 cf::lock_wait "map_find:$path"; 2102 my $guard2 = cf::lock_acquire "map_find:$path";
2040 2103
2041 $cf::MAP{$path} || do { 2104 $cf::MAP{$path} || do {
2042 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2043 my $guard2 = cf::lock_acquire "map_find:$path";
2044
2045 my $map = new_from_path cf::map $path 2105 my $map = new_from_path cf::map $path
2046 or return; 2106 or return;
2047 2107
2048 $map->{last_save} = $cf::RUNTIME; 2108 $map->{last_save} = $cf::RUNTIME;
2049 2109
… …
2061 2121
2062 $cf::MAP{$path} = $map 2122 $cf::MAP{$path} = $map
2063 } 2123 }
2064} 2124}
2065 2125
2066sub pre_load { } 2126sub pre_load { }
2067sub post_load { } 2127#sub post_load { } # XS
2068 2128
2069sub load { 2129sub load {
2070 my ($self) = @_; 2130 my ($self) = @_;
2071 2131
2072 local $self->{deny_reset} = 1; # loading can take a long time 2132 local $self->{deny_reset} = 1; # loading can take a long time
… …
2117 unless ($self->{deny_activate}) { 2177 unless ($self->{deny_activate}) {
2118 $self->decay_objects; 2178 $self->decay_objects;
2119 $self->fix_auto_apply; 2179 $self->fix_auto_apply;
2120 $self->update_buttons; 2180 $self->update_buttons;
2121 cf::cede_to_tick; 2181 cf::cede_to_tick;
2122 $self->set_darkness_map;
2123 cf::cede_to_tick;
2124 $self->activate; 2182 $self->activate;
2125 } 2183 }
2126 2184
2127 $self->{last_save} = $cf::RUNTIME; 2185 $self->{last_save} = $cf::RUNTIME;
2128 $self->last_access ($cf::RUNTIME); 2186 $self->last_access ($cf::RUNTIME);
… …
2131 } 2189 }
2132 2190
2133 $self->post_load; 2191 $self->post_load;
2134} 2192}
2135 2193
2194# customize the map for a given player, i.e.
2195# return the _real_ map. used by e.g. per-player
2196# maps to change the path to ~playername/mappath
2136sub customise_for { 2197sub customise_for {
2137 my ($self, $ob) = @_; 2198 my ($self, $ob) = @_;
2138 2199
2139 return find "~" . $ob->name . "/" . $self->{path} 2200 return find "~" . $ob->name . "/" . $self->{path}
2140 if $self->per_player; 2201 if $self->per_player;
… …
2156 or next; 2217 or next;
2157 $neigh = find $neigh, $map 2218 $neigh = find $neigh, $map
2158 or next; 2219 or next;
2159 $neigh->load; 2220 $neigh->load;
2160 2221
2222 # now find the diagonal neighbours
2161 push @neigh, 2223 push @neigh,
2162 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2224 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2163 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2225 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2164 } 2226 }
2165 2227
… …
2172} 2234}
2173 2235
2174sub find_sync { 2236sub find_sync {
2175 my ($path, $origin) = @_; 2237 my ($path, $origin) = @_;
2176 2238
2177 cf::sync_job { find $path, $origin } 2239 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2240 if $Coro::current == $Coro::main;
2241
2242 find $path, $origin
2178} 2243}
2179 2244
2180sub do_load_sync { 2245sub do_load_sync {
2181 my ($map) = @_; 2246 my ($map) = @_;
2182 2247
2183 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2248 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2184 if $Coro::current == $Coro::main; 2249 if $Coro::current == $Coro::main;
2185 2250
2186 cf::sync_job { $map->load }; 2251 $map->load;
2187} 2252}
2188 2253
2189our %MAP_PREFETCH; 2254our %MAP_PREFETCH;
2190our $MAP_PREFETCHER = undef; 2255our $MAP_PREFETCHER = undef;
2191 2256
… …
2217 $MAP_PREFETCHER->prio (6); 2282 $MAP_PREFETCHER->prio (6);
2218 2283
2219 () 2284 ()
2220} 2285}
2221 2286
2287# common code, used by both ->save and ->swapout
2222sub save { 2288sub _save {
2223 my ($self) = @_; 2289 my ($self) = @_;
2224
2225 my $lock = cf::lock_acquire "map_data:$self->{path}";
2226 2290
2227 $self->{last_save} = $cf::RUNTIME; 2291 $self->{last_save} = $cf::RUNTIME;
2228 2292
2229 return unless $self->dirty; 2293 return unless $self->dirty;
2230 2294
… …
2250 } else { 2314 } else {
2251 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2315 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2252 } 2316 }
2253} 2317}
2254 2318
2319sub save {
2320 my ($self) = @_;
2321
2322 my $lock = cf::lock_acquire "map_data:$self->{path}";
2323
2324 $self->_save;
2325}
2326
2255sub swap_out { 2327sub swap_out {
2256 my ($self) = @_; 2328 my ($self) = @_;
2257 2329
2258 # save first because save cedes
2259 $self->save;
2260
2261 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2330 my $lock = cf::lock_acquire "map_data:$self->{path}";
2262 2331
2263 return if $self->players;
2264 return if $self->in_memory != cf::MAP_ACTIVE; 2332 return if $self->in_memory != cf::MAP_ACTIVE;
2265 return if $self->{deny_save}; 2333 return if $self->{deny_save};
2334 return if $self->players;
2266 2335
2336 # first deactivate the map and "unlink" it from the core
2337 $self->deactivate;
2338 $_->clear_links_to ($self) for values %cf::MAP;
2267 $self->in_memory (cf::MAP_SWAPPED); 2339 $self->in_memory (cf::MAP_SWAPPED);
2340
2341 # then atomically save
2342 $self->_save;
2343
2344 # then free the map
2345 $self->clear;
2346}
2347
2348sub reset_at {
2349 my ($self) = @_;
2350
2351 # TODO: safety, remove and allow resettable per-player maps
2352 return 1e99 if $self->{deny_reset};
2353
2354 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2355 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2356
2357 $time + $to
2358}
2359
2360sub should_reset {
2361 my ($self) = @_;
2362
2363 $self->reset_at <= $cf::RUNTIME
2364}
2365
2366sub reset {
2367 my ($self) = @_;
2368
2369 my $lock = cf::lock_acquire "map_data:$self->{path}";
2370
2371 return if $self->players;
2372
2373 cf::trace "resetting map ", $self->path, "\n";
2374
2375 $self->in_memory (cf::MAP_SWAPPED);
2376
2377 # need to save uniques path
2378 unless ($self->{deny_save}) {
2379 my $uniq = $self->uniq_path; utf8::encode $uniq;
2380
2381 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2382 if $uniq;
2383 }
2384
2385 delete $cf::MAP{$self->path};
2268 2386
2269 $self->deactivate; 2387 $self->deactivate;
2270 $_->clear_links_to ($self) for values %cf::MAP; 2388 $_->clear_links_to ($self) for values %cf::MAP;
2271 $self->clear; 2389 $self->clear;
2272}
2273
2274sub reset_at {
2275 my ($self) = @_;
2276
2277 # TODO: safety, remove and allow resettable per-player maps
2278 return 1e99 if $self->{deny_reset};
2279
2280 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2281 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2282
2283 $time + $to
2284}
2285
2286sub should_reset {
2287 my ($self) = @_;
2288
2289 $self->reset_at <= $cf::RUNTIME
2290}
2291
2292sub reset {
2293 my ($self) = @_;
2294
2295 my $lock = cf::lock_acquire "map_data:$self->{path}";
2296
2297 return if $self->players;
2298
2299 warn "resetting map ", $self->path;
2300
2301 $self->in_memory (cf::MAP_SWAPPED);
2302
2303 # need to save uniques path
2304 unless ($self->{deny_save}) {
2305 my $uniq = $self->uniq_path; utf8::encode $uniq;
2306
2307 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2308 if $uniq;
2309 }
2310
2311 delete $cf::MAP{$self->path};
2312
2313 $self->deactivate;
2314 $_->clear_links_to ($self) for values %cf::MAP;
2315 $self->clear;
2316 2390
2317 $self->unlink_save; 2391 $self->unlink_save;
2318 $self->destroy; 2392 $self->destroy;
2319} 2393}
2320 2394
… …
2328 2402
2329 delete $cf::MAP{$self->path}; 2403 delete $cf::MAP{$self->path};
2330 2404
2331 $self->unlink_save; 2405 $self->unlink_save;
2332 2406
2333 bless $self, "cf::map"; 2407 bless $self, "cf::map::wrap";
2334 delete $self->{deny_reset}; 2408 delete $self->{deny_reset};
2335 $self->{deny_save} = 1; 2409 $self->{deny_save} = 1;
2336 $self->reset_timeout (1); 2410 $self->reset_timeout (1);
2337 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2411 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2338 2412
… …
2395 : normalise $_ 2469 : normalise $_
2396 } @{ aio_readdir $UNIQUEDIR or [] } 2470 } @{ aio_readdir $UNIQUEDIR or [] }
2397 ] 2471 ]
2398} 2472}
2399 2473
2474=item cf::map::static_maps
2475
2476Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2477file in the shared directory excluding F</styles> and F</editor>). May
2478block.
2479
2480=cut
2481
2482sub static_maps() {
2483 my @dirs = "";
2484 my @maps;
2485
2486 while (@dirs) {
2487 my $dir = shift @dirs;
2488
2489 next if $dir eq "/styles" || $dir eq "/editor";
2490
2491 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2492 or return;
2493
2494 for (@$files) {
2495 s/\.map$// or next;
2496 utf8::decode $_;
2497 push @maps, "$dir/$_";
2498 }
2499
2500 push @dirs, map "$dir/$_", @$dirs;
2501 }
2502
2503 \@maps
2504}
2505
2400=back 2506=back
2401 2507
2402=head3 cf::object 2508=head3 cf::object
2403 2509
2404=cut 2510=cut
… …
2469 2575
2470our $SAY_CHANNEL = { 2576our $SAY_CHANNEL = {
2471 id => "say", 2577 id => "say",
2472 title => "Map", 2578 title => "Map",
2473 reply => "say ", 2579 reply => "say ",
2474 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2580 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2475}; 2581};
2476 2582
2477our $CHAT_CHANNEL = { 2583our $CHAT_CHANNEL = {
2478 id => "chat", 2584 id => "chat",
2479 title => "Chat", 2585 title => "Chat",
… …
2534 2640
2535=item $player_object->enter_link 2641=item $player_object->enter_link
2536 2642
2537Freezes the player and moves him/her to a special map (C<{link}>). 2643Freezes the player and moves him/her to a special map (C<{link}>).
2538 2644
2539The player should be reasonably safe there for short amounts of time. You 2645The player should be reasonably safe there for short amounts of time (e.g.
2540I<MUST> call C<leave_link> as soon as possible, though. 2646for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2647though, as the player cannot control the character while it is on the link
2648map.
2541 2649
2542Will never block. 2650Will never block.
2543 2651
2544=item $player_object->leave_link ($map, $x, $y) 2652=item $player_object->leave_link ($map, $x, $y)
2545 2653
… …
2565sub cf::object::player::enter_link { 2673sub cf::object::player::enter_link {
2566 my ($self) = @_; 2674 my ($self) = @_;
2567 2675
2568 $self->deactivate_recursive; 2676 $self->deactivate_recursive;
2569 2677
2678 ++$self->{_link_recursion};
2679
2570 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2680 return if UNIVERSAL::isa $self->map, "ext::map_link";
2571 2681
2572 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2682 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2573 if $self->map && $self->map->{path} ne "{link}"; 2683 if $self->map && $self->map->{path} ne "{link}";
2574 2684
2575 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2685 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2576} 2686}
2577 2687
2578sub cf::object::player::leave_link { 2688sub cf::object::player::leave_link {
2579 my ($self, $map, $x, $y) = @_; 2689 my ($self, $map, $x, $y) = @_;
2580 2690
… …
2597 ($x, $y) = (-1, -1) 2707 ($x, $y) = (-1, -1)
2598 unless (defined $x) && (defined $y); 2708 unless (defined $x) && (defined $y);
2599 2709
2600 # use -1 or undef as default coordinates, not 0, 0 2710 # use -1 or undef as default coordinates, not 0, 0
2601 ($x, $y) = ($map->enter_x, $map->enter_y) 2711 ($x, $y) = ($map->enter_x, $map->enter_y)
2602 if $x <=0 && $y <= 0; 2712 if $x <= 0 && $y <= 0;
2603 2713
2604 $map->load; 2714 $map->load;
2605 $map->load_neighbours; 2715 $map->load_neighbours;
2606 2716
2607 return unless $self->contr->active; 2717 return unless $self->contr->active;
2608 $self->activate_recursive;
2609 2718
2610 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2719 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2611 $self->enter_map ($map, $x, $y); 2720 if ($self->enter_map ($map, $x, $y)) {
2612} 2721 # entering was successful
2722 delete $self->{_link_recursion};
2723 # only activate afterwards, to support waiting in hooks
2724 $self->activate_recursive;
2725 }
2613 2726
2727}
2728
2614=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2729=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2615 2730
2616Moves the player to the given map-path and coordinates by first freezing 2731Moves the player to the given map-path and coordinates by first freezing
2617her, loading and preparing them map, calling the provided $check callback 2732her, loading and preparing them map, calling the provided $check callback
2618that has to return the map if sucecssful, and then unfreezes the player on 2733that has to return the map if sucecssful, and then unfreezes the player on
2619the new (success) or old (failed) map position. In either case, $done will 2734the new (success) or old (failed) map position. In either case, $done will
… …
2626 2741
2627our $GOTOGEN; 2742our $GOTOGEN;
2628 2743
2629sub cf::object::player::goto { 2744sub cf::object::player::goto {
2630 my ($self, $path, $x, $y, $check, $done) = @_; 2745 my ($self, $path, $x, $y, $check, $done) = @_;
2746
2747 if ($self->{_link_recursion} >= $MAX_LINKS) {
2748 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2749 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2750 ($path, $x, $y) = @$EMERGENCY_POSITION;
2751 }
2631 2752
2632 # do generation counting so two concurrent goto's will be executed in-order 2753 # do generation counting so two concurrent goto's will be executed in-order
2633 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2754 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2634 2755
2635 $self->enter_link; 2756 $self->enter_link;
… …
2659 my $map = eval { 2780 my $map = eval {
2660 my $map = defined $path ? cf::map::find $path : undef; 2781 my $map = defined $path ? cf::map::find $path : undef;
2661 2782
2662 if ($map) { 2783 if ($map) {
2663 $map = $map->customise_for ($self); 2784 $map = $map->customise_for ($self);
2664 $map = $check->($map) if $check && $map; 2785 $map = $check->($map, $x, $y, $self) if $check && $map;
2665 } else { 2786 } else {
2666 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2787 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2667 } 2788 }
2668 2789
2669 $map 2790 $map
… …
2677 if ($gen == $self->{_goto_generation}) { 2798 if ($gen == $self->{_goto_generation}) {
2678 delete $self->{_goto_generation}; 2799 delete $self->{_goto_generation};
2679 $self->leave_link ($map, $x, $y); 2800 $self->leave_link ($map, $x, $y);
2680 } 2801 }
2681 2802
2682 $done->() if $done; 2803 $done->($self) if $done;
2683 })->prio (1); 2804 })->prio (1);
2684} 2805}
2685 2806
2686=item $player_object->enter_exit ($exit_object) 2807=item $player_object->enter_exit ($exit_object)
2687 2808
… …
2775 $self->contr->savebed ($map, $x, $y) 2896 $self->contr->savebed ($map, $x, $y)
2776 if $exit->flag (cf::FLAG_DAMNED); 2897 if $exit->flag (cf::FLAG_DAMNED);
2777 2898
2778 1 2899 1
2779 }) { 2900 }) {
2780 $self->message ("Something went wrong deep within the crossfire server. " 2901 $self->message ("Something went wrong deep within the deliantra server. "
2781 . "I'll try to bring you back to the map you were before. " 2902 . "I'll try to bring you back to the map you were before. "
2782 . "Please report this to the dungeon master!", 2903 . "Please report this to the dungeon master!",
2783 cf::NDI_UNIQUE | cf::NDI_RED); 2904 cf::NDI_UNIQUE | cf::NDI_RED);
2784 2905
2785 warn "ERROR in enter_exit: $@"; 2906 error "ERROR in enter_exit: $@";
2786 $self->leave_link; 2907 $self->leave_link;
2787 } 2908 }
2788 })->prio (1); 2909 })->prio (1);
2789} 2910}
2790 2911
… …
2802sub cf::client::send_drawinfo { 2923sub cf::client::send_drawinfo {
2803 my ($self, $text, $flags) = @_; 2924 my ($self, $text, $flags) = @_;
2804 2925
2805 utf8::encode $text; 2926 utf8::encode $text;
2806 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2927 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2928}
2929
2930=item $client->send_big_packet ($pkt)
2931
2932Like C<send_packet>, but tries to compress large packets, and fragments
2933them as required.
2934
2935=cut
2936
2937our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2938
2939sub cf::client::send_big_packet {
2940 my ($self, $pkt) = @_;
2941
2942 # try lzf for large packets
2943 $pkt = "lzf " . Compress::LZF::compress $pkt
2944 if 1024 <= length $pkt and $self->{can_lzf};
2945
2946 # split very large packets
2947 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2948 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2949 $pkt = "frag";
2950 }
2951
2952 $self->send_packet ($pkt);
2807} 2953}
2808 2954
2809=item $client->send_msg ($channel, $msg, $color, [extra...]) 2955=item $client->send_msg ($channel, $msg, $color, [extra...])
2810 2956
2811Send a drawinfo or msg packet to the client, formatting the msg for the 2957Send a drawinfo or msg packet to the client, formatting the msg for the
… …
2815 2961
2816=cut 2962=cut
2817 2963
2818# non-persistent channels (usually the info channel) 2964# non-persistent channels (usually the info channel)
2819our %CHANNEL = ( 2965our %CHANNEL = (
2966 "c/motd" => {
2967 id => "infobox",
2968 title => "MOTD",
2969 reply => undef,
2970 tooltip => "The message of the day",
2971 },
2820 "c/identify" => { 2972 "c/identify" => {
2821 id => "infobox", 2973 id => "infobox",
2822 title => "Identify", 2974 title => "Identify",
2823 reply => undef, 2975 reply => undef,
2824 tooltip => "Items recently identified", 2976 tooltip => "Items recently identified",
… …
2826 "c/examine" => { 2978 "c/examine" => {
2827 id => "infobox", 2979 id => "infobox",
2828 title => "Examine", 2980 title => "Examine",
2829 reply => undef, 2981 reply => undef,
2830 tooltip => "Signs and other items you examined", 2982 tooltip => "Signs and other items you examined",
2983 },
2984 "c/shopinfo" => {
2985 id => "infobox",
2986 title => "Shop Info",
2987 reply => undef,
2988 tooltip => "What your bargaining skill tells you about the shop",
2831 }, 2989 },
2832 "c/book" => { 2990 "c/book" => {
2833 id => "infobox", 2991 id => "infobox",
2834 title => "Book", 2992 title => "Book",
2835 reply => undef, 2993 reply => undef,
… …
2851 id => "infobox", 3009 id => "infobox",
2852 title => "Body Parts", 3010 title => "Body Parts",
2853 reply => undef, 3011 reply => undef,
2854 tooltip => "Shows which body parts you posess and are available", 3012 tooltip => "Shows which body parts you posess and are available",
2855 }, 3013 },
3014 "c/statistics" => {
3015 id => "infobox",
3016 title => "Statistics",
3017 reply => undef,
3018 tooltip => "Shows your primary statistics",
3019 },
3020 "c/skills" => {
3021 id => "infobox",
3022 title => "Skills",
3023 reply => undef,
3024 tooltip => "Shows your experience per skill and item power",
3025 },
3026 "c/shopitems" => {
3027 id => "infobox",
3028 title => "Shop Items",
3029 reply => undef,
3030 tooltip => "Shows the items currently for sale in this shop",
3031 },
3032 "c/resistances" => {
3033 id => "infobox",
3034 title => "Resistances",
3035 reply => undef,
3036 tooltip => "Shows your resistances",
3037 },
3038 "c/pets" => {
3039 id => "infobox",
3040 title => "Pets",
3041 reply => undef,
3042 tooltip => "Shows information abotu your pets/a specific pet",
3043 },
3044 "c/perceiveself" => {
3045 id => "infobox",
3046 title => "Perceive Self",
3047 reply => undef,
3048 tooltip => "You gained detailed knowledge about yourself",
3049 },
2856 "c/uptime" => { 3050 "c/uptime" => {
2857 id => "infobox", 3051 id => "infobox",
2858 title => "Uptime", 3052 title => "Uptime",
2859 reply => undef, 3053 reply => undef,
2860 tooltip => "How long the server has been running since last restart", 3054 tooltip => "How long the server has been running since last restart",
… …
2869 id => "party", 3063 id => "party",
2870 title => "Party", 3064 title => "Party",
2871 reply => "gsay ", 3065 reply => "gsay ",
2872 tooltip => "Messages and chat related to your party", 3066 tooltip => "Messages and chat related to your party",
2873 }, 3067 },
3068 "c/death" => {
3069 id => "death",
3070 title => "Death",
3071 reply => undef,
3072 tooltip => "Reason for and more info about your most recent death",
3073 },
3074 "c/say" => $SAY_CHANNEL,
3075 "c/chat" => $CHAT_CHANNEL,
2874); 3076);
2875 3077
2876sub cf::client::send_msg { 3078sub cf::client::send_msg {
2877 my ($self, $channel, $msg, $color, @extra) = @_; 3079 my ($self, $channel, $msg, $color, @extra) = @_;
2878 3080
2879 $msg = $self->pl->expand_cfpod ($msg); 3081 $msg = $self->pl->expand_cfpod ($msg)
3082 unless $color & cf::NDI_VERBATIM;
2880 3083
2881 $color &= cf::NDI_CLIENT_MASK; # just in case... 3084 $color &= cf::NDI_CLIENT_MASK; # just in case...
2882 3085
2883 # check predefined channels, for the benefit of C 3086 # check predefined channels, for the benefit of C
2884 if ($CHANNEL{$channel}) { 3087 if ($CHANNEL{$channel}) {
2885 $channel = $CHANNEL{$channel}; 3088 $channel = $CHANNEL{$channel};
2886 3089
2887 $self->ext_msg (channel_info => $channel) 3090 $self->ext_msg (channel_info => $channel);
2888 if $self->can_msg;
2889
2890 $channel = $channel->{id}; 3091 $channel = $channel->{id};
2891 3092
2892 } elsif (ref $channel) { 3093 } elsif (ref $channel) {
2893 # send meta info to client, if not yet sent 3094 # send meta info to client, if not yet sent
2894 unless (exists $self->{channel}{$channel->{id}}) { 3095 unless (exists $self->{channel}{$channel->{id}}) {
2895 $self->{channel}{$channel->{id}} = $channel; 3096 $self->{channel}{$channel->{id}} = $channel;
2896 $self->ext_msg (channel_info => $channel) 3097 $self->ext_msg (channel_info => $channel);
2897 if $self->can_msg;
2898 } 3098 }
2899 3099
2900 $channel = $channel->{id}; 3100 $channel = $channel->{id};
2901 } 3101 }
2902 3102
2903 return unless @extra || length $msg; 3103 return unless @extra || length $msg;
2904 3104
2905 if ($self->can_msg) {
2906 # default colour, mask it out 3105 # default colour, mask it out
2907 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3106 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2908 if $color & cf::NDI_DEF; 3107 if $color & cf::NDI_DEF;
2909 3108
2910 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3109 my $pkt = "msg "
3110 . $self->{json_coder}->encode (
2911 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3111 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2912 } else { 3112 );
2913 if ($color >= 0) {
2914 # replace some tags by gcfclient-compatible ones
2915 for ($msg) {
2916 1 while
2917 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2918 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2919 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2920 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2921 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2922 }
2923 3113
2924 $color &= cf::NDI_COLOR_MASK; 3114 $self->send_big_packet ($pkt);
2925
2926 utf8::encode $msg;
2927
2928 if (0 && $msg =~ /\[/) {
2929 # COMMAND/INFO
2930 $self->send_packet ("drawextinfo $color 10 8 $msg")
2931 } else {
2932 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2933 $self->send_packet ("drawinfo $color $msg")
2934 }
2935 }
2936 }
2937} 3115}
2938 3116
2939=item $client->ext_msg ($type, @msg) 3117=item $client->ext_msg ($type, @msg)
2940 3118
2941Sends an ext event to the client. 3119Sends an ext event to the client.
… …
2944 3122
2945sub cf::client::ext_msg($$@) { 3123sub cf::client::ext_msg($$@) {
2946 my ($self, $type, @msg) = @_; 3124 my ($self, $type, @msg) = @_;
2947 3125
2948 if ($self->extcmd == 2) { 3126 if ($self->extcmd == 2) {
2949 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3127 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2950 } elsif ($self->extcmd == 1) { # TODO: remove 3128 } elsif ($self->extcmd == 1) { # TODO: remove
2951 push @msg, msgtype => "event_$type"; 3129 push @msg, msgtype => "event_$type";
2952 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3130 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2953 } 3131 }
2954} 3132}
2955 3133
2956=item $client->ext_reply ($msgid, @msg) 3134=item $client->ext_reply ($msgid, @msg)
2957 3135
… …
2961 3139
2962sub cf::client::ext_reply($$@) { 3140sub cf::client::ext_reply($$@) {
2963 my ($self, $id, @msg) = @_; 3141 my ($self, $id, @msg) = @_;
2964 3142
2965 if ($self->extcmd == 2) { 3143 if ($self->extcmd == 2) {
2966 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3144 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2967 } elsif ($self->extcmd == 1) { 3145 } elsif ($self->extcmd == 1) {
2968 #TODO: version 1, remove 3146 #TODO: version 1, remove
2969 unshift @msg, msgtype => "reply", msgid => $id; 3147 unshift @msg, msgtype => "reply", msgid => $id;
2970 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3148 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2971 } 3149 }
2972} 3150}
2973 3151
2974=item $success = $client->query ($flags, "text", \&cb) 3152=item $success = $client->query ($flags, "text", \&cb)
2975 3153
… …
3046 3224
3047 $ns->ext_reply ($reply, @reply) 3225 $ns->ext_reply ($reply, @reply)
3048 if $reply; 3226 if $reply;
3049 3227
3050 } else { 3228 } else {
3051 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3229 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3052 } 3230 }
3053 3231
3054 cf::override; 3232 cf::override;
3055 }, 3233 },
3056); 3234);
… …
3076 3254
3077 $coro 3255 $coro
3078} 3256}
3079 3257
3080cf::client->attach ( 3258cf::client->attach (
3081 on_destroy => sub { 3259 on_client_destroy => sub {
3082 my ($ns) = @_; 3260 my ($ns) = @_;
3083 3261
3084 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3262 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3085 }, 3263 },
3086); 3264);
… …
3102our $safe_hole = new Safe::Hole; 3280our $safe_hole = new Safe::Hole;
3103 3281
3104$SIG{FPE} = 'IGNORE'; 3282$SIG{FPE} = 'IGNORE';
3105 3283
3106$safe->permit_only (Opcode::opset qw( 3284$safe->permit_only (Opcode::opset qw(
3107 :base_core :base_mem :base_orig :base_math 3285 :base_core :base_mem :base_orig :base_math :base_loop
3108 grepstart grepwhile mapstart mapwhile 3286 grepstart grepwhile mapstart mapwhile
3109 sort time 3287 sort time
3110)); 3288));
3111 3289
3112# here we export the classes and methods available to script code 3290# here we export the classes and methods available to script code
… …
3116The following functions and methods are available within a safe environment: 3294The following functions and methods are available within a safe environment:
3117 3295
3118 cf::object 3296 cf::object
3119 contr pay_amount pay_player map x y force_find force_add destroy 3297 contr pay_amount pay_player map x y force_find force_add destroy
3120 insert remove name archname title slaying race decrease split 3298 insert remove name archname title slaying race decrease split
3299 value
3121 3300
3122 cf::object::player 3301 cf::object::player
3123 player 3302 player
3124 3303
3125 cf::player 3304 cf::player
… …
3131=cut 3310=cut
3132 3311
3133for ( 3312for (
3134 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3313 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3135 insert remove inv nrof name archname title slaying race 3314 insert remove inv nrof name archname title slaying race
3136 decrease split destroy change_exp)], 3315 decrease split destroy change_exp value msg lore send_msg)],
3137 ["cf::object::player" => qw(player)], 3316 ["cf::object::player" => qw(player)],
3138 ["cf::player" => qw(peaceful)], 3317 ["cf::player" => qw(peaceful send_msg)],
3139 ["cf::map" => qw(trigger)], 3318 ["cf::map" => qw(trigger)],
3140) { 3319) {
3141 no strict 'refs';
3142 my ($pkg, @funs) = @$_; 3320 my ($pkg, @funs) = @$_;
3143 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3321 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3144 for @funs; 3322 for @funs;
3145} 3323}
3146 3324
… …
3161 3339
3162 my $qcode = $code; 3340 my $qcode = $code;
3163 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3341 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3164 $qcode =~ s/\n/\\n/g; 3342 $qcode =~ s/\n/\\n/g;
3165 3343
3344 %vars = (_dummy => 0) unless %vars;
3345
3346 my @res;
3166 local $_; 3347 local $_;
3167 local @safe::cf::_safe_eval_args = values %vars;
3168 3348
3169 my $eval = 3349 my $eval =
3170 "do {\n" 3350 "do {\n"
3171 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3351 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3172 . "#line 0 \"{$qcode}\"\n" 3352 . "#line 0 \"{$qcode}\"\n"
3173 . $code 3353 . $code
3174 . "\n}" 3354 . "\n}"
3175 ; 3355 ;
3176 3356
3357 if ($CFG{safe_eval}) {
3177 sub_generation_inc; 3358 sub_generation_inc;
3359 local @safe::cf::_safe_eval_args = values %vars;
3178 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3360 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3179 sub_generation_inc; 3361 sub_generation_inc;
3362 } else {
3363 local @cf::_safe_eval_args = values %vars;
3364 @res = wantarray ? eval eval : scalar eval $eval;
3365 }
3180 3366
3181 if ($@) { 3367 if ($@) {
3182 warn "$@"; 3368 warn "$@",
3183 warn "while executing safe code '$code'\n"; 3369 "while executing safe code '$code'\n",
3184 warn "with arguments " . (join " ", %vars) . "\n"; 3370 "with arguments " . (join " ", %vars) . "\n";
3185 } 3371 }
3186 3372
3187 wantarray ? @res : $res[0] 3373 wantarray ? @res : $res[0]
3188} 3374}
3189 3375
… …
3203=cut 3389=cut
3204 3390
3205sub register_script_function { 3391sub register_script_function {
3206 my ($fun, $cb) = @_; 3392 my ($fun, $cb) = @_;
3207 3393
3208 no strict 'refs'; 3394 $fun = "safe::$fun" if $CFG{safe_eval};
3209 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3395 *$fun = $safe_hole->wrap ($cb);
3210} 3396}
3211 3397
3212=back 3398=back
3213 3399
3214=cut 3400=cut
… …
3223 # for this (global event?) 3409 # for this (global event?)
3224 %ext::player_env::MUSIC_FACE_CACHE = (); 3410 %ext::player_env::MUSIC_FACE_CACHE = ();
3225 3411
3226 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3412 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3227 3413
3228 warn "loading facedata from $path\n"; 3414 trace "loading facedata from $path\n";
3229 3415
3230 my $facedata;
3231 0 < aio_load $path, $facedata 3416 0 < aio_load $path, my $facedata
3232 or die "$path: $!"; 3417 or die "$path: $!";
3233 3418
3234 $facedata = Coro::Storable::thaw $facedata; 3419 $facedata = Coro::Storable::thaw $facedata;
3235 3420
3236 $facedata->{version} == 2 3421 $facedata->{version} == 2
3237 or cf::cleanup "$path: version mismatch, cannot proceed."; 3422 or cf::cleanup "$path: version mismatch, cannot proceed.";
3238 3423
3239 # patch in the exptable 3424 # patch in the exptable
3425 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3240 $facedata->{resource}{"res/exp_table"} = { 3426 $facedata->{resource}{"res/exp_table"} = {
3241 type => FT_RSRC, 3427 type => FT_RSRC,
3242 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3428 data => $exp_table,
3429 hash => (Digest::MD5::md5 $exp_table),
3243 }; 3430 };
3244 cf::cede_to_tick; 3431 cf::cede_to_tick;
3245 3432
3246 { 3433 {
3247 my $faces = $facedata->{faceinfo}; 3434 my $faces = $facedata->{faceinfo};
… …
3249 while (my ($face, $info) = each %$faces) { 3436 while (my ($face, $info) = each %$faces) {
3250 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3437 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3251 3438
3252 cf::face::set_visibility $idx, $info->{visibility}; 3439 cf::face::set_visibility $idx, $info->{visibility};
3253 cf::face::set_magicmap $idx, $info->{magicmap}; 3440 cf::face::set_magicmap $idx, $info->{magicmap};
3254 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3441 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3255 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3442 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3256 3443
3257 cf::cede_to_tick; 3444 cf::cede_to_tick;
3258 } 3445 }
3259 3446
3260 while (my ($face, $info) = each %$faces) { 3447 while (my ($face, $info) = each %$faces) {
… …
3265 3452
3266 if (my $smooth = cf::face::find $info->{smooth}) { 3453 if (my $smooth = cf::face::find $info->{smooth}) {
3267 cf::face::set_smooth $idx, $smooth; 3454 cf::face::set_smooth $idx, $smooth;
3268 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3455 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3269 } else { 3456 } else {
3270 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3457 error "smooth face '$info->{smooth}' not found for face '$face'";
3271 } 3458 }
3272 3459
3273 cf::cede_to_tick; 3460 cf::cede_to_tick;
3274 } 3461 }
3275 } 3462 }
… …
3284 3471
3285 cf::anim::invalidate_all; # d'oh 3472 cf::anim::invalidate_all; # d'oh
3286 } 3473 }
3287 3474
3288 { 3475 {
3289 # TODO: for gcfclient pleasure, we should give resources
3290 # that gcfclient doesn't grok a >10000 face index.
3291 my $res = $facedata->{resource}; 3476 my $res = $facedata->{resource};
3292 3477
3293 while (my ($name, $info) = each %$res) { 3478 while (my ($name, $info) = each %$res) {
3294 if (defined $info->{type}) { 3479 if (defined $info->{type}) {
3295 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3480 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3296 my $data;
3297 3481
3298 if ($info->{type} & 1) { 3482 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3299 # prepend meta info
3300
3301 my $meta = $enc->encode ({
3302 name => $name,
3303 %{ $info->{meta} || {} },
3304 });
3305
3306 $data = pack "(w/a*)*", $meta, $info->{data};
3307 } else {
3308 $data = $info->{data};
3309 }
3310
3311 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3312 cf::face::set_type $idx, $info->{type}; 3483 cf::face::set_type $idx, $info->{type};
3313 } else { 3484 } else {
3314 $RESOURCE{$name} = $info; 3485 $RESOURCE{$name} = $info; # unused
3315 } 3486 }
3316 3487
3317 cf::cede_to_tick; 3488 cf::cede_to_tick;
3318 } 3489 }
3319 } 3490 }
3320 3491
3321 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3492 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3322 3493
3323 1 3494 1
3324} 3495}
3325
3326cf::global->attach (on_resource_update => sub {
3327 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3328 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3329
3330 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3331 my $sound = $soundconf->{compat}[$_]
3332 or next;
3333
3334 my $face = cf::face::find "sound/$sound->[1]";
3335 cf::sound::set $sound->[0] => $face;
3336 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3337 }
3338
3339 while (my ($k, $v) = each %{$soundconf->{event}}) {
3340 my $face = cf::face::find "sound/$v";
3341 cf::sound::set $k => $face;
3342 }
3343 }
3344});
3345 3496
3346register_exticmd fx_want => sub { 3497register_exticmd fx_want => sub {
3347 my ($ns, $want) = @_; 3498 my ($ns, $want) = @_;
3348 3499
3349 while (my ($k, $v) = each %$want) { 3500 while (my ($k, $v) = each %$want) {
… …
3388sub reload_treasures { 3539sub reload_treasures {
3389 load_resource_file "$DATADIR/treasures" 3540 load_resource_file "$DATADIR/treasures"
3390 or die "unable to load treasurelists\n"; 3541 or die "unable to load treasurelists\n";
3391} 3542}
3392 3543
3544sub reload_sound {
3545 trace "loading sound config from $DATADIR/sound\n";
3546
3547 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3548 or die "$DATADIR/sound $!";
3549
3550 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3551
3552 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3553 my $sound = $soundconf->{compat}[$_]
3554 or next;
3555
3556 my $face = cf::face::find "sound/$sound->[1]";
3557 cf::sound::set $sound->[0] => $face;
3558 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3559 }
3560
3561 while (my ($k, $v) = each %{$soundconf->{event}}) {
3562 my $face = cf::face::find "sound/$v";
3563 cf::sound::set $k => $face;
3564 }
3565}
3566
3393sub reload_resources { 3567sub reload_resources {
3394 warn "reloading resource files...\n"; 3568 trace "reloading resource files...\n";
3395 3569
3570 reload_exp_table;
3571 reload_materials;
3396 reload_facedata; 3572 reload_facedata;
3573 reload_sound;
3397 reload_archetypes; 3574 reload_archetypes;
3398 reload_regions; 3575 reload_regions;
3399 reload_treasures; 3576 reload_treasures;
3400 3577
3401 warn "finished reloading resource files\n"; 3578 trace "finished reloading resource files\n";
3402}
3403
3404sub init {
3405 my $guard = freeze_mainloop;
3406
3407 evthread_start IO::AIO::poll_fileno;
3408
3409 reload_resources;
3410} 3579}
3411 3580
3412sub reload_config { 3581sub reload_config {
3413 open my $fh, "<:utf8", "$CONFDIR/config" 3582 trace "reloading config file...\n";
3414 or return;
3415 3583
3416 local $/; 3584 0 < aio_load "$CONFDIR/config", my $config
3417 *CFG = YAML::Load <$fh>; 3585 or die "$CONFDIR/config: $!";
3418 3586
3587 utf8::decode $config;
3588 *CFG = yaml_load $config;
3589
3419 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3590 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3420 3591
3421 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3592 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3422 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3593 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3423 3594
3424 if (exists $CFG{mlockall}) { 3595 if (exists $CFG{mlockall}) {
… …
3428 }; 3599 };
3429 warn $@ if $@; 3600 warn $@ if $@;
3430 } 3601 }
3431} 3602}
3432 3603
3604sub pidfile() {
3605 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3606 or die "$PIDFILE: $!";
3607 flock $fh, &Fcntl::LOCK_EX
3608 or die "$PIDFILE: flock: $!";
3609 $fh
3610}
3611
3612# make sure only one server instance is running at any one time
3613sub atomic {
3614 my $fh = pidfile;
3615
3616 my $pid = <$fh>;
3617 kill 9, $pid if $pid > 0;
3618
3619 seek $fh, 0, 0;
3620 print $fh $$;
3621}
3622
3623sub main_loop {
3624 trace "EV::loop starting\n";
3625 if (1) {
3626 EV::loop;
3627 }
3628 trace "EV::loop returned\n";
3629 goto &main_loop unless $REALLY_UNLOOP;
3630}
3631
3433sub main { 3632sub main {
3633 cf::init_globals; # initialise logging
3634
3635 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3636 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3637 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3638 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3639
3640 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3641
3434 # we must not ever block the main coroutine 3642 # we must not ever block the main coroutine
3435 local $Coro::idle = sub { 3643 local $Coro::idle = sub {
3436 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3644 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3437 (async { 3645 (async {
3438 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3646 $Coro::current->{desc} = "IDLE BUG HANDLER";
3439 EV::loop EV::LOOP_ONESHOT; 3647 EV::loop EV::LOOP_ONESHOT;
3440 })->prio (Coro::PRIO_MAX); 3648 })->prio (Coro::PRIO_MAX);
3441 }; 3649 };
3442 3650
3443 { 3651 evthread_start IO::AIO::poll_fileno;
3444 my $guard = freeze_mainloop; 3652
3653 cf::sync_job {
3654 cf::incloader::init ();
3655
3656 cf::init_anim;
3657 cf::init_attackmess;
3658 cf::init_dynamic;
3659
3660 cf::load_settings;
3661
3662 reload_resources;
3445 reload_config; 3663 reload_config;
3446 db_init; 3664 db_init;
3665
3666 cf::init_uuid;
3667 cf::init_signals;
3668 cf::init_skills;
3669
3670 cf::init_beforeplay;
3671
3672 atomic;
3673
3447 load_extensions; 3674 load_extensions;
3448 3675
3449 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3676 utime time, time, $RUNTIMEFILE;
3677
3678 # no (long-running) fork's whatsoever before this point(!)
3679 use POSIX ();
3680 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3681
3682 cf::_post_init 0;
3450 } 3683 };
3451 3684
3452 EV::loop; 3685 cf::object::thawer::errors_are_fatal 0;
3686 info "parse errors in files are no longer fatal from this point on.\n";
3687
3688 my $free_main; $free_main = EV::idle sub {
3689 undef $free_main;
3690 undef &main; # free gobs of memory :)
3691 };
3692
3693 goto &main_loop;
3453} 3694}
3454 3695
3455############################################################################# 3696#############################################################################
3456# initialisation and cleanup 3697# initialisation and cleanup
3457 3698
3458# install some emergency cleanup handlers 3699# install some emergency cleanup handlers
3459BEGIN { 3700BEGIN {
3460 our %SIGWATCHER = (); 3701 our %SIGWATCHER = ();
3461 for my $signal (qw(INT HUP TERM)) { 3702 for my $signal (qw(INT HUP TERM)) {
3462 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3703 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3463 cf::cleanup "SIG$signal"; 3704 cf::cleanup "SIG$signal";
3464 }; 3705 };
3465 } 3706 }
3466} 3707}
3467 3708
3468sub write_runtime_sync { 3709sub write_runtime_sync {
3469 my $runtime = "$LOCALDIR/runtime"; 3710 my $t0 = AE::time;
3470 3711
3471 # first touch the runtime file to show we are still running: 3712 # first touch the runtime file to show we are still running:
3472 # the fsync below can take a very very long time. 3713 # the fsync below can take a very very long time.
3473 3714
3474 IO::AIO::aio_utime $runtime, undef, undef; 3715 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3475 3716
3476 my $guard = cf::lock_acquire "write_runtime"; 3717 my $guard = cf::lock_acquire "write_runtime";
3477 3718
3478 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3719 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3479 or return; 3720 or return;
3480 3721
3481 my $value = $cf::RUNTIME + 90 + 10; 3722 my $value = $cf::RUNTIME + 90 + 10;
3482 # 10 is the runtime save interval, for a monotonic clock 3723 # 10 is the runtime save interval, for a monotonic clock
3483 # 60 allows for the watchdog to kill the server. 3724 # 60 allows for the watchdog to kill the server.
… …
3493 aio_utime $fh, undef, undef; 3734 aio_utime $fh, undef, undef;
3494 3735
3495 close $fh 3736 close $fh
3496 or return; 3737 or return;
3497 3738
3498 aio_rename "$runtime~", $runtime 3739 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3499 and return; 3740 and return;
3500 3741
3501 warn "runtime file written.\n"; 3742 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3502 3743
3503 1 3744 1
3504} 3745}
3505 3746
3506our $uuid_lock; 3747our $uuid_lock;
… …
3515 my $uuid = "$LOCALDIR/uuid"; 3756 my $uuid = "$LOCALDIR/uuid";
3516 3757
3517 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3758 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3518 or return; 3759 or return;
3519 3760
3520 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3761 my $value = uuid_seq uuid_cur;
3762
3763 unless ($value) {
3764 info "cowardly refusing to write zero uuid value!\n";
3765 return;
3766 }
3767
3768 my $value = uuid_str $value + $uuid_skip;
3521 $uuid_skip = 0; 3769 $uuid_skip = 0;
3522 3770
3523 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3771 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3524 and return; 3772 and return;
3525 3773
… …
3531 or return; 3779 or return;
3532 3780
3533 aio_rename "$uuid~", $uuid 3781 aio_rename "$uuid~", $uuid
3534 and return; 3782 and return;
3535 3783
3536 warn "uuid file written ($value).\n"; 3784 trace "uuid file written ($value).\n";
3537 3785
3538 1 3786 1
3539 3787
3540} 3788}
3541 3789
… …
3547} 3795}
3548 3796
3549sub emergency_save() { 3797sub emergency_save() {
3550 my $freeze_guard = cf::freeze_mainloop; 3798 my $freeze_guard = cf::freeze_mainloop;
3551 3799
3552 warn "enter emergency perl save\n"; 3800 info "emergency_perl_save: enter\n";
3801
3802 # this is a trade-off: we want to be very quick here, so
3803 # save all maps without fsync, and later call a global sync
3804 # (which in turn might be very very slow)
3805 local $USE_FSYNC = 0;
3553 3806
3554 cf::sync_job { 3807 cf::sync_job {
3808 cf::write_runtime_sync; # external watchdog should not bark
3809
3555 # use a peculiar iteration method to avoid tripping on perl 3810 # use a peculiar iteration method to avoid tripping on perl
3556 # refcount bugs in for. also avoids problems with players 3811 # refcount bugs in for. also avoids problems with players
3557 # and maps saved/destroyed asynchronously. 3812 # and maps saved/destroyed asynchronously.
3558 warn "begin emergency player save\n"; 3813 info "emergency_perl_save: begin player save\n";
3559 for my $login (keys %cf::PLAYER) { 3814 for my $login (keys %cf::PLAYER) {
3560 my $pl = $cf::PLAYER{$login} or next; 3815 my $pl = $cf::PLAYER{$login} or next;
3561 $pl->valid or next; 3816 $pl->valid or next;
3562 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3817 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3563 $pl->save; 3818 $pl->save;
3564 } 3819 }
3565 warn "end emergency player save\n"; 3820 info "emergency_perl_save: end player save\n";
3566 3821
3567 warn "begin emergency map save\n"; 3822 cf::write_runtime_sync; # external watchdog should not bark
3823
3824 info "emergency_perl_save: begin map save\n";
3568 for my $path (keys %cf::MAP) { 3825 for my $path (keys %cf::MAP) {
3569 my $map = $cf::MAP{$path} or next; 3826 my $map = $cf::MAP{$path} or next;
3570 $map->valid or next; 3827 $map->valid or next;
3571 $map->save; 3828 $map->save;
3572 } 3829 }
3573 warn "end emergency map save\n"; 3830 info "emergency_perl_save: end map save\n";
3574 3831
3575 warn "begin emergency database checkpoint\n"; 3832 cf::write_runtime_sync; # external watchdog should not bark
3833
3834 info "emergency_perl_save: begin database checkpoint\n";
3576 BDB::db_env_txn_checkpoint $DB_ENV; 3835 BDB::db_env_txn_checkpoint $DB_ENV;
3577 warn "end emergency database checkpoint\n"; 3836 info "emergency_perl_save: end database checkpoint\n";
3578 3837
3579 warn "begin write uuid\n"; 3838 info "emergency_perl_save: begin write uuid\n";
3580 write_uuid_sync 1; 3839 write_uuid_sync 1;
3581 warn "end write uuid\n"; 3840 info "emergency_perl_save: end write uuid\n";
3841
3842 cf::write_runtime_sync; # external watchdog should not bark
3843
3844 trace "emergency_perl_save: syncing database to disk";
3845 BDB::db_env_txn_checkpoint $DB_ENV;
3846
3847 info "emergency_perl_save: starting sync\n";
3848 IO::AIO::aio_sync sub {
3849 info "emergency_perl_save: finished sync\n";
3850 };
3851
3852 cf::write_runtime_sync; # external watchdog should not bark
3853
3854 trace "emergency_perl_save: flushing outstanding aio requests";
3855 while (IO::AIO::nreqs || BDB::nreqs) {
3856 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3857 }
3858
3859 cf::write_runtime_sync; # external watchdog should not bark
3582 }; 3860 };
3583 3861
3584 warn "leave emergency perl save\n"; 3862 info "emergency_perl_save: leave\n";
3585} 3863}
3586 3864
3587sub post_cleanup { 3865sub post_cleanup {
3588 my ($make_core) = @_; 3866 my ($make_core) = @_;
3589 3867
3868 IO::AIO::flush;
3869
3590 warn Carp::longmess "post_cleanup backtrace" 3870 error Carp::longmess "post_cleanup backtrace"
3591 if $make_core; 3871 if $make_core;
3872
3873 my $fh = pidfile;
3874 unlink $PIDFILE if <$fh> == $$;
3592} 3875}
3593 3876
3594# a safer delete_package, copied from Symbol 3877# a safer delete_package, copied from Symbol
3595sub clear_package($) { 3878sub clear_package($) {
3596 my $pkg = shift; 3879 my $pkg = shift;
… …
3612 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3895 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3613 for my $name (keys %$leaf_symtab) { 3896 for my $name (keys %$leaf_symtab) {
3614 _gv_clear *{"$pkg$name"}; 3897 _gv_clear *{"$pkg$name"};
3615# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3898# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3616 } 3899 }
3617 warn "cleared package #$pkg\n";#d#
3618} 3900}
3619
3620our $RELOAD; # how many times to reload
3621 3901
3622sub do_reload_perl() { 3902sub do_reload_perl() {
3623 # can/must only be called in main 3903 # can/must only be called in main
3624 if ($Coro::current != $Coro::main) { 3904 unless (in_main) {
3625 warn "can only reload from main coroutine"; 3905 error "can only reload from main coroutine";
3626 return; 3906 return;
3627 } 3907 }
3628 3908
3629 return if $RELOAD++; 3909 return if $RELOAD++;
3630 3910
3911 my $t1 = AE::time;
3912
3631 while ($RELOAD) { 3913 while ($RELOAD) {
3632 warn "reloading..."; 3914 cf::get_slot 0.1, -1, "reload_perl";
3915 info "perl_reload: reloading...";
3633 3916
3634 warn "entering sync_job"; 3917 trace "perl_reload: entering sync_job";
3635 3918
3636 cf::sync_job { 3919 cf::sync_job {
3637 cf::write_runtime_sync; # external watchdog should not bark
3638 cf::emergency_save; 3920 #cf::emergency_save;
3639 cf::write_runtime_sync; # external watchdog should not bark
3640 3921
3641 warn "syncing database to disk";
3642 BDB::db_env_txn_checkpoint $DB_ENV;
3643
3644 # if anything goes wrong in here, we should simply crash as we already saved
3645
3646 warn "flushing outstanding aio requests";
3647 while (IO::AIO::nreqs || BDB::nreqs) {
3648 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3649 }
3650
3651 warn "cancelling all extension coros"; 3922 trace "perl_reload: cancelling all extension coros";
3652 $_->cancel for values %EXT_CORO; 3923 $_->cancel for values %EXT_CORO;
3653 %EXT_CORO = (); 3924 %EXT_CORO = ();
3654 3925
3655 warn "removing commands"; 3926 trace "perl_reload: removing commands";
3656 %COMMAND = (); 3927 %COMMAND = ();
3657 3928
3658 warn "removing ext/exti commands"; 3929 trace "perl_reload: removing ext/exti commands";
3659 %EXTCMD = (); 3930 %EXTCMD = ();
3660 %EXTICMD = (); 3931 %EXTICMD = ();
3661 3932
3662 warn "unloading/nuking all extensions"; 3933 trace "perl_reload: unloading/nuking all extensions";
3663 for my $pkg (@EXTS) { 3934 for my $pkg (@EXTS) {
3664 warn "... unloading $pkg"; 3935 trace "... unloading $pkg";
3665 3936
3666 if (my $cb = $pkg->can ("unload")) { 3937 if (my $cb = $pkg->can ("unload")) {
3667 eval { 3938 eval {
3668 $cb->($pkg); 3939 $cb->($pkg);
3669 1 3940 1
3670 } or warn "$pkg unloaded, but with errors: $@"; 3941 } or error "$pkg unloaded, but with errors: $@";
3671 } 3942 }
3672 3943
3673 warn "... clearing $pkg"; 3944 trace "... clearing $pkg";
3674 clear_package $pkg; 3945 clear_package $pkg;
3675 } 3946 }
3676 3947
3677 warn "unloading all perl modules loaded from $LIBDIR"; 3948 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3678 while (my ($k, $v) = each %INC) { 3949 while (my ($k, $v) = each %INC) {
3679 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3950 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3680 3951
3681 warn "... unloading $k"; 3952 trace "... unloading $k";
3682 delete $INC{$k}; 3953 delete $INC{$k};
3683 3954
3684 $k =~ s/\.pm$//; 3955 $k =~ s/\.pm$//;
3685 $k =~ s/\//::/g; 3956 $k =~ s/\//::/g;
3686 3957
… …
3689 } 3960 }
3690 3961
3691 clear_package $k; 3962 clear_package $k;
3692 } 3963 }
3693 3964
3694 warn "getting rid of safe::, as good as possible"; 3965 trace "perl_reload: getting rid of safe::, as good as possible";
3695 clear_package "safe::$_" 3966 clear_package "safe::$_"
3696 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3967 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3697 3968
3698 warn "unloading cf.pm \"a bit\""; 3969 trace "perl_reload: unloading cf.pm \"a bit\"";
3699 delete $INC{"cf.pm"}; 3970 delete $INC{"cf.pm"};
3700 delete $INC{"cf/pod.pm"}; 3971 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3701 3972
3702 # don't, removes xs symbols, too, 3973 # don't, removes xs symbols, too,
3703 # and global variables created in xs 3974 # and global variables created in xs
3704 #clear_package __PACKAGE__; 3975 #clear_package __PACKAGE__;
3705 3976
3706 warn "unload completed, starting to reload now"; 3977 info "perl_reload: unload completed, starting to reload now";
3707 3978
3708 warn "reloading cf.pm"; 3979 trace "perl_reload: reloading cf.pm";
3709 require cf; 3980 require cf;
3710 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3981 cf::_connect_to_perl_1;
3711 3982
3712 warn "loading config and database again"; 3983 trace "perl_reload: loading config and database again";
3713 cf::reload_config; 3984 cf::reload_config;
3714 3985
3715 warn "loading extensions"; 3986 trace "perl_reload: loading extensions";
3716 cf::load_extensions; 3987 cf::load_extensions;
3717 3988
3989 if ($REATTACH_ON_RELOAD) {
3718 warn "reattaching attachments to objects/players"; 3990 trace "perl_reload: reattaching attachments to objects/players";
3719 _global_reattach; # objects, sockets 3991 _global_reattach; # objects, sockets
3720 warn "reattaching attachments to maps"; 3992 trace "perl_reload: reattaching attachments to maps";
3721 reattach $_ for values %MAP; 3993 reattach $_ for values %MAP;
3722 warn "reattaching attachments to players"; 3994 trace "perl_reload: reattaching attachments to players";
3723 reattach $_ for values %PLAYER; 3995 reattach $_ for values %PLAYER;
3996 }
3724 3997
3725 warn "leaving sync_job"; 3998 cf::_post_init 1;
3999
4000 trace "perl_reload: leaving sync_job";
3726 4001
3727 1 4002 1
3728 } or do { 4003 } or do {
3729 warn $@; 4004 error $@;
3730 cf::cleanup "error while reloading, exiting."; 4005 cf::cleanup "perl_reload: error, exiting.";
3731 }; 4006 };
3732 4007
3733 warn "reloaded";
3734 --$RELOAD; 4008 --$RELOAD;
3735 } 4009 }
4010
4011 $t1 = AE::time - $t1;
4012 info "perl_reload: completed in ${t1}s\n";
3736}; 4013};
3737 4014
3738our $RELOAD_WATCHER; # used only during reload 4015our $RELOAD_WATCHER; # used only during reload
3739 4016
3740sub reload_perl() { 4017sub reload_perl() {
3741 # doing reload synchronously and two reloads happen back-to-back, 4018 # doing reload synchronously and two reloads happen back-to-back,
3742 # coro crashes during coro_state_free->destroy here. 4019 # coro crashes during coro_state_free->destroy here.
3743 4020
4021 $RELOAD_WATCHER ||= cf::async {
4022 Coro::AIO::aio_wait cache_extensions;
4023
3744 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4024 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3745 do_reload_perl; 4025 do_reload_perl;
3746 undef $RELOAD_WATCHER; 4026 undef $RELOAD_WATCHER;
4027 };
3747 }; 4028 };
3748} 4029}
3749 4030
3750register_command "reload" => sub { 4031register_command "reload" => sub {
3751 my ($who, $arg) = @_; 4032 my ($who, $arg) = @_;
… …
3757 reload_perl; 4038 reload_perl;
3758 }; 4039 };
3759 } 4040 }
3760}; 4041};
3761 4042
3762unshift @INC, $LIBDIR; 4043#############################################################################
3763 4044
3764my $bug_warning = 0; 4045my $bug_warning = 0;
3765 4046
3766our @WAIT_FOR_TICK; 4047our @WAIT_FOR_TICK;
3767our @WAIT_FOR_TICK_BEGIN; 4048our @WAIT_FOR_TICK_BEGIN;
3768 4049
3769sub wait_for_tick { 4050sub wait_for_tick() {
3770 return if tick_inhibit || $Coro::current == $Coro::main; 4051 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3771 4052
3772 my $signal = new Coro::Signal; 4053 my $signal = new Coro::Signal;
3773 push @WAIT_FOR_TICK, $signal; 4054 push @WAIT_FOR_TICK, $signal;
3774 $signal->wait; 4055 $signal->wait;
3775} 4056}
3776 4057
3777sub wait_for_tick_begin { 4058sub wait_for_tick_begin() {
3778 return if tick_inhibit || $Coro::current == $Coro::main; 4059 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3779 4060
3780 my $signal = new Coro::Signal; 4061 my $signal = new Coro::Signal;
3781 push @WAIT_FOR_TICK_BEGIN, $signal; 4062 push @WAIT_FOR_TICK_BEGIN, $signal;
3782 $signal->wait; 4063 $signal->wait;
3783} 4064}
… …
3789 return; 4070 return;
3790 } 4071 }
3791 4072
3792 cf::server_tick; # one server iteration 4073 cf::server_tick; # one server iteration
3793 4074
4075 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4076
3794 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4077 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3795 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4078 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3796 Coro::async_pool { 4079 Coro::async_pool {
3797 $Coro::current->{desc} = "runtime saver"; 4080 $Coro::current->{desc} = "runtime saver";
3798 write_runtime_sync 4081 write_runtime_sync
3799 or warn "ERROR: unable to write runtime file: $!"; 4082 or error "ERROR: unable to write runtime file: $!";
3800 }; 4083 };
3801 } 4084 }
3802 4085
3803 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4086 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3804 $sig->send; 4087 $sig->send;
… …
3812 4095
3813 if (0) { 4096 if (0) {
3814 if ($NEXT_TICK) { 4097 if ($NEXT_TICK) {
3815 my $jitter = $TICK_START - $NEXT_TICK; 4098 my $jitter = $TICK_START - $NEXT_TICK;
3816 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4099 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3817 warn "jitter $JITTER\n";#d# 4100 debug "jitter $JITTER\n";#d#
3818 } 4101 }
3819 } 4102 }
3820} 4103}
3821 4104
3822{ 4105{
3823 # configure BDB 4106 # configure BDB
3824 4107
3825 BDB::min_parallel 8; 4108 BDB::min_parallel 16;
3826 BDB::max_poll_reqs $TICK * 0.1; 4109 BDB::max_poll_reqs $TICK * 0.1;
3827 $AnyEvent::BDB::WATCHER->priority (1); 4110 $AnyEvent::BDB::WATCHER->priority (1);
3828 4111
3829 unless ($DB_ENV) { 4112 unless ($DB_ENV) {
3830 $DB_ENV = BDB::db_env_create; 4113 $DB_ENV = BDB::db_env_create;
… …
3877 $msg =~ s/\n//; 4160 $msg =~ s/\n//;
3878 4161
3879 # limit the # of concurrent backtraces 4162 # limit the # of concurrent backtraces
3880 if ($_log_backtrace < 2) { 4163 if ($_log_backtrace < 2) {
3881 ++$_log_backtrace; 4164 ++$_log_backtrace;
4165 my $perl_bt = Carp::longmess $msg;
3882 async { 4166 async {
3883 $Coro::current->{desc} = "abt $msg"; 4167 $Coro::current->{desc} = "abt $msg";
3884 4168
3885 my @bt = fork_call { 4169 my @bt = fork_call {
3886 @addr = map { sprintf "%x", $_ } @addr; 4170 @addr = map { sprintf "%x", $_ } @addr;
… …
3897 } 4181 }
3898 4182
3899 @funcs 4183 @funcs
3900 }; 4184 };
3901 4185
3902 LOG llevInfo, "[ABT] $msg\n"; 4186 LOG llevInfo, "[ABT] $perl_bt\n";
4187 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3903 LOG llevInfo, "[ABT] $_\n" for @bt; 4188 LOG llevInfo, "[ABT] $_\n" for @bt;
3904 --$_log_backtrace; 4189 --$_log_backtrace;
3905 }; 4190 };
3906 } else { 4191 } else {
3907 LOG llevInfo, "[ABT] $msg\n"; 4192 LOG llevInfo, "[ABT] $msg\n";
3908 LOG llevInfo, "[ABT] [suppressed]\n"; 4193 LOG llevInfo, "[ABT] [suppressed]\n";
3909 } 4194 }
3910} 4195}
3911 4196
3912# load additional modules 4197# load additional modules
3913use cf::pod; 4198require "cf/$_.pm" for @EXTRA_MODULES;
4199cf::_connect_to_perl_2;
3914 4200
3915END { cf::emergency_save } 4201END { cf::emergency_save }
3916 4202
39171 42031
3918 4204

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines