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.434 by root, Thu May 29 03:27:37 2008 UTC vs.
Revision 1.556 by root, Sat Jul 3 01:49:18 2010 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
18# 19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use utf8; 25use common::sense;
25use strict;
26 26
27use Symbol; 27use Symbol;
28use List::Util; 28use List::Util;
29use Socket; 29use Socket;
30use EV; 30use EV;
31use Opcode; 31use Opcode;
32use Safe; 32use Safe;
33use Safe::Hole; 33use Safe::Hole;
34use Storable (); 34use Storable ();
35use Carp ();
35 36
37use Guard ();
36use Coro (); 38use Coro ();
37use Coro::State; 39use Coro::State;
38use Coro::Handle; 40use Coro::Handle;
41use Coro::EV;
39use Coro::AnyEvent; 42use Coro::AnyEvent;
40use Coro::Timer; 43use Coro::Timer;
41use Coro::Signal; 44use Coro::Signal;
42use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
43use Coro::AnyEvent; 47use Coro::AnyEvent;
44use Coro::AIO; 48use Coro::AIO;
45use Coro::BDB; 49use Coro::BDB 1.6;
46use Coro::Storable; 50use Coro::Storable;
47use Coro::Util (); 51use Coro::Util ();
48 52
49use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
50use BDB (); 54use BDB ();
51use Data::Dumper; 55use Data::Dumper;
52use Digest::MD5;
53use Fcntl; 56use Fcntl;
54use YAML (); 57use YAML::XS ();
55use IO::AIO (); 58use IO::AIO ();
56use Time::HiRes; 59use Time::HiRes;
57use Compress::LZF; 60use Compress::LZF;
58use Digest::MD5 (); 61use Digest::MD5 ();
59 62
60AnyEvent::detect; 63AnyEvent::detect;
61 64
62IO::AIO::max_poll_reqs 1;#d#
63
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';
245for my $pkg (qw( 303for my $pkg (qw(
246 cf::global cf::attachable 304 cf::global cf::attachable
247 cf::object cf::object::player 305 cf::object cf::object::player
248 cf::client cf::player 306 cf::client cf::player
249 cf::arch cf::living 307 cf::arch cf::living
308 cf::map cf::mapspace
250 cf::map cf::party cf::region 309 cf::party cf::region
251)) { 310)) {
252 no strict 'refs';
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 }
1088 1186
1089sub reattach { 1187sub reattach {
1090 # basically do the same as instantiate, without calling instantiate 1188 # basically do the same as instantiate, without calling instantiate
1091 my ($obj) = @_; 1189 my ($obj) = @_;
1092 1190
1191 # no longer needed after getting rid of delete_package?
1093 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1192 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1094 1193
1095 my $registry = $obj->registry; 1194 my $registry = $obj->registry;
1096 1195
1097 @$registry = (); 1196 @$registry = ();
1098 1197
1103 for (@$attach) { 1202 for (@$attach) {
1104 my ($klass, @attach) = @$_; 1203 my ($klass, @attach) = @$_;
1105 _attach $registry, $klass, @attach; 1204 _attach $registry, $klass, @attach;
1106 } 1205 }
1107 } else { 1206 } else {
1108 warn "object uses attachment '$name' that is not available, postponing.\n"; 1207 info "object uses attachment '$name' that is not available, postponing.\n";
1109 } 1208 }
1110 } 1209 }
1111} 1210}
1112 1211
1113cf::attachable->attach ( 1212cf::attachable->attach (
1140 my ($filename, $rdata, $objs) = @_; 1239 my ($filename, $rdata, $objs) = @_;
1141 1240
1142 sync_job { 1241 sync_job {
1143 if (length $$rdata) { 1242 if (length $$rdata) {
1144 utf8::decode (my $decname = $filename); 1243 utf8::decode (my $decname = $filename);
1145 warn sprintf "saving %s (%d,%d)\n", 1244 trace sprintf "saving %s (%d,%d)\n",
1146 $decname, length $$rdata, scalar @$objs; 1245 $decname, length $$rdata, scalar @$objs
1246 if $VERBOSE_IO;
1147 1247
1148 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1248 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1149 aio_chmod $fh, SAVE_MODE; 1249 aio_chmod $fh, SAVE_MODE;
1150 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1250 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1151 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 }
1152 aio_close $fh; 1255 aio_close $fh;
1153 1256
1154 if (@$objs) { 1257 if (@$objs) {
1155 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) {
1156 aio_chmod $fh, SAVE_MODE; 1259 aio_chmod $fh, SAVE_MODE;
1157 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1260 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1158 aio_write $fh, 0, (length $data), $data, 0; 1261 aio_write $fh, 0, (length $data), $data, 0;
1159 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 }
1160 aio_close $fh; 1266 aio_close $fh;
1161 aio_rename "$filename.pst~", "$filename.pst"; 1267 aio_rename "$filename.pst~", "$filename.pst";
1162 } 1268 }
1163 } else { 1269 } else {
1164 aio_unlink "$filename.pst"; 1270 aio_unlink "$filename.pst";
1165 } 1271 }
1166 1272
1167 aio_rename "$filename~", $filename; 1273 aio_rename "$filename~", $filename;
1274
1275 $filename =~ s%/[^/]+$%%;
1276 aio_pathsync $filename if $cf::USE_FSYNC;
1168 } else { 1277 } else {
1169 warn "FATAL: $filename~: $!\n"; 1278 error "unable to save objects: $filename~: $!\n";
1170 } 1279 }
1171 } else { 1280 } else {
1172 aio_unlink $filename; 1281 aio_unlink $filename;
1173 aio_unlink "$filename.pst"; 1282 aio_unlink "$filename.pst";
1174 } 1283 }
1198 my $st = eval { Coro::Storable::thaw $av }; 1307 my $st = eval { Coro::Storable::thaw $av };
1199 $av = $st->{objs}; 1308 $av = $st->{objs};
1200 } 1309 }
1201 1310
1202 utf8::decode (my $decname = $filename); 1311 utf8::decode (my $decname = $filename);
1203 warn sprintf "loading %s (%d,%d)\n", 1312 trace sprintf "loading %s (%d,%d)\n",
1204 $decname, length $data, scalar @{$av || []}; 1313 $decname, length $data, scalar @{$av || []}
1314 if $VERBOSE_IO;
1205 1315
1206 ($data, $av) 1316 ($data, $av)
1207} 1317}
1208 1318
1209=head2 COMMAND CALLBACKS 1319=head2 COMMAND CALLBACKS
1265 my ($name, $cb) = @_; 1375 my ($name, $cb) = @_;
1266 1376
1267 $EXTICMD{$name} = $cb; 1377 $EXTICMD{$name} = $cb;
1268} 1378}
1269 1379
1380use File::Glob ();
1381
1270cf::player->attach ( 1382cf::player->attach (
1271 on_command => sub { 1383 on_unknown_command => sub {
1272 my ($pl, $name, $params) = @_; 1384 my ($pl, $name, $params) = @_;
1273 1385
1274 my $cb = $COMMAND{$name} 1386 my $cb = $COMMAND{$name}
1275 or return; 1387 or return;
1276 1388
1299 1411
1300 $pl->ext_reply ($reply, @reply) 1412 $pl->ext_reply ($reply, @reply)
1301 if $reply; 1413 if $reply;
1302 1414
1303 } else { 1415 } else {
1304 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1416 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1305 } 1417 }
1306 1418
1307 cf::override; 1419 cf::override;
1308 }, 1420 },
1309); 1421);
1310 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
1311sub load_extensions { 1436sub load_extensions {
1437 info "loading extensions...";
1438
1312 cf::sync_job { 1439 cf::sync_job {
1313 my %todo; 1440 my %todo;
1314 1441
1315 for my $path (<$LIBDIR/*.ext>) { 1442 for my $path (<$LIBDIR/*.ext>) {
1316 next unless -r $path; 1443 next unless -r $path;
1334 1461
1335 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1462 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1336 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1463 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1337 1464
1338 $ext{source} = 1465 $ext{source} =
1339 "package $pkg; use strict; use utf8;\n" 1466 "package $pkg; use common::sense;\n"
1340 . "#line 1 \"$path\"\n{\n" 1467 . "#line 1 \"$path\"\n{\n"
1341 . $source 1468 . $source
1342 . "\n};\n1"; 1469 . "\n};\n1";
1343 1470
1344 $todo{$base} = \%ext; 1471 $todo{$base} = \%ext;
1345 } 1472 }
1346 1473
1474 my $pass = 0;
1347 my %done; 1475 my %done;
1348 while (%todo) { 1476 while (%todo) {
1349 my $progress; 1477 my $progress;
1350 1478
1479 ++$pass;
1480
1481 ext:
1351 while (my ($k, $v) = each %todo) { 1482 while (my ($k, $v) = each %todo) {
1352 for (split /,\s*/, $v->{meta}{depends}) { 1483 for (split /,\s*/, $v->{meta}{depends}) {
1353 goto skip 1484 next ext
1354 unless exists $done{$_}; 1485 unless exists $done{$_};
1355 } 1486 }
1356 1487
1357 warn "... loading '$k' into '$v->{pkg}'\n"; 1488 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1358 1489
1359 unless (eval $v->{source}) { 1490 my $active = eval $v->{source};
1491
1492 if (length $@) {
1360 my $msg = $@ ? "$v->{path}: $@\n" 1493 error "$v->{path}: $@\n";
1361 : "$v->{base}: extension inactive.\n";
1362 1494
1363 if (exists $v->{meta}{mandatory}) {
1364 warn $msg;
1365 cf::cleanup "mandatory extension failed to load, exiting."; 1495 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1366 } 1496 if exists $v->{meta}{mandatory};
1367 1497
1368 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;
1369 } 1507 }
1370
1371 $done{$k} = delete $todo{$k};
1372 push @EXTS, $v->{pkg};
1373 $progress = 1;
1374 } 1508 }
1375 1509
1376 skip: 1510 unless ($progress) {
1377 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1511 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1378 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 }
1379 } 1518 }
1380 }; 1519 };
1381} 1520}
1382 1521
1383############################################################################# 1522#############################################################################
1384 1523
1385=back 1524=back
1386 1525
1387=head2 CORE EXTENSIONS 1526=head2 CORE EXTENSIONS
1388 1527
1389Functions and methods that extend core crossfire objects. 1528Functions and methods that extend core deliantra objects.
1390 1529
1391=cut 1530=cut
1392 1531
1393package cf::player; 1532package cf::player;
1394 1533
1437 1576
1438sub exists($) { 1577sub exists($) {
1439 my ($login) = @_; 1578 my ($login) = @_;
1440 1579
1441 $cf::PLAYER{$login} 1580 $cf::PLAYER{$login}
1442 or cf::sync_job { !aio_stat path $login } 1581 or !aio_stat path $login
1443} 1582}
1444 1583
1445sub find($) { 1584sub find($) {
1446 return $cf::PLAYER{$_[0]} || do { 1585 return $cf::PLAYER{$_[0]} || do {
1447 my $login = $_[0]; 1586 my $login = $_[0];
1467 $cf::PLAYER{$login} = $pl 1606 $cf::PLAYER{$login} = $pl
1468 } 1607 }
1469 } 1608 }
1470} 1609}
1471 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
1472sub save($) { 1624sub save($) {
1473 my ($pl) = @_; 1625 my ($pl) = @_;
1474 1626
1475 return if $pl->{deny_save}; 1627 return if $pl->{deny_save};
1476 1628
1481 1633
1482 aio_mkdir playerdir $pl, 0770; 1634 aio_mkdir playerdir $pl, 0770;
1483 $pl->{last_save} = $cf::RUNTIME; 1635 $pl->{last_save} = $cf::RUNTIME;
1484 1636
1485 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];
1486 1641
1487 $pl->save_pl ($path); 1642 $pl->save_pl ($path);
1488 cf::cede_to_tick; 1643 cf::cede_to_tick;
1489} 1644}
1490 1645
1522 my ($pl) = @_; 1677 my ($pl) = @_;
1523 1678
1524 my $name = $pl->ob->name; 1679 my $name = $pl->ob->name;
1525 1680
1526 $pl->{deny_save} = 1; 1681 $pl->{deny_save} = 1;
1527 $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
1528 1683
1529 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1684 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1530 $pl->deactivate; 1685 $pl->deactivate;
1686
1531 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;
1532 $pl->ob->check_score;
1533 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1688 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1689 ext::highscore::check ($pl->ob);
1690
1534 $pl->ns->destroy if $pl->ns; 1691 $pl->ns->destroy if $pl->ns;
1535 1692
1536 my $path = playerdir $pl; 1693 my $path = playerdir $pl;
1537 my $temp = "$path~$cf::RUNTIME~deleting~"; 1694 my $temp = "$path~$cf::RUNTIME~deleting~";
1538 aio_rename $path, $temp; 1695 aio_rename $path, $temp;
1592 \@logins 1749 \@logins
1593} 1750}
1594 1751
1595=item $player->maps 1752=item $player->maps
1596 1753
1754=item cf::player::maps $login
1755
1597Returns an arrayref of map paths that are private for this 1756Returns an arrayref of map paths that are private for this
1598player. May block. 1757player. May block.
1599 1758
1600=cut 1759=cut
1601 1760
1618 } 1777 }
1619 1778
1620 \@paths 1779 \@paths
1621} 1780}
1622 1781
1623=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1782=item $protocol_xml = $player->expand_cfpod ($cfpod)
1624 1783
1625Expand crossfire pod fragments into protocol xml. 1784Expand deliantra pod fragments into protocol xml.
1626
1627=cut
1628
1629use re 'eval';
1630
1631my $group;
1632my $interior; $interior = qr{
1633 # match a pod interior sequence sans C<< >>
1634 (?:
1635 \ (.*?)\ (?{ $group = $^N })
1636 | < (??{$interior}) >
1637 )
1638}x;
1639
1640sub expand_cfpod {
1641 my ($self, $pod) = @_;
1642
1643 my $xml;
1644
1645 while () {
1646 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1647 $group = $1;
1648
1649 $group =~ s/&/&amp;/g;
1650 $group =~ s/</&lt;/g;
1651
1652 $xml .= $group;
1653 } elsif ($pod =~ m%\G
1654 ([BCGHITU])
1655 <
1656 (?:
1657 ([^<>]*) (?{ $group = $^N })
1658 | < $interior >
1659 )
1660 >
1661 %gcsx
1662 ) {
1663 my ($code, $data) = ($1, $group);
1664
1665 if ($code eq "B") {
1666 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1667 } elsif ($code eq "I") {
1668 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1669 } elsif ($code eq "U") {
1670 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1671 } elsif ($code eq "C") {
1672 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1673 } elsif ($code eq "T") {
1674 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1675 } elsif ($code eq "G") {
1676 my ($male, $female) = split /\|/, $data;
1677 $data = $self->gender ? $female : $male;
1678 $xml .= expand_cfpod ($self, $data);
1679 } elsif ($code eq "H") {
1680 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1681 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1682 "")
1683 [$self->{hintmode}];
1684 } else {
1685 $xml .= "error processing '$code($data)' directive";
1686 }
1687 } else {
1688 if ($pod =~ /\G(.+)/) {
1689 warn "parse error while expanding $pod (at $1)";
1690 }
1691 last;
1692 }
1693 }
1694
1695 for ($xml) {
1696 # create single paragraphs (very hackish)
1697 s/(?<=\S)\n(?=\w)/ /g;
1698
1699 # compress some whitespace
1700 s/\s+\n/\n/g; # ws line-ends
1701 s/\n\n+/\n/g; # double lines
1702 s/^\n+//; # beginning lines
1703 s/\n+$//; # ending lines
1704 }
1705
1706 $xml
1707}
1708
1709no re 'eval';
1710
1711sub hintmode {
1712 $_[0]{hintmode} = $_[1] if @_ > 1;
1713 $_[0]{hintmode}
1714}
1715 1785
1716=item $player->ext_reply ($msgid, @msg) 1786=item $player->ext_reply ($msgid, @msg)
1717 1787
1718Sends an ext reply to the player. 1788Sends an ext reply to the player.
1719 1789
1751 1821
1752=cut 1822=cut
1753 1823
1754sub find_by_path($) { 1824sub find_by_path($) {
1755 my ($path) = @_; 1825 my ($path) = @_;
1826
1827 $path =~ s/^~[^\/]*//; # skip ~login
1756 1828
1757 my ($match, $specificity); 1829 my ($match, $specificity);
1758 1830
1759 for my $region (list) { 1831 for my $region (list) {
1760 if ($region->{match} && $path =~ $region->{match}) { 1832 if ($region->{match} && $path =~ $region->{match}) {
1789sub generate_random_map { 1861sub generate_random_map {
1790 my ($self, $rmp) = @_; 1862 my ($self, $rmp) = @_;
1791 1863
1792 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
1793 1865
1794 # mit "rum" bekleckern, nicht
1795 $self->_create_random_map ( 1866 $self->_create_random_map ($rmp);
1796 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1797 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1798 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1799 $rmp->{exit_on_final_map},
1800 $rmp->{xsize}, $rmp->{ysize},
1801 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1802 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1803 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1804 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1805 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1806 (cf::region::find $rmp->{region}), $rmp->{custom}
1807 )
1808} 1867}
1809 1868
1810=item cf::map->register ($regex, $prio) 1869=item cf::map->register ($regex, $prio)
1811 1870
1812Register a handler for the map path matching the given regex at the 1871Register a handler for the map path matching the given regex at the
1817 1876
1818sub register { 1877sub register {
1819 my (undef, $regex, $prio) = @_; 1878 my (undef, $regex, $prio) = @_;
1820 my $pkg = caller; 1879 my $pkg = caller;
1821 1880
1822 no strict;
1823 push @{"$pkg\::ISA"}, __PACKAGE__; 1881 push @{"$pkg\::ISA"}, __PACKAGE__;
1824 1882
1825 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1883 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1826} 1884}
1827 1885
1828# also paths starting with '/' 1886# also paths starting with '/'
1829$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1887$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1830 1888
1831sub thawer_merge { 1889sub thawer_merge {
1832 my ($self, $merge) = @_; 1890 my ($self, $merge) = @_;
1833 1891
1834 # we have to keep some variables in memory intact 1892 # we have to keep some variables in memory intact
1839} 1897}
1840 1898
1841sub normalise { 1899sub normalise {
1842 my ($path, $base) = @_; 1900 my ($path, $base) = @_;
1843 1901
1844 $path = "$path"; # make sure its a string 1902 $path = "$path"; # make sure it's a string
1845 1903
1846 $path =~ s/\.map$//; 1904 $path =~ s/\.map$//;
1847 1905
1848 # map plan: 1906 # map plan:
1849 # 1907 #
1864 $base =~ s{[^/]+/?$}{}; 1922 $base =~ s{[^/]+/?$}{};
1865 $path = "$base/$path"; 1923 $path = "$base/$path";
1866 } 1924 }
1867 1925
1868 for ($path) { 1926 for ($path) {
1869 redo if s{//}{/};
1870 redo if s{/\.?/}{/}; 1927 redo if s{/\.?/}{/};
1871 redo if s{/[^/]+/\.\./}{/}; 1928 redo if s{/[^/]+/\.\./}{/};
1872 } 1929 }
1873 1930
1874 $path 1931 $path
1888 $self->init; # pass $1 etc. 1945 $self->init; # pass $1 etc.
1889 return $self; 1946 return $self;
1890 } 1947 }
1891 } 1948 }
1892 1949
1893 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1950 Carp::cluck "unable to resolve path '$path' (base '$base')";
1894 () 1951 ()
1895} 1952}
1896 1953
1897sub init { 1954sub init {
1898 my ($self) = @_; 1955 my ($self) = @_;
1930sub uniq_path { 1987sub uniq_path {
1931 my ($self) = @_; 1988 my ($self) = @_;
1932 1989
1933 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1990 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1934 "$UNIQUEDIR/$path" 1991 "$UNIQUEDIR/$path"
1935}
1936
1937# and all this just because we cannot iterate over
1938# all maps in C++...
1939sub change_all_map_light {
1940 my ($change) = @_;
1941
1942 $_->change_map_light ($change)
1943 for grep $_->outdoor, values %cf::MAP;
1944} 1992}
1945 1993
1946sub decay_objects { 1994sub decay_objects {
1947 my ($self) = @_; 1995 my ($self) = @_;
1948 1996
2030 2078
2031sub find; 2079sub find;
2032sub find { 2080sub find {
2033 my ($path, $origin) = @_; 2081 my ($path, $origin) = @_;
2034 2082
2083 cf::cede_to_tick;
2084
2035 $path = normalise $path, $origin && $origin->path; 2085 $path = normalise $path, $origin && $origin->path;
2036 2086
2037 cf::lock_wait "map_data:$path";#d#remove 2087 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2038 cf::lock_wait "map_find:$path"; 2088 my $guard2 = cf::lock_acquire "map_find:$path";
2039 2089
2040 $cf::MAP{$path} || do { 2090 $cf::MAP{$path} || do {
2041 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2042 my $guard2 = cf::lock_acquire "map_find:$path";
2043
2044 my $map = new_from_path cf::map $path 2091 my $map = new_from_path cf::map $path
2045 or return; 2092 or return;
2046 2093
2047 $map->{last_save} = $cf::RUNTIME; 2094 $map->{last_save} = $cf::RUNTIME;
2048 2095
2060 2107
2061 $cf::MAP{$path} = $map 2108 $cf::MAP{$path} = $map
2062 } 2109 }
2063} 2110}
2064 2111
2065sub pre_load { } 2112sub pre_load { }
2066sub post_load { } 2113#sub post_load { } # XS
2067 2114
2068sub load { 2115sub load {
2069 my ($self) = @_; 2116 my ($self) = @_;
2070 2117
2071 local $self->{deny_reset} = 1; # loading can take a long time 2118 local $self->{deny_reset} = 1; # loading can take a long time
2088 my $f = new_from_file cf::object::thawer $self->{load_path}; 2135 my $f = new_from_file cf::object::thawer $self->{load_path};
2089 $f->skip_block; 2136 $f->skip_block;
2090 $self->_load_objects ($f) 2137 $self->_load_objects ($f)
2091 or return; 2138 or return;
2092 2139
2093 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2140 $self->post_load_original
2094 if delete $self->{load_original}; 2141 if delete $self->{load_original};
2095 2142
2096 if (my $uniq = $self->uniq_path) { 2143 if (my $uniq = $self->uniq_path) {
2097 utf8::encode $uniq; 2144 utf8::encode $uniq;
2098 unless (aio_stat $uniq) { 2145 unless (aio_stat $uniq) {
2116 unless ($self->{deny_activate}) { 2163 unless ($self->{deny_activate}) {
2117 $self->decay_objects; 2164 $self->decay_objects;
2118 $self->fix_auto_apply; 2165 $self->fix_auto_apply;
2119 $self->update_buttons; 2166 $self->update_buttons;
2120 cf::cede_to_tick; 2167 cf::cede_to_tick;
2121 $self->set_darkness_map;
2122 cf::cede_to_tick;
2123 $self->activate; 2168 $self->activate;
2124 } 2169 }
2125 2170
2126 $self->{last_save} = $cf::RUNTIME; 2171 $self->{last_save} = $cf::RUNTIME;
2127 $self->last_access ($cf::RUNTIME); 2172 $self->last_access ($cf::RUNTIME);
2128 2173
2129 $self->in_memory (cf::MAP_ACTIVE); 2174 $self->in_memory (cf::MAP_ACTIVE);
2130 } 2175 }
2131 2176
2132 $self->post_load; 2177 $self->post_load;
2133}
2134 2178
2179 1
2180}
2181
2182# customize the map for a given player, i.e.
2183# return the _real_ map. used by e.g. per-player
2184# maps to change the path to ~playername/mappath
2135sub customise_for { 2185sub customise_for {
2136 my ($self, $ob) = @_; 2186 my ($self, $ob) = @_;
2137 2187
2138 return find "~" . $ob->name . "/" . $self->{path} 2188 return find "~" . $ob->name . "/" . $self->{path}
2139 if $self->per_player; 2189 if $self->per_player;
2155 or next; 2205 or next;
2156 $neigh = find $neigh, $map 2206 $neigh = find $neigh, $map
2157 or next; 2207 or next;
2158 $neigh->load; 2208 $neigh->load;
2159 2209
2210 # now find the diagonal neighbours
2160 push @neigh, 2211 push @neigh,
2161 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2212 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2162 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2213 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2163 } 2214 }
2164 2215
2171} 2222}
2172 2223
2173sub find_sync { 2224sub find_sync {
2174 my ($path, $origin) = @_; 2225 my ($path, $origin) = @_;
2175 2226
2176 cf::sync_job { find $path, $origin } 2227 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2228 if $Coro::current == $Coro::main;
2229
2230 find $path, $origin
2177} 2231}
2178 2232
2179sub do_load_sync { 2233sub do_load_sync {
2180 my ($map) = @_; 2234 my ($map) = @_;
2181 2235
2182 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2236 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2183 if $Coro::current == $Coro::main; 2237 if $Coro::current == $Coro::main;
2184 2238
2185 cf::sync_job { $map->load }; 2239 $map->load;
2186} 2240}
2187 2241
2188our %MAP_PREFETCH; 2242our %MAP_PREFETCH;
2189our $MAP_PREFETCHER = undef; 2243our $MAP_PREFETCHER = undef;
2190 2244
2216 $MAP_PREFETCHER->prio (6); 2270 $MAP_PREFETCHER->prio (6);
2217 2271
2218 () 2272 ()
2219} 2273}
2220 2274
2275# common code, used by both ->save and ->swapout
2221sub save { 2276sub _save {
2222 my ($self) = @_; 2277 my ($self) = @_;
2223
2224 my $lock = cf::lock_acquire "map_data:$self->{path}";
2225 2278
2226 $self->{last_save} = $cf::RUNTIME; 2279 $self->{last_save} = $cf::RUNTIME;
2227 2280
2228 return unless $self->dirty; 2281 return unless $self->dirty;
2229 2282
2249 } else { 2302 } else {
2250 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2303 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2251 } 2304 }
2252} 2305}
2253 2306
2307sub save {
2308 my ($self) = @_;
2309
2310 my $lock = cf::lock_acquire "map_data:$self->{path}";
2311
2312 $self->_save;
2313}
2314
2254sub swap_out { 2315sub swap_out {
2255 my ($self) = @_; 2316 my ($self) = @_;
2256 2317
2257 # save first because save cedes
2258 $self->save;
2259
2260 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2318 my $lock = cf::lock_acquire "map_data:$self->{path}";
2261 2319
2262 return if $self->players;
2263 return if $self->in_memory != cf::MAP_ACTIVE; 2320 return if $self->in_memory != cf::MAP_ACTIVE;
2264 return if $self->{deny_save}; 2321 return if $self->{deny_save};
2322 return if $self->players;
2265 2323
2324 # first deactivate the map and "unlink" it from the core
2325 $self->deactivate;
2326 $_->clear_links_to ($self) for values %cf::MAP;
2266 $self->in_memory (cf::MAP_SWAPPED); 2327 $self->in_memory (cf::MAP_SWAPPED);
2328
2329 # then atomically save
2330 $self->_save;
2331
2332 # then free the map
2333 $self->clear;
2334}
2335
2336sub reset_at {
2337 my ($self) = @_;
2338
2339 # TODO: safety, remove and allow resettable per-player maps
2340 return 1e99 if $self->{deny_reset};
2341
2342 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2343 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2344
2345 $time + $to
2346}
2347
2348sub should_reset {
2349 my ($self) = @_;
2350
2351 $self->reset_at <= $cf::RUNTIME
2352}
2353
2354sub reset {
2355 my ($self) = @_;
2356
2357 my $lock = cf::lock_acquire "map_data:$self->{path}";
2358
2359 return if $self->players;
2360
2361 cf::trace "resetting map ", $self->path, "\n";
2362
2363 $self->in_memory (cf::MAP_SWAPPED);
2364
2365 # need to save uniques path
2366 unless ($self->{deny_save}) {
2367 my $uniq = $self->uniq_path; utf8::encode $uniq;
2368
2369 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2370 if $uniq;
2371 }
2372
2373 delete $cf::MAP{$self->path};
2267 2374
2268 $self->deactivate; 2375 $self->deactivate;
2269 $_->clear_links_to ($self) for values %cf::MAP; 2376 $_->clear_links_to ($self) for values %cf::MAP;
2270 $self->clear; 2377 $self->clear;
2271}
2272
2273sub reset_at {
2274 my ($self) = @_;
2275
2276 # TODO: safety, remove and allow resettable per-player maps
2277 return 1e99 if $self->{deny_reset};
2278
2279 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2280 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2281
2282 $time + $to
2283}
2284
2285sub should_reset {
2286 my ($self) = @_;
2287
2288 $self->reset_at <= $cf::RUNTIME
2289}
2290
2291sub reset {
2292 my ($self) = @_;
2293
2294 my $lock = cf::lock_acquire "map_data:$self->{path}";
2295
2296 return if $self->players;
2297
2298 warn "resetting map ", $self->path;
2299
2300 $self->in_memory (cf::MAP_SWAPPED);
2301
2302 # need to save uniques path
2303 unless ($self->{deny_save}) {
2304 my $uniq = $self->uniq_path; utf8::encode $uniq;
2305
2306 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2307 if $uniq;
2308 }
2309
2310 delete $cf::MAP{$self->path};
2311
2312 $self->deactivate;
2313 $_->clear_links_to ($self) for values %cf::MAP;
2314 $self->clear;
2315 2378
2316 $self->unlink_save; 2379 $self->unlink_save;
2317 $self->destroy; 2380 $self->destroy;
2318} 2381}
2319 2382
2327 2390
2328 delete $cf::MAP{$self->path}; 2391 delete $cf::MAP{$self->path};
2329 2392
2330 $self->unlink_save; 2393 $self->unlink_save;
2331 2394
2332 bless $self, "cf::map"; 2395 bless $self, "cf::map::wrap";
2333 delete $self->{deny_reset}; 2396 delete $self->{deny_reset};
2334 $self->{deny_save} = 1; 2397 $self->{deny_save} = 1;
2335 $self->reset_timeout (1); 2398 $self->reset_timeout (1);
2336 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2399 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2337 2400
2394 : normalise $_ 2457 : normalise $_
2395 } @{ aio_readdir $UNIQUEDIR or [] } 2458 } @{ aio_readdir $UNIQUEDIR or [] }
2396 ] 2459 ]
2397} 2460}
2398 2461
2462=item cf::map::static_maps
2463
2464Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2465file in the shared directory excluding F</styles> and F</editor>). May
2466block.
2467
2468=cut
2469
2470sub static_maps() {
2471 my @dirs = "";
2472 my @maps;
2473
2474 while (@dirs) {
2475 my $dir = shift @dirs;
2476
2477 next if $dir eq "/styles" || $dir eq "/editor";
2478
2479 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2480 or return;
2481
2482 for (@$files) {
2483 s/\.map$// or next;
2484 utf8::decode $_;
2485 push @maps, "$dir/$_";
2486 }
2487
2488 push @dirs, map "$dir/$_", @$dirs;
2489 }
2490
2491 \@maps
2492}
2493
2399=back 2494=back
2400 2495
2401=head3 cf::object 2496=head3 cf::object
2402 2497
2403=cut 2498=cut
2468 2563
2469our $SAY_CHANNEL = { 2564our $SAY_CHANNEL = {
2470 id => "say", 2565 id => "say",
2471 title => "Map", 2566 title => "Map",
2472 reply => "say ", 2567 reply => "say ",
2473 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2568 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2474}; 2569};
2475 2570
2476our $CHAT_CHANNEL = { 2571our $CHAT_CHANNEL = {
2477 id => "chat", 2572 id => "chat",
2478 title => "Chat", 2573 title => "Chat",
2533 2628
2534=item $player_object->enter_link 2629=item $player_object->enter_link
2535 2630
2536Freezes the player and moves him/her to a special map (C<{link}>). 2631Freezes the player and moves him/her to a special map (C<{link}>).
2537 2632
2538The player should be reasonably safe there for short amounts of time. You 2633The player should be reasonably safe there for short amounts of time (e.g.
2539I<MUST> call C<leave_link> as soon as possible, though. 2634for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2635though, as the player cannot control the character while it is on the link
2636map.
2540 2637
2541Will never block. 2638Will never block.
2542 2639
2543=item $player_object->leave_link ($map, $x, $y) 2640=item $player_object->leave_link ($map, $x, $y)
2544 2641
2564sub cf::object::player::enter_link { 2661sub cf::object::player::enter_link {
2565 my ($self) = @_; 2662 my ($self) = @_;
2566 2663
2567 $self->deactivate_recursive; 2664 $self->deactivate_recursive;
2568 2665
2666 ++$self->{_link_recursion};
2667
2569 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2668 return if UNIVERSAL::isa $self->map, "ext::map_link";
2570 2669
2571 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2670 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2572 if $self->map && $self->map->{path} ne "{link}"; 2671 if $self->map && $self->map->{path} ne "{link}";
2573 2672
2574 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2673 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2575} 2674}
2576 2675
2577sub cf::object::player::leave_link { 2676sub cf::object::player::leave_link {
2578 my ($self, $map, $x, $y) = @_; 2677 my ($self, $map, $x, $y) = @_;
2579 2678
2596 ($x, $y) = (-1, -1) 2695 ($x, $y) = (-1, -1)
2597 unless (defined $x) && (defined $y); 2696 unless (defined $x) && (defined $y);
2598 2697
2599 # use -1 or undef as default coordinates, not 0, 0 2698 # use -1 or undef as default coordinates, not 0, 0
2600 ($x, $y) = ($map->enter_x, $map->enter_y) 2699 ($x, $y) = ($map->enter_x, $map->enter_y)
2601 if $x <=0 && $y <= 0; 2700 if $x <= 0 && $y <= 0;
2602 2701
2603 $map->load; 2702 $map->load;
2604 $map->load_neighbours; 2703 $map->load_neighbours;
2605 2704
2606 return unless $self->contr->active; 2705 return unless $self->contr->active;
2607 $self->activate_recursive;
2608 2706
2609 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2707 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2610 $self->enter_map ($map, $x, $y); 2708 if ($self->enter_map ($map, $x, $y)) {
2611} 2709 # entering was successful
2710 delete $self->{_link_recursion};
2711 # only activate afterwards, to support waiting in hooks
2712 $self->activate_recursive;
2713 }
2612 2714
2715}
2716
2613=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2717=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2614 2718
2615Moves the player to the given map-path and coordinates by first freezing 2719Moves the player to the given map-path and coordinates by first freezing
2616her, loading and preparing them map, calling the provided $check callback 2720her, loading and preparing them map, calling the provided $check callback
2617that has to return the map if sucecssful, and then unfreezes the player on 2721that has to return the map if sucecssful, and then unfreezes the player on
2618the new (success) or old (failed) map position. In either case, $done will 2722the new (success) or old (failed) map position. In either case, $done will
2619be called at the end of this process. 2723be called at the end of this process.
2620 2724
2725Note that $check will be called with a potentially non-loaded map, so if
2726it needs a loaded map it has to call C<< ->load >>.
2727
2621=cut 2728=cut
2622 2729
2623our $GOTOGEN; 2730our $GOTOGEN;
2624 2731
2625sub cf::object::player::goto { 2732sub cf::object::player::goto {
2626 my ($self, $path, $x, $y, $check, $done) = @_; 2733 my ($self, $path, $x, $y, $check, $done) = @_;
2734
2735 if ($self->{_link_recursion} >= $MAX_LINKS) {
2736 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2737 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2738 ($path, $x, $y) = @$EMERGENCY_POSITION;
2739 }
2627 2740
2628 # do generation counting so two concurrent goto's will be executed in-order 2741 # do generation counting so two concurrent goto's will be executed in-order
2629 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2742 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2630 2743
2631 $self->enter_link; 2744 $self->enter_link;
2655 my $map = eval { 2768 my $map = eval {
2656 my $map = defined $path ? cf::map::find $path : undef; 2769 my $map = defined $path ? cf::map::find $path : undef;
2657 2770
2658 if ($map) { 2771 if ($map) {
2659 $map = $map->customise_for ($self); 2772 $map = $map->customise_for ($self);
2660 $map = $check->($map) if $check && $map; 2773 $map = $check->($map, $x, $y, $self) if $check && $map;
2661 } else { 2774 } else {
2662 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2775 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2663 } 2776 }
2664 2777
2665 $map 2778 $map
2673 if ($gen == $self->{_goto_generation}) { 2786 if ($gen == $self->{_goto_generation}) {
2674 delete $self->{_goto_generation}; 2787 delete $self->{_goto_generation};
2675 $self->leave_link ($map, $x, $y); 2788 $self->leave_link ($map, $x, $y);
2676 } 2789 }
2677 2790
2678 $done->() if $done; 2791 $done->($self) if $done;
2679 })->prio (1); 2792 })->prio (1);
2680} 2793}
2681 2794
2682=item $player_object->enter_exit ($exit_object) 2795=item $player_object->enter_exit ($exit_object)
2683 2796
2771 $self->contr->savebed ($map, $x, $y) 2884 $self->contr->savebed ($map, $x, $y)
2772 if $exit->flag (cf::FLAG_DAMNED); 2885 if $exit->flag (cf::FLAG_DAMNED);
2773 2886
2774 1 2887 1
2775 }) { 2888 }) {
2776 $self->message ("Something went wrong deep within the crossfire server. " 2889 $self->message ("Something went wrong deep within the deliantra server. "
2777 . "I'll try to bring you back to the map you were before. " 2890 . "I'll try to bring you back to the map you were before. "
2778 . "Please report this to the dungeon master!", 2891 . "Please report this to the dungeon master!",
2779 cf::NDI_UNIQUE | cf::NDI_RED); 2892 cf::NDI_UNIQUE | cf::NDI_RED);
2780 2893
2781 warn "ERROR in enter_exit: $@"; 2894 error "ERROR in enter_exit: $@";
2782 $self->leave_link; 2895 $self->leave_link;
2783 } 2896 }
2784 })->prio (1); 2897 })->prio (1);
2785} 2898}
2786 2899
2798sub cf::client::send_drawinfo { 2911sub cf::client::send_drawinfo {
2799 my ($self, $text, $flags) = @_; 2912 my ($self, $text, $flags) = @_;
2800 2913
2801 utf8::encode $text; 2914 utf8::encode $text;
2802 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2915 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2916}
2917
2918=item $client->send_big_packet ($pkt)
2919
2920Like C<send_packet>, but tries to compress large packets, and fragments
2921them as required.
2922
2923=cut
2924
2925our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2926
2927sub cf::client::send_big_packet {
2928 my ($self, $pkt) = @_;
2929
2930 # try lzf for large packets
2931 $pkt = "lzf " . Compress::LZF::compress $pkt
2932 if 1024 <= length $pkt and $self->{can_lzf};
2933
2934 # split very large packets
2935 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2936 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2937 $pkt = "frag";
2938 }
2939
2940 $self->send_packet ($pkt);
2803} 2941}
2804 2942
2805=item $client->send_msg ($channel, $msg, $color, [extra...]) 2943=item $client->send_msg ($channel, $msg, $color, [extra...])
2806 2944
2807Send a drawinfo or msg packet to the client, formatting the msg for the 2945Send a drawinfo or msg packet to the client, formatting the msg for the
2811 2949
2812=cut 2950=cut
2813 2951
2814# non-persistent channels (usually the info channel) 2952# non-persistent channels (usually the info channel)
2815our %CHANNEL = ( 2953our %CHANNEL = (
2954 "c/motd" => {
2955 id => "infobox",
2956 title => "MOTD",
2957 reply => undef,
2958 tooltip => "The message of the day",
2959 },
2816 "c/identify" => { 2960 "c/identify" => {
2817 id => "infobox", 2961 id => "infobox",
2818 title => "Identify", 2962 title => "Identify",
2819 reply => undef, 2963 reply => undef,
2820 tooltip => "Items recently identified", 2964 tooltip => "Items recently identified",
2822 "c/examine" => { 2966 "c/examine" => {
2823 id => "infobox", 2967 id => "infobox",
2824 title => "Examine", 2968 title => "Examine",
2825 reply => undef, 2969 reply => undef,
2826 tooltip => "Signs and other items you examined", 2970 tooltip => "Signs and other items you examined",
2971 },
2972 "c/shopinfo" => {
2973 id => "infobox",
2974 title => "Shop Info",
2975 reply => undef,
2976 tooltip => "What your bargaining skill tells you about the shop",
2827 }, 2977 },
2828 "c/book" => { 2978 "c/book" => {
2829 id => "infobox", 2979 id => "infobox",
2830 title => "Book", 2980 title => "Book",
2831 reply => undef, 2981 reply => undef,
2847 id => "infobox", 2997 id => "infobox",
2848 title => "Body Parts", 2998 title => "Body Parts",
2849 reply => undef, 2999 reply => undef,
2850 tooltip => "Shows which body parts you posess and are available", 3000 tooltip => "Shows which body parts you posess and are available",
2851 }, 3001 },
3002 "c/statistics" => {
3003 id => "infobox",
3004 title => "Statistics",
3005 reply => undef,
3006 tooltip => "Shows your primary statistics",
3007 },
3008 "c/skills" => {
3009 id => "infobox",
3010 title => "Skills",
3011 reply => undef,
3012 tooltip => "Shows your experience per skill and item power",
3013 },
3014 "c/shopitems" => {
3015 id => "infobox",
3016 title => "Shop Items",
3017 reply => undef,
3018 tooltip => "Shows the items currently for sale in this shop",
3019 },
3020 "c/resistances" => {
3021 id => "infobox",
3022 title => "Resistances",
3023 reply => undef,
3024 tooltip => "Shows your resistances",
3025 },
3026 "c/pets" => {
3027 id => "infobox",
3028 title => "Pets",
3029 reply => undef,
3030 tooltip => "Shows information abotu your pets/a specific pet",
3031 },
3032 "c/perceiveself" => {
3033 id => "infobox",
3034 title => "Perceive Self",
3035 reply => undef,
3036 tooltip => "You gained detailed knowledge about yourself",
3037 },
2852 "c/uptime" => { 3038 "c/uptime" => {
2853 id => "infobox", 3039 id => "infobox",
2854 title => "Uptime", 3040 title => "Uptime",
2855 reply => undef, 3041 reply => undef,
2856 tooltip => "How long the server has been running since last restart", 3042 tooltip => "How long the server has been running since last restart",
2865 id => "party", 3051 id => "party",
2866 title => "Party", 3052 title => "Party",
2867 reply => "gsay ", 3053 reply => "gsay ",
2868 tooltip => "Messages and chat related to your party", 3054 tooltip => "Messages and chat related to your party",
2869 }, 3055 },
3056 "c/death" => {
3057 id => "death",
3058 title => "Death",
3059 reply => undef,
3060 tooltip => "Reason for and more info about your most recent death",
3061 },
3062 "c/say" => $SAY_CHANNEL,
3063 "c/chat" => $CHAT_CHANNEL,
2870); 3064);
2871 3065
2872sub cf::client::send_msg { 3066sub cf::client::send_msg {
2873 my ($self, $channel, $msg, $color, @extra) = @_; 3067 my ($self, $channel, $msg, $color, @extra) = @_;
2874 3068
2875 $msg = $self->pl->expand_cfpod ($msg); 3069 $msg = $self->pl->expand_cfpod ($msg)
3070 unless $color & cf::NDI_VERBATIM;
2876 3071
2877 $color &= cf::NDI_CLIENT_MASK; # just in case... 3072 $color &= cf::NDI_CLIENT_MASK; # just in case...
2878 3073
2879 # check predefined channels, for the benefit of C 3074 # check predefined channels, for the benefit of C
2880 if ($CHANNEL{$channel}) { 3075 if ($CHANNEL{$channel}) {
2881 $channel = $CHANNEL{$channel}; 3076 $channel = $CHANNEL{$channel};
2882 3077
2883 $self->ext_msg (channel_info => $channel) 3078 $self->ext_msg (channel_info => $channel);
2884 if $self->can_msg;
2885
2886 $channel = $channel->{id}; 3079 $channel = $channel->{id};
2887 3080
2888 } elsif (ref $channel) { 3081 } elsif (ref $channel) {
2889 # send meta info to client, if not yet sent 3082 # send meta info to client, if not yet sent
2890 unless (exists $self->{channel}{$channel->{id}}) { 3083 unless (exists $self->{channel}{$channel->{id}}) {
2891 $self->{channel}{$channel->{id}} = $channel; 3084 $self->{channel}{$channel->{id}} = $channel;
2892 $self->ext_msg (channel_info => $channel) 3085 $self->ext_msg (channel_info => $channel);
2893 if $self->can_msg;
2894 } 3086 }
2895 3087
2896 $channel = $channel->{id}; 3088 $channel = $channel->{id};
2897 } 3089 }
2898 3090
2899 return unless @extra || length $msg; 3091 return unless @extra || length $msg;
2900 3092
2901 if ($self->can_msg) {
2902 # default colour, mask it out 3093 # default colour, mask it out
2903 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3094 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2904 if $color & cf::NDI_DEF; 3095 if $color & cf::NDI_DEF;
2905 3096
2906 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3097 my $pkt = "msg "
3098 . $self->{json_coder}->encode (
2907 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3099 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2908 } else { 3100 );
2909 if ($color >= 0) {
2910 # replace some tags by gcfclient-compatible ones
2911 for ($msg) {
2912 1 while
2913 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2914 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2915 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2916 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2917 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2918 }
2919 3101
2920 $color &= cf::NDI_COLOR_MASK; 3102 $self->send_big_packet ($pkt);
2921
2922 utf8::encode $msg;
2923
2924 if (0 && $msg =~ /\[/) {
2925 # COMMAND/INFO
2926 $self->send_packet ("drawextinfo $color 10 8 $msg")
2927 } else {
2928 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2929 $self->send_packet ("drawinfo $color $msg")
2930 }
2931 }
2932 }
2933} 3103}
2934 3104
2935=item $client->ext_msg ($type, @msg) 3105=item $client->ext_msg ($type, @msg)
2936 3106
2937Sends an ext event to the client. 3107Sends an ext event to the client.
2940 3110
2941sub cf::client::ext_msg($$@) { 3111sub cf::client::ext_msg($$@) {
2942 my ($self, $type, @msg) = @_; 3112 my ($self, $type, @msg) = @_;
2943 3113
2944 if ($self->extcmd == 2) { 3114 if ($self->extcmd == 2) {
2945 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3115 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2946 } elsif ($self->extcmd == 1) { # TODO: remove 3116 } elsif ($self->extcmd == 1) { # TODO: remove
2947 push @msg, msgtype => "event_$type"; 3117 push @msg, msgtype => "event_$type";
2948 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3118 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2949 } 3119 }
2950} 3120}
2951 3121
2952=item $client->ext_reply ($msgid, @msg) 3122=item $client->ext_reply ($msgid, @msg)
2953 3123
2957 3127
2958sub cf::client::ext_reply($$@) { 3128sub cf::client::ext_reply($$@) {
2959 my ($self, $id, @msg) = @_; 3129 my ($self, $id, @msg) = @_;
2960 3130
2961 if ($self->extcmd == 2) { 3131 if ($self->extcmd == 2) {
2962 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3132 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2963 } elsif ($self->extcmd == 1) { 3133 } elsif ($self->extcmd == 1) {
2964 #TODO: version 1, remove 3134 #TODO: version 1, remove
2965 unshift @msg, msgtype => "reply", msgid => $id; 3135 unshift @msg, msgtype => "reply", msgid => $id;
2966 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3136 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2967 } 3137 }
2968} 3138}
2969 3139
2970=item $success = $client->query ($flags, "text", \&cb) 3140=item $success = $client->query ($flags, "text", \&cb)
2971 3141
3042 3212
3043 $ns->ext_reply ($reply, @reply) 3213 $ns->ext_reply ($reply, @reply)
3044 if $reply; 3214 if $reply;
3045 3215
3046 } else { 3216 } else {
3047 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3217 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3048 } 3218 }
3049 3219
3050 cf::override; 3220 cf::override;
3051 }, 3221 },
3052); 3222);
3072 3242
3073 $coro 3243 $coro
3074} 3244}
3075 3245
3076cf::client->attach ( 3246cf::client->attach (
3077 on_destroy => sub { 3247 on_client_destroy => sub {
3078 my ($ns) = @_; 3248 my ($ns) = @_;
3079 3249
3080 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3250 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3081 }, 3251 },
3082); 3252);
3098our $safe_hole = new Safe::Hole; 3268our $safe_hole = new Safe::Hole;
3099 3269
3100$SIG{FPE} = 'IGNORE'; 3270$SIG{FPE} = 'IGNORE';
3101 3271
3102$safe->permit_only (Opcode::opset qw( 3272$safe->permit_only (Opcode::opset qw(
3103 :base_core :base_mem :base_orig :base_math 3273 :base_core :base_mem :base_orig :base_math :base_loop
3104 grepstart grepwhile mapstart mapwhile 3274 grepstart grepwhile mapstart mapwhile
3105 sort time 3275 sort time
3106)); 3276));
3107 3277
3108# here we export the classes and methods available to script code 3278# here we export the classes and methods available to script code
3112The following functions and methods are available within a safe environment: 3282The following functions and methods are available within a safe environment:
3113 3283
3114 cf::object 3284 cf::object
3115 contr pay_amount pay_player map x y force_find force_add destroy 3285 contr pay_amount pay_player map x y force_find force_add destroy
3116 insert remove name archname title slaying race decrease split 3286 insert remove name archname title slaying race decrease split
3287 value
3117 3288
3118 cf::object::player 3289 cf::object::player
3119 player 3290 player
3120 3291
3121 cf::player 3292 cf::player
3127=cut 3298=cut
3128 3299
3129for ( 3300for (
3130 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3301 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3131 insert remove inv nrof name archname title slaying race 3302 insert remove inv nrof name archname title slaying race
3132 decrease split destroy)], 3303 decrease split destroy change_exp value msg lore send_msg)],
3133 ["cf::object::player" => qw(player)], 3304 ["cf::object::player" => qw(player)],
3134 ["cf::player" => qw(peaceful)], 3305 ["cf::player" => qw(peaceful send_msg)],
3135 ["cf::map" => qw(trigger)], 3306 ["cf::map" => qw(trigger)],
3136) { 3307) {
3137 no strict 'refs';
3138 my ($pkg, @funs) = @$_; 3308 my ($pkg, @funs) = @$_;
3139 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3309 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3140 for @funs; 3310 for @funs;
3141} 3311}
3142 3312
3157 3327
3158 my $qcode = $code; 3328 my $qcode = $code;
3159 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3329 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3160 $qcode =~ s/\n/\\n/g; 3330 $qcode =~ s/\n/\\n/g;
3161 3331
3332 %vars = (_dummy => 0) unless %vars;
3333
3334 my @res;
3162 local $_; 3335 local $_;
3163 local @safe::cf::_safe_eval_args = values %vars;
3164 3336
3165 my $eval = 3337 my $eval =
3166 "do {\n" 3338 "do {\n"
3167 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3339 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3168 . "#line 0 \"{$qcode}\"\n" 3340 . "#line 0 \"{$qcode}\"\n"
3169 . $code 3341 . $code
3170 . "\n}" 3342 . "\n}"
3171 ; 3343 ;
3172 3344
3345 if ($CFG{safe_eval}) {
3173 sub_generation_inc; 3346 sub_generation_inc;
3347 local @safe::cf::_safe_eval_args = values %vars;
3174 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3348 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3175 sub_generation_inc; 3349 sub_generation_inc;
3350 } else {
3351 local @cf::_safe_eval_args = values %vars;
3352 @res = wantarray ? eval eval : scalar eval $eval;
3353 }
3176 3354
3177 if ($@) { 3355 if ($@) {
3178 warn "$@"; 3356 warn "$@",
3179 warn "while executing safe code '$code'\n"; 3357 "while executing safe code '$code'\n",
3180 warn "with arguments " . (join " ", %vars) . "\n"; 3358 "with arguments " . (join " ", %vars) . "\n";
3181 } 3359 }
3182 3360
3183 wantarray ? @res : $res[0] 3361 wantarray ? @res : $res[0]
3184} 3362}
3185 3363
3199=cut 3377=cut
3200 3378
3201sub register_script_function { 3379sub register_script_function {
3202 my ($fun, $cb) = @_; 3380 my ($fun, $cb) = @_;
3203 3381
3204 no strict 'refs'; 3382 $fun = "safe::$fun" if $CFG{safe_eval};
3205 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3383 *$fun = $safe_hole->wrap ($cb);
3206} 3384}
3207 3385
3208=back 3386=back
3209 3387
3210=cut 3388=cut
3219 # for this (global event?) 3397 # for this (global event?)
3220 %ext::player_env::MUSIC_FACE_CACHE = (); 3398 %ext::player_env::MUSIC_FACE_CACHE = ();
3221 3399
3222 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3400 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3223 3401
3224 warn "loading facedata from $path\n"; 3402 trace "loading facedata from $path\n";
3225 3403
3226 my $facedata;
3227 0 < aio_load $path, $facedata 3404 0 < aio_load $path, my $facedata
3228 or die "$path: $!"; 3405 or die "$path: $!";
3229 3406
3230 $facedata = Coro::Storable::thaw $facedata; 3407 $facedata = Coro::Storable::thaw $facedata;
3231 3408
3232 $facedata->{version} == 2 3409 $facedata->{version} == 2
3233 or cf::cleanup "$path: version mismatch, cannot proceed."; 3410 or cf::cleanup "$path: version mismatch, cannot proceed.";
3234 3411
3235 # patch in the exptable 3412 # patch in the exptable
3413 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3236 $facedata->{resource}{"res/exp_table"} = { 3414 $facedata->{resource}{"res/exp_table"} = {
3237 type => FT_RSRC, 3415 type => FT_RSRC,
3238 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3416 data => $exp_table,
3417 hash => (Digest::MD5::md5 $exp_table),
3239 }; 3418 };
3240 cf::cede_to_tick; 3419 cf::cede_to_tick;
3241 3420
3242 { 3421 {
3243 my $faces = $facedata->{faceinfo}; 3422 my $faces = $facedata->{faceinfo};
3245 while (my ($face, $info) = each %$faces) { 3424 while (my ($face, $info) = each %$faces) {
3246 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3425 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3247 3426
3248 cf::face::set_visibility $idx, $info->{visibility}; 3427 cf::face::set_visibility $idx, $info->{visibility};
3249 cf::face::set_magicmap $idx, $info->{magicmap}; 3428 cf::face::set_magicmap $idx, $info->{magicmap};
3250 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3429 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3251 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3430 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3252 3431
3253 cf::cede_to_tick; 3432 cf::cede_to_tick;
3254 } 3433 }
3255 3434
3256 while (my ($face, $info) = each %$faces) { 3435 while (my ($face, $info) = each %$faces) {
3261 3440
3262 if (my $smooth = cf::face::find $info->{smooth}) { 3441 if (my $smooth = cf::face::find $info->{smooth}) {
3263 cf::face::set_smooth $idx, $smooth; 3442 cf::face::set_smooth $idx, $smooth;
3264 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3443 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3265 } else { 3444 } else {
3266 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3445 error "smooth face '$info->{smooth}' not found for face '$face'";
3267 } 3446 }
3268 3447
3269 cf::cede_to_tick; 3448 cf::cede_to_tick;
3270 } 3449 }
3271 } 3450 }
3280 3459
3281 cf::anim::invalidate_all; # d'oh 3460 cf::anim::invalidate_all; # d'oh
3282 } 3461 }
3283 3462
3284 { 3463 {
3285 # TODO: for gcfclient pleasure, we should give resources
3286 # that gcfclient doesn't grok a >10000 face index.
3287 my $res = $facedata->{resource}; 3464 my $res = $facedata->{resource};
3288 3465
3289 while (my ($name, $info) = each %$res) { 3466 while (my ($name, $info) = each %$res) {
3290 if (defined $info->{type}) { 3467 if (defined $info->{type}) {
3291 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3468 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3292 my $data;
3293 3469
3294 if ($info->{type} & 1) { 3470 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3295 # prepend meta info
3296
3297 my $meta = $enc->encode ({
3298 name => $name,
3299 %{ $info->{meta} || {} },
3300 });
3301
3302 $data = pack "(w/a*)*", $meta, $info->{data};
3303 } else {
3304 $data = $info->{data};
3305 }
3306
3307 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3308 cf::face::set_type $idx, $info->{type}; 3471 cf::face::set_type $idx, $info->{type};
3309 } else { 3472 } else {
3310 $RESOURCE{$name} = $info; 3473 $RESOURCE{$name} = $info; # unused
3311 } 3474 }
3312 3475
3313 cf::cede_to_tick; 3476 cf::cede_to_tick;
3314 } 3477 }
3315 } 3478 }
3316 3479
3317 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3480 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3318 3481
3319 1 3482 1
3320} 3483}
3321
3322cf::global->attach (on_resource_update => sub {
3323 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3324 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3325
3326 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3327 my $sound = $soundconf->{compat}[$_]
3328 or next;
3329
3330 my $face = cf::face::find "sound/$sound->[1]";
3331 cf::sound::set $sound->[0] => $face;
3332 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3333 }
3334
3335 while (my ($k, $v) = each %{$soundconf->{event}}) {
3336 my $face = cf::face::find "sound/$v";
3337 cf::sound::set $k => $face;
3338 }
3339 }
3340});
3341 3484
3342register_exticmd fx_want => sub { 3485register_exticmd fx_want => sub {
3343 my ($ns, $want) = @_; 3486 my ($ns, $want) = @_;
3344 3487
3345 while (my ($k, $v) = each %$want) { 3488 while (my ($k, $v) = each %$want) {
3384sub reload_treasures { 3527sub reload_treasures {
3385 load_resource_file "$DATADIR/treasures" 3528 load_resource_file "$DATADIR/treasures"
3386 or die "unable to load treasurelists\n"; 3529 or die "unable to load treasurelists\n";
3387} 3530}
3388 3531
3532sub reload_sound {
3533 trace "loading sound config from $DATADIR/sound\n";
3534
3535 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3536 or die "$DATADIR/sound $!";
3537
3538 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3539
3540 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3541 my $sound = $soundconf->{compat}[$_]
3542 or next;
3543
3544 my $face = cf::face::find "sound/$sound->[1]";
3545 cf::sound::set $sound->[0] => $face;
3546 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3547 }
3548
3549 while (my ($k, $v) = each %{$soundconf->{event}}) {
3550 my $face = cf::face::find "sound/$v";
3551 cf::sound::set $k => $face;
3552 }
3553}
3554
3389sub reload_resources { 3555sub reload_resources {
3390 warn "reloading resource files...\n"; 3556 trace "reloading resource files...\n";
3391 3557
3558 reload_exp_table;
3559 reload_materials;
3392 reload_facedata; 3560 reload_facedata;
3561 reload_sound;
3393 reload_archetypes; 3562 reload_archetypes;
3394 reload_regions; 3563 reload_regions;
3395 reload_treasures; 3564 reload_treasures;
3396 3565
3397 warn "finished reloading resource files\n"; 3566 trace "finished reloading resource files\n";
3398}
3399
3400sub init {
3401 my $guard = freeze_mainloop;
3402
3403 reload_resources;
3404} 3567}
3405 3568
3406sub reload_config { 3569sub reload_config {
3407 open my $fh, "<:utf8", "$CONFDIR/config" 3570 trace "reloading config file...\n";
3408 or return;
3409 3571
3410 local $/; 3572 0 < aio_load "$CONFDIR/config", my $config
3411 *CFG = YAML::Load <$fh>; 3573 or die "$CONFDIR/config: $!";
3412 3574
3575 utf8::decode $config;
3576 *CFG = yaml_load $config;
3577
3413 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3578 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3414 3579
3415 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3580 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3416 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3581 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3417 3582
3418 if (exists $CFG{mlockall}) { 3583 if (exists $CFG{mlockall}) {
3422 }; 3587 };
3423 warn $@ if $@; 3588 warn $@ if $@;
3424 } 3589 }
3425} 3590}
3426 3591
3592sub pidfile() {
3593 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3594 or die "$PIDFILE: $!";
3595 flock $fh, &Fcntl::LOCK_EX
3596 or die "$PIDFILE: flock: $!";
3597 $fh
3598}
3599
3600# make sure only one server instance is running at any one time
3601sub atomic {
3602 my $fh = pidfile;
3603
3604 my $pid = <$fh>;
3605 kill 9, $pid if $pid > 0;
3606
3607 seek $fh, 0, 0;
3608 print $fh $$;
3609}
3610
3611sub main_loop {
3612 trace "EV::loop starting\n";
3613 if (1) {
3614 EV::loop;
3615 }
3616 trace "EV::loop returned\n";
3617 goto &main_loop unless $REALLY_UNLOOP;
3618}
3619
3427sub main { 3620sub main {
3621 cf::init_globals; # initialise logging
3622
3623 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3624 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3625 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3626 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3627
3628 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3629
3428 # we must not ever block the main coroutine 3630 # we must not ever block the main coroutine
3429 local $Coro::idle = sub { 3631 local $Coro::idle = sub {
3430 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3632 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3431 (async { 3633 (async {
3432 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3634 $Coro::current->{desc} = "IDLE BUG HANDLER";
3433 EV::loop EV::LOOP_ONESHOT; 3635 EV::loop EV::LOOP_ONESHOT;
3434 })->prio (Coro::PRIO_MAX); 3636 })->prio (Coro::PRIO_MAX);
3435 }; 3637 };
3436 3638
3437 { 3639 evthread_start IO::AIO::poll_fileno;
3438 my $guard = freeze_mainloop; 3640
3641 cf::sync_job {
3642 cf::incloader::init ();
3643
3644 cf::init_anim;
3645 cf::init_attackmess;
3646 cf::init_dynamic;
3647
3648 cf::load_settings;
3649
3650 reload_resources;
3439 reload_config; 3651 reload_config;
3440 db_init; 3652 db_init;
3653
3654 cf::init_uuid;
3655 cf::init_signals;
3656 cf::init_skills;
3657
3658 cf::init_beforeplay;
3659
3660 atomic;
3661
3441 load_extensions; 3662 load_extensions;
3442 3663
3443 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3664 utime time, time, $RUNTIMEFILE;
3665
3666 # no (long-running) fork's whatsoever before this point(!)
3667 use POSIX ();
3668 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3669
3670 cf::_post_init 0;
3444 } 3671 };
3445 3672
3446 EV::loop; 3673 cf::object::thawer::errors_are_fatal 0;
3674 info "parse errors in files are no longer fatal from this point on.\n";
3675
3676 my $free_main; $free_main = EV::idle sub {
3677 undef $free_main;
3678 undef &main; # free gobs of memory :)
3679 };
3680
3681 goto &main_loop;
3447} 3682}
3448 3683
3449############################################################################# 3684#############################################################################
3450# initialisation and cleanup 3685# initialisation and cleanup
3451 3686
3452# install some emergency cleanup handlers 3687# install some emergency cleanup handlers
3453BEGIN { 3688BEGIN {
3454 our %SIGWATCHER = (); 3689 our %SIGWATCHER = ();
3455 for my $signal (qw(INT HUP TERM)) { 3690 for my $signal (qw(INT HUP TERM)) {
3456 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3691 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3457 cf::cleanup "SIG$signal"; 3692 cf::cleanup "SIG$signal";
3458 }; 3693 };
3459 } 3694 }
3460} 3695}
3461 3696
3462sub write_runtime_sync { 3697sub write_runtime_sync {
3463 my $runtime = "$LOCALDIR/runtime"; 3698 my $t0 = AE::time;
3464 3699
3465 # first touch the runtime file to show we are still running: 3700 # first touch the runtime file to show we are still running:
3466 # the fsync below can take a very very long time. 3701 # the fsync below can take a very very long time.
3467 3702
3468 IO::AIO::aio_utime $runtime, undef, undef; 3703 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3469 3704
3470 my $guard = cf::lock_acquire "write_runtime"; 3705 my $guard = cf::lock_acquire "write_runtime";
3471 3706
3472 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3707 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3473 or return; 3708 or return;
3474 3709
3475 my $value = $cf::RUNTIME + 90 + 10; 3710 my $value = $cf::RUNTIME + 90 + 10;
3476 # 10 is the runtime save interval, for a monotonic clock 3711 # 10 is the runtime save interval, for a monotonic clock
3477 # 60 allows for the watchdog to kill the server. 3712 # 60 allows for the watchdog to kill the server.
3487 aio_utime $fh, undef, undef; 3722 aio_utime $fh, undef, undef;
3488 3723
3489 close $fh 3724 close $fh
3490 or return; 3725 or return;
3491 3726
3492 aio_rename "$runtime~", $runtime 3727 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3493 and return; 3728 and return;
3494 3729
3495 warn "runtime file written.\n"; 3730 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3496 3731
3497 1 3732 1
3498} 3733}
3499 3734
3500our $uuid_lock; 3735our $uuid_lock;
3509 my $uuid = "$LOCALDIR/uuid"; 3744 my $uuid = "$LOCALDIR/uuid";
3510 3745
3511 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3746 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3512 or return; 3747 or return;
3513 3748
3514 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3749 my $value = uuid_seq uuid_cur;
3750
3751 unless ($value) {
3752 info "cowardly refusing to write zero uuid value!\n";
3753 return;
3754 }
3755
3756 my $value = uuid_str $value + $uuid_skip;
3515 $uuid_skip = 0; 3757 $uuid_skip = 0;
3516 3758
3517 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3759 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3518 and return; 3760 and return;
3519 3761
3525 or return; 3767 or return;
3526 3768
3527 aio_rename "$uuid~", $uuid 3769 aio_rename "$uuid~", $uuid
3528 and return; 3770 and return;
3529 3771
3530 warn "uuid file written ($value).\n"; 3772 trace "uuid file written ($value).\n";
3531 3773
3532 1 3774 1
3533 3775
3534} 3776}
3535 3777
3541} 3783}
3542 3784
3543sub emergency_save() { 3785sub emergency_save() {
3544 my $freeze_guard = cf::freeze_mainloop; 3786 my $freeze_guard = cf::freeze_mainloop;
3545 3787
3546 warn "enter emergency perl save\n"; 3788 info "emergency_perl_save: enter\n";
3789
3790 # this is a trade-off: we want to be very quick here, so
3791 # save all maps without fsync, and later call a global sync
3792 # (which in turn might be very very slow)
3793 local $USE_FSYNC = 0;
3547 3794
3548 cf::sync_job { 3795 cf::sync_job {
3796 cf::write_runtime_sync; # external watchdog should not bark
3797
3549 # use a peculiar iteration method to avoid tripping on perl 3798 # use a peculiar iteration method to avoid tripping on perl
3550 # refcount bugs in for. also avoids problems with players 3799 # refcount bugs in for. also avoids problems with players
3551 # and maps saved/destroyed asynchronously. 3800 # and maps saved/destroyed asynchronously.
3552 warn "begin emergency player save\n"; 3801 info "emergency_perl_save: begin player save\n";
3553 for my $login (keys %cf::PLAYER) { 3802 for my $login (keys %cf::PLAYER) {
3554 my $pl = $cf::PLAYER{$login} or next; 3803 my $pl = $cf::PLAYER{$login} or next;
3555 $pl->valid or next; 3804 $pl->valid or next;
3556 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3805 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3557 $pl->save; 3806 $pl->save;
3558 } 3807 }
3559 warn "end emergency player save\n"; 3808 info "emergency_perl_save: end player save\n";
3560 3809
3561 warn "begin emergency map save\n"; 3810 cf::write_runtime_sync; # external watchdog should not bark
3811
3812 info "emergency_perl_save: begin map save\n";
3562 for my $path (keys %cf::MAP) { 3813 for my $path (keys %cf::MAP) {
3563 my $map = $cf::MAP{$path} or next; 3814 my $map = $cf::MAP{$path} or next;
3564 $map->valid or next; 3815 $map->valid or next;
3565 $map->save; 3816 $map->save;
3566 } 3817 }
3567 warn "end emergency map save\n"; 3818 info "emergency_perl_save: end map save\n";
3568 3819
3569 warn "begin emergency database checkpoint\n"; 3820 cf::write_runtime_sync; # external watchdog should not bark
3821
3822 info "emergency_perl_save: begin database checkpoint\n";
3570 BDB::db_env_txn_checkpoint $DB_ENV; 3823 BDB::db_env_txn_checkpoint $DB_ENV;
3571 warn "end emergency database checkpoint\n"; 3824 info "emergency_perl_save: end database checkpoint\n";
3572 3825
3573 warn "begin write uuid\n"; 3826 info "emergency_perl_save: begin write uuid\n";
3574 write_uuid_sync 1; 3827 write_uuid_sync 1;
3575 warn "end write uuid\n"; 3828 info "emergency_perl_save: end write uuid\n";
3829
3830 cf::write_runtime_sync; # external watchdog should not bark
3831
3832 trace "emergency_perl_save: syncing database to disk";
3833 BDB::db_env_txn_checkpoint $DB_ENV;
3834
3835 info "emergency_perl_save: starting sync\n";
3836 IO::AIO::aio_sync sub {
3837 info "emergency_perl_save: finished sync\n";
3838 };
3839
3840 cf::write_runtime_sync; # external watchdog should not bark
3841
3842 trace "emergency_perl_save: flushing outstanding aio requests";
3843 while (IO::AIO::nreqs || BDB::nreqs) {
3844 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3845 }
3846
3847 cf::write_runtime_sync; # external watchdog should not bark
3576 }; 3848 };
3577 3849
3578 warn "leave emergency perl save\n"; 3850 info "emergency_perl_save: leave\n";
3579} 3851}
3580 3852
3581sub post_cleanup { 3853sub post_cleanup {
3582 my ($make_core) = @_; 3854 my ($make_core) = @_;
3583 3855
3856 IO::AIO::flush;
3857
3584 warn Carp::longmess "post_cleanup backtrace" 3858 error Carp::longmess "post_cleanup backtrace"
3585 if $make_core; 3859 if $make_core;
3860
3861 my $fh = pidfile;
3862 unlink $PIDFILE if <$fh> == $$;
3863}
3864
3865# a safer delete_package, copied from Symbol
3866sub clear_package($) {
3867 my $pkg = shift;
3868
3869 # expand to full symbol table name if needed
3870 unless ($pkg =~ /^main::.*::$/) {
3871 $pkg = "main$pkg" if $pkg =~ /^::/;
3872 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3873 $pkg .= '::' unless $pkg =~ /::$/;
3874 }
3875
3876 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3877 my $stem_symtab = *{$stem}{HASH};
3878
3879 defined $stem_symtab and exists $stem_symtab->{$leaf}
3880 or return;
3881
3882 # clear all symbols
3883 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3884 for my $name (keys %$leaf_symtab) {
3885 _gv_clear *{"$pkg$name"};
3886# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3887 }
3586} 3888}
3587 3889
3588sub do_reload_perl() { 3890sub do_reload_perl() {
3589 # can/must only be called in main 3891 # can/must only be called in main
3590 if ($Coro::current != $Coro::main) { 3892 unless (in_main) {
3591 warn "can only reload from main coroutine"; 3893 error "can only reload from main coroutine";
3592 return; 3894 return;
3593 } 3895 }
3594 3896
3595 warn "reloading..."; 3897 return if $RELOAD++;
3596 3898
3597 warn "entering sync_job"; 3899 my $t1 = AE::time;
3598 3900
3901 while ($RELOAD) {
3902 cf::get_slot 0.1, -1, "reload_perl";
3903 info "perl_reload: reloading...";
3904
3905 trace "perl_reload: entering sync_job";
3906
3599 cf::sync_job { 3907 cf::sync_job {
3600 cf::write_runtime_sync; # external watchdog should not bark
3601 cf::emergency_save; 3908 #cf::emergency_save;
3602 cf::write_runtime_sync; # external watchdog should not bark
3603 3909
3604 warn "syncing database to disk";
3605 BDB::db_env_txn_checkpoint $DB_ENV;
3606
3607 # if anything goes wrong in here, we should simply crash as we already saved
3608
3609 warn "flushing outstanding aio requests";
3610 for (;;) {
3611 BDB::flush;
3612 IO::AIO::flush;
3613 Coro::cede_notself;
3614 last unless IO::AIO::nreqs || BDB::nreqs;
3615 warn "iterate...";
3616 }
3617
3618 ++$RELOAD;
3619
3620 warn "cancelling all extension coros"; 3910 trace "perl_reload: cancelling all extension coros";
3621 $_->cancel for values %EXT_CORO; 3911 $_->cancel for values %EXT_CORO;
3622 %EXT_CORO = (); 3912 %EXT_CORO = ();
3623 3913
3624 warn "removing commands"; 3914 trace "perl_reload: removing commands";
3625 %COMMAND = (); 3915 %COMMAND = ();
3626 3916
3627 warn "removing ext/exti commands"; 3917 trace "perl_reload: removing ext/exti commands";
3628 %EXTCMD = (); 3918 %EXTCMD = ();
3629 %EXTICMD = (); 3919 %EXTICMD = ();
3630 3920
3631 warn "unloading/nuking all extensions"; 3921 trace "perl_reload: unloading/nuking all extensions";
3632 for my $pkg (@EXTS) { 3922 for my $pkg (@EXTS) {
3633 warn "... unloading $pkg"; 3923 trace "... unloading $pkg";
3634 3924
3635 if (my $cb = $pkg->can ("unload")) { 3925 if (my $cb = $pkg->can ("unload")) {
3636 eval { 3926 eval {
3637 $cb->($pkg); 3927 $cb->($pkg);
3638 1 3928 1
3639 } or warn "$pkg unloaded, but with errors: $@"; 3929 } or error "$pkg unloaded, but with errors: $@";
3930 }
3931
3932 trace "... clearing $pkg";
3933 clear_package $pkg;
3640 } 3934 }
3641 3935
3642 warn "... nuking $pkg";
3643 Symbol::delete_package $pkg;
3644 }
3645
3646 warn "unloading all perl modules loaded from $LIBDIR"; 3936 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3647 while (my ($k, $v) = each %INC) { 3937 while (my ($k, $v) = each %INC) {
3648 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3938 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3649 3939
3650 warn "... unloading $k"; 3940 trace "... unloading $k";
3651 delete $INC{$k}; 3941 delete $INC{$k};
3652 3942
3653 $k =~ s/\.pm$//; 3943 $k =~ s/\.pm$//;
3654 $k =~ s/\//::/g; 3944 $k =~ s/\//::/g;
3655 3945
3656 if (my $cb = $k->can ("unload_module")) { 3946 if (my $cb = $k->can ("unload_module")) {
3657 $cb->(); 3947 $cb->();
3948 }
3949
3950 clear_package $k;
3658 } 3951 }
3659 3952
3660 Symbol::delete_package $k;
3661 }
3662
3663 warn "getting rid of safe::, as good as possible"; 3953 trace "perl_reload: getting rid of safe::, as good as possible";
3664 Symbol::delete_package "safe::$_" 3954 clear_package "safe::$_"
3665 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3955 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3666 3956
3667 warn "unloading cf.pm \"a bit\""; 3957 trace "perl_reload: unloading cf.pm \"a bit\"";
3668 delete $INC{"cf.pm"}; 3958 delete $INC{"cf.pm"};
3669 delete $INC{"cf/pod.pm"}; 3959 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3670 3960
3671 # don't, removes xs symbols, too, 3961 # don't, removes xs symbols, too,
3672 # and global variables created in xs 3962 # and global variables created in xs
3673 #Symbol::delete_package __PACKAGE__; 3963 #clear_package __PACKAGE__;
3674 3964
3675 warn "unload completed, starting to reload now"; 3965 info "perl_reload: unload completed, starting to reload now";
3676 3966
3677 warn "reloading cf.pm"; 3967 trace "perl_reload: reloading cf.pm";
3678 require cf; 3968 require cf;
3679 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3969 cf::_connect_to_perl_1;
3680 3970
3681 warn "loading config and database again"; 3971 trace "perl_reload: loading config and database again";
3682 cf::reload_config; 3972 cf::reload_config;
3683 3973
3684 warn "loading extensions"; 3974 trace "perl_reload: loading extensions";
3685 cf::load_extensions; 3975 cf::load_extensions;
3686 3976
3977 if ($REATTACH_ON_RELOAD) {
3687 warn "reattaching attachments to objects/players"; 3978 trace "perl_reload: reattaching attachments to objects/players";
3688 _global_reattach; # objects, sockets 3979 _global_reattach; # objects, sockets
3689 warn "reattaching attachments to maps"; 3980 trace "perl_reload: reattaching attachments to maps";
3690 reattach $_ for values %MAP; 3981 reattach $_ for values %MAP;
3691 warn "reattaching attachments to players"; 3982 trace "perl_reload: reattaching attachments to players";
3692 reattach $_ for values %PLAYER; 3983 reattach $_ for values %PLAYER;
3984 }
3693 3985
3694 warn "leaving sync_job"; 3986 cf::_post_init 1;
3695 3987
3988 trace "perl_reload: leaving sync_job";
3989
3696 1 3990 1
3697 } or do { 3991 } or do {
3698 warn $@; 3992 error $@;
3699 cf::cleanup "error while reloading, exiting."; 3993 cf::cleanup "perl_reload: error, exiting.";
3994 };
3995
3996 --$RELOAD;
3700 }; 3997 }
3701 3998
3702 warn "reloaded"; 3999 $t1 = AE::time - $t1;
4000 info "perl_reload: completed in ${t1}s\n";
3703}; 4001};
3704 4002
3705our $RELOAD_WATCHER; # used only during reload 4003our $RELOAD_WATCHER; # used only during reload
3706 4004
3707sub reload_perl() { 4005sub reload_perl() {
3708 # doing reload synchronously and two reloads happen back-to-back, 4006 # doing reload synchronously and two reloads happen back-to-back,
3709 # coro crashes during coro_state_free->destroy here. 4007 # coro crashes during coro_state_free->destroy here.
3710 4008
4009 $RELOAD_WATCHER ||= cf::async {
4010 Coro::AIO::aio_wait cache_extensions;
4011
3711 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4012 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3712 do_reload_perl; 4013 do_reload_perl;
3713 undef $RELOAD_WATCHER; 4014 undef $RELOAD_WATCHER;
4015 };
3714 }; 4016 };
3715} 4017}
3716 4018
3717register_command "reload" => sub { 4019register_command "reload" => sub {
3718 my ($who, $arg) = @_; 4020 my ($who, $arg) = @_;
3724 reload_perl; 4026 reload_perl;
3725 }; 4027 };
3726 } 4028 }
3727}; 4029};
3728 4030
3729unshift @INC, $LIBDIR; 4031#############################################################################
3730 4032
3731my $bug_warning = 0; 4033my $bug_warning = 0;
3732 4034
3733our @WAIT_FOR_TICK; 4035our @WAIT_FOR_TICK;
3734our @WAIT_FOR_TICK_BEGIN; 4036our @WAIT_FOR_TICK_BEGIN;
3735 4037
3736sub wait_for_tick { 4038sub wait_for_tick() {
3737 return if tick_inhibit || $Coro::current == $Coro::main; 4039 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3738 4040
3739 my $signal = new Coro::Signal; 4041 my $signal = new Coro::Signal;
3740 push @WAIT_FOR_TICK, $signal; 4042 push @WAIT_FOR_TICK, $signal;
3741 $signal->wait; 4043 $signal->wait;
3742} 4044}
3743 4045
3744sub wait_for_tick_begin { 4046sub wait_for_tick_begin() {
3745 return if tick_inhibit || $Coro::current == $Coro::main; 4047 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3746 4048
3747 my $signal = new Coro::Signal; 4049 my $signal = new Coro::Signal;
3748 push @WAIT_FOR_TICK_BEGIN, $signal; 4050 push @WAIT_FOR_TICK_BEGIN, $signal;
3749 $signal->wait; 4051 $signal->wait;
3750} 4052}
3756 return; 4058 return;
3757 } 4059 }
3758 4060
3759 cf::server_tick; # one server iteration 4061 cf::server_tick; # one server iteration
3760 4062
4063 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4064
3761 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4065 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3762 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4066 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3763 Coro::async_pool { 4067 Coro::async_pool {
3764 $Coro::current->{desc} = "runtime saver"; 4068 $Coro::current->{desc} = "runtime saver";
3765 write_runtime_sync 4069 write_runtime_sync
3766 or warn "ERROR: unable to write runtime file: $!"; 4070 or error "ERROR: unable to write runtime file: $!";
3767 }; 4071 };
3768 } 4072 }
3769 4073
3770 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4074 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3771 $sig->send; 4075 $sig->send;
3779 4083
3780 if (0) { 4084 if (0) {
3781 if ($NEXT_TICK) { 4085 if ($NEXT_TICK) {
3782 my $jitter = $TICK_START - $NEXT_TICK; 4086 my $jitter = $TICK_START - $NEXT_TICK;
3783 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4087 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3784 warn "jitter $JITTER\n";#d# 4088 debug "jitter $JITTER\n";#d#
3785 } 4089 }
3786 } 4090 }
3787} 4091}
3788 4092
3789{ 4093{
3790 # configure BDB 4094 # configure BDB
3791 4095
3792 BDB::min_parallel 8; 4096 BDB::min_parallel 16;
3793 BDB::max_poll_reqs $TICK * 0.1; 4097 BDB::max_poll_reqs $TICK * 0.1;
3794 $AnyEvent::BDB::WATCHER->priority (1); 4098 $AnyEvent::BDB::WATCHER->priority (1);
3795 4099
3796 unless ($DB_ENV) { 4100 unless ($DB_ENV) {
3797 $DB_ENV = BDB::db_env_create; 4101 $DB_ENV = BDB::db_env_create;
3798 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4102 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3799 | BDB::LOG_AUTOREMOVE, 1); 4103 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4104 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3800 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4105 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3801 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4106 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3802 4107
3803 cf::sync_job { 4108 cf::sync_job {
3804 eval { 4109 eval {
3830{ 4135{
3831 # configure IO::AIO 4136 # configure IO::AIO
3832 4137
3833 IO::AIO::min_parallel 8; 4138 IO::AIO::min_parallel 8;
3834 IO::AIO::max_poll_time $TICK * 0.1; 4139 IO::AIO::max_poll_time $TICK * 0.1;
3835 #undef $AnyEvent::AIO::WATCHER; 4140 undef $AnyEvent::AIO::WATCHER;
3836} 4141}
3837 4142
3838my $_log_backtrace; 4143our $_log_backtrace;
4144our $_log_backtrace_last;
3839 4145
3840sub _log_backtrace { 4146sub _log_backtrace {
3841 my ($msg, @addr) = @_; 4147 my ($msg, @addr) = @_;
3842 4148
3843 $msg =~ s/\n//; 4149 $msg =~ s/\n$//;
3844 4150
4151 if ($_log_backtrace_last eq $msg) {
4152 LOG llevInfo, "[ABT] $msg\n";
4153 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3845 # limit the # of concurrent backtraces 4154 # limit the # of concurrent backtraces
3846 if ($_log_backtrace < 2) { 4155 } elsif ($_log_backtrace < 2) {
4156 $_log_backtrace_last = $msg;
3847 ++$_log_backtrace; 4157 ++$_log_backtrace;
4158 my $perl_bt = Carp::longmess $msg;
3848 async { 4159 async {
3849 $Coro::current->{desc} = "abt $msg"; 4160 $Coro::current->{desc} = "abt $msg";
3850 4161
3851 my @bt = fork_call { 4162 my @bt = fork_call {
3852 @addr = map { sprintf "%x", $_ } @addr; 4163 @addr = map { sprintf "%x", $_ } @addr;
3863 } 4174 }
3864 4175
3865 @funcs 4176 @funcs
3866 }; 4177 };
3867 4178
3868 LOG llevInfo, "[ABT] $msg\n"; 4179 LOG llevInfo, "[ABT] $perl_bt\n";
4180 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3869 LOG llevInfo, "[ABT] $_\n" for @bt; 4181 LOG llevInfo, "[ABT] $_\n" for @bt;
3870 --$_log_backtrace; 4182 --$_log_backtrace;
3871 }; 4183 };
3872 } else { 4184 } else {
3873 LOG llevInfo, "[ABT] $msg\n"; 4185 LOG llevInfo, "[ABT] $msg\n";
3874 LOG llevInfo, "[ABT] [suppressed]\n"; 4186 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3875 } 4187 }
3876} 4188}
3877 4189
3878# load additional modules 4190# load additional modules
3879use cf::pod; 4191require "cf/$_.pm" for @EXTRA_MODULES;
4192cf::_connect_to_perl_2;
3880 4193
3881END { cf::emergency_save } 4194END { cf::emergency_save }
3882 4195
3883evthread_start IO::AIO::poll_fileno;
3884
38851 41961
3886 4197

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines