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.437 by root, Tue Jul 8 08:33:27 2008 UTC vs.
Revision 1.546 by root, Thu May 6 22:57:49 2010 UTC

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

Diff Legend

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