ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.439 by root, Mon Jul 14 16:42:49 2008 UTC vs.
Revision 1.547 by root, Sun May 9 22:51:13 2010 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
18# 19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use 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 {
… …
537Coro::Storable. May, of course, block. Note that the executed sub may 592Coro::Storable. May, of course, block. Note that the executed sub may
538never block itself or use any form of event handling. 593never block itself or use any form of event handling.
539 594
540=cut 595=cut
541 596
597sub post_fork {
598 reset_signals;
599}
600
542sub fork_call(&@) { 601sub fork_call(&@) {
543 my ($cb, @args) = @_; 602 my ($cb, @args) = @_;
544 603
545 # we seemingly have to make a local copy of the whole thing, 604 # we seemingly have to make a local copy of the whole thing,
546 # otherwise perl prematurely frees the stuff :/ 605 # otherwise perl prematurely frees the stuff :/
547 # TODO: investigate and fix (likely this will be rather laborious) 606 # TODO: investigate and fix (likely this will be rather laborious)
548 607
549 my @res = Coro::Util::fork_eval { 608 my @res = Coro::Util::fork_eval {
550 reset_signals; 609 cf::post_fork;
551 &$cb 610 &$cb
552 }, @args; 611 }, @args;
553 612
554 wantarray ? @res : $res[-1] 613 wantarray ? @res : $res[-1]
614}
615
616sub objinfo {
617 (
618 "counter value" => cf::object::object_count,
619 "objects created" => cf::object::create_count,
620 "objects destroyed" => cf::object::destroy_count,
621 "freelist size" => cf::object::free_count,
622 "allocated objects" => cf::object::objects_size,
623 "active objects" => cf::object::actives_size,
624 )
555} 625}
556 626
557=item $coin = coin_from_name $name 627=item $coin = coin_from_name $name
558 628
559=cut 629=cut
… …
596within each server. 666within each server.
597 667
598=cut 668=cut
599 669
600sub db_table($) { 670sub db_table($) {
671 cf::error "db_get called from main context"
672 if $Coro::current == $Coro::main;
673
601 my ($name) = @_; 674 my ($name) = @_;
602 my $db = BDB::db_create $DB_ENV; 675 my $db = BDB::db_create $DB_ENV;
603 676
604 eval { 677 eval {
605 $db->set_flags (BDB::CHKSUM); 678 $db->set_flags (BDB::CHKSUM);
… …
615} 688}
616 689
617our $DB; 690our $DB;
618 691
619sub db_init { 692sub db_init {
620 cf::sync_job {
621 $DB ||= db_table "db"; 693 $DB ||= db_table "db";
622 };
623} 694}
624 695
625sub db_get($$) { 696sub db_get($$) {
626 my $key = "$_[0]/$_[1]"; 697 my $key = "$_[0]/$_[1]";
627 698
628 cf::sync_job { 699 cf::error "db_get called from main context"
700 if $Coro::current == $Coro::main;
701
629 BDB::db_get $DB, undef, $key, my $data; 702 BDB::db_get $DB, undef, $key, my $data;
630 703
631 $! ? () 704 $! ? ()
632 : $data 705 : $data
633 }
634} 706}
635 707
636sub db_put($$$) { 708sub db_put($$$) {
637 BDB::dbreq_pri 4; 709 BDB::dbreq_pri 4;
638 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 710 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
694 766
695 my $t1 = Time::HiRes::time; 767 my $t1 = Time::HiRes::time;
696 my $data = $process->(\@data); 768 my $data = $process->(\@data);
697 my $t2 = Time::HiRes::time; 769 my $t2 = Time::HiRes::time;
698 770
699 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 771 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
700 772
701 db_put cache => "$id/data", $data; 773 db_put cache => "$id/data", $data;
702 db_put cache => "$id/md5" , $md5; 774 db_put cache => "$id/md5" , $md5;
703 db_put cache => "$id/meta", $meta; 775 db_put cache => "$id/meta", $meta;
704 776
… …
714 786
715=cut 787=cut
716 788
717sub datalog($@) { 789sub datalog($@) {
718 my ($type, %kv) = @_; 790 my ($type, %kv) = @_;
719 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 791 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
720} 792}
721 793
722=back 794=back
723 795
724=cut 796=cut
725 797
726############################################################################# 798#############################################################################
727 799
728=head2 ATTACHABLE OBJECTS 800=head2 ATTACHABLE OBJECTS
729 801
730Many objects in crossfire are so-called attachable objects. That means you can 802Many objects in deliantra are so-called attachable objects. That means you can
731attach callbacks/event handlers (a collection of which is called an "attachment") 803attach callbacks/event handlers (a collection of which is called an "attachment")
732to it. All such attachable objects support the following methods. 804to it. All such attachable objects support the following methods.
733 805
734In the following description, CLASS can be any of C<global>, C<object> 806In the following description, CLASS can be any of C<global>, C<object>
735C<player>, C<client> or C<map> (i.e. the attachable objects in 807C<player>, C<client> or C<map> (i.e. the attachable objects in
… …
785=item cf::CLASS::attachment $name, ... 857=item cf::CLASS::attachment $name, ...
786 858
787Register an attachment by C<$name> through which attachable objects of the 859Register an attachment by C<$name> through which attachable objects of the
788given CLASS can refer to this attachment. 860given CLASS can refer to this attachment.
789 861
790Some classes such as crossfire maps and objects can specify attachments 862Some classes such as deliantra maps and objects can specify attachments
791that are attached at load/instantiate time, thus the need for a name. 863that are attached at load/instantiate time, thus the need for a name.
792 864
793These calls expect any number of the following handler/hook descriptions: 865These calls expect any number of the following handler/hook descriptions:
794 866
795=over 4 867=over 4
… …
919 991
920 } elsif (exists $cb_id{$type}) { 992 } elsif (exists $cb_id{$type}) {
921 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 993 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
922 994
923 } elsif (ref $type) { 995 } elsif (ref $type) {
924 warn "attaching objects not supported, ignoring.\n"; 996 error "attaching objects not supported, ignoring.\n";
925 997
926 } else { 998 } else {
927 shift @arg; 999 shift @arg;
928 warn "attach argument '$type' not supported, ignoring.\n"; 1000 error "attach argument '$type' not supported, ignoring.\n";
929 } 1001 }
930 } 1002 }
931} 1003}
932 1004
933sub _object_attach { 1005sub _object_attach {
… …
943 _attach $registry, $klass, @attach; 1015 _attach $registry, $klass, @attach;
944 } 1016 }
945 1017
946 $obj->{$name} = \%arg; 1018 $obj->{$name} = \%arg;
947 } else { 1019 } else {
948 warn "object uses attachment '$name' which is not available, postponing.\n"; 1020 info "object uses attachment '$name' which is not available, postponing.\n";
949 } 1021 }
950 1022
951 $obj->{_attachment}{$name} = undef; 1023 $obj->{_attachment}{$name} = undef;
952} 1024}
953 1025
… …
1012 1084
1013 for (@$callbacks) { 1085 for (@$callbacks) {
1014 eval { &{$_->[1]} }; 1086 eval { &{$_->[1]} };
1015 1087
1016 if ($@) { 1088 if ($@) {
1017 warn "$@";
1018 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1089 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1019 override; 1090 override;
1020 } 1091 }
1021 1092
1022 return 1 if $override; 1093 return 1 if $override;
1023 } 1094 }
… …
1086 1157
1087sub reattach { 1158sub reattach {
1088 # basically do the same as instantiate, without calling instantiate 1159 # basically do the same as instantiate, without calling instantiate
1089 my ($obj) = @_; 1160 my ($obj) = @_;
1090 1161
1162 # no longer needed after getting rid of delete_package?
1091 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1163 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1092 1164
1093 my $registry = $obj->registry; 1165 my $registry = $obj->registry;
1094 1166
1095 @$registry = (); 1167 @$registry = ();
1096 1168
… …
1101 for (@$attach) { 1173 for (@$attach) {
1102 my ($klass, @attach) = @$_; 1174 my ($klass, @attach) = @$_;
1103 _attach $registry, $klass, @attach; 1175 _attach $registry, $klass, @attach;
1104 } 1176 }
1105 } else { 1177 } else {
1106 warn "object uses attachment '$name' that is not available, postponing.\n"; 1178 info "object uses attachment '$name' that is not available, postponing.\n";
1107 } 1179 }
1108 } 1180 }
1109} 1181}
1110 1182
1111cf::attachable->attach ( 1183cf::attachable->attach (
… …
1138 my ($filename, $rdata, $objs) = @_; 1210 my ($filename, $rdata, $objs) = @_;
1139 1211
1140 sync_job { 1212 sync_job {
1141 if (length $$rdata) { 1213 if (length $$rdata) {
1142 utf8::decode (my $decname = $filename); 1214 utf8::decode (my $decname = $filename);
1143 warn sprintf "saving %s (%d,%d)\n", 1215 trace sprintf "saving %s (%d,%d)\n",
1144 $decname, length $$rdata, scalar @$objs; 1216 $decname, length $$rdata, scalar @$objs
1217 if $VERBOSE_IO;
1145 1218
1146 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1219 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1147 aio_chmod $fh, SAVE_MODE; 1220 aio_chmod $fh, SAVE_MODE;
1148 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1221 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1149 aio_fsync $fh if $cf::USE_FSYNC; 1222 if ($cf::USE_FSYNC) {
1223 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1224 aio_fsync $fh;
1225 }
1150 aio_close $fh; 1226 aio_close $fh;
1151 1227
1152 if (@$objs) { 1228 if (@$objs) {
1153 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1229 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1154 aio_chmod $fh, SAVE_MODE; 1230 aio_chmod $fh, SAVE_MODE;
1155 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1231 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1156 aio_write $fh, 0, (length $data), $data, 0; 1232 aio_write $fh, 0, (length $data), $data, 0;
1157 aio_fsync $fh if $cf::USE_FSYNC; 1233 if ($cf::USE_FSYNC) {
1234 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1235 aio_fsync $fh;
1236 }
1158 aio_close $fh; 1237 aio_close $fh;
1159 aio_rename "$filename.pst~", "$filename.pst"; 1238 aio_rename "$filename.pst~", "$filename.pst";
1160 } 1239 }
1161 } else { 1240 } else {
1162 aio_unlink "$filename.pst"; 1241 aio_unlink "$filename.pst";
1163 } 1242 }
1164 1243
1165 aio_rename "$filename~", $filename; 1244 aio_rename "$filename~", $filename;
1245
1246 $filename =~ s%/[^/]+$%%;
1247 aio_pathsync $filename if $cf::USE_FSYNC;
1166 } else { 1248 } else {
1167 warn "FATAL: $filename~: $!\n"; 1249 error "unable to save objects: $filename~: $!\n";
1168 } 1250 }
1169 } else { 1251 } else {
1170 aio_unlink $filename; 1252 aio_unlink $filename;
1171 aio_unlink "$filename.pst"; 1253 aio_unlink "$filename.pst";
1172 } 1254 }
… …
1196 my $st = eval { Coro::Storable::thaw $av }; 1278 my $st = eval { Coro::Storable::thaw $av };
1197 $av = $st->{objs}; 1279 $av = $st->{objs};
1198 } 1280 }
1199 1281
1200 utf8::decode (my $decname = $filename); 1282 utf8::decode (my $decname = $filename);
1201 warn sprintf "loading %s (%d,%d)\n", 1283 trace sprintf "loading %s (%d,%d)\n",
1202 $decname, length $data, scalar @{$av || []}; 1284 $decname, length $data, scalar @{$av || []}
1285 if $VERBOSE_IO;
1203 1286
1204 ($data, $av) 1287 ($data, $av)
1205} 1288}
1206 1289
1207=head2 COMMAND CALLBACKS 1290=head2 COMMAND CALLBACKS
… …
1263 my ($name, $cb) = @_; 1346 my ($name, $cb) = @_;
1264 1347
1265 $EXTICMD{$name} = $cb; 1348 $EXTICMD{$name} = $cb;
1266} 1349}
1267 1350
1351use File::Glob ();
1352
1268cf::player->attach ( 1353cf::player->attach (
1269 on_command => sub { 1354 on_unknown_command => sub {
1270 my ($pl, $name, $params) = @_; 1355 my ($pl, $name, $params) = @_;
1271 1356
1272 my $cb = $COMMAND{$name} 1357 my $cb = $COMMAND{$name}
1273 or return; 1358 or return;
1274 1359
… …
1297 1382
1298 $pl->ext_reply ($reply, @reply) 1383 $pl->ext_reply ($reply, @reply)
1299 if $reply; 1384 if $reply;
1300 1385
1301 } else { 1386 } else {
1302 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1387 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1303 } 1388 }
1304 1389
1305 cf::override; 1390 cf::override;
1306 }, 1391 },
1307); 1392);
1308 1393
1394# "readahead" all extensions
1395sub cache_extensions {
1396 my $grp = IO::AIO::aio_group;
1397
1398 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1399 for (grep /\.ext$/, @{$_[0]}) {
1400 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1401 }
1402 };
1403
1404 $grp
1405}
1406
1309sub load_extensions { 1407sub load_extensions {
1408 info "loading extensions...";
1409
1310 cf::sync_job { 1410 cf::sync_job {
1311 my %todo; 1411 my %todo;
1312 1412
1313 for my $path (<$LIBDIR/*.ext>) { 1413 for my $path (<$LIBDIR/*.ext>) {
1314 next unless -r $path; 1414 next unless -r $path;
… …
1332 1432
1333 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1433 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1334 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1434 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1335 1435
1336 $ext{source} = 1436 $ext{source} =
1337 "package $pkg; use strict; use utf8;\n" 1437 "package $pkg; use common::sense;\n"
1338 . "#line 1 \"$path\"\n{\n" 1438 . "#line 1 \"$path\"\n{\n"
1339 . $source 1439 . $source
1340 . "\n};\n1"; 1440 . "\n};\n1";
1341 1441
1342 $todo{$base} = \%ext; 1442 $todo{$base} = \%ext;
1343 } 1443 }
1344 1444
1445 my $pass = 0;
1345 my %done; 1446 my %done;
1346 while (%todo) { 1447 while (%todo) {
1347 my $progress; 1448 my $progress;
1348 1449
1450 ++$pass;
1451
1452 ext:
1349 while (my ($k, $v) = each %todo) { 1453 while (my ($k, $v) = each %todo) {
1350 for (split /,\s*/, $v->{meta}{depends}) { 1454 for (split /,\s*/, $v->{meta}{depends}) {
1351 goto skip 1455 next ext
1352 unless exists $done{$_}; 1456 unless exists $done{$_};
1353 } 1457 }
1354 1458
1355 warn "... loading '$k' into '$v->{pkg}'\n"; 1459 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1356 1460
1357 unless (eval $v->{source}) { 1461 my $active = eval $v->{source};
1462
1463 if (length $@) {
1358 my $msg = $@ ? "$v->{path}: $@\n" 1464 error "$v->{path}: $@\n";
1359 : "$v->{base}: extension inactive.\n";
1360 1465
1361 if (exists $v->{meta}{mandatory}) {
1362 warn $msg;
1363 cf::cleanup "mandatory extension failed to load, exiting."; 1466 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1364 } 1467 if exists $v->{meta}{mandatory};
1365 1468
1366 warn $msg; 1469 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1470 delete $todo{$k};
1471 } else {
1472 $done{$k} = delete $todo{$k};
1473 push @EXTS, $v->{pkg};
1474 $progress = 1;
1475
1476 info "$v->{base}: extension inactive.\n"
1477 unless $active;
1367 } 1478 }
1368
1369 $done{$k} = delete $todo{$k};
1370 push @EXTS, $v->{pkg};
1371 $progress = 1;
1372 } 1479 }
1373 1480
1374 skip: 1481 unless ($progress) {
1375 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1482 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1376 unless $progress; 1483
1484 while (my ($k, $v) = each %todo) {
1485 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1486 if exists $v->{meta}{mandatory};
1487 }
1488 }
1377 } 1489 }
1378 }; 1490 };
1379} 1491}
1380 1492
1381############################################################################# 1493#############################################################################
1382 1494
1383=back 1495=back
1384 1496
1385=head2 CORE EXTENSIONS 1497=head2 CORE EXTENSIONS
1386 1498
1387Functions and methods that extend core crossfire objects. 1499Functions and methods that extend core deliantra objects.
1388 1500
1389=cut 1501=cut
1390 1502
1391package cf::player; 1503package cf::player;
1392 1504
… …
1435 1547
1436sub exists($) { 1548sub exists($) {
1437 my ($login) = @_; 1549 my ($login) = @_;
1438 1550
1439 $cf::PLAYER{$login} 1551 $cf::PLAYER{$login}
1440 or cf::sync_job { !aio_stat path $login } 1552 or !aio_stat path $login
1441} 1553}
1442 1554
1443sub find($) { 1555sub find($) {
1444 return $cf::PLAYER{$_[0]} || do { 1556 return $cf::PLAYER{$_[0]} || do {
1445 my $login = $_[0]; 1557 my $login = $_[0];
… …
1465 $cf::PLAYER{$login} = $pl 1577 $cf::PLAYER{$login} = $pl
1466 } 1578 }
1467 } 1579 }
1468} 1580}
1469 1581
1582cf::player->attach (
1583 on_load => sub {
1584 my ($pl, $path) = @_;
1585
1586 # restore slots saved in save, below
1587 my $slots = delete $pl->{_slots};
1588
1589 $pl->ob->current_weapon ($slots->[0]);
1590 $pl->combat_ob ($slots->[1]);
1591 $pl->ranged_ob ($slots->[2]);
1592 },
1593);
1594
1470sub save($) { 1595sub save($) {
1471 my ($pl) = @_; 1596 my ($pl) = @_;
1472 1597
1473 return if $pl->{deny_save}; 1598 return if $pl->{deny_save};
1474 1599
… …
1479 1604
1480 aio_mkdir playerdir $pl, 0770; 1605 aio_mkdir playerdir $pl, 0770;
1481 $pl->{last_save} = $cf::RUNTIME; 1606 $pl->{last_save} = $cf::RUNTIME;
1482 1607
1483 cf::get_slot 0.01; 1608 cf::get_slot 0.01;
1609
1610 # save slots, to be restored later
1611 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1484 1612
1485 $pl->save_pl ($path); 1613 $pl->save_pl ($path);
1486 cf::cede_to_tick; 1614 cf::cede_to_tick;
1487} 1615}
1488 1616
… …
1520 my ($pl) = @_; 1648 my ($pl) = @_;
1521 1649
1522 my $name = $pl->ob->name; 1650 my $name = $pl->ob->name;
1523 1651
1524 $pl->{deny_save} = 1; 1652 $pl->{deny_save} = 1;
1525 $pl->password ("*"); # this should lock out the player until we nuked the dir 1653 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1526 1654
1527 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1655 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1528 $pl->deactivate; 1656 $pl->deactivate;
1657
1529 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1658 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1530 $pl->ob->check_score; 1659 ext::highscore::check ($pl->ob);
1660
1531 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1661 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1532 $pl->ns->destroy if $pl->ns; 1662 $pl->ns->destroy if $pl->ns;
1533 1663
1534 my $path = playerdir $pl; 1664 my $path = playerdir $pl;
1535 my $temp = "$path~$cf::RUNTIME~deleting~"; 1665 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1590 \@logins 1720 \@logins
1591} 1721}
1592 1722
1593=item $player->maps 1723=item $player->maps
1594 1724
1725=item cf::player::maps $login
1726
1595Returns an arrayref of map paths that are private for this 1727Returns an arrayref of map paths that are private for this
1596player. May block. 1728player. May block.
1597 1729
1598=cut 1730=cut
1599 1731
… …
1616 } 1748 }
1617 1749
1618 \@paths 1750 \@paths
1619} 1751}
1620 1752
1621=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1753=item $protocol_xml = $player->expand_cfpod ($cfpod)
1622 1754
1623Expand crossfire pod fragments into protocol xml. 1755Expand 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 1756
1714=item $player->ext_reply ($msgid, @msg) 1757=item $player->ext_reply ($msgid, @msg)
1715 1758
1716Sends an ext reply to the player. 1759Sends an ext reply to the player.
1717 1760
… …
1749 1792
1750=cut 1793=cut
1751 1794
1752sub find_by_path($) { 1795sub find_by_path($) {
1753 my ($path) = @_; 1796 my ($path) = @_;
1797
1798 $path =~ s/^~[^\/]*//; # skip ~login
1754 1799
1755 my ($match, $specificity); 1800 my ($match, $specificity);
1756 1801
1757 for my $region (list) { 1802 for my $region (list) {
1758 if ($region->{match} && $path =~ $region->{match}) { 1803 if ($region->{match} && $path =~ $region->{match}) {
… …
1790 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1835 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1791 1836
1792 # mit "rum" bekleckern, nicht 1837 # mit "rum" bekleckern, nicht
1793 $self->_create_random_map ( 1838 $self->_create_random_map (
1794 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1839 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1795 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1840 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1796 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1841 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1797 $rmp->{exit_on_final_map}, 1842 $rmp->{exit_on_final_map},
1798 $rmp->{xsize}, $rmp->{ysize}, 1843 $rmp->{xsize}, $rmp->{ysize},
1799 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1844 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1800 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1845 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
1815 1860
1816sub register { 1861sub register {
1817 my (undef, $regex, $prio) = @_; 1862 my (undef, $regex, $prio) = @_;
1818 my $pkg = caller; 1863 my $pkg = caller;
1819 1864
1820 no strict;
1821 push @{"$pkg\::ISA"}, __PACKAGE__; 1865 push @{"$pkg\::ISA"}, __PACKAGE__;
1822 1866
1823 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1867 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1824} 1868}
1825 1869
1826# also paths starting with '/' 1870# also paths starting with '/'
1827$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1871$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1828 1872
1829sub thawer_merge { 1873sub thawer_merge {
1830 my ($self, $merge) = @_; 1874 my ($self, $merge) = @_;
1831 1875
1832 # we have to keep some variables in memory intact 1876 # we have to keep some variables in memory intact
… …
1837} 1881}
1838 1882
1839sub normalise { 1883sub normalise {
1840 my ($path, $base) = @_; 1884 my ($path, $base) = @_;
1841 1885
1842 $path = "$path"; # make sure its a string 1886 $path = "$path"; # make sure it's a string
1843 1887
1844 $path =~ s/\.map$//; 1888 $path =~ s/\.map$//;
1845 1889
1846 # map plan: 1890 # map plan:
1847 # 1891 #
… …
1886 $self->init; # pass $1 etc. 1930 $self->init; # pass $1 etc.
1887 return $self; 1931 return $self;
1888 } 1932 }
1889 } 1933 }
1890 1934
1891 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1935 Carp::cluck "unable to resolve path '$path' (base '$base')";
1892 () 1936 ()
1893} 1937}
1894 1938
1895sub init { 1939sub init {
1896 my ($self) = @_; 1940 my ($self) = @_;
… …
1928sub uniq_path { 1972sub uniq_path {
1929 my ($self) = @_; 1973 my ($self) = @_;
1930 1974
1931 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1975 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1932 "$UNIQUEDIR/$path" 1976 "$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} 1977}
1943 1978
1944sub decay_objects { 1979sub decay_objects {
1945 my ($self) = @_; 1980 my ($self) = @_;
1946 1981
… …
2028 2063
2029sub find; 2064sub find;
2030sub find { 2065sub find {
2031 my ($path, $origin) = @_; 2066 my ($path, $origin) = @_;
2032 2067
2068 cf::cede_to_tick;
2069
2033 $path = normalise $path, $origin && $origin->path; 2070 $path = normalise $path, $origin && $origin->path;
2034 2071
2035 cf::lock_wait "map_data:$path";#d#remove 2072 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2036 cf::lock_wait "map_find:$path"; 2073 my $guard2 = cf::lock_acquire "map_find:$path";
2037 2074
2038 $cf::MAP{$path} || do { 2075 $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 2076 my $map = new_from_path cf::map $path
2043 or return; 2077 or return;
2044 2078
2045 $map->{last_save} = $cf::RUNTIME; 2079 $map->{last_save} = $cf::RUNTIME;
2046 2080
… …
2058 2092
2059 $cf::MAP{$path} = $map 2093 $cf::MAP{$path} = $map
2060 } 2094 }
2061} 2095}
2062 2096
2063sub pre_load { } 2097sub pre_load { }
2064sub post_load { } 2098#sub post_load { } # XS
2065 2099
2066sub load { 2100sub load {
2067 my ($self) = @_; 2101 my ($self) = @_;
2068 2102
2069 local $self->{deny_reset} = 1; # loading can take a long time 2103 local $self->{deny_reset} = 1; # loading can take a long time
… …
2114 unless ($self->{deny_activate}) { 2148 unless ($self->{deny_activate}) {
2115 $self->decay_objects; 2149 $self->decay_objects;
2116 $self->fix_auto_apply; 2150 $self->fix_auto_apply;
2117 $self->update_buttons; 2151 $self->update_buttons;
2118 cf::cede_to_tick; 2152 cf::cede_to_tick;
2119 $self->set_darkness_map;
2120 cf::cede_to_tick;
2121 $self->activate; 2153 $self->activate;
2122 } 2154 }
2123 2155
2124 $self->{last_save} = $cf::RUNTIME; 2156 $self->{last_save} = $cf::RUNTIME;
2125 $self->last_access ($cf::RUNTIME); 2157 $self->last_access ($cf::RUNTIME);
… …
2128 } 2160 }
2129 2161
2130 $self->post_load; 2162 $self->post_load;
2131} 2163}
2132 2164
2165# customize the map for a given player, i.e.
2166# return the _real_ map. used by e.g. per-player
2167# maps to change the path to ~playername/mappath
2133sub customise_for { 2168sub customise_for {
2134 my ($self, $ob) = @_; 2169 my ($self, $ob) = @_;
2135 2170
2136 return find "~" . $ob->name . "/" . $self->{path} 2171 return find "~" . $ob->name . "/" . $self->{path}
2137 if $self->per_player; 2172 if $self->per_player;
… …
2153 or next; 2188 or next;
2154 $neigh = find $neigh, $map 2189 $neigh = find $neigh, $map
2155 or next; 2190 or next;
2156 $neigh->load; 2191 $neigh->load;
2157 2192
2193 # now find the diagonal neighbours
2158 push @neigh, 2194 push @neigh,
2159 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2195 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2160 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2196 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2161 } 2197 }
2162 2198
… …
2169} 2205}
2170 2206
2171sub find_sync { 2207sub find_sync {
2172 my ($path, $origin) = @_; 2208 my ($path, $origin) = @_;
2173 2209
2174 cf::sync_job { find $path, $origin } 2210 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2211 if $Coro::current == $Coro::main;
2212
2213 find $path, $origin
2175} 2214}
2176 2215
2177sub do_load_sync { 2216sub do_load_sync {
2178 my ($map) = @_; 2217 my ($map) = @_;
2179 2218
2180 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2219 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2181 if $Coro::current == $Coro::main; 2220 if $Coro::current == $Coro::main;
2182 2221
2183 cf::sync_job { $map->load }; 2222 $map->load;
2184} 2223}
2185 2224
2186our %MAP_PREFETCH; 2225our %MAP_PREFETCH;
2187our $MAP_PREFETCHER = undef; 2226our $MAP_PREFETCHER = undef;
2188 2227
… …
2214 $MAP_PREFETCHER->prio (6); 2253 $MAP_PREFETCHER->prio (6);
2215 2254
2216 () 2255 ()
2217} 2256}
2218 2257
2258# common code, used by both ->save and ->swapout
2219sub save { 2259sub _save {
2220 my ($self) = @_; 2260 my ($self) = @_;
2221
2222 my $lock = cf::lock_acquire "map_data:$self->{path}";
2223 2261
2224 $self->{last_save} = $cf::RUNTIME; 2262 $self->{last_save} = $cf::RUNTIME;
2225 2263
2226 return unless $self->dirty; 2264 return unless $self->dirty;
2227 2265
… …
2247 } else { 2285 } else {
2248 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2286 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2249 } 2287 }
2250} 2288}
2251 2289
2290sub save {
2291 my ($self) = @_;
2292
2293 my $lock = cf::lock_acquire "map_data:$self->{path}";
2294
2295 $self->_save;
2296}
2297
2252sub swap_out { 2298sub swap_out {
2253 my ($self) = @_; 2299 my ($self) = @_;
2254 2300
2255 # save first because save cedes
2256 $self->save;
2257
2258 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2301 my $lock = cf::lock_acquire "map_data:$self->{path}";
2259 2302
2260 return if $self->players;
2261 return if $self->in_memory != cf::MAP_ACTIVE; 2303 return if $self->in_memory != cf::MAP_ACTIVE;
2262 return if $self->{deny_save}; 2304 return if $self->{deny_save};
2305 return if $self->players;
2263 2306
2307 # first deactivate the map and "unlink" it from the core
2308 $self->deactivate;
2309 $_->clear_links_to ($self) for values %cf::MAP;
2264 $self->in_memory (cf::MAP_SWAPPED); 2310 $self->in_memory (cf::MAP_SWAPPED);
2311
2312 # then atomically save
2313 $self->_save;
2314
2315 # then free the map
2316 $self->clear;
2317}
2318
2319sub reset_at {
2320 my ($self) = @_;
2321
2322 # TODO: safety, remove and allow resettable per-player maps
2323 return 1e99 if $self->{deny_reset};
2324
2325 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2326 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2327
2328 $time + $to
2329}
2330
2331sub should_reset {
2332 my ($self) = @_;
2333
2334 $self->reset_at <= $cf::RUNTIME
2335}
2336
2337sub reset {
2338 my ($self) = @_;
2339
2340 my $lock = cf::lock_acquire "map_data:$self->{path}";
2341
2342 return if $self->players;
2343
2344 cf::trace "resetting map ", $self->path, "\n";
2345
2346 $self->in_memory (cf::MAP_SWAPPED);
2347
2348 # need to save uniques path
2349 unless ($self->{deny_save}) {
2350 my $uniq = $self->uniq_path; utf8::encode $uniq;
2351
2352 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2353 if $uniq;
2354 }
2355
2356 delete $cf::MAP{$self->path};
2265 2357
2266 $self->deactivate; 2358 $self->deactivate;
2267 $_->clear_links_to ($self) for values %cf::MAP; 2359 $_->clear_links_to ($self) for values %cf::MAP;
2268 $self->clear; 2360 $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 2361
2314 $self->unlink_save; 2362 $self->unlink_save;
2315 $self->destroy; 2363 $self->destroy;
2316} 2364}
2317 2365
… …
2325 2373
2326 delete $cf::MAP{$self->path}; 2374 delete $cf::MAP{$self->path};
2327 2375
2328 $self->unlink_save; 2376 $self->unlink_save;
2329 2377
2330 bless $self, "cf::map"; 2378 bless $self, "cf::map::wrap";
2331 delete $self->{deny_reset}; 2379 delete $self->{deny_reset};
2332 $self->{deny_save} = 1; 2380 $self->{deny_save} = 1;
2333 $self->reset_timeout (1); 2381 $self->reset_timeout (1);
2334 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2382 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2335 2383
… …
2392 : normalise $_ 2440 : normalise $_
2393 } @{ aio_readdir $UNIQUEDIR or [] } 2441 } @{ aio_readdir $UNIQUEDIR or [] }
2394 ] 2442 ]
2395} 2443}
2396 2444
2445=item cf::map::static_maps
2446
2447Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2448file in the shared directory excluding F</styles> and F</editor>). May
2449block.
2450
2451=cut
2452
2453sub static_maps() {
2454 my @dirs = "";
2455 my @maps;
2456
2457 while (@dirs) {
2458 my $dir = shift @dirs;
2459
2460 next if $dir eq "/styles" || $dir eq "/editor";
2461
2462 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2463 or return;
2464
2465 for (@$files) {
2466 s/\.map$// or next;
2467 utf8::decode $_;
2468 push @maps, "$dir/$_";
2469 }
2470
2471 push @dirs, map "$dir/$_", @$dirs;
2472 }
2473
2474 \@maps
2475}
2476
2397=back 2477=back
2398 2478
2399=head3 cf::object 2479=head3 cf::object
2400 2480
2401=cut 2481=cut
… …
2466 2546
2467our $SAY_CHANNEL = { 2547our $SAY_CHANNEL = {
2468 id => "say", 2548 id => "say",
2469 title => "Map", 2549 title => "Map",
2470 reply => "say ", 2550 reply => "say ",
2471 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2551 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2472}; 2552};
2473 2553
2474our $CHAT_CHANNEL = { 2554our $CHAT_CHANNEL = {
2475 id => "chat", 2555 id => "chat",
2476 title => "Chat", 2556 title => "Chat",
… …
2531 2611
2532=item $player_object->enter_link 2612=item $player_object->enter_link
2533 2613
2534Freezes the player and moves him/her to a special map (C<{link}>). 2614Freezes the player and moves him/her to a special map (C<{link}>).
2535 2615
2536The player should be reasonably safe there for short amounts of time. You 2616The player should be reasonably safe there for short amounts of time (e.g.
2537I<MUST> call C<leave_link> as soon as possible, though. 2617for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2618though, as the player cannot control the character while it is on the link
2619map.
2538 2620
2539Will never block. 2621Will never block.
2540 2622
2541=item $player_object->leave_link ($map, $x, $y) 2623=item $player_object->leave_link ($map, $x, $y)
2542 2624
… …
2562sub cf::object::player::enter_link { 2644sub cf::object::player::enter_link {
2563 my ($self) = @_; 2645 my ($self) = @_;
2564 2646
2565 $self->deactivate_recursive; 2647 $self->deactivate_recursive;
2566 2648
2649 ++$self->{_link_recursion};
2650
2567 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2651 return if UNIVERSAL::isa $self->map, "ext::map_link";
2568 2652
2569 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2653 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2570 if $self->map && $self->map->{path} ne "{link}"; 2654 if $self->map && $self->map->{path} ne "{link}";
2571 2655
2572 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2656 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2573} 2657}
2574 2658
2575sub cf::object::player::leave_link { 2659sub cf::object::player::leave_link {
2576 my ($self, $map, $x, $y) = @_; 2660 my ($self, $map, $x, $y) = @_;
2577 2661
… …
2594 ($x, $y) = (-1, -1) 2678 ($x, $y) = (-1, -1)
2595 unless (defined $x) && (defined $y); 2679 unless (defined $x) && (defined $y);
2596 2680
2597 # use -1 or undef as default coordinates, not 0, 0 2681 # use -1 or undef as default coordinates, not 0, 0
2598 ($x, $y) = ($map->enter_x, $map->enter_y) 2682 ($x, $y) = ($map->enter_x, $map->enter_y)
2599 if $x <=0 && $y <= 0; 2683 if $x <= 0 && $y <= 0;
2600 2684
2601 $map->load; 2685 $map->load;
2602 $map->load_neighbours; 2686 $map->load_neighbours;
2603 2687
2604 return unless $self->contr->active; 2688 return unless $self->contr->active;
2605 $self->activate_recursive;
2606 2689
2607 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2690 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2608 $self->enter_map ($map, $x, $y); 2691 if ($self->enter_map ($map, $x, $y)) {
2609} 2692 # entering was successful
2693 delete $self->{_link_recursion};
2694 # only activate afterwards, to support waiting in hooks
2695 $self->activate_recursive;
2696 }
2610 2697
2698}
2699
2611=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2700=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2612 2701
2613Moves the player to the given map-path and coordinates by first freezing 2702Moves the player to the given map-path and coordinates by first freezing
2614her, loading and preparing them map, calling the provided $check callback 2703her, loading and preparing them map, calling the provided $check callback
2615that has to return the map if sucecssful, and then unfreezes the player on 2704that has to return the map if sucecssful, and then unfreezes the player on
2616the new (success) or old (failed) map position. In either case, $done will 2705the new (success) or old (failed) map position. In either case, $done will
… …
2623 2712
2624our $GOTOGEN; 2713our $GOTOGEN;
2625 2714
2626sub cf::object::player::goto { 2715sub cf::object::player::goto {
2627 my ($self, $path, $x, $y, $check, $done) = @_; 2716 my ($self, $path, $x, $y, $check, $done) = @_;
2717
2718 if ($self->{_link_recursion} >= $MAX_LINKS) {
2719 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2720 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2721 ($path, $x, $y) = @$EMERGENCY_POSITION;
2722 }
2628 2723
2629 # do generation counting so two concurrent goto's will be executed in-order 2724 # do generation counting so two concurrent goto's will be executed in-order
2630 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2725 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2631 2726
2632 $self->enter_link; 2727 $self->enter_link;
… …
2656 my $map = eval { 2751 my $map = eval {
2657 my $map = defined $path ? cf::map::find $path : undef; 2752 my $map = defined $path ? cf::map::find $path : undef;
2658 2753
2659 if ($map) { 2754 if ($map) {
2660 $map = $map->customise_for ($self); 2755 $map = $map->customise_for ($self);
2661 $map = $check->($map) if $check && $map; 2756 $map = $check->($map, $x, $y, $self) if $check && $map;
2662 } else { 2757 } else {
2663 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2758 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2664 } 2759 }
2665 2760
2666 $map 2761 $map
… …
2674 if ($gen == $self->{_goto_generation}) { 2769 if ($gen == $self->{_goto_generation}) {
2675 delete $self->{_goto_generation}; 2770 delete $self->{_goto_generation};
2676 $self->leave_link ($map, $x, $y); 2771 $self->leave_link ($map, $x, $y);
2677 } 2772 }
2678 2773
2679 $done->() if $done; 2774 $done->($self) if $done;
2680 })->prio (1); 2775 })->prio (1);
2681} 2776}
2682 2777
2683=item $player_object->enter_exit ($exit_object) 2778=item $player_object->enter_exit ($exit_object)
2684 2779
… …
2772 $self->contr->savebed ($map, $x, $y) 2867 $self->contr->savebed ($map, $x, $y)
2773 if $exit->flag (cf::FLAG_DAMNED); 2868 if $exit->flag (cf::FLAG_DAMNED);
2774 2869
2775 1 2870 1
2776 }) { 2871 }) {
2777 $self->message ("Something went wrong deep within the crossfire server. " 2872 $self->message ("Something went wrong deep within the deliantra server. "
2778 . "I'll try to bring you back to the map you were before. " 2873 . "I'll try to bring you back to the map you were before. "
2779 . "Please report this to the dungeon master!", 2874 . "Please report this to the dungeon master!",
2780 cf::NDI_UNIQUE | cf::NDI_RED); 2875 cf::NDI_UNIQUE | cf::NDI_RED);
2781 2876
2782 warn "ERROR in enter_exit: $@"; 2877 error "ERROR in enter_exit: $@";
2783 $self->leave_link; 2878 $self->leave_link;
2784 } 2879 }
2785 })->prio (1); 2880 })->prio (1);
2786} 2881}
2787 2882
… …
2799sub cf::client::send_drawinfo { 2894sub cf::client::send_drawinfo {
2800 my ($self, $text, $flags) = @_; 2895 my ($self, $text, $flags) = @_;
2801 2896
2802 utf8::encode $text; 2897 utf8::encode $text;
2803 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2898 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2899}
2900
2901=item $client->send_big_packet ($pkt)
2902
2903Like C<send_packet>, but tries to compress large packets, and fragments
2904them as required.
2905
2906=cut
2907
2908our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2909
2910sub cf::client::send_big_packet {
2911 my ($self, $pkt) = @_;
2912
2913 # try lzf for large packets
2914 $pkt = "lzf " . Compress::LZF::compress $pkt
2915 if 1024 <= length $pkt and $self->{can_lzf};
2916
2917 # split very large packets
2918 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2919 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2920 $pkt = "frag";
2921 }
2922
2923 $self->send_packet ($pkt);
2804} 2924}
2805 2925
2806=item $client->send_msg ($channel, $msg, $color, [extra...]) 2926=item $client->send_msg ($channel, $msg, $color, [extra...])
2807 2927
2808Send a drawinfo or msg packet to the client, formatting the msg for the 2928Send a drawinfo or msg packet to the client, formatting the msg for the
… …
2812 2932
2813=cut 2933=cut
2814 2934
2815# non-persistent channels (usually the info channel) 2935# non-persistent channels (usually the info channel)
2816our %CHANNEL = ( 2936our %CHANNEL = (
2937 "c/motd" => {
2938 id => "infobox",
2939 title => "MOTD",
2940 reply => undef,
2941 tooltip => "The message of the day",
2942 },
2817 "c/identify" => { 2943 "c/identify" => {
2818 id => "infobox", 2944 id => "infobox",
2819 title => "Identify", 2945 title => "Identify",
2820 reply => undef, 2946 reply => undef,
2821 tooltip => "Items recently identified", 2947 tooltip => "Items recently identified",
… …
2823 "c/examine" => { 2949 "c/examine" => {
2824 id => "infobox", 2950 id => "infobox",
2825 title => "Examine", 2951 title => "Examine",
2826 reply => undef, 2952 reply => undef,
2827 tooltip => "Signs and other items you examined", 2953 tooltip => "Signs and other items you examined",
2954 },
2955 "c/shopinfo" => {
2956 id => "infobox",
2957 title => "Shop Info",
2958 reply => undef,
2959 tooltip => "What your bargaining skill tells you about the shop",
2828 }, 2960 },
2829 "c/book" => { 2961 "c/book" => {
2830 id => "infobox", 2962 id => "infobox",
2831 title => "Book", 2963 title => "Book",
2832 reply => undef, 2964 reply => undef,
… …
2848 id => "infobox", 2980 id => "infobox",
2849 title => "Body Parts", 2981 title => "Body Parts",
2850 reply => undef, 2982 reply => undef,
2851 tooltip => "Shows which body parts you posess and are available", 2983 tooltip => "Shows which body parts you posess and are available",
2852 }, 2984 },
2985 "c/statistics" => {
2986 id => "infobox",
2987 title => "Statistics",
2988 reply => undef,
2989 tooltip => "Shows your primary statistics",
2990 },
2991 "c/skills" => {
2992 id => "infobox",
2993 title => "Skills",
2994 reply => undef,
2995 tooltip => "Shows your experience per skill and item power",
2996 },
2997 "c/shopitems" => {
2998 id => "infobox",
2999 title => "Shop Items",
3000 reply => undef,
3001 tooltip => "Shows the items currently for sale in this shop",
3002 },
3003 "c/resistances" => {
3004 id => "infobox",
3005 title => "Resistances",
3006 reply => undef,
3007 tooltip => "Shows your resistances",
3008 },
3009 "c/pets" => {
3010 id => "infobox",
3011 title => "Pets",
3012 reply => undef,
3013 tooltip => "Shows information abotu your pets/a specific pet",
3014 },
3015 "c/perceiveself" => {
3016 id => "infobox",
3017 title => "Perceive Self",
3018 reply => undef,
3019 tooltip => "You gained detailed knowledge about yourself",
3020 },
2853 "c/uptime" => { 3021 "c/uptime" => {
2854 id => "infobox", 3022 id => "infobox",
2855 title => "Uptime", 3023 title => "Uptime",
2856 reply => undef, 3024 reply => undef,
2857 tooltip => "How long the server has been running since last restart", 3025 tooltip => "How long the server has been running since last restart",
… …
2866 id => "party", 3034 id => "party",
2867 title => "Party", 3035 title => "Party",
2868 reply => "gsay ", 3036 reply => "gsay ",
2869 tooltip => "Messages and chat related to your party", 3037 tooltip => "Messages and chat related to your party",
2870 }, 3038 },
3039 "c/death" => {
3040 id => "death",
3041 title => "Death",
3042 reply => undef,
3043 tooltip => "Reason for and more info about your most recent death",
3044 },
3045 "c/say" => $SAY_CHANNEL,
3046 "c/chat" => $CHAT_CHANNEL,
2871); 3047);
2872 3048
2873sub cf::client::send_msg { 3049sub cf::client::send_msg {
2874 my ($self, $channel, $msg, $color, @extra) = @_; 3050 my ($self, $channel, $msg, $color, @extra) = @_;
2875 3051
2876 $msg = $self->pl->expand_cfpod ($msg); 3052 $msg = $self->pl->expand_cfpod ($msg)
3053 unless $color & cf::NDI_VERBATIM;
2877 3054
2878 $color &= cf::NDI_CLIENT_MASK; # just in case... 3055 $color &= cf::NDI_CLIENT_MASK; # just in case...
2879 3056
2880 # check predefined channels, for the benefit of C 3057 # check predefined channels, for the benefit of C
2881 if ($CHANNEL{$channel}) { 3058 if ($CHANNEL{$channel}) {
2882 $channel = $CHANNEL{$channel}; 3059 $channel = $CHANNEL{$channel};
2883 3060
2884 $self->ext_msg (channel_info => $channel) 3061 $self->ext_msg (channel_info => $channel);
2885 if $self->can_msg;
2886
2887 $channel = $channel->{id}; 3062 $channel = $channel->{id};
2888 3063
2889 } elsif (ref $channel) { 3064 } elsif (ref $channel) {
2890 # send meta info to client, if not yet sent 3065 # send meta info to client, if not yet sent
2891 unless (exists $self->{channel}{$channel->{id}}) { 3066 unless (exists $self->{channel}{$channel->{id}}) {
2892 $self->{channel}{$channel->{id}} = $channel; 3067 $self->{channel}{$channel->{id}} = $channel;
2893 $self->ext_msg (channel_info => $channel) 3068 $self->ext_msg (channel_info => $channel);
2894 if $self->can_msg;
2895 } 3069 }
2896 3070
2897 $channel = $channel->{id}; 3071 $channel = $channel->{id};
2898 } 3072 }
2899 3073
2900 return unless @extra || length $msg; 3074 return unless @extra || length $msg;
2901 3075
2902 if ($self->can_msg) {
2903 # default colour, mask it out 3076 # default colour, mask it out
2904 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3077 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2905 if $color & cf::NDI_DEF; 3078 if $color & cf::NDI_DEF;
2906 3079
2907 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3080 my $pkt = "msg "
3081 . $self->{json_coder}->encode (
2908 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3082 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2909 } else { 3083 );
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 3084
2921 $color &= cf::NDI_COLOR_MASK; 3085 $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} 3086}
2935 3087
2936=item $client->ext_msg ($type, @msg) 3088=item $client->ext_msg ($type, @msg)
2937 3089
2938Sends an ext event to the client. 3090Sends an ext event to the client.
… …
2941 3093
2942sub cf::client::ext_msg($$@) { 3094sub cf::client::ext_msg($$@) {
2943 my ($self, $type, @msg) = @_; 3095 my ($self, $type, @msg) = @_;
2944 3096
2945 if ($self->extcmd == 2) { 3097 if ($self->extcmd == 2) {
2946 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3098 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2947 } elsif ($self->extcmd == 1) { # TODO: remove 3099 } elsif ($self->extcmd == 1) { # TODO: remove
2948 push @msg, msgtype => "event_$type"; 3100 push @msg, msgtype => "event_$type";
2949 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3101 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2950 } 3102 }
2951} 3103}
2952 3104
2953=item $client->ext_reply ($msgid, @msg) 3105=item $client->ext_reply ($msgid, @msg)
2954 3106
… …
2958 3110
2959sub cf::client::ext_reply($$@) { 3111sub cf::client::ext_reply($$@) {
2960 my ($self, $id, @msg) = @_; 3112 my ($self, $id, @msg) = @_;
2961 3113
2962 if ($self->extcmd == 2) { 3114 if ($self->extcmd == 2) {
2963 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3115 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2964 } elsif ($self->extcmd == 1) { 3116 } elsif ($self->extcmd == 1) {
2965 #TODO: version 1, remove 3117 #TODO: version 1, remove
2966 unshift @msg, msgtype => "reply", msgid => $id; 3118 unshift @msg, msgtype => "reply", msgid => $id;
2967 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3119 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2968 } 3120 }
2969} 3121}
2970 3122
2971=item $success = $client->query ($flags, "text", \&cb) 3123=item $success = $client->query ($flags, "text", \&cb)
2972 3124
… …
3043 3195
3044 $ns->ext_reply ($reply, @reply) 3196 $ns->ext_reply ($reply, @reply)
3045 if $reply; 3197 if $reply;
3046 3198
3047 } else { 3199 } else {
3048 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3200 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3049 } 3201 }
3050 3202
3051 cf::override; 3203 cf::override;
3052 }, 3204 },
3053); 3205);
… …
3073 3225
3074 $coro 3226 $coro
3075} 3227}
3076 3228
3077cf::client->attach ( 3229cf::client->attach (
3078 on_destroy => sub { 3230 on_client_destroy => sub {
3079 my ($ns) = @_; 3231 my ($ns) = @_;
3080 3232
3081 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3233 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3082 }, 3234 },
3083); 3235);
… …
3099our $safe_hole = new Safe::Hole; 3251our $safe_hole = new Safe::Hole;
3100 3252
3101$SIG{FPE} = 'IGNORE'; 3253$SIG{FPE} = 'IGNORE';
3102 3254
3103$safe->permit_only (Opcode::opset qw( 3255$safe->permit_only (Opcode::opset qw(
3104 :base_core :base_mem :base_orig :base_math 3256 :base_core :base_mem :base_orig :base_math :base_loop
3105 grepstart grepwhile mapstart mapwhile 3257 grepstart grepwhile mapstart mapwhile
3106 sort time 3258 sort time
3107)); 3259));
3108 3260
3109# here we export the classes and methods available to script code 3261# here we export the classes and methods available to script code
… …
3113The following functions and methods are available within a safe environment: 3265The following functions and methods are available within a safe environment:
3114 3266
3115 cf::object 3267 cf::object
3116 contr pay_amount pay_player map x y force_find force_add destroy 3268 contr pay_amount pay_player map x y force_find force_add destroy
3117 insert remove name archname title slaying race decrease split 3269 insert remove name archname title slaying race decrease split
3270 value
3118 3271
3119 cf::object::player 3272 cf::object::player
3120 player 3273 player
3121 3274
3122 cf::player 3275 cf::player
… …
3128=cut 3281=cut
3129 3282
3130for ( 3283for (
3131 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3284 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3132 insert remove inv nrof name archname title slaying race 3285 insert remove inv nrof name archname title slaying race
3133 decrease split destroy change_exp)], 3286 decrease split destroy change_exp value msg lore send_msg)],
3134 ["cf::object::player" => qw(player)], 3287 ["cf::object::player" => qw(player)],
3135 ["cf::player" => qw(peaceful)], 3288 ["cf::player" => qw(peaceful send_msg)],
3136 ["cf::map" => qw(trigger)], 3289 ["cf::map" => qw(trigger)],
3137) { 3290) {
3138 no strict 'refs';
3139 my ($pkg, @funs) = @$_; 3291 my ($pkg, @funs) = @$_;
3140 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3292 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3141 for @funs; 3293 for @funs;
3142} 3294}
3143 3295
… …
3158 3310
3159 my $qcode = $code; 3311 my $qcode = $code;
3160 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3312 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3161 $qcode =~ s/\n/\\n/g; 3313 $qcode =~ s/\n/\\n/g;
3162 3314
3315 %vars = (_dummy => 0) unless %vars;
3316
3317 my @res;
3163 local $_; 3318 local $_;
3164 local @safe::cf::_safe_eval_args = values %vars;
3165 3319
3166 my $eval = 3320 my $eval =
3167 "do {\n" 3321 "do {\n"
3168 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3322 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3169 . "#line 0 \"{$qcode}\"\n" 3323 . "#line 0 \"{$qcode}\"\n"
3170 . $code 3324 . $code
3171 . "\n}" 3325 . "\n}"
3172 ; 3326 ;
3173 3327
3328 if ($CFG{safe_eval}) {
3174 sub_generation_inc; 3329 sub_generation_inc;
3330 local @safe::cf::_safe_eval_args = values %vars;
3175 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3331 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3176 sub_generation_inc; 3332 sub_generation_inc;
3333 } else {
3334 local @cf::_safe_eval_args = values %vars;
3335 @res = wantarray ? eval eval : scalar eval $eval;
3336 }
3177 3337
3178 if ($@) { 3338 if ($@) {
3179 warn "$@"; 3339 warn "$@",
3180 warn "while executing safe code '$code'\n"; 3340 "while executing safe code '$code'\n",
3181 warn "with arguments " . (join " ", %vars) . "\n"; 3341 "with arguments " . (join " ", %vars) . "\n";
3182 } 3342 }
3183 3343
3184 wantarray ? @res : $res[0] 3344 wantarray ? @res : $res[0]
3185} 3345}
3186 3346
… …
3200=cut 3360=cut
3201 3361
3202sub register_script_function { 3362sub register_script_function {
3203 my ($fun, $cb) = @_; 3363 my ($fun, $cb) = @_;
3204 3364
3205 no strict 'refs'; 3365 $fun = "safe::$fun" if $CFG{safe_eval};
3206 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3366 *$fun = $safe_hole->wrap ($cb);
3207} 3367}
3208 3368
3209=back 3369=back
3210 3370
3211=cut 3371=cut
… …
3220 # for this (global event?) 3380 # for this (global event?)
3221 %ext::player_env::MUSIC_FACE_CACHE = (); 3381 %ext::player_env::MUSIC_FACE_CACHE = ();
3222 3382
3223 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3383 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3224 3384
3225 warn "loading facedata from $path\n"; 3385 trace "loading facedata from $path\n";
3226 3386
3227 my $facedata;
3228 0 < aio_load $path, $facedata 3387 0 < aio_load $path, my $facedata
3229 or die "$path: $!"; 3388 or die "$path: $!";
3230 3389
3231 $facedata = Coro::Storable::thaw $facedata; 3390 $facedata = Coro::Storable::thaw $facedata;
3232 3391
3233 $facedata->{version} == 2 3392 $facedata->{version} == 2
3234 or cf::cleanup "$path: version mismatch, cannot proceed."; 3393 or cf::cleanup "$path: version mismatch, cannot proceed.";
3235 3394
3236 # patch in the exptable 3395 # patch in the exptable
3396 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3237 $facedata->{resource}{"res/exp_table"} = { 3397 $facedata->{resource}{"res/exp_table"} = {
3238 type => FT_RSRC, 3398 type => FT_RSRC,
3239 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3399 data => $exp_table,
3400 hash => (Digest::MD5::md5 $exp_table),
3240 }; 3401 };
3241 cf::cede_to_tick; 3402 cf::cede_to_tick;
3242 3403
3243 { 3404 {
3244 my $faces = $facedata->{faceinfo}; 3405 my $faces = $facedata->{faceinfo};
… …
3246 while (my ($face, $info) = each %$faces) { 3407 while (my ($face, $info) = each %$faces) {
3247 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3408 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3248 3409
3249 cf::face::set_visibility $idx, $info->{visibility}; 3410 cf::face::set_visibility $idx, $info->{visibility};
3250 cf::face::set_magicmap $idx, $info->{magicmap}; 3411 cf::face::set_magicmap $idx, $info->{magicmap};
3251 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3412 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3252 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3413 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3253 3414
3254 cf::cede_to_tick; 3415 cf::cede_to_tick;
3255 } 3416 }
3256 3417
3257 while (my ($face, $info) = each %$faces) { 3418 while (my ($face, $info) = each %$faces) {
… …
3262 3423
3263 if (my $smooth = cf::face::find $info->{smooth}) { 3424 if (my $smooth = cf::face::find $info->{smooth}) {
3264 cf::face::set_smooth $idx, $smooth; 3425 cf::face::set_smooth $idx, $smooth;
3265 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3426 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3266 } else { 3427 } else {
3267 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3428 error "smooth face '$info->{smooth}' not found for face '$face'";
3268 } 3429 }
3269 3430
3270 cf::cede_to_tick; 3431 cf::cede_to_tick;
3271 } 3432 }
3272 } 3433 }
… …
3281 3442
3282 cf::anim::invalidate_all; # d'oh 3443 cf::anim::invalidate_all; # d'oh
3283 } 3444 }
3284 3445
3285 { 3446 {
3286 # TODO: for gcfclient pleasure, we should give resources
3287 # that gcfclient doesn't grok a >10000 face index.
3288 my $res = $facedata->{resource}; 3447 my $res = $facedata->{resource};
3289 3448
3290 while (my ($name, $info) = each %$res) { 3449 while (my ($name, $info) = each %$res) {
3291 if (defined $info->{type}) { 3450 if (defined $info->{type}) {
3292 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3451 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3293 my $data;
3294 3452
3295 if ($info->{type} & 1) { 3453 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}; 3454 cf::face::set_type $idx, $info->{type};
3310 } else { 3455 } else {
3311 $RESOURCE{$name} = $info; 3456 $RESOURCE{$name} = $info; # unused
3312 } 3457 }
3313 3458
3314 cf::cede_to_tick; 3459 cf::cede_to_tick;
3315 } 3460 }
3316 } 3461 }
3317 3462
3318 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3463 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3319 3464
3320 1 3465 1
3321} 3466}
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 3467
3343register_exticmd fx_want => sub { 3468register_exticmd fx_want => sub {
3344 my ($ns, $want) = @_; 3469 my ($ns, $want) = @_;
3345 3470
3346 while (my ($k, $v) = each %$want) { 3471 while (my ($k, $v) = each %$want) {
… …
3385sub reload_treasures { 3510sub reload_treasures {
3386 load_resource_file "$DATADIR/treasures" 3511 load_resource_file "$DATADIR/treasures"
3387 or die "unable to load treasurelists\n"; 3512 or die "unable to load treasurelists\n";
3388} 3513}
3389 3514
3515sub reload_sound {
3516 trace "loading sound config from $DATADIR/sound\n";
3517
3518 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3519 or die "$DATADIR/sound $!";
3520
3521 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3522
3523 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3524 my $sound = $soundconf->{compat}[$_]
3525 or next;
3526
3527 my $face = cf::face::find "sound/$sound->[1]";
3528 cf::sound::set $sound->[0] => $face;
3529 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3530 }
3531
3532 while (my ($k, $v) = each %{$soundconf->{event}}) {
3533 my $face = cf::face::find "sound/$v";
3534 cf::sound::set $k => $face;
3535 }
3536}
3537
3390sub reload_resources { 3538sub reload_resources {
3391 warn "reloading resource files...\n"; 3539 trace "reloading resource files...\n";
3392 3540
3541 reload_exp_table;
3542 reload_materials;
3393 reload_facedata; 3543 reload_facedata;
3544 reload_sound;
3394 reload_archetypes; 3545 reload_archetypes;
3395 reload_regions; 3546 reload_regions;
3396 reload_treasures; 3547 reload_treasures;
3397 3548
3398 warn "finished reloading resource files\n"; 3549 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} 3550}
3408 3551
3409sub reload_config { 3552sub reload_config {
3410 open my $fh, "<:utf8", "$CONFDIR/config" 3553 trace "reloading config file...\n";
3411 or return;
3412 3554
3413 local $/; 3555 0 < aio_load "$CONFDIR/config", my $config
3556 or die "$CONFDIR/config: $!";
3557
3558 utf8::decode $config;
3559
3560 cf::get_slot 0.1, 10, "reload_config"; # yaml might be slow...
3414 *CFG = YAML::Load <$fh>; 3561 *CFG = YAML::XS::Load $config;
3415 3562
3416 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3563 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3417 3564
3418 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3565 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3419 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3566 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3420 3567
3421 if (exists $CFG{mlockall}) { 3568 if (exists $CFG{mlockall}) {
… …
3425 }; 3572 };
3426 warn $@ if $@; 3573 warn $@ if $@;
3427 } 3574 }
3428} 3575}
3429 3576
3577sub pidfile() {
3578 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3579 or die "$PIDFILE: $!";
3580 flock $fh, &Fcntl::LOCK_EX
3581 or die "$PIDFILE: flock: $!";
3582 $fh
3583}
3584
3585# make sure only one server instance is running at any one time
3586sub atomic {
3587 my $fh = pidfile;
3588
3589 my $pid = <$fh>;
3590 kill 9, $pid if $pid > 0;
3591
3592 seek $fh, 0, 0;
3593 print $fh $$;
3594}
3595
3596sub main_loop {
3597 trace "EV::loop starting\n";
3598 if (1) {
3599 EV::loop;
3600 }
3601 trace "EV::loop returned\n";
3602 goto &main_loop unless $REALLY_UNLOOP;
3603}
3604
3430sub main { 3605sub main {
3606 cf::init_globals; # initialise logging
3607
3608 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3609 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3610 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3611 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3612
3613 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3614
3431 # we must not ever block the main coroutine 3615 # we must not ever block the main coroutine
3432 local $Coro::idle = sub { 3616 local $Coro::idle = sub {
3433 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3617 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3434 (async { 3618 (async {
3435 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3619 $Coro::current->{desc} = "IDLE BUG HANDLER";
3436 EV::loop EV::LOOP_ONESHOT; 3620 EV::loop EV::LOOP_ONESHOT;
3437 })->prio (Coro::PRIO_MAX); 3621 })->prio (Coro::PRIO_MAX);
3438 }; 3622 };
3439 3623
3440 { 3624 evthread_start IO::AIO::poll_fileno;
3441 my $guard = freeze_mainloop; 3625
3626 cf::sync_job {
3627 cf::incloader::init ();
3628
3629 cf::init_anim;
3630 cf::init_attackmess;
3631 cf::init_dynamic;
3632
3633 cf::load_settings;
3634
3635 reload_resources;
3442 reload_config; 3636 reload_config;
3443 db_init; 3637 db_init;
3638
3639 cf::init_uuid;
3640 cf::init_signals;
3641 cf::init_skills;
3642
3643 cf::init_beforeplay;
3644
3645 atomic;
3646
3444 load_extensions; 3647 load_extensions;
3445 3648
3446 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3649 utime time, time, $RUNTIMEFILE;
3650
3651 # no (long-running) fork's whatsoever before this point(!)
3652 use POSIX ();
3653 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3654
3655 (pop @POST_INIT)->(0) while @POST_INIT;
3447 } 3656 };
3448 3657
3449 EV::loop; 3658 cf::object::thawer::errors_are_fatal 0;
3659 info "parse errors in files are no longer fatal from this point on.\n";
3660
3661 my $free_main; $free_main = EV::idle sub {
3662 undef $free_main;
3663 undef &main; # free gobs of memory :)
3664 };
3665
3666 goto &main_loop;
3450} 3667}
3451 3668
3452############################################################################# 3669#############################################################################
3453# initialisation and cleanup 3670# initialisation and cleanup
3454 3671
3455# install some emergency cleanup handlers 3672# install some emergency cleanup handlers
3456BEGIN { 3673BEGIN {
3457 our %SIGWATCHER = (); 3674 our %SIGWATCHER = ();
3458 for my $signal (qw(INT HUP TERM)) { 3675 for my $signal (qw(INT HUP TERM)) {
3459 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3676 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3460 cf::cleanup "SIG$signal"; 3677 cf::cleanup "SIG$signal";
3461 }; 3678 };
3462 } 3679 }
3463} 3680}
3464 3681
3465sub write_runtime_sync { 3682sub write_runtime_sync {
3466 my $runtime = "$LOCALDIR/runtime"; 3683 my $t0 = AE::time;
3467 3684
3468 # first touch the runtime file to show we are still running: 3685 # first touch the runtime file to show we are still running:
3469 # the fsync below can take a very very long time. 3686 # the fsync below can take a very very long time.
3470 3687
3471 IO::AIO::aio_utime $runtime, undef, undef; 3688 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3472 3689
3473 my $guard = cf::lock_acquire "write_runtime"; 3690 my $guard = cf::lock_acquire "write_runtime";
3474 3691
3475 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3692 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3476 or return; 3693 or return;
3477 3694
3478 my $value = $cf::RUNTIME + 90 + 10; 3695 my $value = $cf::RUNTIME + 90 + 10;
3479 # 10 is the runtime save interval, for a monotonic clock 3696 # 10 is the runtime save interval, for a monotonic clock
3480 # 60 allows for the watchdog to kill the server. 3697 # 60 allows for the watchdog to kill the server.
… …
3490 aio_utime $fh, undef, undef; 3707 aio_utime $fh, undef, undef;
3491 3708
3492 close $fh 3709 close $fh
3493 or return; 3710 or return;
3494 3711
3495 aio_rename "$runtime~", $runtime 3712 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3496 and return; 3713 and return;
3497 3714
3498 warn "runtime file written.\n"; 3715 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3499 3716
3500 1 3717 1
3501} 3718}
3502 3719
3503our $uuid_lock; 3720our $uuid_lock;
… …
3512 my $uuid = "$LOCALDIR/uuid"; 3729 my $uuid = "$LOCALDIR/uuid";
3513 3730
3514 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3731 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3515 or return; 3732 or return;
3516 3733
3517 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3734 my $value = uuid_seq uuid_cur;
3735
3736 unless ($value) {
3737 info "cowardly refusing to write zero uuid value!\n";
3738 return;
3739 }
3740
3741 my $value = uuid_str $value + $uuid_skip;
3518 $uuid_skip = 0; 3742 $uuid_skip = 0;
3519 3743
3520 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3744 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3521 and return; 3745 and return;
3522 3746
… …
3528 or return; 3752 or return;
3529 3753
3530 aio_rename "$uuid~", $uuid 3754 aio_rename "$uuid~", $uuid
3531 and return; 3755 and return;
3532 3756
3533 warn "uuid file written ($value).\n"; 3757 trace "uuid file written ($value).\n";
3534 3758
3535 1 3759 1
3536 3760
3537} 3761}
3538 3762
… …
3544} 3768}
3545 3769
3546sub emergency_save() { 3770sub emergency_save() {
3547 my $freeze_guard = cf::freeze_mainloop; 3771 my $freeze_guard = cf::freeze_mainloop;
3548 3772
3549 warn "enter emergency perl save\n"; 3773 info "emergency_perl_save: enter\n";
3774
3775 # this is a trade-off: we want to be very quick here, so
3776 # save all maps without fsync, and later call a global sync
3777 # (which in turn might be very very slow)
3778 local $USE_FSYNC = 0;
3550 3779
3551 cf::sync_job { 3780 cf::sync_job {
3781 cf::write_runtime_sync; # external watchdog should not bark
3782
3552 # use a peculiar iteration method to avoid tripping on perl 3783 # use a peculiar iteration method to avoid tripping on perl
3553 # refcount bugs in for. also avoids problems with players 3784 # refcount bugs in for. also avoids problems with players
3554 # and maps saved/destroyed asynchronously. 3785 # and maps saved/destroyed asynchronously.
3555 warn "begin emergency player save\n"; 3786 info "emergency_perl_save: begin player save\n";
3556 for my $login (keys %cf::PLAYER) { 3787 for my $login (keys %cf::PLAYER) {
3557 my $pl = $cf::PLAYER{$login} or next; 3788 my $pl = $cf::PLAYER{$login} or next;
3558 $pl->valid or next; 3789 $pl->valid or next;
3559 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3790 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3560 $pl->save; 3791 $pl->save;
3561 } 3792 }
3562 warn "end emergency player save\n"; 3793 info "emergency_perl_save: end player save\n";
3563 3794
3564 warn "begin emergency map save\n"; 3795 cf::write_runtime_sync; # external watchdog should not bark
3796
3797 info "emergency_perl_save: begin map save\n";
3565 for my $path (keys %cf::MAP) { 3798 for my $path (keys %cf::MAP) {
3566 my $map = $cf::MAP{$path} or next; 3799 my $map = $cf::MAP{$path} or next;
3567 $map->valid or next; 3800 $map->valid or next;
3568 $map->save; 3801 $map->save;
3569 } 3802 }
3570 warn "end emergency map save\n"; 3803 info "emergency_perl_save: end map save\n";
3571 3804
3572 warn "begin emergency database checkpoint\n"; 3805 cf::write_runtime_sync; # external watchdog should not bark
3806
3807 info "emergency_perl_save: begin database checkpoint\n";
3573 BDB::db_env_txn_checkpoint $DB_ENV; 3808 BDB::db_env_txn_checkpoint $DB_ENV;
3574 warn "end emergency database checkpoint\n"; 3809 info "emergency_perl_save: end database checkpoint\n";
3575 3810
3576 warn "begin write uuid\n"; 3811 info "emergency_perl_save: begin write uuid\n";
3577 write_uuid_sync 1; 3812 write_uuid_sync 1;
3578 warn "end write uuid\n"; 3813 info "emergency_perl_save: end write uuid\n";
3814
3815 cf::write_runtime_sync; # external watchdog should not bark
3816
3817 trace "emergency_perl_save: syncing database to disk";
3818 BDB::db_env_txn_checkpoint $DB_ENV;
3819
3820 info "emergency_perl_save: starting sync\n";
3821 IO::AIO::aio_sync sub {
3822 info "emergency_perl_save: finished sync\n";
3823 };
3824
3825 cf::write_runtime_sync; # external watchdog should not bark
3826
3827 trace "emergency_perl_save: flushing outstanding aio requests";
3828 while (IO::AIO::nreqs || BDB::nreqs) {
3829 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3830 }
3831
3832 cf::write_runtime_sync; # external watchdog should not bark
3579 }; 3833 };
3580 3834
3581 warn "leave emergency perl save\n"; 3835 info "emergency_perl_save: leave\n";
3582} 3836}
3583 3837
3584sub post_cleanup { 3838sub post_cleanup {
3585 my ($make_core) = @_; 3839 my ($make_core) = @_;
3586 3840
3841 IO::AIO::flush;
3842
3587 warn Carp::longmess "post_cleanup backtrace" 3843 error Carp::longmess "post_cleanup backtrace"
3588 if $make_core; 3844 if $make_core;
3845
3846 my $fh = pidfile;
3847 unlink $PIDFILE if <$fh> == $$;
3848}
3849
3850# a safer delete_package, copied from Symbol
3851sub clear_package($) {
3852 my $pkg = shift;
3853
3854 # expand to full symbol table name if needed
3855 unless ($pkg =~ /^main::.*::$/) {
3856 $pkg = "main$pkg" if $pkg =~ /^::/;
3857 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3858 $pkg .= '::' unless $pkg =~ /::$/;
3859 }
3860
3861 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3862 my $stem_symtab = *{$stem}{HASH};
3863
3864 defined $stem_symtab and exists $stem_symtab->{$leaf}
3865 or return;
3866
3867 # clear all symbols
3868 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3869 for my $name (keys %$leaf_symtab) {
3870 _gv_clear *{"$pkg$name"};
3871# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3872 }
3589} 3873}
3590 3874
3591sub do_reload_perl() { 3875sub do_reload_perl() {
3592 # can/must only be called in main 3876 # can/must only be called in main
3593 if ($Coro::current != $Coro::main) { 3877 unless (in_main) {
3594 warn "can only reload from main coroutine"; 3878 error "can only reload from main coroutine";
3595 return; 3879 return;
3596 } 3880 }
3597 3881
3882 return if $RELOAD++;
3883
3884 my $t1 = AE::time;
3885
3886 while ($RELOAD) {
3887 cf::get_slot 0.1, -1, "reload_perl";
3598 warn "reloading..."; 3888 info "reloading...";
3599 3889
3600 warn "entering sync_job"; 3890 trace "entering sync_job";
3601 3891
3602 cf::sync_job { 3892 cf::sync_job {
3603 cf::write_runtime_sync; # external watchdog should not bark
3604 cf::emergency_save; 3893 #cf::emergency_save;
3605 cf::write_runtime_sync; # external watchdog should not bark
3606 3894
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"; 3895 trace "cancelling all extension coros";
3624 $_->cancel for values %EXT_CORO; 3896 $_->cancel for values %EXT_CORO;
3625 %EXT_CORO = (); 3897 %EXT_CORO = ();
3626 3898
3627 warn "removing commands"; 3899 trace "removing commands";
3628 %COMMAND = (); 3900 %COMMAND = ();
3629 3901
3630 warn "removing ext/exti commands"; 3902 trace "removing ext/exti commands";
3631 %EXTCMD = (); 3903 %EXTCMD = ();
3632 %EXTICMD = (); 3904 %EXTICMD = ();
3633 3905
3634 warn "unloading/nuking all extensions"; 3906 trace "unloading/nuking all extensions";
3635 for my $pkg (@EXTS) { 3907 for my $pkg (@EXTS) {
3636 warn "... unloading $pkg"; 3908 trace "... unloading $pkg";
3637 3909
3638 if (my $cb = $pkg->can ("unload")) { 3910 if (my $cb = $pkg->can ("unload")) {
3639 eval { 3911 eval {
3640 $cb->($pkg); 3912 $cb->($pkg);
3641 1 3913 1
3642 } or warn "$pkg unloaded, but with errors: $@"; 3914 } or error "$pkg unloaded, but with errors: $@";
3915 }
3916
3917 trace "... clearing $pkg";
3918 clear_package $pkg;
3643 } 3919 }
3644 3920
3645 warn "... nuking $pkg";
3646 Symbol::delete_package $pkg;
3647 }
3648
3649 warn "unloading all perl modules loaded from $LIBDIR"; 3921 trace "unloading all perl modules loaded from $LIBDIR";
3650 while (my ($k, $v) = each %INC) { 3922 while (my ($k, $v) = each %INC) {
3651 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3923 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3652 3924
3653 warn "... unloading $k"; 3925 trace "... unloading $k";
3654 delete $INC{$k}; 3926 delete $INC{$k};
3655 3927
3656 $k =~ s/\.pm$//; 3928 $k =~ s/\.pm$//;
3657 $k =~ s/\//::/g; 3929 $k =~ s/\//::/g;
3658 3930
3659 if (my $cb = $k->can ("unload_module")) { 3931 if (my $cb = $k->can ("unload_module")) {
3660 $cb->(); 3932 $cb->();
3933 }
3934
3935 clear_package $k;
3661 } 3936 }
3662 3937
3663 Symbol::delete_package $k;
3664 }
3665
3666 warn "getting rid of safe::, as good as possible"; 3938 trace "getting rid of safe::, as good as possible";
3667 Symbol::delete_package "safe::$_" 3939 clear_package "safe::$_"
3668 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3940 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3669 3941
3670 warn "unloading cf.pm \"a bit\""; 3942 trace "unloading cf.pm \"a bit\"";
3671 delete $INC{"cf.pm"}; 3943 delete $INC{"cf.pm"};
3672 delete $INC{"cf/pod.pm"}; 3944 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3673 3945
3674 # don't, removes xs symbols, too, 3946 # don't, removes xs symbols, too,
3675 # and global variables created in xs 3947 # and global variables created in xs
3676 #Symbol::delete_package __PACKAGE__; 3948 #clear_package __PACKAGE__;
3677 3949
3678 warn "unload completed, starting to reload now"; 3950 info "unload completed, starting to reload now";
3679 3951
3680 warn "reloading cf.pm"; 3952 trace "reloading cf.pm";
3681 require cf; 3953 require cf;
3682 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3954 cf::_connect_to_perl_1;
3683 3955
3684 warn "loading config and database again"; 3956 trace "loading config and database again";
3685 cf::reload_config; 3957 cf::reload_config;
3686 3958
3687 warn "loading extensions"; 3959 trace "loading extensions";
3688 cf::load_extensions; 3960 cf::load_extensions;
3689 3961
3962 if ($REATTACH_ON_RELOAD) {
3690 warn "reattaching attachments to objects/players"; 3963 trace "reattaching attachments to objects/players";
3691 _global_reattach; # objects, sockets 3964 _global_reattach; # objects, sockets
3692 warn "reattaching attachments to maps"; 3965 trace "reattaching attachments to maps";
3693 reattach $_ for values %MAP; 3966 reattach $_ for values %MAP;
3694 warn "reattaching attachments to players"; 3967 trace "reattaching attachments to players";
3695 reattach $_ for values %PLAYER; 3968 reattach $_ for values %PLAYER;
3969 }
3696 3970
3971 trace "running post_init jobs";
3972 (pop @POST_INIT)->(1) while @POST_INIT;
3973
3697 warn "leaving sync_job"; 3974 trace "leaving sync_job";
3698 3975
3699 1 3976 1
3700 } or do { 3977 } or do {
3701 warn $@; 3978 error $@;
3702 cf::cleanup "error while reloading, exiting."; 3979 cf::cleanup "error while reloading, exiting.";
3980 };
3981
3982 info "reloaded";
3983 --$RELOAD;
3703 }; 3984 }
3704 3985
3705 warn "reloaded"; 3986 $t1 = AE::time - $t1;
3987 info "reload completed in ${t1}s\n";
3706}; 3988};
3707 3989
3708our $RELOAD_WATCHER; # used only during reload 3990our $RELOAD_WATCHER; # used only during reload
3709 3991
3710sub reload_perl() { 3992sub reload_perl() {
3711 # doing reload synchronously and two reloads happen back-to-back, 3993 # doing reload synchronously and two reloads happen back-to-back,
3712 # coro crashes during coro_state_free->destroy here. 3994 # coro crashes during coro_state_free->destroy here.
3713 3995
3996 $RELOAD_WATCHER ||= cf::async {
3997 Coro::AIO::aio_wait cache_extensions;
3998
3714 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3999 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3715 do_reload_perl; 4000 do_reload_perl;
3716 undef $RELOAD_WATCHER; 4001 undef $RELOAD_WATCHER;
4002 };
3717 }; 4003 };
3718} 4004}
3719 4005
3720register_command "reload" => sub { 4006register_command "reload" => sub {
3721 my ($who, $arg) = @_; 4007 my ($who, $arg) = @_;
… …
3727 reload_perl; 4013 reload_perl;
3728 }; 4014 };
3729 } 4015 }
3730}; 4016};
3731 4017
3732unshift @INC, $LIBDIR; 4018#############################################################################
3733 4019
3734my $bug_warning = 0; 4020my $bug_warning = 0;
3735 4021
3736our @WAIT_FOR_TICK; 4022our @WAIT_FOR_TICK;
3737our @WAIT_FOR_TICK_BEGIN; 4023our @WAIT_FOR_TICK_BEGIN;
3738 4024
3739sub wait_for_tick { 4025sub wait_for_tick() {
3740 return if tick_inhibit || $Coro::current == $Coro::main; 4026 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3741 4027
3742 my $signal = new Coro::Signal; 4028 my $signal = new Coro::Signal;
3743 push @WAIT_FOR_TICK, $signal; 4029 push @WAIT_FOR_TICK, $signal;
3744 $signal->wait; 4030 $signal->wait;
3745} 4031}
3746 4032
3747sub wait_for_tick_begin { 4033sub wait_for_tick_begin() {
3748 return if tick_inhibit || $Coro::current == $Coro::main; 4034 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3749 4035
3750 my $signal = new Coro::Signal; 4036 my $signal = new Coro::Signal;
3751 push @WAIT_FOR_TICK_BEGIN, $signal; 4037 push @WAIT_FOR_TICK_BEGIN, $signal;
3752 $signal->wait; 4038 $signal->wait;
3753} 4039}
… …
3759 return; 4045 return;
3760 } 4046 }
3761 4047
3762 cf::server_tick; # one server iteration 4048 cf::server_tick; # one server iteration
3763 4049
4050 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4051
3764 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4052 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3765 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4053 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3766 Coro::async_pool { 4054 Coro::async_pool {
3767 $Coro::current->{desc} = "runtime saver"; 4055 $Coro::current->{desc} = "runtime saver";
3768 write_runtime_sync 4056 write_runtime_sync
3769 or warn "ERROR: unable to write runtime file: $!"; 4057 or error "ERROR: unable to write runtime file: $!";
3770 }; 4058 };
3771 } 4059 }
3772 4060
3773 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4061 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3774 $sig->send; 4062 $sig->send;
… …
3782 4070
3783 if (0) { 4071 if (0) {
3784 if ($NEXT_TICK) { 4072 if ($NEXT_TICK) {
3785 my $jitter = $TICK_START - $NEXT_TICK; 4073 my $jitter = $TICK_START - $NEXT_TICK;
3786 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4074 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3787 warn "jitter $JITTER\n";#d# 4075 debug "jitter $JITTER\n";#d#
3788 } 4076 }
3789 } 4077 }
3790} 4078}
3791 4079
3792{ 4080{
3793 # configure BDB 4081 # configure BDB
3794 4082
3795 BDB::min_parallel 8; 4083 BDB::min_parallel 16;
3796 BDB::max_poll_reqs $TICK * 0.1; 4084 BDB::max_poll_reqs $TICK * 0.1;
3797 $AnyEvent::BDB::WATCHER->priority (1); 4085 $AnyEvent::BDB::WATCHER->priority (1);
3798 4086
3799 unless ($DB_ENV) { 4087 unless ($DB_ENV) {
3800 $DB_ENV = BDB::db_env_create; 4088 $DB_ENV = BDB::db_env_create;
… …
3847 $msg =~ s/\n//; 4135 $msg =~ s/\n//;
3848 4136
3849 # limit the # of concurrent backtraces 4137 # limit the # of concurrent backtraces
3850 if ($_log_backtrace < 2) { 4138 if ($_log_backtrace < 2) {
3851 ++$_log_backtrace; 4139 ++$_log_backtrace;
4140 my $perl_bt = Carp::longmess $msg;
3852 async { 4141 async {
3853 $Coro::current->{desc} = "abt $msg"; 4142 $Coro::current->{desc} = "abt $msg";
3854 4143
3855 my @bt = fork_call { 4144 my @bt = fork_call {
3856 @addr = map { sprintf "%x", $_ } @addr; 4145 @addr = map { sprintf "%x", $_ } @addr;
… …
3867 } 4156 }
3868 4157
3869 @funcs 4158 @funcs
3870 }; 4159 };
3871 4160
3872 LOG llevInfo, "[ABT] $msg\n"; 4161 LOG llevInfo, "[ABT] $perl_bt\n";
4162 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3873 LOG llevInfo, "[ABT] $_\n" for @bt; 4163 LOG llevInfo, "[ABT] $_\n" for @bt;
3874 --$_log_backtrace; 4164 --$_log_backtrace;
3875 }; 4165 };
3876 } else { 4166 } else {
3877 LOG llevInfo, "[ABT] $msg\n"; 4167 LOG llevInfo, "[ABT] $msg\n";
3878 LOG llevInfo, "[ABT] [suppressed]\n"; 4168 LOG llevInfo, "[ABT] [suppressed]\n";
3879 } 4169 }
3880} 4170}
3881 4171
3882# load additional modules 4172# load additional modules
3883use cf::pod; 4173require "cf/$_.pm" for @EXTRA_MODULES;
4174cf::_connect_to_perl_2;
3884 4175
3885END { cf::emergency_save } 4176END { cf::emergency_save }
3886 4177
38871 41781
3888 4179

Diff Legend

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