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.446 by root, Tue Sep 16 16:03:02 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 5.10.0; 25use common::sense;
25use utf8;
26use strict "vars", "subs";
27 26
28use Symbol; 27use Symbol;
29use List::Util; 28use List::Util;
30use Socket; 29use Socket;
31use EV; 30use EV;
32use Opcode; 31use Opcode;
33use Safe; 32use Safe;
34use Safe::Hole; 33use Safe::Hole;
35use Storable (); 34use Storable ();
35use Carp ();
36 36
37use Guard ();
37use Coro (); 38use Coro ();
38use Coro::State; 39use Coro::State;
39use Coro::Handle; 40use Coro::Handle;
40use Coro::EV; 41use Coro::EV;
41use Coro::AnyEvent; 42use Coro::AnyEvent;
42use Coro::Timer; 43use Coro::Timer;
43use Coro::Signal; 44use Coro::Signal;
44use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
45use Coro::AnyEvent; 47use Coro::AnyEvent;
46use Coro::AIO; 48use Coro::AIO;
47use Coro::BDB 1.6; 49use Coro::BDB 1.6;
48use Coro::Storable; 50use Coro::Storable;
49use Coro::Util (); 51use Coro::Util ();
50 52
51use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
52use BDB (); 54use BDB ();
53use Data::Dumper; 55use Data::Dumper;
54use Digest::MD5;
55use Fcntl; 56use Fcntl;
56use YAML (); 57use YAML::XS ();
57use IO::AIO (); 58use IO::AIO ();
58use Time::HiRes; 59use Time::HiRes;
59use Compress::LZF; 60use Compress::LZF;
60use Digest::MD5 (); 61use Digest::MD5 ();
61 62
63 64
64# configure various modules to our taste 65# configure various modules to our taste
65# 66#
66$Storable::canonical = 1; # reduce rsync transfers 67$Storable::canonical = 1; # reduce rsync transfers
67Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 68Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
69
70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
71
72# make sure c-lzf reinitialises itself
73Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
68Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 74Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
69 75
70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 76# strictly for debugging
77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
71 78
72sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
73 82
74our %COMMAND = (); 83our %COMMAND = ();
75our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
76 85
77our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
78our %EXTCMD = (); 87our %EXTCMD = ();
79our %EXTICMD = (); 88our %EXTICMD = ();
80our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
81our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
82 91
83our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
84our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
85 96
86our $CONFDIR = confdir; 97our $CONFDIR = confdir;
87our $DATADIR = datadir; 98our $DATADIR = datadir;
88our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
89our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
95our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
96our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
97our $PIDFILE = "$LOCALDIR/pid"; 108our $PIDFILE = "$LOCALDIR/pid";
98our $RUNTIMEFILE = "$LOCALDIR/runtime"; 109our $RUNTIMEFILE = "$LOCALDIR/runtime";
99 110
100our %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;
101 118
102our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
103our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
104our $NEXT_TICK; 121our $NEXT_TICK;
105our $USE_FSYNC = 1; # use fsync to write maps - default off 122our $USE_FSYNC = 1; # use fsync to write maps - default on
106 123
107our $BDB_DEADLOCK_WATCHER; 124our $BDB_DEADLOCK_WATCHER;
108our $BDB_CHECKPOINT_WATCHER; 125our $BDB_CHECKPOINT_WATCHER;
109our $BDB_TRICKLE_WATCHER; 126our $BDB_TRICKLE_WATCHER;
110our $DB_ENV; 127our $DB_ENV;
111 128
129our @EXTRA_MODULES = qw(pod match mapscript incloader);
130
112our %CFG; 131our %CFG;
113 132
114our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
115our $RUNTIME; 134our $RUNTIME;
116our $NOW; 135our $NOW;
124 143
125our $LOAD; # a number between 0 (idle) and 1 (too many objects) 144our $LOAD; # a number between 0 (idle) and 1 (too many objects)
126our $LOADAVG; # same thing, but with alpha-smoothing 145our $LOADAVG; # same thing, but with alpha-smoothing
127our $JITTER; # average jitter 146our $JITTER; # average jitter
128our $TICK_START; # for load detecting purposes 147our $TICK_START; # for load detecting purposes
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 :)
129 153
130binmode STDOUT; 154binmode STDOUT;
131binmode STDERR; 155binmode STDERR;
132 156
133# read virtual server time, if available 157# read virtual server time, if available
135 open my $fh, "<", $RUNTIMEFILE 159 open my $fh, "<", $RUNTIMEFILE
136 or die "unable to read $RUNTIMEFILE file: $!"; 160 or die "unable to read $RUNTIMEFILE file: $!";
137 $RUNTIME = <$fh> + 0.; 161 $RUNTIME = <$fh> + 0.;
138} 162}
139 163
164eval "sub TICK() { $TICK } 1" or die;
165
140mkdir $_ 166mkdir $_
141 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 167 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
142 168
143our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
144 170
145sub 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::"} };
146 187
147############################################################################# 188#############################################################################
148 189
149=head2 GLOBAL VARIABLES 190=head2 GLOBAL VARIABLES
150 191
192from wherever your confdir points to. 233from wherever your confdir points to.
193 234
194=item cf::wait_for_tick, cf::wait_for_tick_begin 235=item cf::wait_for_tick, cf::wait_for_tick_begin
195 236
196These 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
197returns 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
198per 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.
199 240
241=cut
242
243sub wait_for_tick();
244sub wait_for_tick_begin();
245
200=item @cf::INVOKE_RESULTS 246=item @cf::INVOKE_RESULTS
201 247
202This array contains the results of the last C<invoke ()> call. When 248This array contains the results of the last C<invoke ()> call. When
203C<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
204that call. 250that call.
205 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
206=back 258=back
207 259
208=cut 260=cut
209 261
210BEGIN { 262sub error(@) { LOG llevError, join "", @_ }
211 *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 {
212 my $msg = join "", @_; 269 my $msg = join "", @_;
213 270
214 $msg .= "\n" 271 $msg .= "\n"
215 unless $msg =~ /\n$/; 272 unless $msg =~ /\n$/;
216 273
217 $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;
218 275
219 LOG llevError, $msg; 276 LOG llevWarn, $msg;
220 }; 277};
221}
222 278
223$Coro::State::DIEHOOK = sub { 279$Coro::State::DIEHOOK = sub {
224 return unless $^S eq 0; # "eq", not "==" 280 return unless $^S eq 0; # "eq", not "=="
225 281
226 if ($Coro::current == $Coro::main) {#d# 282 error Carp::longmess $_[0];
283
284 if (in_main) {#d#
227 warn "DIEHOOK called in main context, Coro bug?\n";#d# 285 error "DIEHOOK called in main context, Coro bug?\n";#d#
228 return;#d# 286 return;#d#
229 }#d# 287 }#d#
230 288
231 # kill coroutine otherwise 289 # kill coroutine otherwise
232 warn Carp::longmess $_[0];
233 Coro::terminate 290 Coro::terminate
234}; 291};
235
236$SIG{__DIE__} = sub { }; #d#?
237 292
238@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 293@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
239@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 294@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
240@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 295@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
241@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 296@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
255)) { 310)) {
256 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 311 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
257} 312}
258 313
259$EV::DIED = sub { 314$EV::DIED = sub {
260 warn "error in event callback: @_"; 315 Carp::cluck "error in event callback: @_";
261}; 316};
262 317
263############################################################################# 318#############################################################################
264 319
265=head2 UTILITY FUNCTIONS 320=head2 UTILITY FUNCTIONS
302our $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
303 358
304sub encode_json($) { $json_coder->encode ($_[0]) } 359sub encode_json($) { $json_coder->encode ($_[0]) }
305sub decode_json($) { $json_coder->decode ($_[0]) } 360sub decode_json($) { $json_coder->decode ($_[0]) }
306 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
307=item cf::lock_wait $string 388=item cf::lock_wait $string
308 389
309Wait until the given lock is available. See cf::lock_acquire. 390Wait until the given lock is available. See cf::lock_acquire.
310 391
311=item my $lock = cf::lock_acquire $string 392=item my $lock = cf::lock_acquire $string
312 393
313Wait 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
314a 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,
315for example when the coroutine gets canceled), the lock is automatically 396for example when the coroutine gets canceled), the lock is automatically
316returned. 397returned.
317 398
318Locks 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
319deadlocked coro. 400deadlocked coro.
325 406
326Return 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.
327 408
328=cut 409=cut
329 410
330our %LOCK; 411our $LOCKS = new Coro::SemaphoreSet;
331our %LOCKER;#d#
332 412
333sub lock_wait($) { 413sub lock_wait($) {
334 my ($key) = @_; 414 $LOCKS->wait ($_[0]);
335
336 if ($LOCKER{$key} == $Coro::current) {#d#
337 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
338 return;#d#
339 }#d#
340
341 # wait for lock, if any
342 while ($LOCK{$key}) {
343 push @{ $LOCK{$key} }, $Coro::current;
344 Coro::schedule;
345 }
346} 415}
347 416
348sub lock_acquire($) { 417sub lock_acquire($) {
349 my ($key) = @_; 418 $LOCKS->guard ($_[0])
350
351 # wait, to be sure we are not locked
352 lock_wait $key;
353
354 $LOCK{$key} = [];
355 $LOCKER{$key} = $Coro::current;#d#
356
357 Coro::guard {
358 delete $LOCKER{$key};#d#
359 # wake up all waiters, to be on the safe side
360 $_->ready for @{ delete $LOCK{$key} };
361 }
362} 419}
363 420
364sub lock_active($) { 421sub lock_active($) {
365 my ($key) = @_; 422 $LOCKS->count ($_[0]) < 1
366
367 ! ! $LOCK{$key}
368} 423}
369 424
370sub freeze_mainloop { 425sub freeze_mainloop {
371 tick_inhibit_inc; 426 tick_inhibit_inc;
372 427
373 Coro::guard \&tick_inhibit_dec; 428 &Guard::guard (\&tick_inhibit_dec);
374} 429}
375 430
376=item cf::periodic $interval, $cb 431=item cf::periodic $interval, $cb
377 432
378Like 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
379get spread over timer. 434get spread over time.
380 435
381=cut 436=cut
382 437
383sub periodic($$) { 438sub periodic($$) {
384 my ($interval, $cb) = @_; 439 my ($interval, $cb) = @_;
401 456
402=cut 457=cut
403 458
404our @SLOT_QUEUE; 459our @SLOT_QUEUE;
405our $SLOT_QUEUE; 460our $SLOT_QUEUE;
461our $SLOT_DECAY = 0.9;
406 462
407$SLOT_QUEUE->cancel if $SLOT_QUEUE; 463$SLOT_QUEUE->cancel if $SLOT_QUEUE;
408$SLOT_QUEUE = Coro::async { 464$SLOT_QUEUE = Coro::async {
409 $Coro::current->desc ("timeslot manager"); 465 $Coro::current->desc ("timeslot manager");
410 466
411 my $signal = new Coro::Signal; 467 my $signal = new Coro::Signal;
468 my $busy;
412 469
413 while () { 470 while () {
414 next_job: 471 next_job:
472
415 my $avail = cf::till_tick; 473 my $avail = cf::till_tick;
416 if ($avail > 0.01) { 474
417 for (0 .. $#SLOT_QUEUE) { 475 for (0 .. $#SLOT_QUEUE) {
418 if ($SLOT_QUEUE[$_][0] < $avail) { 476 if ($SLOT_QUEUE[$_][0] <= $avail) {
477 $busy = 0;
419 my $job = splice @SLOT_QUEUE, $_, 1, (); 478 my $job = splice @SLOT_QUEUE, $_, 1, ();
420 $job->[2]->send; 479 $job->[2]->send;
421 Coro::cede; 480 Coro::cede;
422 goto next_job; 481 goto next_job;
423 } 482 } else {
483 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
424 } 484 }
425 } 485 }
426 486
427 if (@SLOT_QUEUE) { 487 if (@SLOT_QUEUE) {
428 # 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
429 push @cf::WAIT_FOR_TICK, $signal; 489 push @cf::WAIT_FOR_TICK, $signal;
430 $signal->wait; 490 $signal->wait;
431 } else { 491 } else {
492 $busy = 0;
432 Coro::schedule; 493 Coro::schedule;
433 } 494 }
434 } 495 }
435}; 496};
436 497
437sub get_slot($;$$) { 498sub get_slot($;$$) {
438 return if tick_inhibit || $Coro::current == $Coro::main; 499 return if tick_inhibit || $Coro::current == $Coro::main;
439 500
440 my ($time, $pri, $name) = @_; 501 my ($time, $pri, $name) = @_;
441 502
442 $time = $TICK * .6 if $time > $TICK * .6; 503 $time = clamp $time, 0.01, $TICK * .6;
504
443 my $sig = new Coro::Signal; 505 my $sig = new Coro::Signal;
444 506
445 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 507 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
446 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 508 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
447 $SLOT_QUEUE->ready; 509 $SLOT_QUEUE->ready;
473=cut 535=cut
474 536
475sub sync_job(&) { 537sub sync_job(&) {
476 my ($job) = @_; 538 my ($job) = @_;
477 539
478 if ($Coro::current == $Coro::main) { 540 if (in_main) {
479 my $time = EV::time; 541 my $time = AE::time;
480 542
481 # this is the main coro, too bad, we have to block 543 # this is the main coro, too bad, we have to block
482 # till the operation succeeds, freezing the server :/ 544 # till the operation succeeds, freezing the server :/
483 545
484 LOG llevError, Carp::longmess "sync job";#d# 546 #LOG llevError, Carp::longmess "sync job";#d#
485 547
486 my $freeze_guard = freeze_mainloop; 548 my $freeze_guard = freeze_mainloop;
487 549
488 my $busy = 1; 550 my $busy = 1;
489 my @res; 551 my @res;
490 552
491 (async { 553 (async {
492 $Coro::current->desc ("sync job coro"); 554 $Coro::current->desc ("sync job coro");
493 @res = eval { $job->() }; 555 @res = eval { $job->() };
494 warn $@ if $@; 556 error $@ if $@;
495 undef $busy; 557 undef $busy;
496 })->prio (Coro::PRIO_MAX); 558 })->prio (Coro::PRIO_MAX);
497 559
498 while ($busy) { 560 while ($busy) {
499 if (Coro::nready) { 561 if (Coro::nready) {
501 } else { 563 } else {
502 EV::loop EV::LOOP_ONESHOT; 564 EV::loop EV::LOOP_ONESHOT;
503 } 565 }
504 } 566 }
505 567
506 my $time = EV::time - $time; 568 my $time = AE::time - $time;
507 569
508 $TICK_START += $time; # do not account sync jobs to server load 570 $TICK_START += $time; # do not account sync jobs to server load
509 571
510 wantarray ? @res : $res[0] 572 wantarray ? @res : $res[0]
511 } else { 573 } else {
533 $EXT_CORO{$coro+0} = $coro; 595 $EXT_CORO{$coro+0} = $coro;
534 596
535 $coro 597 $coro
536} 598}
537 599
538=item fork_call { }, $args 600=item fork_call { }, @args
539 601
540Executes the given code block with the given arguments in a seperate 602Executes the given code block with the given arguments in a seperate
541process, returning the results. Everything must be serialisable with 603process, returning the results. Everything must be serialisable with
542Coro::Storable. May, of course, block. Note that the executed sub may 604Coro::Storable. May, of course, block. Note that the executed sub may
543never block itself or use any form of event handling. 605never block itself or use any form of event handling.
544 606
545=cut 607=cut
546 608
609sub post_fork {
610 reset_signals;
611}
612
547sub fork_call(&@) { 613sub fork_call(&@) {
548 my ($cb, @args) = @_; 614 my ($cb, @args) = @_;
549 615
550 # 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,
551 # otherwise perl prematurely frees the stuff :/ 617 # otherwise perl prematurely frees the stuff :/
552 # TODO: investigate and fix (likely this will be rather laborious) 618 # TODO: investigate and fix (likely this will be rather laborious)
553 619
554 my @res = Coro::Util::fork_eval { 620 my @res = Coro::Util::fork_eval {
555 reset_signals; 621 cf::post_fork;
556 &$cb 622 &$cb
557 }, @args; 623 } @args;
558 624
559 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 )
560} 637}
561 638
562=item $coin = coin_from_name $name 639=item $coin = coin_from_name $name
563 640
564=cut 641=cut
601within each server. 678within each server.
602 679
603=cut 680=cut
604 681
605sub db_table($) { 682sub db_table($) {
683 cf::error "db_get called from main context"
684 if $Coro::current == $Coro::main;
685
606 my ($name) = @_; 686 my ($name) = @_;
607 my $db = BDB::db_create $DB_ENV; 687 my $db = BDB::db_create $DB_ENV;
608 688
609 eval { 689 eval {
610 $db->set_flags (BDB::CHKSUM); 690 $db->set_flags (BDB::CHKSUM);
620} 700}
621 701
622our $DB; 702our $DB;
623 703
624sub db_init { 704sub db_init {
625 cf::sync_job {
626 $DB ||= db_table "db"; 705 $DB ||= db_table "db";
627 };
628} 706}
629 707
630sub db_get($$) { 708sub db_get($$) {
631 my $key = "$_[0]/$_[1]"; 709 my $key = "$_[0]/$_[1]";
632 710
633 cf::sync_job { 711 cf::error "db_get called from main context"
712 if $Coro::current == $Coro::main;
713
634 BDB::db_get $DB, undef, $key, my $data; 714 BDB::db_get $DB, undef, $key, my $data;
635 715
636 $! ? () 716 $! ? ()
637 : $data 717 : $data
638 }
639} 718}
640 719
641sub db_put($$$) { 720sub db_put($$$) {
642 BDB::dbreq_pri 4; 721 BDB::dbreq_pri 4;
643 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 722 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
699 778
700 my $t1 = Time::HiRes::time; 779 my $t1 = Time::HiRes::time;
701 my $data = $process->(\@data); 780 my $data = $process->(\@data);
702 my $t2 = Time::HiRes::time; 781 my $t2 = Time::HiRes::time;
703 782
704 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 783 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
705 784
706 db_put cache => "$id/data", $data; 785 db_put cache => "$id/data", $data;
707 db_put cache => "$id/md5" , $md5; 786 db_put cache => "$id/md5" , $md5;
708 db_put cache => "$id/meta", $meta; 787 db_put cache => "$id/meta", $meta;
709 788
719 798
720=cut 799=cut
721 800
722sub datalog($@) { 801sub datalog($@) {
723 my ($type, %kv) = @_; 802 my ($type, %kv) = @_;
724 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 803 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
725} 804}
726 805
727=back 806=back
728 807
729=cut 808=cut
730 809
731############################################################################# 810#############################################################################
732 811
733=head2 ATTACHABLE OBJECTS 812=head2 ATTACHABLE OBJECTS
734 813
735Many 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
736attach callbacks/event handlers (a collection of which is called an "attachment") 815attach callbacks/event handlers (a collection of which is called an "attachment")
737to it. All such attachable objects support the following methods. 816to it. All such attachable objects support the following methods.
738 817
739In 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>
740C<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
790=item cf::CLASS::attachment $name, ... 869=item cf::CLASS::attachment $name, ...
791 870
792Register an attachment by C<$name> through which attachable objects of the 871Register an attachment by C<$name> through which attachable objects of the
793given CLASS can refer to this attachment. 872given CLASS can refer to this attachment.
794 873
795Some classes such as crossfire maps and objects can specify attachments 874Some classes such as deliantra maps and objects can specify attachments
796that 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.
797 876
798These calls expect any number of the following handler/hook descriptions: 877These calls expect any number of the following handler/hook descriptions:
799 878
800=over 4 879=over 4
924 1003
925 } elsif (exists $cb_id{$type}) { 1004 } elsif (exists $cb_id{$type}) {
926 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1005 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
927 1006
928 } elsif (ref $type) { 1007 } elsif (ref $type) {
929 warn "attaching objects not supported, ignoring.\n"; 1008 error "attaching objects not supported, ignoring.\n";
930 1009
931 } else { 1010 } else {
932 shift @arg; 1011 shift @arg;
933 warn "attach argument '$type' not supported, ignoring.\n"; 1012 error "attach argument '$type' not supported, ignoring.\n";
934 } 1013 }
935 } 1014 }
936} 1015}
937 1016
938sub _object_attach { 1017sub _object_attach {
948 _attach $registry, $klass, @attach; 1027 _attach $registry, $klass, @attach;
949 } 1028 }
950 1029
951 $obj->{$name} = \%arg; 1030 $obj->{$name} = \%arg;
952 } else { 1031 } else {
953 warn "object uses attachment '$name' which is not available, postponing.\n"; 1032 info "object uses attachment '$name' which is not available, postponing.\n";
954 } 1033 }
955 1034
956 $obj->{_attachment}{$name} = undef; 1035 $obj->{_attachment}{$name} = undef;
957} 1036}
958 1037
1017 1096
1018 for (@$callbacks) { 1097 for (@$callbacks) {
1019 eval { &{$_->[1]} }; 1098 eval { &{$_->[1]} };
1020 1099
1021 if ($@) { 1100 if ($@) {
1022 warn "$@";
1023 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1101 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1024 override; 1102 override;
1025 } 1103 }
1026 1104
1027 return 1 if $override; 1105 return 1 if $override;
1028 } 1106 }
1107 for (@$attach) { 1185 for (@$attach) {
1108 my ($klass, @attach) = @$_; 1186 my ($klass, @attach) = @$_;
1109 _attach $registry, $klass, @attach; 1187 _attach $registry, $klass, @attach;
1110 } 1188 }
1111 } else { 1189 } else {
1112 warn "object uses attachment '$name' that is not available, postponing.\n"; 1190 info "object uses attachment '$name' that is not available, postponing.\n";
1113 } 1191 }
1114 } 1192 }
1115} 1193}
1116 1194
1117cf::attachable->attach ( 1195cf::attachable->attach (
1144 my ($filename, $rdata, $objs) = @_; 1222 my ($filename, $rdata, $objs) = @_;
1145 1223
1146 sync_job { 1224 sync_job {
1147 if (length $$rdata) { 1225 if (length $$rdata) {
1148 utf8::decode (my $decname = $filename); 1226 utf8::decode (my $decname = $filename);
1149 warn sprintf "saving %s (%d,%d)\n", 1227 trace sprintf "saving %s (%d,%d)\n",
1150 $decname, length $$rdata, scalar @$objs; 1228 $decname, length $$rdata, scalar @$objs
1229 if $VERBOSE_IO;
1151 1230
1152 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1231 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1153 aio_chmod $fh, SAVE_MODE; 1232 aio_chmod $fh, SAVE_MODE;
1154 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1233 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1155 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 }
1156 aio_close $fh; 1238 aio_close $fh;
1157 1239
1158 if (@$objs) { 1240 if (@$objs) {
1159 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) {
1160 aio_chmod $fh, SAVE_MODE; 1242 aio_chmod $fh, SAVE_MODE;
1161 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1243 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1162 aio_write $fh, 0, (length $data), $data, 0; 1244 aio_write $fh, 0, (length $data), $data, 0;
1163 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 }
1164 aio_close $fh; 1249 aio_close $fh;
1165 aio_rename "$filename.pst~", "$filename.pst"; 1250 aio_rename "$filename.pst~", "$filename.pst";
1166 } 1251 }
1167 } else { 1252 } else {
1168 aio_unlink "$filename.pst"; 1253 aio_unlink "$filename.pst";
1169 } 1254 }
1170 1255
1171 aio_rename "$filename~", $filename; 1256 aio_rename "$filename~", $filename;
1257
1258 $filename =~ s%/[^/]+$%%;
1259 aio_pathsync $filename if $cf::USE_FSYNC;
1172 } else { 1260 } else {
1173 warn "FATAL: $filename~: $!\n"; 1261 error "unable to save objects: $filename~: $!\n";
1174 } 1262 }
1175 } else { 1263 } else {
1176 aio_unlink $filename; 1264 aio_unlink $filename;
1177 aio_unlink "$filename.pst"; 1265 aio_unlink "$filename.pst";
1178 } 1266 }
1202 my $st = eval { Coro::Storable::thaw $av }; 1290 my $st = eval { Coro::Storable::thaw $av };
1203 $av = $st->{objs}; 1291 $av = $st->{objs};
1204 } 1292 }
1205 1293
1206 utf8::decode (my $decname = $filename); 1294 utf8::decode (my $decname = $filename);
1207 warn sprintf "loading %s (%d,%d)\n", 1295 trace sprintf "loading %s (%d,%d)\n",
1208 $decname, length $data, scalar @{$av || []}; 1296 $decname, length $data, scalar @{$av || []}
1297 if $VERBOSE_IO;
1209 1298
1210 ($data, $av) 1299 ($data, $av)
1211} 1300}
1212 1301
1213=head2 COMMAND CALLBACKS 1302=head2 COMMAND CALLBACKS
1269 my ($name, $cb) = @_; 1358 my ($name, $cb) = @_;
1270 1359
1271 $EXTICMD{$name} = $cb; 1360 $EXTICMD{$name} = $cb;
1272} 1361}
1273 1362
1363use File::Glob ();
1364
1274cf::player->attach ( 1365cf::player->attach (
1275 on_command => sub { 1366 on_unknown_command => sub {
1276 my ($pl, $name, $params) = @_; 1367 my ($pl, $name, $params) = @_;
1277 1368
1278 my $cb = $COMMAND{$name} 1369 my $cb = $COMMAND{$name}
1279 or return; 1370 or return;
1280 1371
1303 1394
1304 $pl->ext_reply ($reply, @reply) 1395 $pl->ext_reply ($reply, @reply)
1305 if $reply; 1396 if $reply;
1306 1397
1307 } else { 1398 } else {
1308 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1399 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1309 } 1400 }
1310 1401
1311 cf::override; 1402 cf::override;
1312 }, 1403 },
1313); 1404);
1314 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
1315sub load_extensions { 1419sub load_extensions {
1420 info "loading extensions...";
1421
1316 cf::sync_job { 1422 cf::sync_job {
1317 my %todo; 1423 my %todo;
1318 1424
1319 for my $path (<$LIBDIR/*.ext>) { 1425 for my $path (<$LIBDIR/*.ext>) {
1320 next unless -r $path; 1426 next unless -r $path;
1338 1444
1339 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1445 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1340 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1446 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1341 1447
1342 $ext{source} = 1448 $ext{source} =
1343 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1449 "package $pkg; use common::sense;\n"
1344 . "#line 1 \"$path\"\n{\n" 1450 . "#line 1 \"$path\"\n{\n"
1345 . $source 1451 . $source
1346 . "\n};\n1"; 1452 . "\n};\n1";
1347 1453
1348 $todo{$base} = \%ext; 1454 $todo{$base} = \%ext;
1349 } 1455 }
1350 1456
1457 my $pass = 0;
1351 my %done; 1458 my %done;
1352 while (%todo) { 1459 while (%todo) {
1353 my $progress; 1460 my $progress;
1354 1461
1462 ++$pass;
1463
1464 ext:
1355 while (my ($k, $v) = each %todo) { 1465 while (my ($k, $v) = each %todo) {
1356 for (split /,\s*/, $v->{meta}{depends}) { 1466 for (split /,\s*/, $v->{meta}{depends}) {
1357 goto skip 1467 next ext
1358 unless exists $done{$_}; 1468 unless exists $done{$_};
1359 } 1469 }
1360 1470
1361 warn "... loading '$k' into '$v->{pkg}'\n"; 1471 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1362 1472
1363 unless (eval $v->{source}) { 1473 my $active = eval $v->{source};
1474
1475 if (length $@) {
1364 my $msg = $@ ? "$v->{path}: $@\n" 1476 error "$v->{path}: $@\n";
1365 : "$v->{base}: extension inactive.\n";
1366 1477
1367 if (exists $v->{meta}{mandatory}) {
1368 warn $msg;
1369 cf::cleanup "mandatory extension failed to load, exiting."; 1478 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1370 } 1479 if exists $v->{meta}{mandatory};
1371 1480
1372 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;
1373 } 1490 }
1374
1375 $done{$k} = delete $todo{$k};
1376 push @EXTS, $v->{pkg};
1377 $progress = 1;
1378 } 1491 }
1379 1492
1380 skip: 1493 unless ($progress) {
1381 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1494 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1382 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 }
1383 } 1501 }
1384 }; 1502 };
1385} 1503}
1386 1504
1387############################################################################# 1505#############################################################################
1388 1506
1389=back 1507=back
1390 1508
1391=head2 CORE EXTENSIONS 1509=head2 CORE EXTENSIONS
1392 1510
1393Functions and methods that extend core crossfire objects. 1511Functions and methods that extend core deliantra objects.
1394 1512
1395=cut 1513=cut
1396 1514
1397package cf::player; 1515package cf::player;
1398 1516
1441 1559
1442sub exists($) { 1560sub exists($) {
1443 my ($login) = @_; 1561 my ($login) = @_;
1444 1562
1445 $cf::PLAYER{$login} 1563 $cf::PLAYER{$login}
1446 or cf::sync_job { !aio_stat path $login } 1564 or !aio_stat path $login
1447} 1565}
1448 1566
1449sub find($) { 1567sub find($) {
1450 return $cf::PLAYER{$_[0]} || do { 1568 return $cf::PLAYER{$_[0]} || do {
1451 my $login = $_[0]; 1569 my $login = $_[0];
1471 $cf::PLAYER{$login} = $pl 1589 $cf::PLAYER{$login} = $pl
1472 } 1590 }
1473 } 1591 }
1474} 1592}
1475 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
1476sub save($) { 1607sub save($) {
1477 my ($pl) = @_; 1608 my ($pl) = @_;
1478 1609
1479 return if $pl->{deny_save}; 1610 return if $pl->{deny_save};
1480 1611
1485 1616
1486 aio_mkdir playerdir $pl, 0770; 1617 aio_mkdir playerdir $pl, 0770;
1487 $pl->{last_save} = $cf::RUNTIME; 1618 $pl->{last_save} = $cf::RUNTIME;
1488 1619
1489 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];
1490 1624
1491 $pl->save_pl ($path); 1625 $pl->save_pl ($path);
1492 cf::cede_to_tick; 1626 cf::cede_to_tick;
1493} 1627}
1494 1628
1528 my $name = $pl->ob->name; 1662 my $name = $pl->ob->name;
1529 1663
1530 $pl->{deny_save} = 1; 1664 $pl->{deny_save} = 1;
1531 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1665 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1532 1666
1533 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1667 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1534 $pl->deactivate; 1668 $pl->deactivate;
1669
1535 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;
1536 $pl->ob->check_score;
1537 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1671 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1672 ext::highscore::check ($pl->ob);
1673
1538 $pl->ns->destroy if $pl->ns; 1674 $pl->ns->destroy if $pl->ns;
1539 1675
1540 my $path = playerdir $pl; 1676 my $path = playerdir $pl;
1541 my $temp = "$path~$cf::RUNTIME~deleting~"; 1677 my $temp = "$path~$cf::RUNTIME~deleting~";
1542 aio_rename $path, $temp; 1678 aio_rename $path, $temp;
1596 \@logins 1732 \@logins
1597} 1733}
1598 1734
1599=item $player->maps 1735=item $player->maps
1600 1736
1737=item cf::player::maps $login
1738
1601Returns an arrayref of map paths that are private for this 1739Returns an arrayref of map paths that are private for this
1602player. May block. 1740player. May block.
1603 1741
1604=cut 1742=cut
1605 1743
1622 } 1760 }
1623 1761
1624 \@paths 1762 \@paths
1625} 1763}
1626 1764
1627=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1765=item $protocol_xml = $player->expand_cfpod ($cfpod)
1628 1766
1629Expand crossfire pod fragments into protocol xml. 1767Expand deliantra pod fragments into protocol xml.
1630 1768
1631=item $player->ext_reply ($msgid, @msg) 1769=item $player->ext_reply ($msgid, @msg)
1632 1770
1633Sends an ext reply to the player. 1771Sends an ext reply to the player.
1634 1772
1666 1804
1667=cut 1805=cut
1668 1806
1669sub find_by_path($) { 1807sub find_by_path($) {
1670 my ($path) = @_; 1808 my ($path) = @_;
1809
1810 $path =~ s/^~[^\/]*//; # skip ~login
1671 1811
1672 my ($match, $specificity); 1812 my ($match, $specificity);
1673 1813
1674 for my $region (list) { 1814 for my $region (list) {
1675 if ($region->{match} && $path =~ $region->{match}) { 1815 if ($region->{match} && $path =~ $region->{match}) {
1707 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
1708 1848
1709 # mit "rum" bekleckern, nicht 1849 # mit "rum" bekleckern, nicht
1710 $self->_create_random_map ( 1850 $self->_create_random_map (
1711 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1851 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1712 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1852 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1713 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1853 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1714 $rmp->{exit_on_final_map}, 1854 $rmp->{exit_on_final_map},
1715 $rmp->{xsize}, $rmp->{ysize}, 1855 $rmp->{xsize}, $rmp->{ysize},
1716 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1856 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1717 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1857 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1732 1872
1733sub register { 1873sub register {
1734 my (undef, $regex, $prio) = @_; 1874 my (undef, $regex, $prio) = @_;
1735 my $pkg = caller; 1875 my $pkg = caller;
1736 1876
1737 no strict;
1738 push @{"$pkg\::ISA"}, __PACKAGE__; 1877 push @{"$pkg\::ISA"}, __PACKAGE__;
1739 1878
1740 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1879 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1741} 1880}
1742 1881
1743# also paths starting with '/' 1882# also paths starting with '/'
1744$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1883$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1745 1884
1746sub thawer_merge { 1885sub thawer_merge {
1747 my ($self, $merge) = @_; 1886 my ($self, $merge) = @_;
1748 1887
1749 # we have to keep some variables in memory intact 1888 # we have to keep some variables in memory intact
1754} 1893}
1755 1894
1756sub normalise { 1895sub normalise {
1757 my ($path, $base) = @_; 1896 my ($path, $base) = @_;
1758 1897
1759 $path = "$path"; # make sure its a string 1898 $path = "$path"; # make sure it's a string
1760 1899
1761 $path =~ s/\.map$//; 1900 $path =~ s/\.map$//;
1762 1901
1763 # map plan: 1902 # map plan:
1764 # 1903 #
1803 $self->init; # pass $1 etc. 1942 $self->init; # pass $1 etc.
1804 return $self; 1943 return $self;
1805 } 1944 }
1806 } 1945 }
1807 1946
1808 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1947 Carp::cluck "unable to resolve path '$path' (base '$base')";
1809 () 1948 ()
1810} 1949}
1811 1950
1812sub init { 1951sub init {
1813 my ($self) = @_; 1952 my ($self) = @_;
1845sub uniq_path { 1984sub uniq_path {
1846 my ($self) = @_; 1985 my ($self) = @_;
1847 1986
1848 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1987 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1849 "$UNIQUEDIR/$path" 1988 "$UNIQUEDIR/$path"
1850}
1851
1852# and all this just because we cannot iterate over
1853# all maps in C++...
1854sub change_all_map_light {
1855 my ($change) = @_;
1856
1857 $_->change_map_light ($change)
1858 for grep $_->outdoor, values %cf::MAP;
1859} 1989}
1860 1990
1861sub decay_objects { 1991sub decay_objects {
1862 my ($self) = @_; 1992 my ($self) = @_;
1863 1993
1945 2075
1946sub find; 2076sub find;
1947sub find { 2077sub find {
1948 my ($path, $origin) = @_; 2078 my ($path, $origin) = @_;
1949 2079
2080 cf::cede_to_tick;
2081
1950 $path = normalise $path, $origin && $origin->path; 2082 $path = normalise $path, $origin && $origin->path;
1951 2083
1952 cf::lock_wait "map_data:$path";#d#remove 2084 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1953 cf::lock_wait "map_find:$path"; 2085 my $guard2 = cf::lock_acquire "map_find:$path";
1954 2086
1955 $cf::MAP{$path} || do { 2087 $cf::MAP{$path} || do {
1956 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1957 my $guard2 = cf::lock_acquire "map_find:$path";
1958
1959 my $map = new_from_path cf::map $path 2088 my $map = new_from_path cf::map $path
1960 or return; 2089 or return;
1961 2090
1962 $map->{last_save} = $cf::RUNTIME; 2091 $map->{last_save} = $cf::RUNTIME;
1963 2092
1975 2104
1976 $cf::MAP{$path} = $map 2105 $cf::MAP{$path} = $map
1977 } 2106 }
1978} 2107}
1979 2108
1980sub pre_load { } 2109sub pre_load { }
1981sub post_load { } 2110#sub post_load { } # XS
1982 2111
1983sub load { 2112sub load {
1984 my ($self) = @_; 2113 my ($self) = @_;
1985 2114
1986 local $self->{deny_reset} = 1; # loading can take a long time 2115 local $self->{deny_reset} = 1; # loading can take a long time
2031 unless ($self->{deny_activate}) { 2160 unless ($self->{deny_activate}) {
2032 $self->decay_objects; 2161 $self->decay_objects;
2033 $self->fix_auto_apply; 2162 $self->fix_auto_apply;
2034 $self->update_buttons; 2163 $self->update_buttons;
2035 cf::cede_to_tick; 2164 cf::cede_to_tick;
2036 $self->set_darkness_map;
2037 cf::cede_to_tick;
2038 $self->activate; 2165 $self->activate;
2039 } 2166 }
2040 2167
2041 $self->{last_save} = $cf::RUNTIME; 2168 $self->{last_save} = $cf::RUNTIME;
2042 $self->last_access ($cf::RUNTIME); 2169 $self->last_access ($cf::RUNTIME);
2045 } 2172 }
2046 2173
2047 $self->post_load; 2174 $self->post_load;
2048} 2175}
2049 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
2050sub customise_for { 2180sub customise_for {
2051 my ($self, $ob) = @_; 2181 my ($self, $ob) = @_;
2052 2182
2053 return find "~" . $ob->name . "/" . $self->{path} 2183 return find "~" . $ob->name . "/" . $self->{path}
2054 if $self->per_player; 2184 if $self->per_player;
2070 or next; 2200 or next;
2071 $neigh = find $neigh, $map 2201 $neigh = find $neigh, $map
2072 or next; 2202 or next;
2073 $neigh->load; 2203 $neigh->load;
2074 2204
2205 # now find the diagonal neighbours
2075 push @neigh, 2206 push @neigh,
2076 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2207 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2077 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2208 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2078 } 2209 }
2079 2210
2086} 2217}
2087 2218
2088sub find_sync { 2219sub find_sync {
2089 my ($path, $origin) = @_; 2220 my ($path, $origin) = @_;
2090 2221
2091 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
2092} 2226}
2093 2227
2094sub do_load_sync { 2228sub do_load_sync {
2095 my ($map) = @_; 2229 my ($map) = @_;
2096 2230
2097 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2231 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2098 if $Coro::current == $Coro::main; 2232 if $Coro::current == $Coro::main;
2099 2233
2100 cf::sync_job { $map->load }; 2234 $map->load;
2101} 2235}
2102 2236
2103our %MAP_PREFETCH; 2237our %MAP_PREFETCH;
2104our $MAP_PREFETCHER = undef; 2238our $MAP_PREFETCHER = undef;
2105 2239
2131 $MAP_PREFETCHER->prio (6); 2265 $MAP_PREFETCHER->prio (6);
2132 2266
2133 () 2267 ()
2134} 2268}
2135 2269
2270# common code, used by both ->save and ->swapout
2136sub save { 2271sub _save {
2137 my ($self) = @_; 2272 my ($self) = @_;
2138
2139 my $lock = cf::lock_acquire "map_data:$self->{path}";
2140 2273
2141 $self->{last_save} = $cf::RUNTIME; 2274 $self->{last_save} = $cf::RUNTIME;
2142 2275
2143 return unless $self->dirty; 2276 return unless $self->dirty;
2144 2277
2164 } else { 2297 } else {
2165 $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);
2166 } 2299 }
2167} 2300}
2168 2301
2302sub save {
2303 my ($self) = @_;
2304
2305 my $lock = cf::lock_acquire "map_data:$self->{path}";
2306
2307 $self->_save;
2308}
2309
2169sub swap_out { 2310sub swap_out {
2170 my ($self) = @_; 2311 my ($self) = @_;
2171 2312
2172 # save first because save cedes
2173 $self->save;
2174
2175 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2313 my $lock = cf::lock_acquire "map_data:$self->{path}";
2176 2314
2177 return if $self->players;
2178 return if $self->in_memory != cf::MAP_ACTIVE; 2315 return if $self->in_memory != cf::MAP_ACTIVE;
2179 return if $self->{deny_save}; 2316 return if $self->{deny_save};
2317 return if $self->players;
2180 2318
2319 # first deactivate the map and "unlink" it from the core
2320 $self->deactivate;
2321 $_->clear_links_to ($self) for values %cf::MAP;
2181 $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};
2182 2369
2183 $self->deactivate; 2370 $self->deactivate;
2184 $_->clear_links_to ($self) for values %cf::MAP; 2371 $_->clear_links_to ($self) for values %cf::MAP;
2185 $self->clear; 2372 $self->clear;
2186}
2187
2188sub reset_at {
2189 my ($self) = @_;
2190
2191 # TODO: safety, remove and allow resettable per-player maps
2192 return 1e99 if $self->{deny_reset};
2193
2194 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2195 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2196
2197 $time + $to
2198}
2199
2200sub should_reset {
2201 my ($self) = @_;
2202
2203 $self->reset_at <= $cf::RUNTIME
2204}
2205
2206sub reset {
2207 my ($self) = @_;
2208
2209 my $lock = cf::lock_acquire "map_data:$self->{path}";
2210
2211 return if $self->players;
2212
2213 warn "resetting map ", $self->path;
2214
2215 $self->in_memory (cf::MAP_SWAPPED);
2216
2217 # need to save uniques path
2218 unless ($self->{deny_save}) {
2219 my $uniq = $self->uniq_path; utf8::encode $uniq;
2220
2221 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2222 if $uniq;
2223 }
2224
2225 delete $cf::MAP{$self->path};
2226
2227 $self->deactivate;
2228 $_->clear_links_to ($self) for values %cf::MAP;
2229 $self->clear;
2230 2373
2231 $self->unlink_save; 2374 $self->unlink_save;
2232 $self->destroy; 2375 $self->destroy;
2233} 2376}
2234 2377
2242 2385
2243 delete $cf::MAP{$self->path}; 2386 delete $cf::MAP{$self->path};
2244 2387
2245 $self->unlink_save; 2388 $self->unlink_save;
2246 2389
2247 bless $self, "cf::map"; 2390 bless $self, "cf::map::wrap";
2248 delete $self->{deny_reset}; 2391 delete $self->{deny_reset};
2249 $self->{deny_save} = 1; 2392 $self->{deny_save} = 1;
2250 $self->reset_timeout (1); 2393 $self->reset_timeout (1);
2251 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2394 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2252 2395
2309 : normalise $_ 2452 : normalise $_
2310 } @{ aio_readdir $UNIQUEDIR or [] } 2453 } @{ aio_readdir $UNIQUEDIR or [] }
2311 ] 2454 ]
2312} 2455}
2313 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
2314=back 2489=back
2315 2490
2316=head3 cf::object 2491=head3 cf::object
2317 2492
2318=cut 2493=cut
2383 2558
2384our $SAY_CHANNEL = { 2559our $SAY_CHANNEL = {
2385 id => "say", 2560 id => "say",
2386 title => "Map", 2561 title => "Map",
2387 reply => "say ", 2562 reply => "say ",
2388 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.",
2389}; 2564};
2390 2565
2391our $CHAT_CHANNEL = { 2566our $CHAT_CHANNEL = {
2392 id => "chat", 2567 id => "chat",
2393 title => "Chat", 2568 title => "Chat",
2450 2625
2451Freezes 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}>).
2452 2627
2453The player should be reasonably safe there for short amounts of time (e.g. 2628The player should be reasonably safe there for short amounts of time (e.g.
2454for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2629for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2455though, as the palyer cannot control the character while it is on the link 2630though, as the player cannot control the character while it is on the link
2456map. 2631map.
2457 2632
2458Will never block. 2633Will never block.
2459 2634
2460=item $player_object->leave_link ($map, $x, $y) 2635=item $player_object->leave_link ($map, $x, $y)
2481sub cf::object::player::enter_link { 2656sub cf::object::player::enter_link {
2482 my ($self) = @_; 2657 my ($self) = @_;
2483 2658
2484 $self->deactivate_recursive; 2659 $self->deactivate_recursive;
2485 2660
2661 ++$self->{_link_recursion};
2662
2486 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2663 return if UNIVERSAL::isa $self->map, "ext::map_link";
2487 2664
2488 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2665 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2489 if $self->map && $self->map->{path} ne "{link}"; 2666 if $self->map && $self->map->{path} ne "{link}";
2490 2667
2491 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2668 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2492} 2669}
2493 2670
2494sub cf::object::player::leave_link { 2671sub cf::object::player::leave_link {
2495 my ($self, $map, $x, $y) = @_; 2672 my ($self, $map, $x, $y) = @_;
2496 2673
2513 ($x, $y) = (-1, -1) 2690 ($x, $y) = (-1, -1)
2514 unless (defined $x) && (defined $y); 2691 unless (defined $x) && (defined $y);
2515 2692
2516 # use -1 or undef as default coordinates, not 0, 0 2693 # use -1 or undef as default coordinates, not 0, 0
2517 ($x, $y) = ($map->enter_x, $map->enter_y) 2694 ($x, $y) = ($map->enter_x, $map->enter_y)
2518 if $x <=0 && $y <= 0; 2695 if $x <= 0 && $y <= 0;
2519 2696
2520 $map->load; 2697 $map->load;
2521 $map->load_neighbours; 2698 $map->load_neighbours;
2522 2699
2523 return unless $self->contr->active; 2700 return unless $self->contr->active;
2524 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2525 $self->activate_recursive;
2526 2701
2527 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2702 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2528 $self->enter_map ($map, $x, $y); 2703 if ($self->enter_map ($map, $x, $y)) {
2529} 2704 # entering was successful
2705 delete $self->{_link_recursion};
2706 # only activate afterwards, to support waiting in hooks
2707 $self->activate_recursive;
2708 }
2530 2709
2710}
2711
2531=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)]])
2532 2713
2533Moves 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
2534her, loading and preparing them map, calling the provided $check callback 2715her, loading and preparing them map, calling the provided $check callback
2535that 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
2536the 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
2543 2724
2544our $GOTOGEN; 2725our $GOTOGEN;
2545 2726
2546sub cf::object::player::goto { 2727sub cf::object::player::goto {
2547 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 }
2548 2735
2549 # 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
2550 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2737 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2551 2738
2552 $self->enter_link; 2739 $self->enter_link;
2576 my $map = eval { 2763 my $map = eval {
2577 my $map = defined $path ? cf::map::find $path : undef; 2764 my $map = defined $path ? cf::map::find $path : undef;
2578 2765
2579 if ($map) { 2766 if ($map) {
2580 $map = $map->customise_for ($self); 2767 $map = $map->customise_for ($self);
2581 $map = $check->($map) if $check && $map; 2768 $map = $check->($map, $x, $y, $self) if $check && $map;
2582 } else { 2769 } else {
2583 $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);
2584 } 2771 }
2585 2772
2586 $map 2773 $map
2594 if ($gen == $self->{_goto_generation}) { 2781 if ($gen == $self->{_goto_generation}) {
2595 delete $self->{_goto_generation}; 2782 delete $self->{_goto_generation};
2596 $self->leave_link ($map, $x, $y); 2783 $self->leave_link ($map, $x, $y);
2597 } 2784 }
2598 2785
2599 $done->() if $done; 2786 $done->($self) if $done;
2600 })->prio (1); 2787 })->prio (1);
2601} 2788}
2602 2789
2603=item $player_object->enter_exit ($exit_object) 2790=item $player_object->enter_exit ($exit_object)
2604 2791
2692 $self->contr->savebed ($map, $x, $y) 2879 $self->contr->savebed ($map, $x, $y)
2693 if $exit->flag (cf::FLAG_DAMNED); 2880 if $exit->flag (cf::FLAG_DAMNED);
2694 2881
2695 1 2882 1
2696 }) { 2883 }) {
2697 $self->message ("Something went wrong deep within the crossfire server. " 2884 $self->message ("Something went wrong deep within the deliantra server. "
2698 . "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. "
2699 . "Please report this to the dungeon master!", 2886 . "Please report this to the dungeon master!",
2700 cf::NDI_UNIQUE | cf::NDI_RED); 2887 cf::NDI_UNIQUE | cf::NDI_RED);
2701 2888
2702 warn "ERROR in enter_exit: $@"; 2889 error "ERROR in enter_exit: $@";
2703 $self->leave_link; 2890 $self->leave_link;
2704 } 2891 }
2705 })->prio (1); 2892 })->prio (1);
2706} 2893}
2707 2894
2719sub cf::client::send_drawinfo { 2906sub cf::client::send_drawinfo {
2720 my ($self, $text, $flags) = @_; 2907 my ($self, $text, $flags) = @_;
2721 2908
2722 utf8::encode $text; 2909 utf8::encode $text;
2723 $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);
2724} 2936}
2725 2937
2726=item $client->send_msg ($channel, $msg, $color, [extra...]) 2938=item $client->send_msg ($channel, $msg, $color, [extra...])
2727 2939
2728Send 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
2732 2944
2733=cut 2945=cut
2734 2946
2735# non-persistent channels (usually the info channel) 2947# non-persistent channels (usually the info channel)
2736our %CHANNEL = ( 2948our %CHANNEL = (
2949 "c/motd" => {
2950 id => "infobox",
2951 title => "MOTD",
2952 reply => undef,
2953 tooltip => "The message of the day",
2954 },
2737 "c/identify" => { 2955 "c/identify" => {
2738 id => "infobox", 2956 id => "infobox",
2739 title => "Identify", 2957 title => "Identify",
2740 reply => undef, 2958 reply => undef,
2741 tooltip => "Items recently identified", 2959 tooltip => "Items recently identified",
2743 "c/examine" => { 2961 "c/examine" => {
2744 id => "infobox", 2962 id => "infobox",
2745 title => "Examine", 2963 title => "Examine",
2746 reply => undef, 2964 reply => undef,
2747 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",
2748 }, 2972 },
2749 "c/book" => { 2973 "c/book" => {
2750 id => "infobox", 2974 id => "infobox",
2751 title => "Book", 2975 title => "Book",
2752 reply => undef, 2976 reply => undef,
2768 id => "infobox", 2992 id => "infobox",
2769 title => "Body Parts", 2993 title => "Body Parts",
2770 reply => undef, 2994 reply => undef,
2771 tooltip => "Shows which body parts you posess and are available", 2995 tooltip => "Shows which body parts you posess and are available",
2772 }, 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 },
2773 "c/uptime" => { 3033 "c/uptime" => {
2774 id => "infobox", 3034 id => "infobox",
2775 title => "Uptime", 3035 title => "Uptime",
2776 reply => undef, 3036 reply => undef,
2777 tooltip => "How long the server has been running since last restart", 3037 tooltip => "How long the server has been running since last restart",
2786 id => "party", 3046 id => "party",
2787 title => "Party", 3047 title => "Party",
2788 reply => "gsay ", 3048 reply => "gsay ",
2789 tooltip => "Messages and chat related to your party", 3049 tooltip => "Messages and chat related to your party",
2790 }, 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,
2791); 3059);
2792 3060
2793sub cf::client::send_msg { 3061sub cf::client::send_msg {
2794 my ($self, $channel, $msg, $color, @extra) = @_; 3062 my ($self, $channel, $msg, $color, @extra) = @_;
2795 3063
2796 $msg = $self->pl->expand_cfpod ($msg); 3064 $msg = $self->pl->expand_cfpod ($msg)
3065 unless $color & cf::NDI_VERBATIM;
2797 3066
2798 $color &= cf::NDI_CLIENT_MASK; # just in case... 3067 $color &= cf::NDI_CLIENT_MASK; # just in case...
2799 3068
2800 # check predefined channels, for the benefit of C 3069 # check predefined channels, for the benefit of C
2801 if ($CHANNEL{$channel}) { 3070 if ($CHANNEL{$channel}) {
2802 $channel = $CHANNEL{$channel}; 3071 $channel = $CHANNEL{$channel};
2803 3072
2804 $self->ext_msg (channel_info => $channel) 3073 $self->ext_msg (channel_info => $channel);
2805 if $self->can_msg;
2806
2807 $channel = $channel->{id}; 3074 $channel = $channel->{id};
2808 3075
2809 } elsif (ref $channel) { 3076 } elsif (ref $channel) {
2810 # send meta info to client, if not yet sent 3077 # send meta info to client, if not yet sent
2811 unless (exists $self->{channel}{$channel->{id}}) { 3078 unless (exists $self->{channel}{$channel->{id}}) {
2812 $self->{channel}{$channel->{id}} = $channel; 3079 $self->{channel}{$channel->{id}} = $channel;
2813 $self->ext_msg (channel_info => $channel) 3080 $self->ext_msg (channel_info => $channel);
2814 if $self->can_msg;
2815 } 3081 }
2816 3082
2817 $channel = $channel->{id}; 3083 $channel = $channel->{id};
2818 } 3084 }
2819 3085
2820 return unless @extra || length $msg; 3086 return unless @extra || length $msg;
2821 3087
2822 if ($self->can_msg) {
2823 # default colour, mask it out 3088 # default colour, mask it out
2824 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3089 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2825 if $color & cf::NDI_DEF; 3090 if $color & cf::NDI_DEF;
2826 3091
2827 my $pkt = "msg " 3092 my $pkt = "msg "
2828 . $self->{json_coder}->encode ( 3093 . $self->{json_coder}->encode (
2829 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3094 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2830 ); 3095 );
2831 3096
2832 # try lzf for large packets
2833 $pkt = "lzf " . Compress::LZF::compress $pkt
2834 if 1024 <= length $pkt and $self->{can_lzf};
2835
2836 # split very large packets
2837 if (8192 < length $pkt and $self->{can_lzf}) {
2838 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2839 $pkt = "frag";
2840 }
2841
2842 $self->send_packet ($pkt); 3097 $self->send_big_packet ($pkt);
2843 } else {
2844 if ($color >= 0) {
2845 # replace some tags by gcfclient-compatible ones
2846 for ($msg) {
2847 1 while
2848 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2849 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2850 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2851 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2852 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2853 }
2854
2855 $color &= cf::NDI_COLOR_MASK;
2856
2857 utf8::encode $msg;
2858
2859 if (0 && $msg =~ /\[/) {
2860 # COMMAND/INFO
2861 $self->send_packet ("drawextinfo $color 10 8 $msg")
2862 } else {
2863 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2864 $self->send_packet ("drawinfo $color $msg")
2865 }
2866 }
2867 }
2868} 3098}
2869 3099
2870=item $client->ext_msg ($type, @msg) 3100=item $client->ext_msg ($type, @msg)
2871 3101
2872Sends an ext event to the client. 3102Sends an ext event to the client.
2875 3105
2876sub cf::client::ext_msg($$@) { 3106sub cf::client::ext_msg($$@) {
2877 my ($self, $type, @msg) = @_; 3107 my ($self, $type, @msg) = @_;
2878 3108
2879 if ($self->extcmd == 2) { 3109 if ($self->extcmd == 2) {
2880 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3110 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2881 } elsif ($self->extcmd == 1) { # TODO: remove 3111 } elsif ($self->extcmd == 1) { # TODO: remove
2882 push @msg, msgtype => "event_$type"; 3112 push @msg, msgtype => "event_$type";
2883 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3113 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2884 } 3114 }
2885} 3115}
2886 3116
2887=item $client->ext_reply ($msgid, @msg) 3117=item $client->ext_reply ($msgid, @msg)
2888 3118
2892 3122
2893sub cf::client::ext_reply($$@) { 3123sub cf::client::ext_reply($$@) {
2894 my ($self, $id, @msg) = @_; 3124 my ($self, $id, @msg) = @_;
2895 3125
2896 if ($self->extcmd == 2) { 3126 if ($self->extcmd == 2) {
2897 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3127 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2898 } elsif ($self->extcmd == 1) { 3128 } elsif ($self->extcmd == 1) {
2899 #TODO: version 1, remove 3129 #TODO: version 1, remove
2900 unshift @msg, msgtype => "reply", msgid => $id; 3130 unshift @msg, msgtype => "reply", msgid => $id;
2901 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3131 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2902 } 3132 }
2903} 3133}
2904 3134
2905=item $success = $client->query ($flags, "text", \&cb) 3135=item $success = $client->query ($flags, "text", \&cb)
2906 3136
2977 3207
2978 $ns->ext_reply ($reply, @reply) 3208 $ns->ext_reply ($reply, @reply)
2979 if $reply; 3209 if $reply;
2980 3210
2981 } else { 3211 } else {
2982 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";
2983 } 3213 }
2984 3214
2985 cf::override; 3215 cf::override;
2986 }, 3216 },
2987); 3217);
3007 3237
3008 $coro 3238 $coro
3009} 3239}
3010 3240
3011cf::client->attach ( 3241cf::client->attach (
3012 on_destroy => sub { 3242 on_client_destroy => sub {
3013 my ($ns) = @_; 3243 my ($ns) = @_;
3014 3244
3015 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3245 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3016 }, 3246 },
3017); 3247);
3033our $safe_hole = new Safe::Hole; 3263our $safe_hole = new Safe::Hole;
3034 3264
3035$SIG{FPE} = 'IGNORE'; 3265$SIG{FPE} = 'IGNORE';
3036 3266
3037$safe->permit_only (Opcode::opset qw( 3267$safe->permit_only (Opcode::opset qw(
3038 :base_core :base_mem :base_orig :base_math 3268 :base_core :base_mem :base_orig :base_math :base_loop
3039 grepstart grepwhile mapstart mapwhile 3269 grepstart grepwhile mapstart mapwhile
3040 sort time 3270 sort time
3041)); 3271));
3042 3272
3043# here we export the classes and methods available to script code 3273# here we export the classes and methods available to script code
3047The following functions and methods are available within a safe environment: 3277The following functions and methods are available within a safe environment:
3048 3278
3049 cf::object 3279 cf::object
3050 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
3051 insert remove name archname title slaying race decrease split 3281 insert remove name archname title slaying race decrease split
3282 value
3052 3283
3053 cf::object::player 3284 cf::object::player
3054 player 3285 player
3055 3286
3056 cf::player 3287 cf::player
3062=cut 3293=cut
3063 3294
3064for ( 3295for (
3065 ["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
3066 insert remove inv nrof name archname title slaying race 3297 insert remove inv nrof name archname title slaying race
3067 decrease split destroy change_exp)], 3298 decrease split destroy change_exp value msg lore send_msg)],
3068 ["cf::object::player" => qw(player)], 3299 ["cf::object::player" => qw(player)],
3069 ["cf::player" => qw(peaceful)], 3300 ["cf::player" => qw(peaceful send_msg)],
3070 ["cf::map" => qw(trigger)], 3301 ["cf::map" => qw(trigger)],
3071) { 3302) {
3072 no strict 'refs';
3073 my ($pkg, @funs) = @$_; 3303 my ($pkg, @funs) = @$_;
3074 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3304 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3075 for @funs; 3305 for @funs;
3076} 3306}
3077 3307
3092 3322
3093 my $qcode = $code; 3323 my $qcode = $code;
3094 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3324 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3095 $qcode =~ s/\n/\\n/g; 3325 $qcode =~ s/\n/\\n/g;
3096 3326
3327 %vars = (_dummy => 0) unless %vars;
3328
3329 my @res;
3097 local $_; 3330 local $_;
3098 local @safe::cf::_safe_eval_args = values %vars;
3099 3331
3100 my $eval = 3332 my $eval =
3101 "do {\n" 3333 "do {\n"
3102 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3334 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3103 . "#line 0 \"{$qcode}\"\n" 3335 . "#line 0 \"{$qcode}\"\n"
3104 . $code 3336 . $code
3105 . "\n}" 3337 . "\n}"
3106 ; 3338 ;
3107 3339
3340 if ($CFG{safe_eval}) {
3108 sub_generation_inc; 3341 sub_generation_inc;
3342 local @safe::cf::_safe_eval_args = values %vars;
3109 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3343 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3110 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 }
3111 3349
3112 if ($@) { 3350 if ($@) {
3113 warn "$@"; 3351 warn "$@",
3114 warn "while executing safe code '$code'\n"; 3352 "while executing safe code '$code'\n",
3115 warn "with arguments " . (join " ", %vars) . "\n"; 3353 "with arguments " . (join " ", %vars) . "\n";
3116 } 3354 }
3117 3355
3118 wantarray ? @res : $res[0] 3356 wantarray ? @res : $res[0]
3119} 3357}
3120 3358
3134=cut 3372=cut
3135 3373
3136sub register_script_function { 3374sub register_script_function {
3137 my ($fun, $cb) = @_; 3375 my ($fun, $cb) = @_;
3138 3376
3139 no strict 'refs'; 3377 $fun = "safe::$fun" if $CFG{safe_eval};
3140 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3378 *$fun = $safe_hole->wrap ($cb);
3141} 3379}
3142 3380
3143=back 3381=back
3144 3382
3145=cut 3383=cut
3154 # for this (global event?) 3392 # for this (global event?)
3155 %ext::player_env::MUSIC_FACE_CACHE = (); 3393 %ext::player_env::MUSIC_FACE_CACHE = ();
3156 3394
3157 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3395 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3158 3396
3159 warn "loading facedata from $path\n"; 3397 trace "loading facedata from $path\n";
3160 3398
3161 my $facedata;
3162 0 < aio_load $path, $facedata 3399 0 < aio_load $path, my $facedata
3163 or die "$path: $!"; 3400 or die "$path: $!";
3164 3401
3165 $facedata = Coro::Storable::thaw $facedata; 3402 $facedata = Coro::Storable::thaw $facedata;
3166 3403
3167 $facedata->{version} == 2 3404 $facedata->{version} == 2
3168 or cf::cleanup "$path: version mismatch, cannot proceed."; 3405 or cf::cleanup "$path: version mismatch, cannot proceed.";
3169 3406
3170 # 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]);
3171 $facedata->{resource}{"res/exp_table"} = { 3409 $facedata->{resource}{"res/exp_table"} = {
3172 type => FT_RSRC, 3410 type => FT_RSRC,
3173 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),
3174 }; 3413 };
3175 cf::cede_to_tick; 3414 cf::cede_to_tick;
3176 3415
3177 { 3416 {
3178 my $faces = $facedata->{faceinfo}; 3417 my $faces = $facedata->{faceinfo};
3180 while (my ($face, $info) = each %$faces) { 3419 while (my ($face, $info) = each %$faces) {
3181 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3420 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3182 3421
3183 cf::face::set_visibility $idx, $info->{visibility}; 3422 cf::face::set_visibility $idx, $info->{visibility};
3184 cf::face::set_magicmap $idx, $info->{magicmap}; 3423 cf::face::set_magicmap $idx, $info->{magicmap};
3185 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3424 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3186 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3425 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3187 3426
3188 cf::cede_to_tick; 3427 cf::cede_to_tick;
3189 } 3428 }
3190 3429
3191 while (my ($face, $info) = each %$faces) { 3430 while (my ($face, $info) = each %$faces) {
3196 3435
3197 if (my $smooth = cf::face::find $info->{smooth}) { 3436 if (my $smooth = cf::face::find $info->{smooth}) {
3198 cf::face::set_smooth $idx, $smooth; 3437 cf::face::set_smooth $idx, $smooth;
3199 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3438 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3200 } else { 3439 } else {
3201 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3440 error "smooth face '$info->{smooth}' not found for face '$face'";
3202 } 3441 }
3203 3442
3204 cf::cede_to_tick; 3443 cf::cede_to_tick;
3205 } 3444 }
3206 } 3445 }
3215 3454
3216 cf::anim::invalidate_all; # d'oh 3455 cf::anim::invalidate_all; # d'oh
3217 } 3456 }
3218 3457
3219 { 3458 {
3220 # TODO: for gcfclient pleasure, we should give resources
3221 # that gcfclient doesn't grok a >10000 face index.
3222 my $res = $facedata->{resource}; 3459 my $res = $facedata->{resource};
3223 3460
3224 while (my ($name, $info) = each %$res) { 3461 while (my ($name, $info) = each %$res) {
3225 if (defined $info->{type}) { 3462 if (defined $info->{type}) {
3226 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3463 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3227 my $data;
3228 3464
3229 if ($info->{type} & 1) { 3465 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3230 # prepend meta info
3231
3232 my $meta = $enc->encode ({
3233 name => $name,
3234 %{ $info->{meta} || {} },
3235 });
3236
3237 $data = pack "(w/a*)*", $meta, $info->{data};
3238 } else {
3239 $data = $info->{data};
3240 }
3241
3242 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3243 cf::face::set_type $idx, $info->{type}; 3466 cf::face::set_type $idx, $info->{type};
3244 } else { 3467 } else {
3245 $RESOURCE{$name} = $info; 3468 $RESOURCE{$name} = $info; # unused
3246 } 3469 }
3247 3470
3248 cf::cede_to_tick; 3471 cf::cede_to_tick;
3249 } 3472 }
3250 } 3473 }
3251 3474
3252 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3475 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3253 3476
3254 1 3477 1
3255} 3478}
3256
3257cf::global->attach (on_resource_update => sub {
3258 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3259 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3260
3261 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3262 my $sound = $soundconf->{compat}[$_]
3263 or next;
3264
3265 my $face = cf::face::find "sound/$sound->[1]";
3266 cf::sound::set $sound->[0] => $face;
3267 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3268 }
3269
3270 while (my ($k, $v) = each %{$soundconf->{event}}) {
3271 my $face = cf::face::find "sound/$v";
3272 cf::sound::set $k => $face;
3273 }
3274 }
3275});
3276 3479
3277register_exticmd fx_want => sub { 3480register_exticmd fx_want => sub {
3278 my ($ns, $want) = @_; 3481 my ($ns, $want) = @_;
3279 3482
3280 while (my ($k, $v) = each %$want) { 3483 while (my ($k, $v) = each %$want) {
3319sub reload_treasures { 3522sub reload_treasures {
3320 load_resource_file "$DATADIR/treasures" 3523 load_resource_file "$DATADIR/treasures"
3321 or die "unable to load treasurelists\n"; 3524 or die "unable to load treasurelists\n";
3322} 3525}
3323 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
3324sub reload_resources { 3550sub reload_resources {
3325 warn "reloading resource files...\n"; 3551 trace "reloading resource files...\n";
3326 3552
3553 reload_exp_table;
3554 reload_materials;
3327 reload_facedata; 3555 reload_facedata;
3556 reload_sound;
3328 reload_archetypes; 3557 reload_archetypes;
3329 reload_regions; 3558 reload_regions;
3330 reload_treasures; 3559 reload_treasures;
3331 3560
3332 warn "finished reloading resource files\n"; 3561 trace "finished reloading resource files\n";
3333}
3334
3335sub init {
3336 my $guard = freeze_mainloop;
3337
3338 evthread_start IO::AIO::poll_fileno;
3339
3340 reload_resources;
3341} 3562}
3342 3563
3343sub reload_config { 3564sub reload_config {
3344 open my $fh, "<:utf8", "$CONFDIR/config" 3565 trace "reloading config file...\n";
3345 or return;
3346 3566
3347 local $/; 3567 0 < aio_load "$CONFDIR/config", my $config
3348 *CFG = YAML::Load <$fh>; 3568 or die "$CONFDIR/config: $!";
3349 3569
3570 utf8::decode $config;
3571 *CFG = yaml_load $config;
3572
3350 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3573 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3351 3574
3352 $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};
3353 $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};
3354 3577
3355 if (exists $CFG{mlockall}) { 3578 if (exists $CFG{mlockall}) {
3378 3601
3379 seek $fh, 0, 0; 3602 seek $fh, 0, 0;
3380 print $fh $$; 3603 print $fh $$;
3381} 3604}
3382 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
3383sub main { 3615sub main {
3384 atomic; 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
3385 3624
3386 # we must not ever block the main coroutine 3625 # we must not ever block the main coroutine
3387 local $Coro::idle = sub { 3626 local $Coro::idle = sub {
3388 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#
3389 (async { 3628 (async {
3390 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3629 $Coro::current->{desc} = "IDLE BUG HANDLER";
3391 EV::loop EV::LOOP_ONESHOT; 3630 EV::loop EV::LOOP_ONESHOT;
3392 })->prio (Coro::PRIO_MAX); 3631 })->prio (Coro::PRIO_MAX);
3393 }; 3632 };
3394 3633
3395 { 3634 evthread_start IO::AIO::poll_fileno;
3396 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;
3397 reload_config; 3646 reload_config;
3398 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
3399 load_extensions; 3657 load_extensions;
3400 3658
3401 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3402 }
3403
3404 utime time, time, $RUNTIMEFILE; 3659 utime time, time, $RUNTIMEFILE;
3405 3660
3406 # no (long-running) fork's whatsoever before this point(!) 3661 # no (long-running) fork's whatsoever before this point(!)
3662 use POSIX ();
3407 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3663 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3408 3664
3409 EV::loop; 3665 (pop @POST_INIT)->(0) while @POST_INIT;
3666 };
3667
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;
3410} 3677}
3411 3678
3412############################################################################# 3679#############################################################################
3413# initialisation and cleanup 3680# initialisation and cleanup
3414 3681
3415# install some emergency cleanup handlers 3682# install some emergency cleanup handlers
3416BEGIN { 3683BEGIN {
3417 our %SIGWATCHER = (); 3684 our %SIGWATCHER = ();
3418 for my $signal (qw(INT HUP TERM)) { 3685 for my $signal (qw(INT HUP TERM)) {
3419 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3686 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3420 cf::cleanup "SIG$signal"; 3687 cf::cleanup "SIG$signal";
3421 }; 3688 };
3422 } 3689 }
3423} 3690}
3424 3691
3425sub write_runtime_sync { 3692sub write_runtime_sync {
3693 my $t0 = AE::time;
3694
3426 # first touch the runtime file to show we are still running: 3695 # first touch the runtime file to show we are still running:
3427 # the fsync below can take a very very long time. 3696 # the fsync below can take a very very long time.
3428 3697
3429 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3698 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3430 3699
3431 my $guard = cf::lock_acquire "write_runtime"; 3700 my $guard = cf::lock_acquire "write_runtime";
3432 3701
3433 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3702 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3434 or return; 3703 or return;
3435 3704
3436 my $value = $cf::RUNTIME + 90 + 10; 3705 my $value = $cf::RUNTIME + 90 + 10;
3437 # 10 is the runtime save interval, for a monotonic clock 3706 # 10 is the runtime save interval, for a monotonic clock
3438 # 60 allows for the watchdog to kill the server. 3707 # 60 allows for the watchdog to kill the server.
3451 or return; 3720 or return;
3452 3721
3453 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3722 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3454 and return; 3723 and return;
3455 3724
3456 warn "runtime file written.\n"; 3725 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3457 3726
3458 1 3727 1
3459} 3728}
3460 3729
3461our $uuid_lock; 3730our $uuid_lock;
3470 my $uuid = "$LOCALDIR/uuid"; 3739 my $uuid = "$LOCALDIR/uuid";
3471 3740
3472 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3741 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3473 or return; 3742 or return;
3474 3743
3475 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;
3476 $uuid_skip = 0; 3752 $uuid_skip = 0;
3477 3753
3478 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3754 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3479 and return; 3755 and return;
3480 3756
3486 or return; 3762 or return;
3487 3763
3488 aio_rename "$uuid~", $uuid 3764 aio_rename "$uuid~", $uuid
3489 and return; 3765 and return;
3490 3766
3491 warn "uuid file written ($value).\n"; 3767 trace "uuid file written ($value).\n";
3492 3768
3493 1 3769 1
3494 3770
3495} 3771}
3496 3772
3502} 3778}
3503 3779
3504sub emergency_save() { 3780sub emergency_save() {
3505 my $freeze_guard = cf::freeze_mainloop; 3781 my $freeze_guard = cf::freeze_mainloop;
3506 3782
3507 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;
3508 3789
3509 cf::sync_job { 3790 cf::sync_job {
3791 cf::write_runtime_sync; # external watchdog should not bark
3792
3510 # use a peculiar iteration method to avoid tripping on perl 3793 # use a peculiar iteration method to avoid tripping on perl
3511 # refcount bugs in for. also avoids problems with players 3794 # refcount bugs in for. also avoids problems with players
3512 # and maps saved/destroyed asynchronously. 3795 # and maps saved/destroyed asynchronously.
3513 warn "begin emergency player save\n"; 3796 info "emergency_perl_save: begin player save\n";
3514 for my $login (keys %cf::PLAYER) { 3797 for my $login (keys %cf::PLAYER) {
3515 my $pl = $cf::PLAYER{$login} or next; 3798 my $pl = $cf::PLAYER{$login} or next;
3516 $pl->valid or next; 3799 $pl->valid or next;
3517 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3800 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3518 $pl->save; 3801 $pl->save;
3519 } 3802 }
3520 warn "end emergency player save\n"; 3803 info "emergency_perl_save: end player save\n";
3521 3804
3522 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";
3523 for my $path (keys %cf::MAP) { 3808 for my $path (keys %cf::MAP) {
3524 my $map = $cf::MAP{$path} or next; 3809 my $map = $cf::MAP{$path} or next;
3525 $map->valid or next; 3810 $map->valid or next;
3526 $map->save; 3811 $map->save;
3527 } 3812 }
3528 warn "end emergency map save\n"; 3813 info "emergency_perl_save: end map save\n";
3529 3814
3530 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";
3531 BDB::db_env_txn_checkpoint $DB_ENV; 3818 BDB::db_env_txn_checkpoint $DB_ENV;
3532 warn "end emergency database checkpoint\n"; 3819 info "emergency_perl_save: end database checkpoint\n";
3533 3820
3534 warn "begin write uuid\n"; 3821 info "emergency_perl_save: begin write uuid\n";
3535 write_uuid_sync 1; 3822 write_uuid_sync 1;
3536 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
3537 }; 3843 };
3538 3844
3539 warn "leave emergency perl save\n"; 3845 info "emergency_perl_save: leave\n";
3540} 3846}
3541 3847
3542sub post_cleanup { 3848sub post_cleanup {
3543 my ($make_core) = @_; 3849 my ($make_core) = @_;
3544 3850
3851 IO::AIO::flush;
3852
3545 warn Carp::longmess "post_cleanup backtrace" 3853 error Carp::longmess "post_cleanup backtrace"
3546 if $make_core; 3854 if $make_core;
3547 3855
3548 my $fh = pidfile; 3856 my $fh = pidfile;
3549 unlink $PIDFILE if <$fh> == $$; 3857 unlink $PIDFILE if <$fh> == $$;
3550} 3858}
3570 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3878 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3571 for my $name (keys %$leaf_symtab) { 3879 for my $name (keys %$leaf_symtab) {
3572 _gv_clear *{"$pkg$name"}; 3880 _gv_clear *{"$pkg$name"};
3573# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3881# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3574 } 3882 }
3575 warn "cleared package #$pkg\n";#d#
3576} 3883}
3577
3578our $RELOAD; # how many times to reload
3579 3884
3580sub do_reload_perl() { 3885sub do_reload_perl() {
3581 # can/must only be called in main 3886 # can/must only be called in main
3582 if ($Coro::current != $Coro::main) { 3887 unless (in_main) {
3583 warn "can only reload from main coroutine"; 3888 error "can only reload from main coroutine";
3584 return; 3889 return;
3585 } 3890 }
3586 3891
3587 return if $RELOAD++; 3892 return if $RELOAD++;
3588 3893
3894 my $t1 = AE::time;
3895
3589 while ($RELOAD) { 3896 while ($RELOAD) {
3897 cf::get_slot 0.1, -1, "reload_perl";
3590 warn "reloading..."; 3898 info "reloading...";
3591 3899
3592 warn "entering sync_job"; 3900 trace "entering sync_job";
3593 3901
3594 cf::sync_job { 3902 cf::sync_job {
3595 cf::write_runtime_sync; # external watchdog should not bark
3596 cf::emergency_save; 3903 #cf::emergency_save;
3597 cf::write_runtime_sync; # external watchdog should not bark
3598 3904
3599 warn "syncing database to disk";
3600 BDB::db_env_txn_checkpoint $DB_ENV;
3601
3602 # if anything goes wrong in here, we should simply crash as we already saved
3603
3604 warn "flushing outstanding aio requests";
3605 while (IO::AIO::nreqs || BDB::nreqs) {
3606 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3607 }
3608
3609 warn "cancelling all extension coros"; 3905 trace "cancelling all extension coros";
3610 $_->cancel for values %EXT_CORO; 3906 $_->cancel for values %EXT_CORO;
3611 %EXT_CORO = (); 3907 %EXT_CORO = ();
3612 3908
3613 warn "removing commands"; 3909 trace "removing commands";
3614 %COMMAND = (); 3910 %COMMAND = ();
3615 3911
3616 warn "removing ext/exti commands"; 3912 trace "removing ext/exti commands";
3617 %EXTCMD = (); 3913 %EXTCMD = ();
3618 %EXTICMD = (); 3914 %EXTICMD = ();
3619 3915
3620 warn "unloading/nuking all extensions"; 3916 trace "unloading/nuking all extensions";
3621 for my $pkg (@EXTS) { 3917 for my $pkg (@EXTS) {
3622 warn "... unloading $pkg"; 3918 trace "... unloading $pkg";
3623 3919
3624 if (my $cb = $pkg->can ("unload")) { 3920 if (my $cb = $pkg->can ("unload")) {
3625 eval { 3921 eval {
3626 $cb->($pkg); 3922 $cb->($pkg);
3627 1 3923 1
3628 } or warn "$pkg unloaded, but with errors: $@"; 3924 } or error "$pkg unloaded, but with errors: $@";
3629 } 3925 }
3630 3926
3631 warn "... clearing $pkg"; 3927 trace "... clearing $pkg";
3632 clear_package $pkg; 3928 clear_package $pkg;
3633 } 3929 }
3634 3930
3635 warn "unloading all perl modules loaded from $LIBDIR"; 3931 trace "unloading all perl modules loaded from $LIBDIR";
3636 while (my ($k, $v) = each %INC) { 3932 while (my ($k, $v) = each %INC) {
3637 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3933 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3638 3934
3639 warn "... unloading $k"; 3935 trace "... unloading $k";
3640 delete $INC{$k}; 3936 delete $INC{$k};
3641 3937
3642 $k =~ s/\.pm$//; 3938 $k =~ s/\.pm$//;
3643 $k =~ s/\//::/g; 3939 $k =~ s/\//::/g;
3644 3940
3647 } 3943 }
3648 3944
3649 clear_package $k; 3945 clear_package $k;
3650 } 3946 }
3651 3947
3652 warn "getting rid of safe::, as good as possible"; 3948 trace "getting rid of safe::, as good as possible";
3653 clear_package "safe::$_" 3949 clear_package "safe::$_"
3654 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);
3655 3951
3656 warn "unloading cf.pm \"a bit\""; 3952 trace "unloading cf.pm \"a bit\"";
3657 delete $INC{"cf.pm"}; 3953 delete $INC{"cf.pm"};
3658 delete $INC{"cf/pod.pm"}; 3954 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3659 3955
3660 # don't, removes xs symbols, too, 3956 # don't, removes xs symbols, too,
3661 # and global variables created in xs 3957 # and global variables created in xs
3662 #clear_package __PACKAGE__; 3958 #clear_package __PACKAGE__;
3663 3959
3664 warn "unload completed, starting to reload now"; 3960 info "unload completed, starting to reload now";
3665 3961
3666 warn "reloading cf.pm"; 3962 trace "reloading cf.pm";
3667 require cf; 3963 require cf;
3668 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3964 cf::_connect_to_perl_1;
3669 3965
3670 warn "loading config and database again"; 3966 trace "loading config and database again";
3671 cf::reload_config; 3967 cf::reload_config;
3672 3968
3673 warn "loading extensions"; 3969 trace "loading extensions";
3674 cf::load_extensions; 3970 cf::load_extensions;
3675 3971
3972 if ($REATTACH_ON_RELOAD) {
3676 warn "reattaching attachments to objects/players"; 3973 trace "reattaching attachments to objects/players";
3677 _global_reattach; # objects, sockets 3974 _global_reattach; # objects, sockets
3678 warn "reattaching attachments to maps"; 3975 trace "reattaching attachments to maps";
3679 reattach $_ for values %MAP; 3976 reattach $_ for values %MAP;
3680 warn "reattaching attachments to players"; 3977 trace "reattaching attachments to players";
3681 reattach $_ for values %PLAYER; 3978 reattach $_ for values %PLAYER;
3979 }
3682 3980
3981 trace "running post_init jobs";
3982 (pop @POST_INIT)->(1) while @POST_INIT;
3983
3683 warn "leaving sync_job"; 3984 trace "leaving sync_job";
3684 3985
3685 1 3986 1
3686 } or do { 3987 } or do {
3687 warn $@; 3988 error $@;
3688 cf::cleanup "error while reloading, exiting."; 3989 cf::cleanup "error while reloading, exiting.";
3689 }; 3990 };
3690 3991
3691 warn "reloaded"; 3992 info "reloaded";
3692 --$RELOAD; 3993 --$RELOAD;
3693 } 3994 }
3995
3996 $t1 = AE::time - $t1;
3997 info "reload completed in ${t1}s\n";
3694}; 3998};
3695 3999
3696our $RELOAD_WATCHER; # used only during reload 4000our $RELOAD_WATCHER; # used only during reload
3697 4001
3698sub reload_perl() { 4002sub reload_perl() {
3699 # doing reload synchronously and two reloads happen back-to-back, 4003 # doing reload synchronously and two reloads happen back-to-back,
3700 # coro crashes during coro_state_free->destroy here. 4004 # coro crashes during coro_state_free->destroy here.
3701 4005
4006 $RELOAD_WATCHER ||= cf::async {
4007 Coro::AIO::aio_wait cache_extensions;
4008
3702 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4009 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3703 do_reload_perl; 4010 do_reload_perl;
3704 undef $RELOAD_WATCHER; 4011 undef $RELOAD_WATCHER;
4012 };
3705 }; 4013 };
3706} 4014}
3707 4015
3708register_command "reload" => sub { 4016register_command "reload" => sub {
3709 my ($who, $arg) = @_; 4017 my ($who, $arg) = @_;
3715 reload_perl; 4023 reload_perl;
3716 }; 4024 };
3717 } 4025 }
3718}; 4026};
3719 4027
3720unshift @INC, $LIBDIR; 4028#############################################################################
3721 4029
3722my $bug_warning = 0; 4030my $bug_warning = 0;
3723 4031
3724our @WAIT_FOR_TICK; 4032our @WAIT_FOR_TICK;
3725our @WAIT_FOR_TICK_BEGIN; 4033our @WAIT_FOR_TICK_BEGIN;
3726 4034
3727sub wait_for_tick { 4035sub wait_for_tick() {
3728 return if tick_inhibit || $Coro::current == $Coro::main; 4036 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3729 4037
3730 my $signal = new Coro::Signal; 4038 my $signal = new Coro::Signal;
3731 push @WAIT_FOR_TICK, $signal; 4039 push @WAIT_FOR_TICK, $signal;
3732 $signal->wait; 4040 $signal->wait;
3733} 4041}
3734 4042
3735sub wait_for_tick_begin { 4043sub wait_for_tick_begin() {
3736 return if tick_inhibit || $Coro::current == $Coro::main; 4044 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3737 4045
3738 my $signal = new Coro::Signal; 4046 my $signal = new Coro::Signal;
3739 push @WAIT_FOR_TICK_BEGIN, $signal; 4047 push @WAIT_FOR_TICK_BEGIN, $signal;
3740 $signal->wait; 4048 $signal->wait;
3741} 4049}
3747 return; 4055 return;
3748 } 4056 }
3749 4057
3750 cf::server_tick; # one server iteration 4058 cf::server_tick; # one server iteration
3751 4059
4060 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4061
3752 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4062 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3753 $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.;
3754 Coro::async_pool { 4064 Coro::async_pool {
3755 $Coro::current->{desc} = "runtime saver"; 4065 $Coro::current->{desc} = "runtime saver";
3756 write_runtime_sync 4066 write_runtime_sync
3757 or warn "ERROR: unable to write runtime file: $!"; 4067 or error "ERROR: unable to write runtime file: $!";
3758 }; 4068 };
3759 } 4069 }
3760 4070
3761 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4071 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3762 $sig->send; 4072 $sig->send;
3770 4080
3771 if (0) { 4081 if (0) {
3772 if ($NEXT_TICK) { 4082 if ($NEXT_TICK) {
3773 my $jitter = $TICK_START - $NEXT_TICK; 4083 my $jitter = $TICK_START - $NEXT_TICK;
3774 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4084 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3775 warn "jitter $JITTER\n";#d# 4085 debug "jitter $JITTER\n";#d#
3776 } 4086 }
3777 } 4087 }
3778} 4088}
3779 4089
3780{ 4090{
3781 # configure BDB 4091 # configure BDB
3782 4092
3783 BDB::min_parallel 8; 4093 BDB::min_parallel 16;
3784 BDB::max_poll_reqs $TICK * 0.1; 4094 BDB::max_poll_reqs $TICK * 0.1;
3785 $AnyEvent::BDB::WATCHER->priority (1); 4095 $AnyEvent::BDB::WATCHER->priority (1);
3786 4096
3787 unless ($DB_ENV) { 4097 unless ($DB_ENV) {
3788 $DB_ENV = BDB::db_env_create; 4098 $DB_ENV = BDB::db_env_create;
3868 LOG llevInfo, "[ABT] [suppressed]\n"; 4178 LOG llevInfo, "[ABT] [suppressed]\n";
3869 } 4179 }
3870} 4180}
3871 4181
3872# load additional modules 4182# load additional modules
3873use cf::pod; 4183require "cf/$_.pm" for @EXTRA_MODULES;
4184cf::_connect_to_perl_2;
3874 4185
3875END { cf::emergency_save } 4186END { cf::emergency_save }
3876 4187
38771 41881
3878 4189

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines