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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines