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.440 by root, Mon Aug 11 23:23:41 2008 UTC vs.
Revision 1.549 by root, Tue May 11 13:19:59 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';
246 cf::client cf::player 306 cf::client cf::player
247 cf::arch cf::living 307 cf::arch cf::living
248 cf::map cf::mapspace 308 cf::map cf::mapspace
249 cf::party cf::region 309 cf::party cf::region
250)) { 310)) {
251 no strict 'refs';
252 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 311 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
253} 312}
254 313
255$EV::DIED = sub { 314$EV::DIED = sub {
256 warn "error in event callback: @_"; 315 Carp::cluck "error in event callback: @_";
257}; 316};
258 317
259############################################################################# 318#############################################################################
260 319
261=head2 UTILITY FUNCTIONS 320=head2 UTILITY FUNCTIONS
298our $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
299 358
300sub encode_json($) { $json_coder->encode ($_[0]) } 359sub encode_json($) { $json_coder->encode ($_[0]) }
301sub decode_json($) { $json_coder->decode ($_[0]) } 360sub decode_json($) { $json_coder->decode ($_[0]) }
302 361
362=item $ref = cf::yaml_load $scalar
363
364Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
365
366=cut
367
368sub fork_call(&@);
369
370sub yaml_load($) {
371 fork_call { YAML::XS::Load $_[0] } @_
372}
373
374=item cf::post_init { BLOCK }
375
376Execute the given codeblock, I<after> all extensions have been (re-)loaded,
377but I<before> the server starts ticking again.
378
379The codeblock will have a single boolean argument to indicate whether this
380is a reload or not.
381
382=cut
383
384sub post_init(&) {
385 push @POST_INIT, shift;
386}
387
303=item cf::lock_wait $string 388=item cf::lock_wait $string
304 389
305Wait until the given lock is available. See cf::lock_acquire. 390Wait until the given lock is available. See cf::lock_acquire.
306 391
307=item my $lock = cf::lock_acquire $string 392=item my $lock = cf::lock_acquire $string
308 393
309Wait until the given lock is available and then acquires it and returns 394Wait until the given lock is available and then acquires it and returns
310a Coro::guard object. If the guard object gets destroyed (goes out of scope, 395a L<Guard> object. If the guard object gets destroyed (goes out of scope,
311for example when the coroutine gets canceled), the lock is automatically 396for example when the coroutine gets canceled), the lock is automatically
312returned. 397returned.
313 398
314Locks are *not* recursive, locking from the same coro twice results in a 399Locks are *not* recursive, locking from the same coro twice results in a
315deadlocked coro. 400deadlocked coro.
321 406
322Return true if the lock is currently active, i.e. somebody has locked it. 407Return true if the lock is currently active, i.e. somebody has locked it.
323 408
324=cut 409=cut
325 410
326our %LOCK; 411our $LOCKS = new Coro::SemaphoreSet;
327our %LOCKER;#d#
328 412
329sub lock_wait($) { 413sub lock_wait($) {
330 my ($key) = @_; 414 $LOCKS->wait ($_[0]);
331
332 if ($LOCKER{$key} == $Coro::current) {#d#
333 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
334 return;#d#
335 }#d#
336
337 # wait for lock, if any
338 while ($LOCK{$key}) {
339 push @{ $LOCK{$key} }, $Coro::current;
340 Coro::schedule;
341 }
342} 415}
343 416
344sub lock_acquire($) { 417sub lock_acquire($) {
345 my ($key) = @_; 418 $LOCKS->guard ($_[0])
346
347 # wait, to be sure we are not locked
348 lock_wait $key;
349
350 $LOCK{$key} = [];
351 $LOCKER{$key} = $Coro::current;#d#
352
353 Coro::guard {
354 delete $LOCKER{$key};#d#
355 # wake up all waiters, to be on the safe side
356 $_->ready for @{ delete $LOCK{$key} };
357 }
358} 419}
359 420
360sub lock_active($) { 421sub lock_active($) {
361 my ($key) = @_; 422 $LOCKS->count ($_[0]) < 1
362
363 ! ! $LOCK{$key}
364} 423}
365 424
366sub freeze_mainloop { 425sub freeze_mainloop {
367 tick_inhibit_inc; 426 tick_inhibit_inc;
368 427
369 Coro::guard \&tick_inhibit_dec; 428 &Guard::guard (\&tick_inhibit_dec);
370} 429}
371 430
372=item cf::periodic $interval, $cb 431=item cf::periodic $interval, $cb
373 432
374Like EV::periodic, but randomly selects a starting point so that the actions 433Like EV::periodic, but randomly selects a starting point so that the actions
375get spread over timer. 434get spread over time.
376 435
377=cut 436=cut
378 437
379sub periodic($$) { 438sub periodic($$) {
380 my ($interval, $cb) = @_; 439 my ($interval, $cb) = @_;
397 456
398=cut 457=cut
399 458
400our @SLOT_QUEUE; 459our @SLOT_QUEUE;
401our $SLOT_QUEUE; 460our $SLOT_QUEUE;
461our $SLOT_DECAY = 0.9;
402 462
403$SLOT_QUEUE->cancel if $SLOT_QUEUE; 463$SLOT_QUEUE->cancel if $SLOT_QUEUE;
404$SLOT_QUEUE = Coro::async { 464$SLOT_QUEUE = Coro::async {
405 $Coro::current->desc ("timeslot manager"); 465 $Coro::current->desc ("timeslot manager");
406 466
407 my $signal = new Coro::Signal; 467 my $signal = new Coro::Signal;
468 my $busy;
408 469
409 while () { 470 while () {
410 next_job: 471 next_job:
472
411 my $avail = cf::till_tick; 473 my $avail = cf::till_tick;
412 if ($avail > 0.01) { 474
413 for (0 .. $#SLOT_QUEUE) { 475 for (0 .. $#SLOT_QUEUE) {
414 if ($SLOT_QUEUE[$_][0] < $avail) { 476 if ($SLOT_QUEUE[$_][0] <= $avail) {
477 $busy = 0;
415 my $job = splice @SLOT_QUEUE, $_, 1, (); 478 my $job = splice @SLOT_QUEUE, $_, 1, ();
416 $job->[2]->send; 479 $job->[2]->send;
417 Coro::cede; 480 Coro::cede;
418 goto next_job; 481 goto next_job;
419 } 482 } else {
483 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
420 } 484 }
421 } 485 }
422 486
423 if (@SLOT_QUEUE) { 487 if (@SLOT_QUEUE) {
424 # we do not use wait_for_tick() as it returns immediately when tick is inactive 488 # we do not use wait_for_tick() as it returns immediately when tick is inactive
425 push @cf::WAIT_FOR_TICK, $signal; 489 push @cf::WAIT_FOR_TICK, $signal;
426 $signal->wait; 490 $signal->wait;
427 } else { 491 } else {
492 $busy = 0;
428 Coro::schedule; 493 Coro::schedule;
429 } 494 }
430 } 495 }
431}; 496};
432 497
433sub get_slot($;$$) { 498sub get_slot($;$$) {
434 return if tick_inhibit || $Coro::current == $Coro::main; 499 return if tick_inhibit || $Coro::current == $Coro::main;
435 500
436 my ($time, $pri, $name) = @_; 501 my ($time, $pri, $name) = @_;
437 502
438 $time = $TICK * .6 if $time > $TICK * .6; 503 $time = clamp $time, 0.01, $TICK * .6;
504
439 my $sig = new Coro::Signal; 505 my $sig = new Coro::Signal;
440 506
441 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 507 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
442 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 508 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
443 $SLOT_QUEUE->ready; 509 $SLOT_QUEUE->ready;
469=cut 535=cut
470 536
471sub sync_job(&) { 537sub sync_job(&) {
472 my ($job) = @_; 538 my ($job) = @_;
473 539
474 if ($Coro::current == $Coro::main) { 540 if (in_main) {
475 my $time = EV::time; 541 my $time = AE::time;
476 542
477 # this is the main coro, too bad, we have to block 543 # this is the main coro, too bad, we have to block
478 # till the operation succeeds, freezing the server :/ 544 # till the operation succeeds, freezing the server :/
479 545
480 LOG llevError, Carp::longmess "sync job";#d# 546 #LOG llevError, Carp::longmess "sync job";#d#
481 547
482 my $freeze_guard = freeze_mainloop; 548 my $freeze_guard = freeze_mainloop;
483 549
484 my $busy = 1; 550 my $busy = 1;
485 my @res; 551 my @res;
486 552
487 (async { 553 (async {
488 $Coro::current->desc ("sync job coro"); 554 $Coro::current->desc ("sync job coro");
489 @res = eval { $job->() }; 555 @res = eval { $job->() };
490 warn $@ if $@; 556 error $@ if $@;
491 undef $busy; 557 undef $busy;
492 })->prio (Coro::PRIO_MAX); 558 })->prio (Coro::PRIO_MAX);
493 559
494 while ($busy) { 560 while ($busy) {
495 if (Coro::nready) { 561 if (Coro::nready) {
497 } else { 563 } else {
498 EV::loop EV::LOOP_ONESHOT; 564 EV::loop EV::LOOP_ONESHOT;
499 } 565 }
500 } 566 }
501 567
502 my $time = EV::time - $time; 568 my $time = AE::time - $time;
503 569
504 $TICK_START += $time; # do not account sync jobs to server load 570 $TICK_START += $time; # do not account sync jobs to server load
505 571
506 wantarray ? @res : $res[0] 572 wantarray ? @res : $res[0]
507 } else { 573 } else {
529 $EXT_CORO{$coro+0} = $coro; 595 $EXT_CORO{$coro+0} = $coro;
530 596
531 $coro 597 $coro
532} 598}
533 599
534=item fork_call { }, $args 600=item fork_call { }, @args
535 601
536Executes the given code block with the given arguments in a seperate 602Executes the given code block with the given arguments in a seperate
537process, returning the results. Everything must be serialisable with 603process, returning the results. Everything must be serialisable with
538Coro::Storable. May, of course, block. Note that the executed sub may 604Coro::Storable. May, of course, block. Note that the executed sub may
539never block itself or use any form of event handling. 605never block itself or use any form of event handling.
540 606
541=cut 607=cut
542 608
609sub post_fork {
610 reset_signals;
611}
612
543sub fork_call(&@) { 613sub fork_call(&@) {
544 my ($cb, @args) = @_; 614 my ($cb, @args) = @_;
545 615
546 # we seemingly have to make a local copy of the whole thing, 616 # we seemingly have to make a local copy of the whole thing,
547 # otherwise perl prematurely frees the stuff :/ 617 # otherwise perl prematurely frees the stuff :/
548 # TODO: investigate and fix (likely this will be rather laborious) 618 # TODO: investigate and fix (likely this will be rather laborious)
549 619
550 my @res = Coro::Util::fork_eval { 620 my @res = Coro::Util::fork_eval {
551 reset_signals; 621 cf::post_fork;
552 &$cb 622 &$cb
553 }, @args; 623 } @args;
554 624
555 wantarray ? @res : $res[-1] 625 wantarray ? @res : $res[-1]
626}
627
628sub objinfo {
629 (
630 "counter value" => cf::object::object_count,
631 "objects created" => cf::object::create_count,
632 "objects destroyed" => cf::object::destroy_count,
633 "freelist size" => cf::object::free_count,
634 "allocated objects" => cf::object::objects_size,
635 "active objects" => cf::object::actives_size,
636 )
556} 637}
557 638
558=item $coin = coin_from_name $name 639=item $coin = coin_from_name $name
559 640
560=cut 641=cut
597within each server. 678within each server.
598 679
599=cut 680=cut
600 681
601sub db_table($) { 682sub db_table($) {
683 cf::error "db_get called from main context"
684 if $Coro::current == $Coro::main;
685
602 my ($name) = @_; 686 my ($name) = @_;
603 my $db = BDB::db_create $DB_ENV; 687 my $db = BDB::db_create $DB_ENV;
604 688
605 eval { 689 eval {
606 $db->set_flags (BDB::CHKSUM); 690 $db->set_flags (BDB::CHKSUM);
616} 700}
617 701
618our $DB; 702our $DB;
619 703
620sub db_init { 704sub db_init {
621 cf::sync_job {
622 $DB ||= db_table "db"; 705 $DB ||= db_table "db";
623 };
624} 706}
625 707
626sub db_get($$) { 708sub db_get($$) {
627 my $key = "$_[0]/$_[1]"; 709 my $key = "$_[0]/$_[1]";
628 710
629 cf::sync_job { 711 cf::error "db_get called from main context"
712 if $Coro::current == $Coro::main;
713
630 BDB::db_get $DB, undef, $key, my $data; 714 BDB::db_get $DB, undef, $key, my $data;
631 715
632 $! ? () 716 $! ? ()
633 : $data 717 : $data
634 }
635} 718}
636 719
637sub db_put($$$) { 720sub db_put($$$) {
638 BDB::dbreq_pri 4; 721 BDB::dbreq_pri 4;
639 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 722 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
695 778
696 my $t1 = Time::HiRes::time; 779 my $t1 = Time::HiRes::time;
697 my $data = $process->(\@data); 780 my $data = $process->(\@data);
698 my $t2 = Time::HiRes::time; 781 my $t2 = Time::HiRes::time;
699 782
700 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 783 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
701 784
702 db_put cache => "$id/data", $data; 785 db_put cache => "$id/data", $data;
703 db_put cache => "$id/md5" , $md5; 786 db_put cache => "$id/md5" , $md5;
704 db_put cache => "$id/meta", $meta; 787 db_put cache => "$id/meta", $meta;
705 788
715 798
716=cut 799=cut
717 800
718sub datalog($@) { 801sub datalog($@) {
719 my ($type, %kv) = @_; 802 my ($type, %kv) = @_;
720 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 803 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
721} 804}
722 805
723=back 806=back
724 807
725=cut 808=cut
726 809
727############################################################################# 810#############################################################################
728 811
729=head2 ATTACHABLE OBJECTS 812=head2 ATTACHABLE OBJECTS
730 813
731Many objects in crossfire are so-called attachable objects. That means you can 814Many objects in deliantra are so-called attachable objects. That means you can
732attach callbacks/event handlers (a collection of which is called an "attachment") 815attach callbacks/event handlers (a collection of which is called an "attachment")
733to it. All such attachable objects support the following methods. 816to it. All such attachable objects support the following methods.
734 817
735In the following description, CLASS can be any of C<global>, C<object> 818In the following description, CLASS can be any of C<global>, C<object>
736C<player>, C<client> or C<map> (i.e. the attachable objects in 819C<player>, C<client> or C<map> (i.e. the attachable objects in
786=item cf::CLASS::attachment $name, ... 869=item cf::CLASS::attachment $name, ...
787 870
788Register an attachment by C<$name> through which attachable objects of the 871Register an attachment by C<$name> through which attachable objects of the
789given CLASS can refer to this attachment. 872given CLASS can refer to this attachment.
790 873
791Some classes such as crossfire maps and objects can specify attachments 874Some classes such as deliantra maps and objects can specify attachments
792that are attached at load/instantiate time, thus the need for a name. 875that are attached at load/instantiate time, thus the need for a name.
793 876
794These calls expect any number of the following handler/hook descriptions: 877These calls expect any number of the following handler/hook descriptions:
795 878
796=over 4 879=over 4
920 1003
921 } elsif (exists $cb_id{$type}) { 1004 } elsif (exists $cb_id{$type}) {
922 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1005 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
923 1006
924 } elsif (ref $type) { 1007 } elsif (ref $type) {
925 warn "attaching objects not supported, ignoring.\n"; 1008 error "attaching objects not supported, ignoring.\n";
926 1009
927 } else { 1010 } else {
928 shift @arg; 1011 shift @arg;
929 warn "attach argument '$type' not supported, ignoring.\n"; 1012 error "attach argument '$type' not supported, ignoring.\n";
930 } 1013 }
931 } 1014 }
932} 1015}
933 1016
934sub _object_attach { 1017sub _object_attach {
944 _attach $registry, $klass, @attach; 1027 _attach $registry, $klass, @attach;
945 } 1028 }
946 1029
947 $obj->{$name} = \%arg; 1030 $obj->{$name} = \%arg;
948 } else { 1031 } else {
949 warn "object uses attachment '$name' which is not available, postponing.\n"; 1032 info "object uses attachment '$name' which is not available, postponing.\n";
950 } 1033 }
951 1034
952 $obj->{_attachment}{$name} = undef; 1035 $obj->{_attachment}{$name} = undef;
953} 1036}
954 1037
1013 1096
1014 for (@$callbacks) { 1097 for (@$callbacks) {
1015 eval { &{$_->[1]} }; 1098 eval { &{$_->[1]} };
1016 1099
1017 if ($@) { 1100 if ($@) {
1018 warn "$@";
1019 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1101 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1020 override; 1102 override;
1021 } 1103 }
1022 1104
1023 return 1 if $override; 1105 return 1 if $override;
1024 } 1106 }
1087 1169
1088sub reattach { 1170sub reattach {
1089 # basically do the same as instantiate, without calling instantiate 1171 # basically do the same as instantiate, without calling instantiate
1090 my ($obj) = @_; 1172 my ($obj) = @_;
1091 1173
1174 # no longer needed after getting rid of delete_package?
1092 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1175 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1093 1176
1094 my $registry = $obj->registry; 1177 my $registry = $obj->registry;
1095 1178
1096 @$registry = (); 1179 @$registry = ();
1097 1180
1102 for (@$attach) { 1185 for (@$attach) {
1103 my ($klass, @attach) = @$_; 1186 my ($klass, @attach) = @$_;
1104 _attach $registry, $klass, @attach; 1187 _attach $registry, $klass, @attach;
1105 } 1188 }
1106 } else { 1189 } else {
1107 warn "object uses attachment '$name' that is not available, postponing.\n"; 1190 info "object uses attachment '$name' that is not available, postponing.\n";
1108 } 1191 }
1109 } 1192 }
1110} 1193}
1111 1194
1112cf::attachable->attach ( 1195cf::attachable->attach (
1139 my ($filename, $rdata, $objs) = @_; 1222 my ($filename, $rdata, $objs) = @_;
1140 1223
1141 sync_job { 1224 sync_job {
1142 if (length $$rdata) { 1225 if (length $$rdata) {
1143 utf8::decode (my $decname = $filename); 1226 utf8::decode (my $decname = $filename);
1144 warn sprintf "saving %s (%d,%d)\n", 1227 trace sprintf "saving %s (%d,%d)\n",
1145 $decname, length $$rdata, scalar @$objs; 1228 $decname, length $$rdata, scalar @$objs
1229 if $VERBOSE_IO;
1146 1230
1147 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1231 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1148 aio_chmod $fh, SAVE_MODE; 1232 aio_chmod $fh, SAVE_MODE;
1149 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1233 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1150 aio_fsync $fh if $cf::USE_FSYNC; 1234 if ($cf::USE_FSYNC) {
1235 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;
1236 aio_fsync $fh;
1237 }
1151 aio_close $fh; 1238 aio_close $fh;
1152 1239
1153 if (@$objs) { 1240 if (@$objs) {
1154 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1241 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1155 aio_chmod $fh, SAVE_MODE; 1242 aio_chmod $fh, SAVE_MODE;
1156 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1243 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1157 aio_write $fh, 0, (length $data), $data, 0; 1244 aio_write $fh, 0, (length $data), $data, 0;
1158 aio_fsync $fh if $cf::USE_FSYNC; 1245 if ($cf::USE_FSYNC) {
1246 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;
1247 aio_fsync $fh;
1248 }
1159 aio_close $fh; 1249 aio_close $fh;
1160 aio_rename "$filename.pst~", "$filename.pst"; 1250 aio_rename "$filename.pst~", "$filename.pst";
1161 } 1251 }
1162 } else { 1252 } else {
1163 aio_unlink "$filename.pst"; 1253 aio_unlink "$filename.pst";
1164 } 1254 }
1165 1255
1166 aio_rename "$filename~", $filename; 1256 aio_rename "$filename~", $filename;
1257
1258 $filename =~ s%/[^/]+$%%;
1259 aio_pathsync $filename if $cf::USE_FSYNC;
1167 } else { 1260 } else {
1168 warn "FATAL: $filename~: $!\n"; 1261 error "unable to save objects: $filename~: $!\n";
1169 } 1262 }
1170 } else { 1263 } else {
1171 aio_unlink $filename; 1264 aio_unlink $filename;
1172 aio_unlink "$filename.pst"; 1265 aio_unlink "$filename.pst";
1173 } 1266 }
1197 my $st = eval { Coro::Storable::thaw $av }; 1290 my $st = eval { Coro::Storable::thaw $av };
1198 $av = $st->{objs}; 1291 $av = $st->{objs};
1199 } 1292 }
1200 1293
1201 utf8::decode (my $decname = $filename); 1294 utf8::decode (my $decname = $filename);
1202 warn sprintf "loading %s (%d,%d)\n", 1295 trace sprintf "loading %s (%d,%d)\n",
1203 $decname, length $data, scalar @{$av || []}; 1296 $decname, length $data, scalar @{$av || []}
1297 if $VERBOSE_IO;
1204 1298
1205 ($data, $av) 1299 ($data, $av)
1206} 1300}
1207 1301
1208=head2 COMMAND CALLBACKS 1302=head2 COMMAND CALLBACKS
1264 my ($name, $cb) = @_; 1358 my ($name, $cb) = @_;
1265 1359
1266 $EXTICMD{$name} = $cb; 1360 $EXTICMD{$name} = $cb;
1267} 1361}
1268 1362
1363use File::Glob ();
1364
1269cf::player->attach ( 1365cf::player->attach (
1270 on_command => sub { 1366 on_unknown_command => sub {
1271 my ($pl, $name, $params) = @_; 1367 my ($pl, $name, $params) = @_;
1272 1368
1273 my $cb = $COMMAND{$name} 1369 my $cb = $COMMAND{$name}
1274 or return; 1370 or return;
1275 1371
1298 1394
1299 $pl->ext_reply ($reply, @reply) 1395 $pl->ext_reply ($reply, @reply)
1300 if $reply; 1396 if $reply;
1301 1397
1302 } else { 1398 } else {
1303 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1399 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1304 } 1400 }
1305 1401
1306 cf::override; 1402 cf::override;
1307 }, 1403 },
1308); 1404);
1309 1405
1406# "readahead" all extensions
1407sub cache_extensions {
1408 my $grp = IO::AIO::aio_group;
1409
1410 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1411 for (grep /\.ext$/, @{$_[0]}) {
1412 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1413 }
1414 };
1415
1416 $grp
1417}
1418
1310sub load_extensions { 1419sub load_extensions {
1420 info "loading extensions...";
1421
1311 cf::sync_job { 1422 cf::sync_job {
1312 my %todo; 1423 my %todo;
1313 1424
1314 for my $path (<$LIBDIR/*.ext>) { 1425 for my $path (<$LIBDIR/*.ext>) {
1315 next unless -r $path; 1426 next unless -r $path;
1333 1444
1334 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1445 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1335 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1446 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1336 1447
1337 $ext{source} = 1448 $ext{source} =
1338 "package $pkg; use strict; use utf8;\n" 1449 "package $pkg; use common::sense;\n"
1339 . "#line 1 \"$path\"\n{\n" 1450 . "#line 1 \"$path\"\n{\n"
1340 . $source 1451 . $source
1341 . "\n};\n1"; 1452 . "\n};\n1";
1342 1453
1343 $todo{$base} = \%ext; 1454 $todo{$base} = \%ext;
1344 } 1455 }
1345 1456
1457 my $pass = 0;
1346 my %done; 1458 my %done;
1347 while (%todo) { 1459 while (%todo) {
1348 my $progress; 1460 my $progress;
1349 1461
1462 ++$pass;
1463
1464 ext:
1350 while (my ($k, $v) = each %todo) { 1465 while (my ($k, $v) = each %todo) {
1351 for (split /,\s*/, $v->{meta}{depends}) { 1466 for (split /,\s*/, $v->{meta}{depends}) {
1352 goto skip 1467 next ext
1353 unless exists $done{$_}; 1468 unless exists $done{$_};
1354 } 1469 }
1355 1470
1356 warn "... loading '$k' into '$v->{pkg}'\n"; 1471 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1357 1472
1358 unless (eval $v->{source}) { 1473 my $active = eval $v->{source};
1474
1475 if (length $@) {
1359 my $msg = $@ ? "$v->{path}: $@\n" 1476 error "$v->{path}: $@\n";
1360 : "$v->{base}: extension inactive.\n";
1361 1477
1362 if (exists $v->{meta}{mandatory}) {
1363 warn $msg;
1364 cf::cleanup "mandatory extension failed to load, exiting."; 1478 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1365 } 1479 if exists $v->{meta}{mandatory};
1366 1480
1367 warn $msg; 1481 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1482 delete $todo{$k};
1483 } else {
1484 $done{$k} = delete $todo{$k};
1485 push @EXTS, $v->{pkg};
1486 $progress = 1;
1487
1488 info "$v->{base}: extension inactive.\n"
1489 unless $active;
1368 } 1490 }
1369
1370 $done{$k} = delete $todo{$k};
1371 push @EXTS, $v->{pkg};
1372 $progress = 1;
1373 } 1491 }
1374 1492
1375 skip: 1493 unless ($progress) {
1376 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1494 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1377 unless $progress; 1495
1496 while (my ($k, $v) = each %todo) {
1497 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1498 if exists $v->{meta}{mandatory};
1499 }
1500 }
1378 } 1501 }
1379 }; 1502 };
1380} 1503}
1381 1504
1382############################################################################# 1505#############################################################################
1383 1506
1384=back 1507=back
1385 1508
1386=head2 CORE EXTENSIONS 1509=head2 CORE EXTENSIONS
1387 1510
1388Functions and methods that extend core crossfire objects. 1511Functions and methods that extend core deliantra objects.
1389 1512
1390=cut 1513=cut
1391 1514
1392package cf::player; 1515package cf::player;
1393 1516
1436 1559
1437sub exists($) { 1560sub exists($) {
1438 my ($login) = @_; 1561 my ($login) = @_;
1439 1562
1440 $cf::PLAYER{$login} 1563 $cf::PLAYER{$login}
1441 or cf::sync_job { !aio_stat path $login } 1564 or !aio_stat path $login
1442} 1565}
1443 1566
1444sub find($) { 1567sub find($) {
1445 return $cf::PLAYER{$_[0]} || do { 1568 return $cf::PLAYER{$_[0]} || do {
1446 my $login = $_[0]; 1569 my $login = $_[0];
1466 $cf::PLAYER{$login} = $pl 1589 $cf::PLAYER{$login} = $pl
1467 } 1590 }
1468 } 1591 }
1469} 1592}
1470 1593
1594cf::player->attach (
1595 on_load => sub {
1596 my ($pl, $path) = @_;
1597
1598 # restore slots saved in save, below
1599 my $slots = delete $pl->{_slots};
1600
1601 $pl->ob->current_weapon ($slots->[0]);
1602 $pl->combat_ob ($slots->[1]);
1603 $pl->ranged_ob ($slots->[2]);
1604 },
1605);
1606
1471sub save($) { 1607sub save($) {
1472 my ($pl) = @_; 1608 my ($pl) = @_;
1473 1609
1474 return if $pl->{deny_save}; 1610 return if $pl->{deny_save};
1475 1611
1480 1616
1481 aio_mkdir playerdir $pl, 0770; 1617 aio_mkdir playerdir $pl, 0770;
1482 $pl->{last_save} = $cf::RUNTIME; 1618 $pl->{last_save} = $cf::RUNTIME;
1483 1619
1484 cf::get_slot 0.01; 1620 cf::get_slot 0.01;
1621
1622 # save slots, to be restored later
1623 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1485 1624
1486 $pl->save_pl ($path); 1625 $pl->save_pl ($path);
1487 cf::cede_to_tick; 1626 cf::cede_to_tick;
1488} 1627}
1489 1628
1521 my ($pl) = @_; 1660 my ($pl) = @_;
1522 1661
1523 my $name = $pl->ob->name; 1662 my $name = $pl->ob->name;
1524 1663
1525 $pl->{deny_save} = 1; 1664 $pl->{deny_save} = 1;
1526 $pl->password ("*"); # this should lock out the player until we nuked the dir 1665 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1527 1666
1528 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1667 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1529 $pl->deactivate; 1668 $pl->deactivate;
1669
1530 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1670 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1531 $pl->ob->check_score;
1532 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1671 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1672 ext::highscore::check ($pl->ob);
1673
1533 $pl->ns->destroy if $pl->ns; 1674 $pl->ns->destroy if $pl->ns;
1534 1675
1535 my $path = playerdir $pl; 1676 my $path = playerdir $pl;
1536 my $temp = "$path~$cf::RUNTIME~deleting~"; 1677 my $temp = "$path~$cf::RUNTIME~deleting~";
1537 aio_rename $path, $temp; 1678 aio_rename $path, $temp;
1591 \@logins 1732 \@logins
1592} 1733}
1593 1734
1594=item $player->maps 1735=item $player->maps
1595 1736
1737=item cf::player::maps $login
1738
1596Returns an arrayref of map paths that are private for this 1739Returns an arrayref of map paths that are private for this
1597player. May block. 1740player. May block.
1598 1741
1599=cut 1742=cut
1600 1743
1617 } 1760 }
1618 1761
1619 \@paths 1762 \@paths
1620} 1763}
1621 1764
1622=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1765=item $protocol_xml = $player->expand_cfpod ($cfpod)
1623 1766
1624Expand crossfire pod fragments into protocol xml. 1767Expand deliantra pod fragments into protocol xml.
1625
1626=cut
1627
1628use re 'eval';
1629
1630my $group;
1631my $interior; $interior = qr{
1632 # match a pod interior sequence sans C<< >>
1633 (?:
1634 \ (.*?)\ (?{ $group = $^N })
1635 | < (??{$interior}) >
1636 )
1637}x;
1638
1639sub expand_cfpod {
1640 my ($self, $pod) = @_;
1641
1642 my $xml;
1643
1644 while () {
1645 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1646 $group = $1;
1647
1648 $group =~ s/&/&amp;/g;
1649 $group =~ s/</&lt;/g;
1650
1651 $xml .= $group;
1652 } elsif ($pod =~ m%\G
1653 ([BCGHITU])
1654 <
1655 (?:
1656 ([^<>]*) (?{ $group = $^N })
1657 | < $interior >
1658 )
1659 >
1660 %gcsx
1661 ) {
1662 my ($code, $data) = ($1, $group);
1663
1664 if ($code eq "B") {
1665 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1666 } elsif ($code eq "I") {
1667 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1668 } elsif ($code eq "U") {
1669 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1670 } elsif ($code eq "C") {
1671 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1672 } elsif ($code eq "T") {
1673 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1674 } elsif ($code eq "G") {
1675 my ($male, $female) = split /\|/, $data;
1676 $data = $self->gender ? $female : $male;
1677 $xml .= expand_cfpod ($self, $data);
1678 } elsif ($code eq "H") {
1679 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1680 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1681 "")
1682 [$self->{hintmode}];
1683 } else {
1684 $xml .= "error processing '$code($data)' directive";
1685 }
1686 } else {
1687 if ($pod =~ /\G(.+)/) {
1688 warn "parse error while expanding $pod (at $1)";
1689 }
1690 last;
1691 }
1692 }
1693
1694 for ($xml) {
1695 # create single paragraphs (very hackish)
1696 s/(?<=\S)\n(?=\w)/ /g;
1697
1698 # compress some whitespace
1699 s/\s+\n/\n/g; # ws line-ends
1700 s/\n\n+/\n/g; # double lines
1701 s/^\n+//; # beginning lines
1702 s/\n+$//; # ending lines
1703 }
1704
1705 $xml
1706}
1707
1708no re 'eval';
1709
1710sub hintmode {
1711 $_[0]{hintmode} = $_[1] if @_ > 1;
1712 $_[0]{hintmode}
1713}
1714 1768
1715=item $player->ext_reply ($msgid, @msg) 1769=item $player->ext_reply ($msgid, @msg)
1716 1770
1717Sends an ext reply to the player. 1771Sends an ext reply to the player.
1718 1772
1750 1804
1751=cut 1805=cut
1752 1806
1753sub find_by_path($) { 1807sub find_by_path($) {
1754 my ($path) = @_; 1808 my ($path) = @_;
1809
1810 $path =~ s/^~[^\/]*//; # skip ~login
1755 1811
1756 my ($match, $specificity); 1812 my ($match, $specificity);
1757 1813
1758 for my $region (list) { 1814 for my $region (list) {
1759 if ($region->{match} && $path =~ $region->{match}) { 1815 if ($region->{match} && $path =~ $region->{match}) {
1791 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1847 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1792 1848
1793 # mit "rum" bekleckern, nicht 1849 # mit "rum" bekleckern, nicht
1794 $self->_create_random_map ( 1850 $self->_create_random_map (
1795 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1851 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1796 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1852 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1797 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1853 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1798 $rmp->{exit_on_final_map}, 1854 $rmp->{exit_on_final_map},
1799 $rmp->{xsize}, $rmp->{ysize}, 1855 $rmp->{xsize}, $rmp->{ysize},
1800 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1856 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1801 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1857 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1816 1872
1817sub register { 1873sub register {
1818 my (undef, $regex, $prio) = @_; 1874 my (undef, $regex, $prio) = @_;
1819 my $pkg = caller; 1875 my $pkg = caller;
1820 1876
1821 no strict;
1822 push @{"$pkg\::ISA"}, __PACKAGE__; 1877 push @{"$pkg\::ISA"}, __PACKAGE__;
1823 1878
1824 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1879 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1825} 1880}
1826 1881
1827# also paths starting with '/' 1882# also paths starting with '/'
1828$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1883$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1829 1884
1830sub thawer_merge { 1885sub thawer_merge {
1831 my ($self, $merge) = @_; 1886 my ($self, $merge) = @_;
1832 1887
1833 # we have to keep some variables in memory intact 1888 # we have to keep some variables in memory intact
1838} 1893}
1839 1894
1840sub normalise { 1895sub normalise {
1841 my ($path, $base) = @_; 1896 my ($path, $base) = @_;
1842 1897
1843 $path = "$path"; # make sure its a string 1898 $path = "$path"; # make sure it's a string
1844 1899
1845 $path =~ s/\.map$//; 1900 $path =~ s/\.map$//;
1846 1901
1847 # map plan: 1902 # map plan:
1848 # 1903 #
1887 $self->init; # pass $1 etc. 1942 $self->init; # pass $1 etc.
1888 return $self; 1943 return $self;
1889 } 1944 }
1890 } 1945 }
1891 1946
1892 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1947 Carp::cluck "unable to resolve path '$path' (base '$base')";
1893 () 1948 ()
1894} 1949}
1895 1950
1896sub init { 1951sub init {
1897 my ($self) = @_; 1952 my ($self) = @_;
1929sub uniq_path { 1984sub uniq_path {
1930 my ($self) = @_; 1985 my ($self) = @_;
1931 1986
1932 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1987 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1933 "$UNIQUEDIR/$path" 1988 "$UNIQUEDIR/$path"
1934}
1935
1936# and all this just because we cannot iterate over
1937# all maps in C++...
1938sub change_all_map_light {
1939 my ($change) = @_;
1940
1941 $_->change_map_light ($change)
1942 for grep $_->outdoor, values %cf::MAP;
1943} 1989}
1944 1990
1945sub decay_objects { 1991sub decay_objects {
1946 my ($self) = @_; 1992 my ($self) = @_;
1947 1993
2029 2075
2030sub find; 2076sub find;
2031sub find { 2077sub find {
2032 my ($path, $origin) = @_; 2078 my ($path, $origin) = @_;
2033 2079
2080 cf::cede_to_tick;
2081
2034 $path = normalise $path, $origin && $origin->path; 2082 $path = normalise $path, $origin && $origin->path;
2035 2083
2036 cf::lock_wait "map_data:$path";#d#remove 2084 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2037 cf::lock_wait "map_find:$path"; 2085 my $guard2 = cf::lock_acquire "map_find:$path";
2038 2086
2039 $cf::MAP{$path} || do { 2087 $cf::MAP{$path} || do {
2040 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2041 my $guard2 = cf::lock_acquire "map_find:$path";
2042
2043 my $map = new_from_path cf::map $path 2088 my $map = new_from_path cf::map $path
2044 or return; 2089 or return;
2045 2090
2046 $map->{last_save} = $cf::RUNTIME; 2091 $map->{last_save} = $cf::RUNTIME;
2047 2092
2059 2104
2060 $cf::MAP{$path} = $map 2105 $cf::MAP{$path} = $map
2061 } 2106 }
2062} 2107}
2063 2108
2064sub pre_load { } 2109sub pre_load { }
2065sub post_load { } 2110#sub post_load { } # XS
2066 2111
2067sub load { 2112sub load {
2068 my ($self) = @_; 2113 my ($self) = @_;
2069 2114
2070 local $self->{deny_reset} = 1; # loading can take a long time 2115 local $self->{deny_reset} = 1; # loading can take a long time
2115 unless ($self->{deny_activate}) { 2160 unless ($self->{deny_activate}) {
2116 $self->decay_objects; 2161 $self->decay_objects;
2117 $self->fix_auto_apply; 2162 $self->fix_auto_apply;
2118 $self->update_buttons; 2163 $self->update_buttons;
2119 cf::cede_to_tick; 2164 cf::cede_to_tick;
2120 $self->set_darkness_map;
2121 cf::cede_to_tick;
2122 $self->activate; 2165 $self->activate;
2123 } 2166 }
2124 2167
2125 $self->{last_save} = $cf::RUNTIME; 2168 $self->{last_save} = $cf::RUNTIME;
2126 $self->last_access ($cf::RUNTIME); 2169 $self->last_access ($cf::RUNTIME);
2129 } 2172 }
2130 2173
2131 $self->post_load; 2174 $self->post_load;
2132} 2175}
2133 2176
2177# customize the map for a given player, i.e.
2178# return the _real_ map. used by e.g. per-player
2179# maps to change the path to ~playername/mappath
2134sub customise_for { 2180sub customise_for {
2135 my ($self, $ob) = @_; 2181 my ($self, $ob) = @_;
2136 2182
2137 return find "~" . $ob->name . "/" . $self->{path} 2183 return find "~" . $ob->name . "/" . $self->{path}
2138 if $self->per_player; 2184 if $self->per_player;
2154 or next; 2200 or next;
2155 $neigh = find $neigh, $map 2201 $neigh = find $neigh, $map
2156 or next; 2202 or next;
2157 $neigh->load; 2203 $neigh->load;
2158 2204
2205 # now find the diagonal neighbours
2159 push @neigh, 2206 push @neigh,
2160 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2207 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2161 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2208 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2162 } 2209 }
2163 2210
2170} 2217}
2171 2218
2172sub find_sync { 2219sub find_sync {
2173 my ($path, $origin) = @_; 2220 my ($path, $origin) = @_;
2174 2221
2175 cf::sync_job { find $path, $origin } 2222 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2223 if $Coro::current == $Coro::main;
2224
2225 find $path, $origin
2176} 2226}
2177 2227
2178sub do_load_sync { 2228sub do_load_sync {
2179 my ($map) = @_; 2229 my ($map) = @_;
2180 2230
2181 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2231 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2182 if $Coro::current == $Coro::main; 2232 if $Coro::current == $Coro::main;
2183 2233
2184 cf::sync_job { $map->load }; 2234 $map->load;
2185} 2235}
2186 2236
2187our %MAP_PREFETCH; 2237our %MAP_PREFETCH;
2188our $MAP_PREFETCHER = undef; 2238our $MAP_PREFETCHER = undef;
2189 2239
2215 $MAP_PREFETCHER->prio (6); 2265 $MAP_PREFETCHER->prio (6);
2216 2266
2217 () 2267 ()
2218} 2268}
2219 2269
2270# common code, used by both ->save and ->swapout
2220sub save { 2271sub _save {
2221 my ($self) = @_; 2272 my ($self) = @_;
2222
2223 my $lock = cf::lock_acquire "map_data:$self->{path}";
2224 2273
2225 $self->{last_save} = $cf::RUNTIME; 2274 $self->{last_save} = $cf::RUNTIME;
2226 2275
2227 return unless $self->dirty; 2276 return unless $self->dirty;
2228 2277
2248 } else { 2297 } else {
2249 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2298 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2250 } 2299 }
2251} 2300}
2252 2301
2302sub save {
2303 my ($self) = @_;
2304
2305 my $lock = cf::lock_acquire "map_data:$self->{path}";
2306
2307 $self->_save;
2308}
2309
2253sub swap_out { 2310sub swap_out {
2254 my ($self) = @_; 2311 my ($self) = @_;
2255 2312
2256 # save first because save cedes
2257 $self->save;
2258
2259 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2313 my $lock = cf::lock_acquire "map_data:$self->{path}";
2260 2314
2261 return if $self->players;
2262 return if $self->in_memory != cf::MAP_ACTIVE; 2315 return if $self->in_memory != cf::MAP_ACTIVE;
2263 return if $self->{deny_save}; 2316 return if $self->{deny_save};
2317 return if $self->players;
2264 2318
2319 # first deactivate the map and "unlink" it from the core
2320 $self->deactivate;
2321 $_->clear_links_to ($self) for values %cf::MAP;
2265 $self->in_memory (cf::MAP_SWAPPED); 2322 $self->in_memory (cf::MAP_SWAPPED);
2323
2324 # then atomically save
2325 $self->_save;
2326
2327 # then free the map
2328 $self->clear;
2329}
2330
2331sub reset_at {
2332 my ($self) = @_;
2333
2334 # TODO: safety, remove and allow resettable per-player maps
2335 return 1e99 if $self->{deny_reset};
2336
2337 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2338 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2339
2340 $time + $to
2341}
2342
2343sub should_reset {
2344 my ($self) = @_;
2345
2346 $self->reset_at <= $cf::RUNTIME
2347}
2348
2349sub reset {
2350 my ($self) = @_;
2351
2352 my $lock = cf::lock_acquire "map_data:$self->{path}";
2353
2354 return if $self->players;
2355
2356 cf::trace "resetting map ", $self->path, "\n";
2357
2358 $self->in_memory (cf::MAP_SWAPPED);
2359
2360 # need to save uniques path
2361 unless ($self->{deny_save}) {
2362 my $uniq = $self->uniq_path; utf8::encode $uniq;
2363
2364 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2365 if $uniq;
2366 }
2367
2368 delete $cf::MAP{$self->path};
2266 2369
2267 $self->deactivate; 2370 $self->deactivate;
2268 $_->clear_links_to ($self) for values %cf::MAP; 2371 $_->clear_links_to ($self) for values %cf::MAP;
2269 $self->clear; 2372 $self->clear;
2270}
2271
2272sub reset_at {
2273 my ($self) = @_;
2274
2275 # TODO: safety, remove and allow resettable per-player maps
2276 return 1e99 if $self->{deny_reset};
2277
2278 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2279 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2280
2281 $time + $to
2282}
2283
2284sub should_reset {
2285 my ($self) = @_;
2286
2287 $self->reset_at <= $cf::RUNTIME
2288}
2289
2290sub reset {
2291 my ($self) = @_;
2292
2293 my $lock = cf::lock_acquire "map_data:$self->{path}";
2294
2295 return if $self->players;
2296
2297 warn "resetting map ", $self->path;
2298
2299 $self->in_memory (cf::MAP_SWAPPED);
2300
2301 # need to save uniques path
2302 unless ($self->{deny_save}) {
2303 my $uniq = $self->uniq_path; utf8::encode $uniq;
2304
2305 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2306 if $uniq;
2307 }
2308
2309 delete $cf::MAP{$self->path};
2310
2311 $self->deactivate;
2312 $_->clear_links_to ($self) for values %cf::MAP;
2313 $self->clear;
2314 2373
2315 $self->unlink_save; 2374 $self->unlink_save;
2316 $self->destroy; 2375 $self->destroy;
2317} 2376}
2318 2377
2326 2385
2327 delete $cf::MAP{$self->path}; 2386 delete $cf::MAP{$self->path};
2328 2387
2329 $self->unlink_save; 2388 $self->unlink_save;
2330 2389
2331 bless $self, "cf::map"; 2390 bless $self, "cf::map::wrap";
2332 delete $self->{deny_reset}; 2391 delete $self->{deny_reset};
2333 $self->{deny_save} = 1; 2392 $self->{deny_save} = 1;
2334 $self->reset_timeout (1); 2393 $self->reset_timeout (1);
2335 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2394 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2336 2395
2393 : normalise $_ 2452 : normalise $_
2394 } @{ aio_readdir $UNIQUEDIR or [] } 2453 } @{ aio_readdir $UNIQUEDIR or [] }
2395 ] 2454 ]
2396} 2455}
2397 2456
2457=item cf::map::static_maps
2458
2459Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2460file in the shared directory excluding F</styles> and F</editor>). May
2461block.
2462
2463=cut
2464
2465sub static_maps() {
2466 my @dirs = "";
2467 my @maps;
2468
2469 while (@dirs) {
2470 my $dir = shift @dirs;
2471
2472 next if $dir eq "/styles" || $dir eq "/editor";
2473
2474 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2475 or return;
2476
2477 for (@$files) {
2478 s/\.map$// or next;
2479 utf8::decode $_;
2480 push @maps, "$dir/$_";
2481 }
2482
2483 push @dirs, map "$dir/$_", @$dirs;
2484 }
2485
2486 \@maps
2487}
2488
2398=back 2489=back
2399 2490
2400=head3 cf::object 2491=head3 cf::object
2401 2492
2402=cut 2493=cut
2467 2558
2468our $SAY_CHANNEL = { 2559our $SAY_CHANNEL = {
2469 id => "say", 2560 id => "say",
2470 title => "Map", 2561 title => "Map",
2471 reply => "say ", 2562 reply => "say ",
2472 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2563 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2473}; 2564};
2474 2565
2475our $CHAT_CHANNEL = { 2566our $CHAT_CHANNEL = {
2476 id => "chat", 2567 id => "chat",
2477 title => "Chat", 2568 title => "Chat",
2532 2623
2533=item $player_object->enter_link 2624=item $player_object->enter_link
2534 2625
2535Freezes the player and moves him/her to a special map (C<{link}>). 2626Freezes the player and moves him/her to a special map (C<{link}>).
2536 2627
2537The player should be reasonably safe there for short amounts of time. You 2628The player should be reasonably safe there for short amounts of time (e.g.
2538I<MUST> call C<leave_link> as soon as possible, though. 2629for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2630though, as the player cannot control the character while it is on the link
2631map.
2539 2632
2540Will never block. 2633Will never block.
2541 2634
2542=item $player_object->leave_link ($map, $x, $y) 2635=item $player_object->leave_link ($map, $x, $y)
2543 2636
2563sub cf::object::player::enter_link { 2656sub cf::object::player::enter_link {
2564 my ($self) = @_; 2657 my ($self) = @_;
2565 2658
2566 $self->deactivate_recursive; 2659 $self->deactivate_recursive;
2567 2660
2661 ++$self->{_link_recursion};
2662
2568 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2663 return if UNIVERSAL::isa $self->map, "ext::map_link";
2569 2664
2570 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2665 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2571 if $self->map && $self->map->{path} ne "{link}"; 2666 if $self->map && $self->map->{path} ne "{link}";
2572 2667
2573 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2668 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2574} 2669}
2575 2670
2576sub cf::object::player::leave_link { 2671sub cf::object::player::leave_link {
2577 my ($self, $map, $x, $y) = @_; 2672 my ($self, $map, $x, $y) = @_;
2578 2673
2595 ($x, $y) = (-1, -1) 2690 ($x, $y) = (-1, -1)
2596 unless (defined $x) && (defined $y); 2691 unless (defined $x) && (defined $y);
2597 2692
2598 # use -1 or undef as default coordinates, not 0, 0 2693 # use -1 or undef as default coordinates, not 0, 0
2599 ($x, $y) = ($map->enter_x, $map->enter_y) 2694 ($x, $y) = ($map->enter_x, $map->enter_y)
2600 if $x <=0 && $y <= 0; 2695 if $x <= 0 && $y <= 0;
2601 2696
2602 $map->load; 2697 $map->load;
2603 $map->load_neighbours; 2698 $map->load_neighbours;
2604 2699
2605 return unless $self->contr->active; 2700 return unless $self->contr->active;
2606 $self->activate_recursive;
2607 2701
2608 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2702 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2609 $self->enter_map ($map, $x, $y); 2703 if ($self->enter_map ($map, $x, $y)) {
2610} 2704 # entering was successful
2705 delete $self->{_link_recursion};
2706 # only activate afterwards, to support waiting in hooks
2707 $self->activate_recursive;
2708 }
2611 2709
2710}
2711
2612=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2712=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2613 2713
2614Moves the player to the given map-path and coordinates by first freezing 2714Moves the player to the given map-path and coordinates by first freezing
2615her, loading and preparing them map, calling the provided $check callback 2715her, loading and preparing them map, calling the provided $check callback
2616that has to return the map if sucecssful, and then unfreezes the player on 2716that has to return the map if sucecssful, and then unfreezes the player on
2617the new (success) or old (failed) map position. In either case, $done will 2717the new (success) or old (failed) map position. In either case, $done will
2624 2724
2625our $GOTOGEN; 2725our $GOTOGEN;
2626 2726
2627sub cf::object::player::goto { 2727sub cf::object::player::goto {
2628 my ($self, $path, $x, $y, $check, $done) = @_; 2728 my ($self, $path, $x, $y, $check, $done) = @_;
2729
2730 if ($self->{_link_recursion} >= $MAX_LINKS) {
2731 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2732 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2733 ($path, $x, $y) = @$EMERGENCY_POSITION;
2734 }
2629 2735
2630 # do generation counting so two concurrent goto's will be executed in-order 2736 # do generation counting so two concurrent goto's will be executed in-order
2631 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2737 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2632 2738
2633 $self->enter_link; 2739 $self->enter_link;
2657 my $map = eval { 2763 my $map = eval {
2658 my $map = defined $path ? cf::map::find $path : undef; 2764 my $map = defined $path ? cf::map::find $path : undef;
2659 2765
2660 if ($map) { 2766 if ($map) {
2661 $map = $map->customise_for ($self); 2767 $map = $map->customise_for ($self);
2662 $map = $check->($map) if $check && $map; 2768 $map = $check->($map, $x, $y, $self) if $check && $map;
2663 } else { 2769 } else {
2664 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2770 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2665 } 2771 }
2666 2772
2667 $map 2773 $map
2675 if ($gen == $self->{_goto_generation}) { 2781 if ($gen == $self->{_goto_generation}) {
2676 delete $self->{_goto_generation}; 2782 delete $self->{_goto_generation};
2677 $self->leave_link ($map, $x, $y); 2783 $self->leave_link ($map, $x, $y);
2678 } 2784 }
2679 2785
2680 $done->() if $done; 2786 $done->($self) if $done;
2681 })->prio (1); 2787 })->prio (1);
2682} 2788}
2683 2789
2684=item $player_object->enter_exit ($exit_object) 2790=item $player_object->enter_exit ($exit_object)
2685 2791
2773 $self->contr->savebed ($map, $x, $y) 2879 $self->contr->savebed ($map, $x, $y)
2774 if $exit->flag (cf::FLAG_DAMNED); 2880 if $exit->flag (cf::FLAG_DAMNED);
2775 2881
2776 1 2882 1
2777 }) { 2883 }) {
2778 $self->message ("Something went wrong deep within the crossfire server. " 2884 $self->message ("Something went wrong deep within the deliantra server. "
2779 . "I'll try to bring you back to the map you were before. " 2885 . "I'll try to bring you back to the map you were before. "
2780 . "Please report this to the dungeon master!", 2886 . "Please report this to the dungeon master!",
2781 cf::NDI_UNIQUE | cf::NDI_RED); 2887 cf::NDI_UNIQUE | cf::NDI_RED);
2782 2888
2783 warn "ERROR in enter_exit: $@"; 2889 error "ERROR in enter_exit: $@";
2784 $self->leave_link; 2890 $self->leave_link;
2785 } 2891 }
2786 })->prio (1); 2892 })->prio (1);
2787} 2893}
2788 2894
2800sub cf::client::send_drawinfo { 2906sub cf::client::send_drawinfo {
2801 my ($self, $text, $flags) = @_; 2907 my ($self, $text, $flags) = @_;
2802 2908
2803 utf8::encode $text; 2909 utf8::encode $text;
2804 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2910 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2911}
2912
2913=item $client->send_big_packet ($pkt)
2914
2915Like C<send_packet>, but tries to compress large packets, and fragments
2916them as required.
2917
2918=cut
2919
2920our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2921
2922sub cf::client::send_big_packet {
2923 my ($self, $pkt) = @_;
2924
2925 # try lzf for large packets
2926 $pkt = "lzf " . Compress::LZF::compress $pkt
2927 if 1024 <= length $pkt and $self->{can_lzf};
2928
2929 # split very large packets
2930 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2931 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2932 $pkt = "frag";
2933 }
2934
2935 $self->send_packet ($pkt);
2805} 2936}
2806 2937
2807=item $client->send_msg ($channel, $msg, $color, [extra...]) 2938=item $client->send_msg ($channel, $msg, $color, [extra...])
2808 2939
2809Send a drawinfo or msg packet to the client, formatting the msg for the 2940Send a drawinfo or msg packet to the client, formatting the msg for the
2813 2944
2814=cut 2945=cut
2815 2946
2816# non-persistent channels (usually the info channel) 2947# non-persistent channels (usually the info channel)
2817our %CHANNEL = ( 2948our %CHANNEL = (
2949 "c/motd" => {
2950 id => "infobox",
2951 title => "MOTD",
2952 reply => undef,
2953 tooltip => "The message of the day",
2954 },
2818 "c/identify" => { 2955 "c/identify" => {
2819 id => "infobox", 2956 id => "infobox",
2820 title => "Identify", 2957 title => "Identify",
2821 reply => undef, 2958 reply => undef,
2822 tooltip => "Items recently identified", 2959 tooltip => "Items recently identified",
2824 "c/examine" => { 2961 "c/examine" => {
2825 id => "infobox", 2962 id => "infobox",
2826 title => "Examine", 2963 title => "Examine",
2827 reply => undef, 2964 reply => undef,
2828 tooltip => "Signs and other items you examined", 2965 tooltip => "Signs and other items you examined",
2966 },
2967 "c/shopinfo" => {
2968 id => "infobox",
2969 title => "Shop Info",
2970 reply => undef,
2971 tooltip => "What your bargaining skill tells you about the shop",
2829 }, 2972 },
2830 "c/book" => { 2973 "c/book" => {
2831 id => "infobox", 2974 id => "infobox",
2832 title => "Book", 2975 title => "Book",
2833 reply => undef, 2976 reply => undef,
2849 id => "infobox", 2992 id => "infobox",
2850 title => "Body Parts", 2993 title => "Body Parts",
2851 reply => undef, 2994 reply => undef,
2852 tooltip => "Shows which body parts you posess and are available", 2995 tooltip => "Shows which body parts you posess and are available",
2853 }, 2996 },
2997 "c/statistics" => {
2998 id => "infobox",
2999 title => "Statistics",
3000 reply => undef,
3001 tooltip => "Shows your primary statistics",
3002 },
3003 "c/skills" => {
3004 id => "infobox",
3005 title => "Skills",
3006 reply => undef,
3007 tooltip => "Shows your experience per skill and item power",
3008 },
3009 "c/shopitems" => {
3010 id => "infobox",
3011 title => "Shop Items",
3012 reply => undef,
3013 tooltip => "Shows the items currently for sale in this shop",
3014 },
3015 "c/resistances" => {
3016 id => "infobox",
3017 title => "Resistances",
3018 reply => undef,
3019 tooltip => "Shows your resistances",
3020 },
3021 "c/pets" => {
3022 id => "infobox",
3023 title => "Pets",
3024 reply => undef,
3025 tooltip => "Shows information abotu your pets/a specific pet",
3026 },
3027 "c/perceiveself" => {
3028 id => "infobox",
3029 title => "Perceive Self",
3030 reply => undef,
3031 tooltip => "You gained detailed knowledge about yourself",
3032 },
2854 "c/uptime" => { 3033 "c/uptime" => {
2855 id => "infobox", 3034 id => "infobox",
2856 title => "Uptime", 3035 title => "Uptime",
2857 reply => undef, 3036 reply => undef,
2858 tooltip => "How long the server has been running since last restart", 3037 tooltip => "How long the server has been running since last restart",
2867 id => "party", 3046 id => "party",
2868 title => "Party", 3047 title => "Party",
2869 reply => "gsay ", 3048 reply => "gsay ",
2870 tooltip => "Messages and chat related to your party", 3049 tooltip => "Messages and chat related to your party",
2871 }, 3050 },
3051 "c/death" => {
3052 id => "death",
3053 title => "Death",
3054 reply => undef,
3055 tooltip => "Reason for and more info about your most recent death",
3056 },
3057 "c/say" => $SAY_CHANNEL,
3058 "c/chat" => $CHAT_CHANNEL,
2872); 3059);
2873 3060
2874sub cf::client::send_msg { 3061sub cf::client::send_msg {
2875 my ($self, $channel, $msg, $color, @extra) = @_; 3062 my ($self, $channel, $msg, $color, @extra) = @_;
2876 3063
2877 $msg = $self->pl->expand_cfpod ($msg); 3064 $msg = $self->pl->expand_cfpod ($msg)
3065 unless $color & cf::NDI_VERBATIM;
2878 3066
2879 $color &= cf::NDI_CLIENT_MASK; # just in case... 3067 $color &= cf::NDI_CLIENT_MASK; # just in case...
2880 3068
2881 # check predefined channels, for the benefit of C 3069 # check predefined channels, for the benefit of C
2882 if ($CHANNEL{$channel}) { 3070 if ($CHANNEL{$channel}) {
2883 $channel = $CHANNEL{$channel}; 3071 $channel = $CHANNEL{$channel};
2884 3072
2885 $self->ext_msg (channel_info => $channel) 3073 $self->ext_msg (channel_info => $channel);
2886 if $self->can_msg;
2887
2888 $channel = $channel->{id}; 3074 $channel = $channel->{id};
2889 3075
2890 } elsif (ref $channel) { 3076 } elsif (ref $channel) {
2891 # send meta info to client, if not yet sent 3077 # send meta info to client, if not yet sent
2892 unless (exists $self->{channel}{$channel->{id}}) { 3078 unless (exists $self->{channel}{$channel->{id}}) {
2893 $self->{channel}{$channel->{id}} = $channel; 3079 $self->{channel}{$channel->{id}} = $channel;
2894 $self->ext_msg (channel_info => $channel) 3080 $self->ext_msg (channel_info => $channel);
2895 if $self->can_msg;
2896 } 3081 }
2897 3082
2898 $channel = $channel->{id}; 3083 $channel = $channel->{id};
2899 } 3084 }
2900 3085
2901 return unless @extra || length $msg; 3086 return unless @extra || length $msg;
2902 3087
2903 if ($self->can_msg) {
2904 # default colour, mask it out 3088 # default colour, mask it out
2905 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3089 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2906 if $color & cf::NDI_DEF; 3090 if $color & cf::NDI_DEF;
2907 3091
2908 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3092 my $pkt = "msg "
3093 . $self->{json_coder}->encode (
2909 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3094 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2910 } else { 3095 );
2911 if ($color >= 0) {
2912 # replace some tags by gcfclient-compatible ones
2913 for ($msg) {
2914 1 while
2915 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2916 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2917 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2918 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2919 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2920 }
2921 3096
2922 $color &= cf::NDI_COLOR_MASK; 3097 $self->send_big_packet ($pkt);
2923
2924 utf8::encode $msg;
2925
2926 if (0 && $msg =~ /\[/) {
2927 # COMMAND/INFO
2928 $self->send_packet ("drawextinfo $color 10 8 $msg")
2929 } else {
2930 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2931 $self->send_packet ("drawinfo $color $msg")
2932 }
2933 }
2934 }
2935} 3098}
2936 3099
2937=item $client->ext_msg ($type, @msg) 3100=item $client->ext_msg ($type, @msg)
2938 3101
2939Sends an ext event to the client. 3102Sends an ext event to the client.
2942 3105
2943sub cf::client::ext_msg($$@) { 3106sub cf::client::ext_msg($$@) {
2944 my ($self, $type, @msg) = @_; 3107 my ($self, $type, @msg) = @_;
2945 3108
2946 if ($self->extcmd == 2) { 3109 if ($self->extcmd == 2) {
2947 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3110 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2948 } elsif ($self->extcmd == 1) { # TODO: remove 3111 } elsif ($self->extcmd == 1) { # TODO: remove
2949 push @msg, msgtype => "event_$type"; 3112 push @msg, msgtype => "event_$type";
2950 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3113 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2951 } 3114 }
2952} 3115}
2953 3116
2954=item $client->ext_reply ($msgid, @msg) 3117=item $client->ext_reply ($msgid, @msg)
2955 3118
2959 3122
2960sub cf::client::ext_reply($$@) { 3123sub cf::client::ext_reply($$@) {
2961 my ($self, $id, @msg) = @_; 3124 my ($self, $id, @msg) = @_;
2962 3125
2963 if ($self->extcmd == 2) { 3126 if ($self->extcmd == 2) {
2964 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3127 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2965 } elsif ($self->extcmd == 1) { 3128 } elsif ($self->extcmd == 1) {
2966 #TODO: version 1, remove 3129 #TODO: version 1, remove
2967 unshift @msg, msgtype => "reply", msgid => $id; 3130 unshift @msg, msgtype => "reply", msgid => $id;
2968 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3131 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2969 } 3132 }
2970} 3133}
2971 3134
2972=item $success = $client->query ($flags, "text", \&cb) 3135=item $success = $client->query ($flags, "text", \&cb)
2973 3136
3044 3207
3045 $ns->ext_reply ($reply, @reply) 3208 $ns->ext_reply ($reply, @reply)
3046 if $reply; 3209 if $reply;
3047 3210
3048 } else { 3211 } else {
3049 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3212 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3050 } 3213 }
3051 3214
3052 cf::override; 3215 cf::override;
3053 }, 3216 },
3054); 3217);
3074 3237
3075 $coro 3238 $coro
3076} 3239}
3077 3240
3078cf::client->attach ( 3241cf::client->attach (
3079 on_destroy => sub { 3242 on_client_destroy => sub {
3080 my ($ns) = @_; 3243 my ($ns) = @_;
3081 3244
3082 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3245 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3083 }, 3246 },
3084); 3247);
3100our $safe_hole = new Safe::Hole; 3263our $safe_hole = new Safe::Hole;
3101 3264
3102$SIG{FPE} = 'IGNORE'; 3265$SIG{FPE} = 'IGNORE';
3103 3266
3104$safe->permit_only (Opcode::opset qw( 3267$safe->permit_only (Opcode::opset qw(
3105 :base_core :base_mem :base_orig :base_math 3268 :base_core :base_mem :base_orig :base_math :base_loop
3106 grepstart grepwhile mapstart mapwhile 3269 grepstart grepwhile mapstart mapwhile
3107 sort time 3270 sort time
3108)); 3271));
3109 3272
3110# here we export the classes and methods available to script code 3273# here we export the classes and methods available to script code
3114The following functions and methods are available within a safe environment: 3277The following functions and methods are available within a safe environment:
3115 3278
3116 cf::object 3279 cf::object
3117 contr pay_amount pay_player map x y force_find force_add destroy 3280 contr pay_amount pay_player map x y force_find force_add destroy
3118 insert remove name archname title slaying race decrease split 3281 insert remove name archname title slaying race decrease split
3282 value
3119 3283
3120 cf::object::player 3284 cf::object::player
3121 player 3285 player
3122 3286
3123 cf::player 3287 cf::player
3129=cut 3293=cut
3130 3294
3131for ( 3295for (
3132 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3296 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3133 insert remove inv nrof name archname title slaying race 3297 insert remove inv nrof name archname title slaying race
3134 decrease split destroy change_exp)], 3298 decrease split destroy change_exp value msg lore send_msg)],
3135 ["cf::object::player" => qw(player)], 3299 ["cf::object::player" => qw(player)],
3136 ["cf::player" => qw(peaceful)], 3300 ["cf::player" => qw(peaceful send_msg)],
3137 ["cf::map" => qw(trigger)], 3301 ["cf::map" => qw(trigger)],
3138) { 3302) {
3139 no strict 'refs';
3140 my ($pkg, @funs) = @$_; 3303 my ($pkg, @funs) = @$_;
3141 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3304 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3142 for @funs; 3305 for @funs;
3143} 3306}
3144 3307
3159 3322
3160 my $qcode = $code; 3323 my $qcode = $code;
3161 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3324 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3162 $qcode =~ s/\n/\\n/g; 3325 $qcode =~ s/\n/\\n/g;
3163 3326
3327 %vars = (_dummy => 0) unless %vars;
3328
3329 my @res;
3164 local $_; 3330 local $_;
3165 local @safe::cf::_safe_eval_args = values %vars;
3166 3331
3167 my $eval = 3332 my $eval =
3168 "do {\n" 3333 "do {\n"
3169 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3334 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3170 . "#line 0 \"{$qcode}\"\n" 3335 . "#line 0 \"{$qcode}\"\n"
3171 . $code 3336 . $code
3172 . "\n}" 3337 . "\n}"
3173 ; 3338 ;
3174 3339
3340 if ($CFG{safe_eval}) {
3175 sub_generation_inc; 3341 sub_generation_inc;
3342 local @safe::cf::_safe_eval_args = values %vars;
3176 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3343 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3177 sub_generation_inc; 3344 sub_generation_inc;
3345 } else {
3346 local @cf::_safe_eval_args = values %vars;
3347 @res = wantarray ? eval eval : scalar eval $eval;
3348 }
3178 3349
3179 if ($@) { 3350 if ($@) {
3180 warn "$@"; 3351 warn "$@",
3181 warn "while executing safe code '$code'\n"; 3352 "while executing safe code '$code'\n",
3182 warn "with arguments " . (join " ", %vars) . "\n"; 3353 "with arguments " . (join " ", %vars) . "\n";
3183 } 3354 }
3184 3355
3185 wantarray ? @res : $res[0] 3356 wantarray ? @res : $res[0]
3186} 3357}
3187 3358
3201=cut 3372=cut
3202 3373
3203sub register_script_function { 3374sub register_script_function {
3204 my ($fun, $cb) = @_; 3375 my ($fun, $cb) = @_;
3205 3376
3206 no strict 'refs'; 3377 $fun = "safe::$fun" if $CFG{safe_eval};
3207 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3378 *$fun = $safe_hole->wrap ($cb);
3208} 3379}
3209 3380
3210=back 3381=back
3211 3382
3212=cut 3383=cut
3221 # for this (global event?) 3392 # for this (global event?)
3222 %ext::player_env::MUSIC_FACE_CACHE = (); 3393 %ext::player_env::MUSIC_FACE_CACHE = ();
3223 3394
3224 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3395 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3225 3396
3226 warn "loading facedata from $path\n"; 3397 trace "loading facedata from $path\n";
3227 3398
3228 my $facedata;
3229 0 < aio_load $path, $facedata 3399 0 < aio_load $path, my $facedata
3230 or die "$path: $!"; 3400 or die "$path: $!";
3231 3401
3232 $facedata = Coro::Storable::thaw $facedata; 3402 $facedata = Coro::Storable::thaw $facedata;
3233 3403
3234 $facedata->{version} == 2 3404 $facedata->{version} == 2
3235 or cf::cleanup "$path: version mismatch, cannot proceed."; 3405 or cf::cleanup "$path: version mismatch, cannot proceed.";
3236 3406
3237 # patch in the exptable 3407 # patch in the exptable
3408 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3238 $facedata->{resource}{"res/exp_table"} = { 3409 $facedata->{resource}{"res/exp_table"} = {
3239 type => FT_RSRC, 3410 type => FT_RSRC,
3240 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3411 data => $exp_table,
3412 hash => (Digest::MD5::md5 $exp_table),
3241 }; 3413 };
3242 cf::cede_to_tick; 3414 cf::cede_to_tick;
3243 3415
3244 { 3416 {
3245 my $faces = $facedata->{faceinfo}; 3417 my $faces = $facedata->{faceinfo};
3247 while (my ($face, $info) = each %$faces) { 3419 while (my ($face, $info) = each %$faces) {
3248 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3420 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3249 3421
3250 cf::face::set_visibility $idx, $info->{visibility}; 3422 cf::face::set_visibility $idx, $info->{visibility};
3251 cf::face::set_magicmap $idx, $info->{magicmap}; 3423 cf::face::set_magicmap $idx, $info->{magicmap};
3252 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3424 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3253 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3425 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3254 3426
3255 cf::cede_to_tick; 3427 cf::cede_to_tick;
3256 } 3428 }
3257 3429
3258 while (my ($face, $info) = each %$faces) { 3430 while (my ($face, $info) = each %$faces) {
3263 3435
3264 if (my $smooth = cf::face::find $info->{smooth}) { 3436 if (my $smooth = cf::face::find $info->{smooth}) {
3265 cf::face::set_smooth $idx, $smooth; 3437 cf::face::set_smooth $idx, $smooth;
3266 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3438 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3267 } else { 3439 } else {
3268 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3440 error "smooth face '$info->{smooth}' not found for face '$face'";
3269 } 3441 }
3270 3442
3271 cf::cede_to_tick; 3443 cf::cede_to_tick;
3272 } 3444 }
3273 } 3445 }
3282 3454
3283 cf::anim::invalidate_all; # d'oh 3455 cf::anim::invalidate_all; # d'oh
3284 } 3456 }
3285 3457
3286 { 3458 {
3287 # TODO: for gcfclient pleasure, we should give resources
3288 # that gcfclient doesn't grok a >10000 face index.
3289 my $res = $facedata->{resource}; 3459 my $res = $facedata->{resource};
3290 3460
3291 while (my ($name, $info) = each %$res) { 3461 while (my ($name, $info) = each %$res) {
3292 if (defined $info->{type}) { 3462 if (defined $info->{type}) {
3293 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3463 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3294 my $data;
3295 3464
3296 if ($info->{type} & 1) { 3465 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3297 # prepend meta info
3298
3299 my $meta = $enc->encode ({
3300 name => $name,
3301 %{ $info->{meta} || {} },
3302 });
3303
3304 $data = pack "(w/a*)*", $meta, $info->{data};
3305 } else {
3306 $data = $info->{data};
3307 }
3308
3309 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3310 cf::face::set_type $idx, $info->{type}; 3466 cf::face::set_type $idx, $info->{type};
3311 } else { 3467 } else {
3312 $RESOURCE{$name} = $info; 3468 $RESOURCE{$name} = $info; # unused
3313 } 3469 }
3314 3470
3315 cf::cede_to_tick; 3471 cf::cede_to_tick;
3316 } 3472 }
3317 } 3473 }
3318 3474
3319 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3475 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3320 3476
3321 1 3477 1
3322} 3478}
3323
3324cf::global->attach (on_resource_update => sub {
3325 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3326 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3327
3328 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3329 my $sound = $soundconf->{compat}[$_]
3330 or next;
3331
3332 my $face = cf::face::find "sound/$sound->[1]";
3333 cf::sound::set $sound->[0] => $face;
3334 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3335 }
3336
3337 while (my ($k, $v) = each %{$soundconf->{event}}) {
3338 my $face = cf::face::find "sound/$v";
3339 cf::sound::set $k => $face;
3340 }
3341 }
3342});
3343 3479
3344register_exticmd fx_want => sub { 3480register_exticmd fx_want => sub {
3345 my ($ns, $want) = @_; 3481 my ($ns, $want) = @_;
3346 3482
3347 while (my ($k, $v) = each %$want) { 3483 while (my ($k, $v) = each %$want) {
3386sub reload_treasures { 3522sub reload_treasures {
3387 load_resource_file "$DATADIR/treasures" 3523 load_resource_file "$DATADIR/treasures"
3388 or die "unable to load treasurelists\n"; 3524 or die "unable to load treasurelists\n";
3389} 3525}
3390 3526
3527sub reload_sound {
3528 trace "loading sound config from $DATADIR/sound\n";
3529
3530 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3531 or die "$DATADIR/sound $!";
3532
3533 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3534
3535 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3536 my $sound = $soundconf->{compat}[$_]
3537 or next;
3538
3539 my $face = cf::face::find "sound/$sound->[1]";
3540 cf::sound::set $sound->[0] => $face;
3541 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3542 }
3543
3544 while (my ($k, $v) = each %{$soundconf->{event}}) {
3545 my $face = cf::face::find "sound/$v";
3546 cf::sound::set $k => $face;
3547 }
3548}
3549
3391sub reload_resources { 3550sub reload_resources {
3392 warn "reloading resource files...\n"; 3551 trace "reloading resource files...\n";
3393 3552
3553 reload_exp_table;
3554 reload_materials;
3394 reload_facedata; 3555 reload_facedata;
3556 reload_sound;
3395 reload_archetypes; 3557 reload_archetypes;
3396 reload_regions; 3558 reload_regions;
3397 reload_treasures; 3559 reload_treasures;
3398 3560
3399 warn "finished reloading resource files\n"; 3561 trace "finished reloading resource files\n";
3400}
3401
3402sub init {
3403 my $guard = freeze_mainloop;
3404
3405 evthread_start IO::AIO::poll_fileno;
3406
3407 reload_resources;
3408} 3562}
3409 3563
3410sub reload_config { 3564sub reload_config {
3411 open my $fh, "<:utf8", "$CONFDIR/config" 3565 trace "reloading config file...\n";
3412 or return;
3413 3566
3414 local $/; 3567 0 < aio_load "$CONFDIR/config", my $config
3415 *CFG = YAML::Load <$fh>; 3568 or die "$CONFDIR/config: $!";
3416 3569
3570 utf8::decode $config;
3571 *CFG = yaml_load $config;
3572
3417 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3573 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3418 3574
3419 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3575 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3420 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3576 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3421 3577
3422 if (exists $CFG{mlockall}) { 3578 if (exists $CFG{mlockall}) {
3426 }; 3582 };
3427 warn $@ if $@; 3583 warn $@ if $@;
3428 } 3584 }
3429} 3585}
3430 3586
3587sub pidfile() {
3588 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3589 or die "$PIDFILE: $!";
3590 flock $fh, &Fcntl::LOCK_EX
3591 or die "$PIDFILE: flock: $!";
3592 $fh
3593}
3594
3595# make sure only one server instance is running at any one time
3596sub atomic {
3597 my $fh = pidfile;
3598
3599 my $pid = <$fh>;
3600 kill 9, $pid if $pid > 0;
3601
3602 seek $fh, 0, 0;
3603 print $fh $$;
3604}
3605
3606sub main_loop {
3607 trace "EV::loop starting\n";
3608 if (1) {
3609 EV::loop;
3610 }
3611 trace "EV::loop returned\n";
3612 goto &main_loop unless $REALLY_UNLOOP;
3613}
3614
3431sub main { 3615sub main {
3616 cf::init_globals; # initialise logging
3617
3618 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3619 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3620 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3621 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3622
3623 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3624
3432 # we must not ever block the main coroutine 3625 # we must not ever block the main coroutine
3433 local $Coro::idle = sub { 3626 local $Coro::idle = sub {
3434 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3627 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3435 (async { 3628 (async {
3436 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3629 $Coro::current->{desc} = "IDLE BUG HANDLER";
3437 EV::loop EV::LOOP_ONESHOT; 3630 EV::loop EV::LOOP_ONESHOT;
3438 })->prio (Coro::PRIO_MAX); 3631 })->prio (Coro::PRIO_MAX);
3439 }; 3632 };
3440 3633
3441 { 3634 evthread_start IO::AIO::poll_fileno;
3442 my $guard = freeze_mainloop; 3635
3636 cf::sync_job {
3637 cf::incloader::init ();
3638
3639 cf::init_anim;
3640 cf::init_attackmess;
3641 cf::init_dynamic;
3642
3643 cf::load_settings;
3644
3645 reload_resources;
3443 reload_config; 3646 reload_config;
3444 db_init; 3647 db_init;
3648
3649 cf::init_uuid;
3650 cf::init_signals;
3651 cf::init_skills;
3652
3653 cf::init_beforeplay;
3654
3655 atomic;
3656
3445 load_extensions; 3657 load_extensions;
3446 3658
3447 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3659 utime time, time, $RUNTIMEFILE;
3660
3661 # no (long-running) fork's whatsoever before this point(!)
3662 use POSIX ();
3663 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3664
3665 (pop @POST_INIT)->(0) while @POST_INIT;
3448 } 3666 };
3449 3667
3450 EV::loop; 3668 cf::object::thawer::errors_are_fatal 0;
3669 info "parse errors in files are no longer fatal from this point on.\n";
3670
3671 my $free_main; $free_main = EV::idle sub {
3672 undef $free_main;
3673 undef &main; # free gobs of memory :)
3674 };
3675
3676 goto &main_loop;
3451} 3677}
3452 3678
3453############################################################################# 3679#############################################################################
3454# initialisation and cleanup 3680# initialisation and cleanup
3455 3681
3456# install some emergency cleanup handlers 3682# install some emergency cleanup handlers
3457BEGIN { 3683BEGIN {
3458 our %SIGWATCHER = (); 3684 our %SIGWATCHER = ();
3459 for my $signal (qw(INT HUP TERM)) { 3685 for my $signal (qw(INT HUP TERM)) {
3460 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3686 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3461 cf::cleanup "SIG$signal"; 3687 cf::cleanup "SIG$signal";
3462 }; 3688 };
3463 } 3689 }
3464} 3690}
3465 3691
3466sub write_runtime_sync { 3692sub write_runtime_sync {
3467 my $runtime = "$LOCALDIR/runtime"; 3693 my $t0 = AE::time;
3468 3694
3469 # first touch the runtime file to show we are still running: 3695 # first touch the runtime file to show we are still running:
3470 # the fsync below can take a very very long time. 3696 # the fsync below can take a very very long time.
3471 3697
3472 IO::AIO::aio_utime $runtime, undef, undef; 3698 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3473 3699
3474 my $guard = cf::lock_acquire "write_runtime"; 3700 my $guard = cf::lock_acquire "write_runtime";
3475 3701
3476 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3702 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3477 or return; 3703 or return;
3478 3704
3479 my $value = $cf::RUNTIME + 90 + 10; 3705 my $value = $cf::RUNTIME + 90 + 10;
3480 # 10 is the runtime save interval, for a monotonic clock 3706 # 10 is the runtime save interval, for a monotonic clock
3481 # 60 allows for the watchdog to kill the server. 3707 # 60 allows for the watchdog to kill the server.
3491 aio_utime $fh, undef, undef; 3717 aio_utime $fh, undef, undef;
3492 3718
3493 close $fh 3719 close $fh
3494 or return; 3720 or return;
3495 3721
3496 aio_rename "$runtime~", $runtime 3722 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3497 and return; 3723 and return;
3498 3724
3499 warn "runtime file written.\n"; 3725 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3500 3726
3501 1 3727 1
3502} 3728}
3503 3729
3504our $uuid_lock; 3730our $uuid_lock;
3513 my $uuid = "$LOCALDIR/uuid"; 3739 my $uuid = "$LOCALDIR/uuid";
3514 3740
3515 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3741 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3516 or return; 3742 or return;
3517 3743
3518 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3744 my $value = uuid_seq uuid_cur;
3745
3746 unless ($value) {
3747 info "cowardly refusing to write zero uuid value!\n";
3748 return;
3749 }
3750
3751 my $value = uuid_str $value + $uuid_skip;
3519 $uuid_skip = 0; 3752 $uuid_skip = 0;
3520 3753
3521 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3754 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3522 and return; 3755 and return;
3523 3756
3529 or return; 3762 or return;
3530 3763
3531 aio_rename "$uuid~", $uuid 3764 aio_rename "$uuid~", $uuid
3532 and return; 3765 and return;
3533 3766
3534 warn "uuid file written ($value).\n"; 3767 trace "uuid file written ($value).\n";
3535 3768
3536 1 3769 1
3537 3770
3538} 3771}
3539 3772
3545} 3778}
3546 3779
3547sub emergency_save() { 3780sub emergency_save() {
3548 my $freeze_guard = cf::freeze_mainloop; 3781 my $freeze_guard = cf::freeze_mainloop;
3549 3782
3550 warn "enter emergency perl save\n"; 3783 info "emergency_perl_save: enter\n";
3784
3785 # this is a trade-off: we want to be very quick here, so
3786 # save all maps without fsync, and later call a global sync
3787 # (which in turn might be very very slow)
3788 local $USE_FSYNC = 0;
3551 3789
3552 cf::sync_job { 3790 cf::sync_job {
3791 cf::write_runtime_sync; # external watchdog should not bark
3792
3553 # use a peculiar iteration method to avoid tripping on perl 3793 # use a peculiar iteration method to avoid tripping on perl
3554 # refcount bugs in for. also avoids problems with players 3794 # refcount bugs in for. also avoids problems with players
3555 # and maps saved/destroyed asynchronously. 3795 # and maps saved/destroyed asynchronously.
3556 warn "begin emergency player save\n"; 3796 info "emergency_perl_save: begin player save\n";
3557 for my $login (keys %cf::PLAYER) { 3797 for my $login (keys %cf::PLAYER) {
3558 my $pl = $cf::PLAYER{$login} or next; 3798 my $pl = $cf::PLAYER{$login} or next;
3559 $pl->valid or next; 3799 $pl->valid or next;
3560 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3800 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3561 $pl->save; 3801 $pl->save;
3562 } 3802 }
3563 warn "end emergency player save\n"; 3803 info "emergency_perl_save: end player save\n";
3564 3804
3565 warn "begin emergency map save\n"; 3805 cf::write_runtime_sync; # external watchdog should not bark
3806
3807 info "emergency_perl_save: begin map save\n";
3566 for my $path (keys %cf::MAP) { 3808 for my $path (keys %cf::MAP) {
3567 my $map = $cf::MAP{$path} or next; 3809 my $map = $cf::MAP{$path} or next;
3568 $map->valid or next; 3810 $map->valid or next;
3569 $map->save; 3811 $map->save;
3570 } 3812 }
3571 warn "end emergency map save\n"; 3813 info "emergency_perl_save: end map save\n";
3572 3814
3573 warn "begin emergency database checkpoint\n"; 3815 cf::write_runtime_sync; # external watchdog should not bark
3816
3817 info "emergency_perl_save: begin database checkpoint\n";
3574 BDB::db_env_txn_checkpoint $DB_ENV; 3818 BDB::db_env_txn_checkpoint $DB_ENV;
3575 warn "end emergency database checkpoint\n"; 3819 info "emergency_perl_save: end database checkpoint\n";
3576 3820
3577 warn "begin write uuid\n"; 3821 info "emergency_perl_save: begin write uuid\n";
3578 write_uuid_sync 1; 3822 write_uuid_sync 1;
3579 warn "end write uuid\n"; 3823 info "emergency_perl_save: end write uuid\n";
3824
3825 cf::write_runtime_sync; # external watchdog should not bark
3826
3827 trace "emergency_perl_save: syncing database to disk";
3828 BDB::db_env_txn_checkpoint $DB_ENV;
3829
3830 info "emergency_perl_save: starting sync\n";
3831 IO::AIO::aio_sync sub {
3832 info "emergency_perl_save: finished sync\n";
3833 };
3834
3835 cf::write_runtime_sync; # external watchdog should not bark
3836
3837 trace "emergency_perl_save: flushing outstanding aio requests";
3838 while (IO::AIO::nreqs || BDB::nreqs) {
3839 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3840 }
3841
3842 cf::write_runtime_sync; # external watchdog should not bark
3580 }; 3843 };
3581 3844
3582 warn "leave emergency perl save\n"; 3845 info "emergency_perl_save: leave\n";
3583} 3846}
3584 3847
3585sub post_cleanup { 3848sub post_cleanup {
3586 my ($make_core) = @_; 3849 my ($make_core) = @_;
3587 3850
3851 IO::AIO::flush;
3852
3588 warn Carp::longmess "post_cleanup backtrace" 3853 error Carp::longmess "post_cleanup backtrace"
3589 if $make_core; 3854 if $make_core;
3855
3856 my $fh = pidfile;
3857 unlink $PIDFILE if <$fh> == $$;
3858}
3859
3860# a safer delete_package, copied from Symbol
3861sub clear_package($) {
3862 my $pkg = shift;
3863
3864 # expand to full symbol table name if needed
3865 unless ($pkg =~ /^main::.*::$/) {
3866 $pkg = "main$pkg" if $pkg =~ /^::/;
3867 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3868 $pkg .= '::' unless $pkg =~ /::$/;
3869 }
3870
3871 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3872 my $stem_symtab = *{$stem}{HASH};
3873
3874 defined $stem_symtab and exists $stem_symtab->{$leaf}
3875 or return;
3876
3877 # clear all symbols
3878 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3879 for my $name (keys %$leaf_symtab) {
3880 _gv_clear *{"$pkg$name"};
3881# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3882 }
3590} 3883}
3591 3884
3592sub do_reload_perl() { 3885sub do_reload_perl() {
3593 # can/must only be called in main 3886 # can/must only be called in main
3594 if ($Coro::current != $Coro::main) { 3887 unless (in_main) {
3595 warn "can only reload from main coroutine"; 3888 error "can only reload from main coroutine";
3596 return; 3889 return;
3597 } 3890 }
3598 3891
3892 return if $RELOAD++;
3893
3894 my $t1 = AE::time;
3895
3896 while ($RELOAD) {
3897 cf::get_slot 0.1, -1, "reload_perl";
3599 warn "reloading..."; 3898 info "reloading...";
3600 3899
3601 warn "entering sync_job"; 3900 trace "entering sync_job";
3602 3901
3603 cf::sync_job { 3902 cf::sync_job {
3604 cf::write_runtime_sync; # external watchdog should not bark
3605 cf::emergency_save; 3903 #cf::emergency_save;
3606 cf::write_runtime_sync; # external watchdog should not bark
3607 3904
3608 warn "syncing database to disk";
3609 BDB::db_env_txn_checkpoint $DB_ENV;
3610
3611 # if anything goes wrong in here, we should simply crash as we already saved
3612
3613 warn "flushing outstanding aio requests";
3614 for (;;) {
3615 BDB::flush;
3616 IO::AIO::flush;
3617 Coro::cede_notself;
3618 last unless IO::AIO::nreqs || BDB::nreqs;
3619 warn "iterate...";
3620 }
3621
3622 ++$RELOAD;
3623
3624 warn "cancelling all extension coros"; 3905 trace "cancelling all extension coros";
3625 $_->cancel for values %EXT_CORO; 3906 $_->cancel for values %EXT_CORO;
3626 %EXT_CORO = (); 3907 %EXT_CORO = ();
3627 3908
3628 warn "removing commands"; 3909 trace "removing commands";
3629 %COMMAND = (); 3910 %COMMAND = ();
3630 3911
3631 warn "removing ext/exti commands"; 3912 trace "removing ext/exti commands";
3632 %EXTCMD = (); 3913 %EXTCMD = ();
3633 %EXTICMD = (); 3914 %EXTICMD = ();
3634 3915
3635 warn "unloading/nuking all extensions"; 3916 trace "unloading/nuking all extensions";
3636 for my $pkg (@EXTS) { 3917 for my $pkg (@EXTS) {
3637 warn "... unloading $pkg"; 3918 trace "... unloading $pkg";
3638 3919
3639 if (my $cb = $pkg->can ("unload")) { 3920 if (my $cb = $pkg->can ("unload")) {
3640 eval { 3921 eval {
3641 $cb->($pkg); 3922 $cb->($pkg);
3642 1 3923 1
3643 } or warn "$pkg unloaded, but with errors: $@"; 3924 } or error "$pkg unloaded, but with errors: $@";
3925 }
3926
3927 trace "... clearing $pkg";
3928 clear_package $pkg;
3644 } 3929 }
3645 3930
3646 warn "... nuking $pkg";
3647 Symbol::delete_package $pkg;
3648 }
3649
3650 warn "unloading all perl modules loaded from $LIBDIR"; 3931 trace "unloading all perl modules loaded from $LIBDIR";
3651 while (my ($k, $v) = each %INC) { 3932 while (my ($k, $v) = each %INC) {
3652 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3933 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3653 3934
3654 warn "... unloading $k"; 3935 trace "... unloading $k";
3655 delete $INC{$k}; 3936 delete $INC{$k};
3656 3937
3657 $k =~ s/\.pm$//; 3938 $k =~ s/\.pm$//;
3658 $k =~ s/\//::/g; 3939 $k =~ s/\//::/g;
3659 3940
3660 if (my $cb = $k->can ("unload_module")) { 3941 if (my $cb = $k->can ("unload_module")) {
3661 $cb->(); 3942 $cb->();
3943 }
3944
3945 clear_package $k;
3662 } 3946 }
3663 3947
3664 Symbol::delete_package $k;
3665 }
3666
3667 warn "getting rid of safe::, as good as possible"; 3948 trace "getting rid of safe::, as good as possible";
3668 Symbol::delete_package "safe::$_" 3949 clear_package "safe::$_"
3669 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3950 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3670 3951
3671 warn "unloading cf.pm \"a bit\""; 3952 trace "unloading cf.pm \"a bit\"";
3672 delete $INC{"cf.pm"}; 3953 delete $INC{"cf.pm"};
3673 delete $INC{"cf/pod.pm"}; 3954 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3674 3955
3675 # don't, removes xs symbols, too, 3956 # don't, removes xs symbols, too,
3676 # and global variables created in xs 3957 # and global variables created in xs
3677 #Symbol::delete_package __PACKAGE__; 3958 #clear_package __PACKAGE__;
3678 3959
3679 warn "unload completed, starting to reload now"; 3960 info "unload completed, starting to reload now";
3680 3961
3681 warn "reloading cf.pm"; 3962 trace "reloading cf.pm";
3682 require cf; 3963 require cf;
3683 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3964 cf::_connect_to_perl_1;
3684 3965
3685 warn "loading config and database again"; 3966 trace "loading config and database again";
3686 cf::reload_config; 3967 cf::reload_config;
3687 3968
3688 warn "loading extensions"; 3969 trace "loading extensions";
3689 cf::load_extensions; 3970 cf::load_extensions;
3690 3971
3972 if ($REATTACH_ON_RELOAD) {
3691 warn "reattaching attachments to objects/players"; 3973 trace "reattaching attachments to objects/players";
3692 _global_reattach; # objects, sockets 3974 _global_reattach; # objects, sockets
3693 warn "reattaching attachments to maps"; 3975 trace "reattaching attachments to maps";
3694 reattach $_ for values %MAP; 3976 reattach $_ for values %MAP;
3695 warn "reattaching attachments to players"; 3977 trace "reattaching attachments to players";
3696 reattach $_ for values %PLAYER; 3978 reattach $_ for values %PLAYER;
3979 }
3697 3980
3981 trace "running post_init jobs";
3982 (pop @POST_INIT)->(1) while @POST_INIT;
3983
3698 warn "leaving sync_job"; 3984 trace "leaving sync_job";
3699 3985
3700 1 3986 1
3701 } or do { 3987 } or do {
3702 warn $@; 3988 error $@;
3703 cf::cleanup "error while reloading, exiting."; 3989 cf::cleanup "error while reloading, exiting.";
3990 };
3991
3992 info "reloaded";
3993 --$RELOAD;
3704 }; 3994 }
3705 3995
3706 warn "reloaded"; 3996 $t1 = AE::time - $t1;
3997 info "reload completed in ${t1}s\n";
3707}; 3998};
3708 3999
3709our $RELOAD_WATCHER; # used only during reload 4000our $RELOAD_WATCHER; # used only during reload
3710 4001
3711sub reload_perl() { 4002sub reload_perl() {
3712 # doing reload synchronously and two reloads happen back-to-back, 4003 # doing reload synchronously and two reloads happen back-to-back,
3713 # coro crashes during coro_state_free->destroy here. 4004 # coro crashes during coro_state_free->destroy here.
3714 4005
4006 $RELOAD_WATCHER ||= cf::async {
4007 Coro::AIO::aio_wait cache_extensions;
4008
3715 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4009 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3716 do_reload_perl; 4010 do_reload_perl;
3717 undef $RELOAD_WATCHER; 4011 undef $RELOAD_WATCHER;
4012 };
3718 }; 4013 };
3719} 4014}
3720 4015
3721register_command "reload" => sub { 4016register_command "reload" => sub {
3722 my ($who, $arg) = @_; 4017 my ($who, $arg) = @_;
3728 reload_perl; 4023 reload_perl;
3729 }; 4024 };
3730 } 4025 }
3731}; 4026};
3732 4027
3733unshift @INC, $LIBDIR; 4028#############################################################################
3734 4029
3735my $bug_warning = 0; 4030my $bug_warning = 0;
3736 4031
3737our @WAIT_FOR_TICK; 4032our @WAIT_FOR_TICK;
3738our @WAIT_FOR_TICK_BEGIN; 4033our @WAIT_FOR_TICK_BEGIN;
3739 4034
3740sub wait_for_tick { 4035sub wait_for_tick() {
3741 return if tick_inhibit || $Coro::current == $Coro::main; 4036 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3742 4037
3743 my $signal = new Coro::Signal; 4038 my $signal = new Coro::Signal;
3744 push @WAIT_FOR_TICK, $signal; 4039 push @WAIT_FOR_TICK, $signal;
3745 $signal->wait; 4040 $signal->wait;
3746} 4041}
3747 4042
3748sub wait_for_tick_begin { 4043sub wait_for_tick_begin() {
3749 return if tick_inhibit || $Coro::current == $Coro::main; 4044 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3750 4045
3751 my $signal = new Coro::Signal; 4046 my $signal = new Coro::Signal;
3752 push @WAIT_FOR_TICK_BEGIN, $signal; 4047 push @WAIT_FOR_TICK_BEGIN, $signal;
3753 $signal->wait; 4048 $signal->wait;
3754} 4049}
3760 return; 4055 return;
3761 } 4056 }
3762 4057
3763 cf::server_tick; # one server iteration 4058 cf::server_tick; # one server iteration
3764 4059
4060 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4061
3765 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4062 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3766 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4063 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3767 Coro::async_pool { 4064 Coro::async_pool {
3768 $Coro::current->{desc} = "runtime saver"; 4065 $Coro::current->{desc} = "runtime saver";
3769 write_runtime_sync 4066 write_runtime_sync
3770 or warn "ERROR: unable to write runtime file: $!"; 4067 or error "ERROR: unable to write runtime file: $!";
3771 }; 4068 };
3772 } 4069 }
3773 4070
3774 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4071 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3775 $sig->send; 4072 $sig->send;
3783 4080
3784 if (0) { 4081 if (0) {
3785 if ($NEXT_TICK) { 4082 if ($NEXT_TICK) {
3786 my $jitter = $TICK_START - $NEXT_TICK; 4083 my $jitter = $TICK_START - $NEXT_TICK;
3787 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4084 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3788 warn "jitter $JITTER\n";#d# 4085 debug "jitter $JITTER\n";#d#
3789 } 4086 }
3790 } 4087 }
3791} 4088}
3792 4089
3793{ 4090{
3794 # configure BDB 4091 # configure BDB
3795 4092
3796 BDB::min_parallel 8; 4093 BDB::min_parallel 16;
3797 BDB::max_poll_reqs $TICK * 0.1; 4094 BDB::max_poll_reqs $TICK * 0.1;
3798 $AnyEvent::BDB::WATCHER->priority (1); 4095 $AnyEvent::BDB::WATCHER->priority (1);
3799 4096
3800 unless ($DB_ENV) { 4097 unless ($DB_ENV) {
3801 $DB_ENV = BDB::db_env_create; 4098 $DB_ENV = BDB::db_env_create;
3848 $msg =~ s/\n//; 4145 $msg =~ s/\n//;
3849 4146
3850 # limit the # of concurrent backtraces 4147 # limit the # of concurrent backtraces
3851 if ($_log_backtrace < 2) { 4148 if ($_log_backtrace < 2) {
3852 ++$_log_backtrace; 4149 ++$_log_backtrace;
4150 my $perl_bt = Carp::longmess $msg;
3853 async { 4151 async {
3854 $Coro::current->{desc} = "abt $msg"; 4152 $Coro::current->{desc} = "abt $msg";
3855 4153
3856 my @bt = fork_call { 4154 my @bt = fork_call {
3857 @addr = map { sprintf "%x", $_ } @addr; 4155 @addr = map { sprintf "%x", $_ } @addr;
3868 } 4166 }
3869 4167
3870 @funcs 4168 @funcs
3871 }; 4169 };
3872 4170
3873 LOG llevInfo, "[ABT] $msg\n"; 4171 LOG llevInfo, "[ABT] $perl_bt\n";
4172 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3874 LOG llevInfo, "[ABT] $_\n" for @bt; 4173 LOG llevInfo, "[ABT] $_\n" for @bt;
3875 --$_log_backtrace; 4174 --$_log_backtrace;
3876 }; 4175 };
3877 } else { 4176 } else {
3878 LOG llevInfo, "[ABT] $msg\n"; 4177 LOG llevInfo, "[ABT] $msg\n";
3879 LOG llevInfo, "[ABT] [suppressed]\n"; 4178 LOG llevInfo, "[ABT] [suppressed]\n";
3880 } 4179 }
3881} 4180}
3882 4181
3883# load additional modules 4182# load additional modules
3884use cf::pod; 4183require "cf/$_.pm" for @EXTRA_MODULES;
4184cf::_connect_to_perl_2;
3885 4185
3886END { cf::emergency_save } 4186END { cf::emergency_save }
3887 4187
38881 41881
3889 4189

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines