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.444 by root, Mon Sep 8 11:27:25 2008 UTC vs.
Revision 1.540 by root, Tue May 4 23:32:29 2010 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
18# 19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use 5.10.0; 25use common::sense;
25use utf8;
26use strict "vars", "subs";
27 26
28use Symbol; 27use Symbol;
29use List::Util; 28use List::Util;
30use Socket; 29use Socket;
31use EV; 30use EV;
32use Opcode; 31use Opcode;
33use Safe; 32use Safe;
34use Safe::Hole; 33use Safe::Hole;
35use Storable (); 34use Storable ();
35use Carp ();
36 36
37use Guard ();
37use Coro (); 38use Coro ();
38use Coro::State; 39use Coro::State;
39use Coro::Handle; 40use Coro::Handle;
40use Coro::EV; 41use Coro::EV;
41use Coro::AnyEvent; 42use Coro::AnyEvent;
42use Coro::Timer; 43use Coro::Timer;
43use Coro::Signal; 44use Coro::Signal;
44use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
45use Coro::AnyEvent; 47use Coro::AnyEvent;
46use Coro::AIO; 48use Coro::AIO;
47use Coro::BDB 1.6; 49use Coro::BDB 1.6;
48use Coro::Storable; 50use Coro::Storable;
49use Coro::Util (); 51use Coro::Util ();
50 52
51use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
52use BDB (); 54use BDB ();
53use Data::Dumper; 55use Data::Dumper;
54use Digest::MD5;
55use Fcntl; 56use Fcntl;
56use YAML (); 57use YAML::XS ();
57use IO::AIO (); 58use IO::AIO ();
58use Time::HiRes; 59use Time::HiRes;
59use Compress::LZF; 60use Compress::LZF;
60use Digest::MD5 (); 61use Digest::MD5 ();
61 62
63 64
64# configure various modules to our taste 65# configure various modules to our taste
65# 66#
66$Storable::canonical = 1; # reduce rsync transfers 67$Storable::canonical = 1; # reduce rsync transfers
67Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 68Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
69
70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
71
72# make sure c-lzf reinitialises itself
73Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
68Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 74Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
69 75
70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 76# strictly for debugging
77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
71 78
72sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
73 82
74our %COMMAND = (); 83our %COMMAND = ();
75our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
76 85
77our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
78our %EXTCMD = (); 87our %EXTCMD = ();
79our %EXTICMD = (); 88our %EXTICMD = ();
80our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
81our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
82 91
83our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
84our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
85 96
86our $CONFDIR = confdir; 97our $CONFDIR = confdir;
87our $DATADIR = datadir; 98our $DATADIR = datadir;
88our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
89our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
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;
1335 1423
1336 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1424 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1337 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1425 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1338 1426
1339 $ext{source} = 1427 $ext{source} =
1340 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1428 "package $pkg; use common::sense;\n"
1341 . "#line 1 \"$path\"\n{\n" 1429 . "#line 1 \"$path\"\n{\n"
1342 . $source 1430 . $source
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"; 1456 undef $@; # work around perl 5.10.0 utf-8 caching bug
1363 1457
1364 if (exists $v->{meta}{mandatory}) {
1365 warn $msg;
1366 cf::cleanup "mandatory extension failed to load, exiting."; 1458 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1367 } 1459 if exists $v->{meta}{mandatory};
1368 1460
1369 warn $msg; 1461 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1462 delete $todo{$k};
1463 } else {
1464 $done{$k} = delete $todo{$k};
1465 push @EXTS, $v->{pkg};
1466 $progress = 1;
1467
1468 info "$v->{base}: extension inactive.\n"
1469 unless $active;
1370 } 1470 }
1371
1372 $done{$k} = delete $todo{$k};
1373 push @EXTS, $v->{pkg};
1374 $progress = 1;
1375 } 1471 }
1376 1472
1377 skip: 1473 unless ($progress) {
1378 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1474 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1379 unless $progress; 1475
1476 while (my ($k, $v) = each %todo) {
1477 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1478 if exists $v->{meta}{mandatory};
1479 }
1480 }
1380 } 1481 }
1381 }; 1482 };
1382} 1483}
1383 1484
1384############################################################################# 1485#############################################################################
1385 1486
1386=back 1487=back
1387 1488
1388=head2 CORE EXTENSIONS 1489=head2 CORE EXTENSIONS
1389 1490
1390Functions and methods that extend core crossfire objects. 1491Functions and methods that extend core deliantra objects.
1391 1492
1392=cut 1493=cut
1393 1494
1394package cf::player; 1495package cf::player;
1395 1496
1438 1539
1439sub exists($) { 1540sub exists($) {
1440 my ($login) = @_; 1541 my ($login) = @_;
1441 1542
1442 $cf::PLAYER{$login} 1543 $cf::PLAYER{$login}
1443 or cf::sync_job { !aio_stat path $login } 1544 or !aio_stat path $login
1444} 1545}
1445 1546
1446sub find($) { 1547sub find($) {
1447 return $cf::PLAYER{$_[0]} || do { 1548 return $cf::PLAYER{$_[0]} || do {
1448 my $login = $_[0]; 1549 my $login = $_[0];
1468 $cf::PLAYER{$login} = $pl 1569 $cf::PLAYER{$login} = $pl
1469 } 1570 }
1470 } 1571 }
1471} 1572}
1472 1573
1574cf::player->attach (
1575 on_load => sub {
1576 my ($pl, $path) = @_;
1577
1578 # restore slots saved in save, below
1579 my $slots = delete $pl->{_slots};
1580
1581 $pl->ob->current_weapon ($slots->[0]);
1582 $pl->combat_ob ($slots->[1]);
1583 $pl->ranged_ob ($slots->[2]);
1584 },
1585);
1586
1473sub save($) { 1587sub save($) {
1474 my ($pl) = @_; 1588 my ($pl) = @_;
1475 1589
1476 return if $pl->{deny_save}; 1590 return if $pl->{deny_save};
1477 1591
1482 1596
1483 aio_mkdir playerdir $pl, 0770; 1597 aio_mkdir playerdir $pl, 0770;
1484 $pl->{last_save} = $cf::RUNTIME; 1598 $pl->{last_save} = $cf::RUNTIME;
1485 1599
1486 cf::get_slot 0.01; 1600 cf::get_slot 0.01;
1601
1602 # save slots, to be restored later
1603 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1487 1604
1488 $pl->save_pl ($path); 1605 $pl->save_pl ($path);
1489 cf::cede_to_tick; 1606 cf::cede_to_tick;
1490} 1607}
1491 1608
1528 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1645 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1529 1646
1530 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1647 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1531 $pl->deactivate; 1648 $pl->deactivate;
1532 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1649 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1533 $pl->ob->check_score;
1534 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1650 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1535 $pl->ns->destroy if $pl->ns; 1651 $pl->ns->destroy if $pl->ns;
1536 1652
1537 my $path = playerdir $pl; 1653 my $path = playerdir $pl;
1538 my $temp = "$path~$cf::RUNTIME~deleting~"; 1654 my $temp = "$path~$cf::RUNTIME~deleting~";
1593 \@logins 1709 \@logins
1594} 1710}
1595 1711
1596=item $player->maps 1712=item $player->maps
1597 1713
1714=item cf::player::maps $login
1715
1598Returns an arrayref of map paths that are private for this 1716Returns an arrayref of map paths that are private for this
1599player. May block. 1717player. May block.
1600 1718
1601=cut 1719=cut
1602 1720
1619 } 1737 }
1620 1738
1621 \@paths 1739 \@paths
1622} 1740}
1623 1741
1624=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1742=item $protocol_xml = $player->expand_cfpod ($cfpod)
1625 1743
1626Expand crossfire pod fragments into protocol xml. 1744Expand deliantra pod fragments into protocol xml.
1627 1745
1628=item $player->ext_reply ($msgid, @msg) 1746=item $player->ext_reply ($msgid, @msg)
1629 1747
1630Sends an ext reply to the player. 1748Sends an ext reply to the player.
1631 1749
1663 1781
1664=cut 1782=cut
1665 1783
1666sub find_by_path($) { 1784sub find_by_path($) {
1667 my ($path) = @_; 1785 my ($path) = @_;
1786
1787 $path =~ s/^~[^\/]*//; # skip ~login
1668 1788
1669 my ($match, $specificity); 1789 my ($match, $specificity);
1670 1790
1671 for my $region (list) { 1791 for my $region (list) {
1672 if ($region->{match} && $path =~ $region->{match}) { 1792 if ($region->{match} && $path =~ $region->{match}) {
1704 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1824 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1705 1825
1706 # mit "rum" bekleckern, nicht 1826 # mit "rum" bekleckern, nicht
1707 $self->_create_random_map ( 1827 $self->_create_random_map (
1708 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1828 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1709 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1829 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1710 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1830 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1711 $rmp->{exit_on_final_map}, 1831 $rmp->{exit_on_final_map},
1712 $rmp->{xsize}, $rmp->{ysize}, 1832 $rmp->{xsize}, $rmp->{ysize},
1713 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1833 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1714 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1834 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1729 1849
1730sub register { 1850sub register {
1731 my (undef, $regex, $prio) = @_; 1851 my (undef, $regex, $prio) = @_;
1732 my $pkg = caller; 1852 my $pkg = caller;
1733 1853
1734 no strict;
1735 push @{"$pkg\::ISA"}, __PACKAGE__; 1854 push @{"$pkg\::ISA"}, __PACKAGE__;
1736 1855
1737 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1856 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1738} 1857}
1739 1858
1740# also paths starting with '/' 1859# also paths starting with '/'
1741$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1860$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1742 1861
1743sub thawer_merge { 1862sub thawer_merge {
1744 my ($self, $merge) = @_; 1863 my ($self, $merge) = @_;
1745 1864
1746 # we have to keep some variables in memory intact 1865 # we have to keep some variables in memory intact
1844 1963
1845 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1964 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1846 "$UNIQUEDIR/$path" 1965 "$UNIQUEDIR/$path"
1847} 1966}
1848 1967
1849# and all this just because we cannot iterate over
1850# all maps in C++...
1851sub change_all_map_light {
1852 my ($change) = @_;
1853
1854 $_->change_map_light ($change)
1855 for grep $_->outdoor, values %cf::MAP;
1856}
1857
1858sub decay_objects { 1968sub decay_objects {
1859 my ($self) = @_; 1969 my ($self) = @_;
1860 1970
1861 return if $self->{deny_reset}; 1971 return if $self->{deny_reset};
1862 1972
1944sub find { 2054sub find {
1945 my ($path, $origin) = @_; 2055 my ($path, $origin) = @_;
1946 2056
1947 $path = normalise $path, $origin && $origin->path; 2057 $path = normalise $path, $origin && $origin->path;
1948 2058
1949 cf::lock_wait "map_data:$path";#d#remove 2059 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1950 cf::lock_wait "map_find:$path"; 2060 my $guard2 = cf::lock_acquire "map_find:$path";
1951 2061
1952 $cf::MAP{$path} || do { 2062 $cf::MAP{$path} || do {
1953 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1954 my $guard2 = cf::lock_acquire "map_find:$path";
1955
1956 my $map = new_from_path cf::map $path 2063 my $map = new_from_path cf::map $path
1957 or return; 2064 or return;
1958 2065
1959 $map->{last_save} = $cf::RUNTIME; 2066 $map->{last_save} = $cf::RUNTIME;
1960 2067
1972 2079
1973 $cf::MAP{$path} = $map 2080 $cf::MAP{$path} = $map
1974 } 2081 }
1975} 2082}
1976 2083
1977sub pre_load { } 2084sub pre_load { }
1978sub post_load { } 2085#sub post_load { } # XS
1979 2086
1980sub load { 2087sub load {
1981 my ($self) = @_; 2088 my ($self) = @_;
1982 2089
1983 local $self->{deny_reset} = 1; # loading can take a long time 2090 local $self->{deny_reset} = 1; # loading can take a long time
2028 unless ($self->{deny_activate}) { 2135 unless ($self->{deny_activate}) {
2029 $self->decay_objects; 2136 $self->decay_objects;
2030 $self->fix_auto_apply; 2137 $self->fix_auto_apply;
2031 $self->update_buttons; 2138 $self->update_buttons;
2032 cf::cede_to_tick; 2139 cf::cede_to_tick;
2033 $self->set_darkness_map;
2034 cf::cede_to_tick;
2035 $self->activate; 2140 $self->activate;
2036 } 2141 }
2037 2142
2038 $self->{last_save} = $cf::RUNTIME; 2143 $self->{last_save} = $cf::RUNTIME;
2039 $self->last_access ($cf::RUNTIME); 2144 $self->last_access ($cf::RUNTIME);
2042 } 2147 }
2043 2148
2044 $self->post_load; 2149 $self->post_load;
2045} 2150}
2046 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
2047sub customise_for { 2155sub customise_for {
2048 my ($self, $ob) = @_; 2156 my ($self, $ob) = @_;
2049 2157
2050 return find "~" . $ob->name . "/" . $self->{path} 2158 return find "~" . $ob->name . "/" . $self->{path}
2051 if $self->per_player; 2159 if $self->per_player;
2067 or next; 2175 or next;
2068 $neigh = find $neigh, $map 2176 $neigh = find $neigh, $map
2069 or next; 2177 or next;
2070 $neigh->load; 2178 $neigh->load;
2071 2179
2180 # now find the diagonal neighbours
2072 push @neigh, 2181 push @neigh,
2073 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2182 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2074 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2183 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2075 } 2184 }
2076 2185
2083} 2192}
2084 2193
2085sub find_sync { 2194sub find_sync {
2086 my ($path, $origin) = @_; 2195 my ($path, $origin) = @_;
2087 2196
2088 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
2089} 2201}
2090 2202
2091sub do_load_sync { 2203sub do_load_sync {
2092 my ($map) = @_; 2204 my ($map) = @_;
2093 2205
2094 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2206 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2095 if $Coro::current == $Coro::main; 2207 if $Coro::current == $Coro::main;
2096 2208
2097 cf::sync_job { $map->load }; 2209 $map->load;
2098} 2210}
2099 2211
2100our %MAP_PREFETCH; 2212our %MAP_PREFETCH;
2101our $MAP_PREFETCHER = undef; 2213our $MAP_PREFETCHER = undef;
2102 2214
2128 $MAP_PREFETCHER->prio (6); 2240 $MAP_PREFETCHER->prio (6);
2129 2241
2130 () 2242 ()
2131} 2243}
2132 2244
2245# common code, used by both ->save and ->swapout
2133sub save { 2246sub _save {
2134 my ($self) = @_; 2247 my ($self) = @_;
2135
2136 my $lock = cf::lock_acquire "map_data:$self->{path}";
2137 2248
2138 $self->{last_save} = $cf::RUNTIME; 2249 $self->{last_save} = $cf::RUNTIME;
2139 2250
2140 return unless $self->dirty; 2251 return unless $self->dirty;
2141 2252
2161 } else { 2272 } else {
2162 $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);
2163 } 2274 }
2164} 2275}
2165 2276
2277sub save {
2278 my ($self) = @_;
2279
2280 my $lock = cf::lock_acquire "map_data:$self->{path}";
2281
2282 $self->_save;
2283}
2284
2166sub swap_out { 2285sub swap_out {
2167 my ($self) = @_; 2286 my ($self) = @_;
2168 2287
2169 # save first because save cedes
2170 $self->save;
2171
2172 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2288 my $lock = cf::lock_acquire "map_data:$self->{path}";
2173 2289
2174 return if $self->players;
2175 return if $self->in_memory != cf::MAP_ACTIVE; 2290 return if $self->in_memory != cf::MAP_ACTIVE;
2176 return if $self->{deny_save}; 2291 return if $self->{deny_save};
2292 return if $self->players;
2177 2293
2294 # first deactivate the map and "unlink" it from the core
2295 $self->deactivate;
2296 $_->clear_links_to ($self) for values %cf::MAP;
2178 $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};
2179 2344
2180 $self->deactivate; 2345 $self->deactivate;
2181 $_->clear_links_to ($self) for values %cf::MAP; 2346 $_->clear_links_to ($self) for values %cf::MAP;
2182 $self->clear; 2347 $self->clear;
2183}
2184
2185sub reset_at {
2186 my ($self) = @_;
2187
2188 # TODO: safety, remove and allow resettable per-player maps
2189 return 1e99 if $self->{deny_reset};
2190
2191 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2192 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2193
2194 $time + $to
2195}
2196
2197sub should_reset {
2198 my ($self) = @_;
2199
2200 $self->reset_at <= $cf::RUNTIME
2201}
2202
2203sub reset {
2204 my ($self) = @_;
2205
2206 my $lock = cf::lock_acquire "map_data:$self->{path}";
2207
2208 return if $self->players;
2209
2210 warn "resetting map ", $self->path;
2211
2212 $self->in_memory (cf::MAP_SWAPPED);
2213
2214 # need to save uniques path
2215 unless ($self->{deny_save}) {
2216 my $uniq = $self->uniq_path; utf8::encode $uniq;
2217
2218 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2219 if $uniq;
2220 }
2221
2222 delete $cf::MAP{$self->path};
2223
2224 $self->deactivate;
2225 $_->clear_links_to ($self) for values %cf::MAP;
2226 $self->clear;
2227 2348
2228 $self->unlink_save; 2349 $self->unlink_save;
2229 $self->destroy; 2350 $self->destroy;
2230} 2351}
2231 2352
2239 2360
2240 delete $cf::MAP{$self->path}; 2361 delete $cf::MAP{$self->path};
2241 2362
2242 $self->unlink_save; 2363 $self->unlink_save;
2243 2364
2244 bless $self, "cf::map"; 2365 bless $self, "cf::map::wrap";
2245 delete $self->{deny_reset}; 2366 delete $self->{deny_reset};
2246 $self->{deny_save} = 1; 2367 $self->{deny_save} = 1;
2247 $self->reset_timeout (1); 2368 $self->reset_timeout (1);
2248 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2369 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2249 2370
2306 : normalise $_ 2427 : normalise $_
2307 } @{ aio_readdir $UNIQUEDIR or [] } 2428 } @{ aio_readdir $UNIQUEDIR or [] }
2308 ] 2429 ]
2309} 2430}
2310 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
2311=back 2464=back
2312 2465
2313=head3 cf::object 2466=head3 cf::object
2314 2467
2315=cut 2468=cut
2380 2533
2381our $SAY_CHANNEL = { 2534our $SAY_CHANNEL = {
2382 id => "say", 2535 id => "say",
2383 title => "Map", 2536 title => "Map",
2384 reply => "say ", 2537 reply => "say ",
2385 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.",
2386}; 2539};
2387 2540
2388our $CHAT_CHANNEL = { 2541our $CHAT_CHANNEL = {
2389 id => "chat", 2542 id => "chat",
2390 title => "Chat", 2543 title => "Chat",
2445 2598
2446=item $player_object->enter_link 2599=item $player_object->enter_link
2447 2600
2448Freezes 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}>).
2449 2602
2450The 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.
2451I<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.
2452 2607
2453Will never block. 2608Will never block.
2454 2609
2455=item $player_object->leave_link ($map, $x, $y) 2610=item $player_object->leave_link ($map, $x, $y)
2456 2611
2476sub cf::object::player::enter_link { 2631sub cf::object::player::enter_link {
2477 my ($self) = @_; 2632 my ($self) = @_;
2478 2633
2479 $self->deactivate_recursive; 2634 $self->deactivate_recursive;
2480 2635
2636 ++$self->{_link_recursion};
2637
2481 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2638 return if UNIVERSAL::isa $self->map, "ext::map_link";
2482 2639
2483 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2640 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2484 if $self->map && $self->map->{path} ne "{link}"; 2641 if $self->map && $self->map->{path} ne "{link}";
2485 2642
2486 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2643 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2487} 2644}
2488 2645
2489sub cf::object::player::leave_link { 2646sub cf::object::player::leave_link {
2490 my ($self, $map, $x, $y) = @_; 2647 my ($self, $map, $x, $y) = @_;
2491 2648
2508 ($x, $y) = (-1, -1) 2665 ($x, $y) = (-1, -1)
2509 unless (defined $x) && (defined $y); 2666 unless (defined $x) && (defined $y);
2510 2667
2511 # use -1 or undef as default coordinates, not 0, 0 2668 # use -1 or undef as default coordinates, not 0, 0
2512 ($x, $y) = ($map->enter_x, $map->enter_y) 2669 ($x, $y) = ($map->enter_x, $map->enter_y)
2513 if $x <=0 && $y <= 0; 2670 if $x <= 0 && $y <= 0;
2514 2671
2515 $map->load; 2672 $map->load;
2516 $map->load_neighbours; 2673 $map->load_neighbours;
2517 2674
2518 return unless $self->contr->active; 2675 return unless $self->contr->active;
2519 $self->activate_recursive;
2520 2676
2521 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2677 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2522 $self->enter_map ($map, $x, $y); 2678 if ($self->enter_map ($map, $x, $y)) {
2523} 2679 # entering was successful
2680 delete $self->{_link_recursion};
2681 # only activate afterwards, to support waiting in hooks
2682 $self->activate_recursive;
2683 }
2524 2684
2685}
2686
2525=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)]])
2526 2688
2527Moves 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
2528her, loading and preparing them map, calling the provided $check callback 2690her, loading and preparing them map, calling the provided $check callback
2529that 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
2530the 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
2537 2699
2538our $GOTOGEN; 2700our $GOTOGEN;
2539 2701
2540sub cf::object::player::goto { 2702sub cf::object::player::goto {
2541 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 }
2542 2710
2543 # 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
2544 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2712 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2545 2713
2546 $self->enter_link; 2714 $self->enter_link;
2570 my $map = eval { 2738 my $map = eval {
2571 my $map = defined $path ? cf::map::find $path : undef; 2739 my $map = defined $path ? cf::map::find $path : undef;
2572 2740
2573 if ($map) { 2741 if ($map) {
2574 $map = $map->customise_for ($self); 2742 $map = $map->customise_for ($self);
2575 $map = $check->($map) if $check && $map; 2743 $map = $check->($map, $x, $y, $self) if $check && $map;
2576 } else { 2744 } else {
2577 $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);
2578 } 2746 }
2579 2747
2580 $map 2748 $map
2588 if ($gen == $self->{_goto_generation}) { 2756 if ($gen == $self->{_goto_generation}) {
2589 delete $self->{_goto_generation}; 2757 delete $self->{_goto_generation};
2590 $self->leave_link ($map, $x, $y); 2758 $self->leave_link ($map, $x, $y);
2591 } 2759 }
2592 2760
2593 $done->() if $done; 2761 $done->($self) if $done;
2594 })->prio (1); 2762 })->prio (1);
2595} 2763}
2596 2764
2597=item $player_object->enter_exit ($exit_object) 2765=item $player_object->enter_exit ($exit_object)
2598 2766
2686 $self->contr->savebed ($map, $x, $y) 2854 $self->contr->savebed ($map, $x, $y)
2687 if $exit->flag (cf::FLAG_DAMNED); 2855 if $exit->flag (cf::FLAG_DAMNED);
2688 2856
2689 1 2857 1
2690 }) { 2858 }) {
2691 $self->message ("Something went wrong deep within the crossfire server. " 2859 $self->message ("Something went wrong deep within the deliantra server. "
2692 . "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. "
2693 . "Please report this to the dungeon master!", 2861 . "Please report this to the dungeon master!",
2694 cf::NDI_UNIQUE | cf::NDI_RED); 2862 cf::NDI_UNIQUE | cf::NDI_RED);
2695 2863
2696 warn "ERROR in enter_exit: $@"; 2864 error "ERROR in enter_exit: $@";
2697 $self->leave_link; 2865 $self->leave_link;
2698 } 2866 }
2699 })->prio (1); 2867 })->prio (1);
2700} 2868}
2701 2869
2713sub cf::client::send_drawinfo { 2881sub cf::client::send_drawinfo {
2714 my ($self, $text, $flags) = @_; 2882 my ($self, $text, $flags) = @_;
2715 2883
2716 utf8::encode $text; 2884 utf8::encode $text;
2717 $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);
2718} 2911}
2719 2912
2720=item $client->send_msg ($channel, $msg, $color, [extra...]) 2913=item $client->send_msg ($channel, $msg, $color, [extra...])
2721 2914
2722Send 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
2726 2919
2727=cut 2920=cut
2728 2921
2729# non-persistent channels (usually the info channel) 2922# non-persistent channels (usually the info channel)
2730our %CHANNEL = ( 2923our %CHANNEL = (
2924 "c/motd" => {
2925 id => "infobox",
2926 title => "MOTD",
2927 reply => undef,
2928 tooltip => "The message of the day",
2929 },
2731 "c/identify" => { 2930 "c/identify" => {
2732 id => "infobox", 2931 id => "infobox",
2733 title => "Identify", 2932 title => "Identify",
2734 reply => undef, 2933 reply => undef,
2735 tooltip => "Items recently identified", 2934 tooltip => "Items recently identified",
2737 "c/examine" => { 2936 "c/examine" => {
2738 id => "infobox", 2937 id => "infobox",
2739 title => "Examine", 2938 title => "Examine",
2740 reply => undef, 2939 reply => undef,
2741 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",
2742 }, 2947 },
2743 "c/book" => { 2948 "c/book" => {
2744 id => "infobox", 2949 id => "infobox",
2745 title => "Book", 2950 title => "Book",
2746 reply => undef, 2951 reply => undef,
2762 id => "infobox", 2967 id => "infobox",
2763 title => "Body Parts", 2968 title => "Body Parts",
2764 reply => undef, 2969 reply => undef,
2765 tooltip => "Shows which body parts you posess and are available", 2970 tooltip => "Shows which body parts you posess and are available",
2766 }, 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 },
2767 "c/uptime" => { 3008 "c/uptime" => {
2768 id => "infobox", 3009 id => "infobox",
2769 title => "Uptime", 3010 title => "Uptime",
2770 reply => undef, 3011 reply => undef,
2771 tooltip => "How long the server has been running since last restart", 3012 tooltip => "How long the server has been running since last restart",
2780 id => "party", 3021 id => "party",
2781 title => "Party", 3022 title => "Party",
2782 reply => "gsay ", 3023 reply => "gsay ",
2783 tooltip => "Messages and chat related to your party", 3024 tooltip => "Messages and chat related to your party",
2784 }, 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,
2785); 3034);
2786 3035
2787sub cf::client::send_msg { 3036sub cf::client::send_msg {
2788 my ($self, $channel, $msg, $color, @extra) = @_; 3037 my ($self, $channel, $msg, $color, @extra) = @_;
2789 3038
2790 $msg = $self->pl->expand_cfpod ($msg); 3039 $msg = $self->pl->expand_cfpod ($msg)
3040 unless $color & cf::NDI_VERBATIM;
2791 3041
2792 $color &= cf::NDI_CLIENT_MASK; # just in case... 3042 $color &= cf::NDI_CLIENT_MASK; # just in case...
2793 3043
2794 # check predefined channels, for the benefit of C 3044 # check predefined channels, for the benefit of C
2795 if ($CHANNEL{$channel}) { 3045 if ($CHANNEL{$channel}) {
2796 $channel = $CHANNEL{$channel}; 3046 $channel = $CHANNEL{$channel};
2797 3047
2798 $self->ext_msg (channel_info => $channel) 3048 $self->ext_msg (channel_info => $channel);
2799 if $self->can_msg;
2800
2801 $channel = $channel->{id}; 3049 $channel = $channel->{id};
2802 3050
2803 } elsif (ref $channel) { 3051 } elsif (ref $channel) {
2804 # send meta info to client, if not yet sent 3052 # send meta info to client, if not yet sent
2805 unless (exists $self->{channel}{$channel->{id}}) { 3053 unless (exists $self->{channel}{$channel->{id}}) {
2806 $self->{channel}{$channel->{id}} = $channel; 3054 $self->{channel}{$channel->{id}} = $channel;
2807 $self->ext_msg (channel_info => $channel) 3055 $self->ext_msg (channel_info => $channel);
2808 if $self->can_msg;
2809 } 3056 }
2810 3057
2811 $channel = $channel->{id}; 3058 $channel = $channel->{id};
2812 } 3059 }
2813 3060
2814 return unless @extra || length $msg; 3061 return unless @extra || length $msg;
2815 3062
2816 if ($self->can_msg) {
2817 # default colour, mask it out 3063 # default colour, mask it out
2818 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3064 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2819 if $color & cf::NDI_DEF; 3065 if $color & cf::NDI_DEF;
2820 3066
2821 my $pkt = "msg " 3067 my $pkt = "msg "
2822 . $self->{json_coder}->encode ( 3068 . $self->{json_coder}->encode (
2823 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3069 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2824 ); 3070 );
2825 3071
2826 # try lzf for large packets
2827 $pkt = "lzf " . Compress::LZF::compress $pkt
2828 if 1024 <= length $pkt and $self->{can_lzf};
2829
2830 # split very large packets
2831 if (8192 < length $pkt and $self->{can_lzf}) {
2832 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2833 $pkt = "frag";
2834 }
2835
2836 $self->send_packet ($pkt); 3072 $self->send_big_packet ($pkt);
2837 } else {
2838 if ($color >= 0) {
2839 # replace some tags by gcfclient-compatible ones
2840 for ($msg) {
2841 1 while
2842 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2843 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2844 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2845 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2846 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2847 }
2848
2849 $color &= cf::NDI_COLOR_MASK;
2850
2851 utf8::encode $msg;
2852
2853 if (0 && $msg =~ /\[/) {
2854 # COMMAND/INFO
2855 $self->send_packet ("drawextinfo $color 10 8 $msg")
2856 } else {
2857 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2858 $self->send_packet ("drawinfo $color $msg")
2859 }
2860 }
2861 }
2862} 3073}
2863 3074
2864=item $client->ext_msg ($type, @msg) 3075=item $client->ext_msg ($type, @msg)
2865 3076
2866Sends an ext event to the client. 3077Sends an ext event to the client.
2869 3080
2870sub cf::client::ext_msg($$@) { 3081sub cf::client::ext_msg($$@) {
2871 my ($self, $type, @msg) = @_; 3082 my ($self, $type, @msg) = @_;
2872 3083
2873 if ($self->extcmd == 2) { 3084 if ($self->extcmd == 2) {
2874 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3085 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2875 } elsif ($self->extcmd == 1) { # TODO: remove 3086 } elsif ($self->extcmd == 1) { # TODO: remove
2876 push @msg, msgtype => "event_$type"; 3087 push @msg, msgtype => "event_$type";
2877 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3088 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2878 } 3089 }
2879} 3090}
2880 3091
2881=item $client->ext_reply ($msgid, @msg) 3092=item $client->ext_reply ($msgid, @msg)
2882 3093
2886 3097
2887sub cf::client::ext_reply($$@) { 3098sub cf::client::ext_reply($$@) {
2888 my ($self, $id, @msg) = @_; 3099 my ($self, $id, @msg) = @_;
2889 3100
2890 if ($self->extcmd == 2) { 3101 if ($self->extcmd == 2) {
2891 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3102 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2892 } elsif ($self->extcmd == 1) { 3103 } elsif ($self->extcmd == 1) {
2893 #TODO: version 1, remove 3104 #TODO: version 1, remove
2894 unshift @msg, msgtype => "reply", msgid => $id; 3105 unshift @msg, msgtype => "reply", msgid => $id;
2895 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3106 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2896 } 3107 }
2897} 3108}
2898 3109
2899=item $success = $client->query ($flags, "text", \&cb) 3110=item $success = $client->query ($flags, "text", \&cb)
2900 3111
2971 3182
2972 $ns->ext_reply ($reply, @reply) 3183 $ns->ext_reply ($reply, @reply)
2973 if $reply; 3184 if $reply;
2974 3185
2975 } else { 3186 } else {
2976 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";
2977 } 3188 }
2978 3189
2979 cf::override; 3190 cf::override;
2980 }, 3191 },
2981); 3192);
3001 3212
3002 $coro 3213 $coro
3003} 3214}
3004 3215
3005cf::client->attach ( 3216cf::client->attach (
3006 on_destroy => sub { 3217 on_client_destroy => sub {
3007 my ($ns) = @_; 3218 my ($ns) = @_;
3008 3219
3009 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3220 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3010 }, 3221 },
3011); 3222);
3027our $safe_hole = new Safe::Hole; 3238our $safe_hole = new Safe::Hole;
3028 3239
3029$SIG{FPE} = 'IGNORE'; 3240$SIG{FPE} = 'IGNORE';
3030 3241
3031$safe->permit_only (Opcode::opset qw( 3242$safe->permit_only (Opcode::opset qw(
3032 :base_core :base_mem :base_orig :base_math 3243 :base_core :base_mem :base_orig :base_math :base_loop
3033 grepstart grepwhile mapstart mapwhile 3244 grepstart grepwhile mapstart mapwhile
3034 sort time 3245 sort time
3035)); 3246));
3036 3247
3037# here we export the classes and methods available to script code 3248# here we export the classes and methods available to script code
3041The following functions and methods are available within a safe environment: 3252The following functions and methods are available within a safe environment:
3042 3253
3043 cf::object 3254 cf::object
3044 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
3045 insert remove name archname title slaying race decrease split 3256 insert remove name archname title slaying race decrease split
3257 value
3046 3258
3047 cf::object::player 3259 cf::object::player
3048 player 3260 player
3049 3261
3050 cf::player 3262 cf::player
3056=cut 3268=cut
3057 3269
3058for ( 3270for (
3059 ["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
3060 insert remove inv nrof name archname title slaying race 3272 insert remove inv nrof name archname title slaying race
3061 decrease split destroy change_exp)], 3273 decrease split destroy change_exp value msg lore send_msg)],
3062 ["cf::object::player" => qw(player)], 3274 ["cf::object::player" => qw(player)],
3063 ["cf::player" => qw(peaceful)], 3275 ["cf::player" => qw(peaceful send_msg)],
3064 ["cf::map" => qw(trigger)], 3276 ["cf::map" => qw(trigger)],
3065) { 3277) {
3066 no strict 'refs';
3067 my ($pkg, @funs) = @$_; 3278 my ($pkg, @funs) = @$_;
3068 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3279 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3069 for @funs; 3280 for @funs;
3070} 3281}
3071 3282
3086 3297
3087 my $qcode = $code; 3298 my $qcode = $code;
3088 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3299 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3089 $qcode =~ s/\n/\\n/g; 3300 $qcode =~ s/\n/\\n/g;
3090 3301
3302 %vars = (_dummy => 0) unless %vars;
3303
3304 my @res;
3091 local $_; 3305 local $_;
3092 local @safe::cf::_safe_eval_args = values %vars;
3093 3306
3094 my $eval = 3307 my $eval =
3095 "do {\n" 3308 "do {\n"
3096 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3309 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3097 . "#line 0 \"{$qcode}\"\n" 3310 . "#line 0 \"{$qcode}\"\n"
3098 . $code 3311 . $code
3099 . "\n}" 3312 . "\n}"
3100 ; 3313 ;
3101 3314
3315 if ($CFG{safe_eval}) {
3102 sub_generation_inc; 3316 sub_generation_inc;
3317 local @safe::cf::_safe_eval_args = values %vars;
3103 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3318 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3104 sub_generation_inc; 3319 sub_generation_inc;
3320 } else {
3321 local @cf::_safe_eval_args = values %vars;
3322 @res = wantarray ? eval eval : scalar eval $eval;
3323 }
3105 3324
3106 if ($@) { 3325 if ($@) {
3107 warn "$@"; 3326 warn "$@",
3108 warn "while executing safe code '$code'\n"; 3327 "while executing safe code '$code'\n",
3109 warn "with arguments " . (join " ", %vars) . "\n"; 3328 "with arguments " . (join " ", %vars) . "\n";
3110 } 3329 }
3111 3330
3112 wantarray ? @res : $res[0] 3331 wantarray ? @res : $res[0]
3113} 3332}
3114 3333
3128=cut 3347=cut
3129 3348
3130sub register_script_function { 3349sub register_script_function {
3131 my ($fun, $cb) = @_; 3350 my ($fun, $cb) = @_;
3132 3351
3133 no strict 'refs'; 3352 $fun = "safe::$fun" if $CFG{safe_eval};
3134 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3353 *$fun = $safe_hole->wrap ($cb);
3135} 3354}
3136 3355
3137=back 3356=back
3138 3357
3139=cut 3358=cut
3140 3359
3141############################################################################# 3360#############################################################################
3142# the server's init and main functions 3361# the server's init and main functions
3362
3363# async inc loader. yay.
3364sub inc_loader {
3365 my $mod = $_[1];
3366
3367 if (in_main && !tick_inhibit) {
3368 Carp::cluck "ERROR: attempted synchronous perl module load ($mod)";
3369 } else {
3370 debug "loading perl module $mod\n";
3371 }
3372
3373 # 1. find real file
3374 for my $dir (@ORIG_INC) {
3375 warn "$dir/$mod\n";#d#
3376 ref $dir and next;
3377 0 <= Coro::AIO::aio_load "$dir/$mod", my $data
3378 or next;
3379
3380 $data = "#line 1 $dir/$mod\n$data";
3381
3382 open my $fh, "<", \$data or die;
3383
3384 return $fh;
3385 }
3386
3387 ()
3388}
3389
3390sub init_inc {
3391 # save original @INC
3392 @ORIG_INC = ($LIBDIR, @INC) unless @ORIG_INC;
3393
3394 # make sure we can do scalar-opens
3395 open my $dummy, "<", \my $dummy2;
3396
3397 # execute some stuff so perl load's some of the core modules
3398 /Ü/ =~ /ü/i;
3399 eval { &Storable::nstore_fd };
3400
3401 @INC = (\&inc_loader, @ORIG_INC); # @ORIG_INC is needed for DynaLoader, AutoLoad etc.
3402
3403 debug "module loading will be asynchronous from this point on.";
3404}
3143 3405
3144sub load_facedata($) { 3406sub load_facedata($) {
3145 my ($path) = @_; 3407 my ($path) = @_;
3146 3408
3147 # HACK to clear player env face cache, we need some signal framework 3409 # HACK to clear player env face cache, we need some signal framework
3148 # for this (global event?) 3410 # for this (global event?)
3149 %ext::player_env::MUSIC_FACE_CACHE = (); 3411 %ext::player_env::MUSIC_FACE_CACHE = ();
3150 3412
3151 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3413 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3152 3414
3153 warn "loading facedata from $path\n"; 3415 trace "loading facedata from $path\n";
3154 3416
3155 my $facedata; 3417 my $facedata;
3156 0 < aio_load $path, $facedata 3418 0 < aio_load $path, $facedata
3157 or die "$path: $!"; 3419 or die "$path: $!";
3158 3420
3160 3422
3161 $facedata->{version} == 2 3423 $facedata->{version} == 2
3162 or cf::cleanup "$path: version mismatch, cannot proceed."; 3424 or cf::cleanup "$path: version mismatch, cannot proceed.";
3163 3425
3164 # patch in the exptable 3426 # patch in the exptable
3427 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3165 $facedata->{resource}{"res/exp_table"} = { 3428 $facedata->{resource}{"res/exp_table"} = {
3166 type => FT_RSRC, 3429 type => FT_RSRC,
3167 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3430 data => $exp_table,
3431 hash => (Digest::MD5::md5 $exp_table),
3168 }; 3432 };
3169 cf::cede_to_tick; 3433 cf::cede_to_tick;
3170 3434
3171 { 3435 {
3172 my $faces = $facedata->{faceinfo}; 3436 my $faces = $facedata->{faceinfo};
3174 while (my ($face, $info) = each %$faces) { 3438 while (my ($face, $info) = each %$faces) {
3175 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3439 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3176 3440
3177 cf::face::set_visibility $idx, $info->{visibility}; 3441 cf::face::set_visibility $idx, $info->{visibility};
3178 cf::face::set_magicmap $idx, $info->{magicmap}; 3442 cf::face::set_magicmap $idx, $info->{magicmap};
3179 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3443 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3180 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3444 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3181 3445
3182 cf::cede_to_tick; 3446 cf::cede_to_tick;
3183 } 3447 }
3184 3448
3185 while (my ($face, $info) = each %$faces) { 3449 while (my ($face, $info) = each %$faces) {
3190 3454
3191 if (my $smooth = cf::face::find $info->{smooth}) { 3455 if (my $smooth = cf::face::find $info->{smooth}) {
3192 cf::face::set_smooth $idx, $smooth; 3456 cf::face::set_smooth $idx, $smooth;
3193 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3457 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3194 } else { 3458 } else {
3195 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3459 error "smooth face '$info->{smooth}' not found for face '$face'";
3196 } 3460 }
3197 3461
3198 cf::cede_to_tick; 3462 cf::cede_to_tick;
3199 } 3463 }
3200 } 3464 }
3209 3473
3210 cf::anim::invalidate_all; # d'oh 3474 cf::anim::invalidate_all; # d'oh
3211 } 3475 }
3212 3476
3213 { 3477 {
3214 # TODO: for gcfclient pleasure, we should give resources
3215 # that gcfclient doesn't grok a >10000 face index.
3216 my $res = $facedata->{resource}; 3478 my $res = $facedata->{resource};
3217 3479
3218 while (my ($name, $info) = each %$res) { 3480 while (my ($name, $info) = each %$res) {
3219 if (defined $info->{type}) { 3481 if (defined $info->{type}) {
3220 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3482 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3221 my $data;
3222 3483
3223 if ($info->{type} & 1) { 3484 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3224 # prepend meta info
3225
3226 my $meta = $enc->encode ({
3227 name => $name,
3228 %{ $info->{meta} || {} },
3229 });
3230
3231 $data = pack "(w/a*)*", $meta, $info->{data};
3232 } else {
3233 $data = $info->{data};
3234 }
3235
3236 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3237 cf::face::set_type $idx, $info->{type}; 3485 cf::face::set_type $idx, $info->{type};
3238 } else { 3486 } else {
3239 $RESOURCE{$name} = $info; 3487 $RESOURCE{$name} = $info; # unused
3240 } 3488 }
3241 3489
3242 cf::cede_to_tick; 3490 cf::cede_to_tick;
3243 } 3491 }
3244 } 3492 }
3245 3493
3246 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3494 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3247 3495
3248 1 3496 1
3249} 3497}
3250
3251cf::global->attach (on_resource_update => sub {
3252 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3253 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3254
3255 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3256 my $sound = $soundconf->{compat}[$_]
3257 or next;
3258
3259 my $face = cf::face::find "sound/$sound->[1]";
3260 cf::sound::set $sound->[0] => $face;
3261 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3262 }
3263
3264 while (my ($k, $v) = each %{$soundconf->{event}}) {
3265 my $face = cf::face::find "sound/$v";
3266 cf::sound::set $k => $face;
3267 }
3268 }
3269});
3270 3498
3271register_exticmd fx_want => sub { 3499register_exticmd fx_want => sub {
3272 my ($ns, $want) = @_; 3500 my ($ns, $want) = @_;
3273 3501
3274 while (my ($k, $v) = each %$want) { 3502 while (my ($k, $v) = each %$want) {
3313sub reload_treasures { 3541sub reload_treasures {
3314 load_resource_file "$DATADIR/treasures" 3542 load_resource_file "$DATADIR/treasures"
3315 or die "unable to load treasurelists\n"; 3543 or die "unable to load treasurelists\n";
3316} 3544}
3317 3545
3546sub reload_sound {
3547 trace "loading sound config from $DATADIR/sound\n";
3548
3549 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3550 or die "$DATADIR/sound $!";
3551
3552 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3553
3554 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3555 my $sound = $soundconf->{compat}[$_]
3556 or next;
3557
3558 my $face = cf::face::find "sound/$sound->[1]";
3559 cf::sound::set $sound->[0] => $face;
3560 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3561 }
3562
3563 while (my ($k, $v) = each %{$soundconf->{event}}) {
3564 my $face = cf::face::find "sound/$v";
3565 cf::sound::set $k => $face;
3566 }
3567}
3568
3318sub reload_resources { 3569sub reload_resources {
3319 warn "reloading resource files...\n"; 3570 trace "reloading resource files...\n";
3320 3571
3321 reload_facedata; 3572 reload_facedata;
3573 reload_sound;
3322 reload_archetypes; 3574 reload_archetypes;
3323 reload_regions; 3575 reload_regions;
3324 reload_treasures; 3576 reload_treasures;
3325 3577
3326 warn "finished reloading resource files\n"; 3578 trace "finished reloading resource files\n";
3327}
3328
3329sub init {
3330 my $guard = freeze_mainloop;
3331
3332 evthread_start IO::AIO::poll_fileno;
3333
3334 reload_resources;
3335} 3579}
3336 3580
3337sub reload_config { 3581sub reload_config {
3582 trace "reloading config file...\n";
3583
3338 open my $fh, "<:utf8", "$CONFDIR/config" 3584 open my $fh, "<:utf8", "$CONFDIR/config"
3339 or return; 3585 or return;
3340 3586
3341 local $/; 3587 local $/;
3342 *CFG = YAML::Load <$fh>; 3588 *CFG = YAML::XS::Load scalar <$fh>;
3343 3589
3344 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3590 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3345 3591
3346 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3592 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3347 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3593 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3348 3594
3349 if (exists $CFG{mlockall}) { 3595 if (exists $CFG{mlockall}) {
3351 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3597 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3352 and die "WARNING: m(un)lockall failed: $!\n"; 3598 and die "WARNING: m(un)lockall failed: $!\n";
3353 }; 3599 };
3354 warn $@ if $@; 3600 warn $@ if $@;
3355 } 3601 }
3602
3603 trace "finished reloading resource files\n";
3604}
3605
3606sub pidfile() {
3607 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3608 or die "$PIDFILE: $!";
3609 flock $fh, &Fcntl::LOCK_EX
3610 or die "$PIDFILE: flock: $!";
3611 $fh
3612}
3613
3614# make sure only one server instance is running at any one time
3615sub atomic {
3616 my $fh = pidfile;
3617
3618 my $pid = <$fh>;
3619 kill 9, $pid if $pid > 0;
3620
3621 seek $fh, 0, 0;
3622 print $fh $$;
3623}
3624
3625sub main_loop {
3626 trace "EV::loop starting\n";
3627 if (1) {
3628 EV::loop;
3629 }
3630 trace "EV::loop returned\n";
3631 goto &main_loop unless $REALLY_UNLOOP;
3356} 3632}
3357 3633
3358sub main { 3634sub main {
3635 cf::init_globals; # initialise logging
3636
3637 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3638 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3639 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3640 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3641
3642 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3643
3359 # we must not ever block the main coroutine 3644 # we must not ever block the main coroutine
3360 local $Coro::idle = sub { 3645 local $Coro::idle = sub {
3361 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3646 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3362 (async { 3647 (async {
3363 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3648 $Coro::current->{desc} = "IDLE BUG HANDLER";
3364 EV::loop EV::LOOP_ONESHOT; 3649 EV::loop EV::LOOP_ONESHOT;
3365 })->prio (Coro::PRIO_MAX); 3650 })->prio (Coro::PRIO_MAX);
3366 }; 3651 };
3367 3652
3368 { 3653 evthread_start IO::AIO::poll_fileno;
3369 my $guard = freeze_mainloop; 3654
3655 cf::sync_job {
3656 init_inc;
3657
3658 cf::init_experience;
3659 cf::init_anim;
3660 cf::init_attackmess;
3661 cf::init_dynamic;
3662
3663 cf::load_settings;
3664 cf::load_materials;
3665
3666 reload_resources;
3370 reload_config; 3667 reload_config;
3371 db_init; 3668 db_init;
3669
3670 cf::init_uuid;
3671 cf::init_signals;
3672 cf::init_skills;
3673
3674 cf::init_beforeplay;
3675
3676 atomic;
3677
3372 load_extensions; 3678 load_extensions;
3373 3679
3374 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3680 utime time, time, $RUNTIMEFILE;
3681
3682 # no (long-running) fork's whatsoever before this point(!)
3683 use POSIX ();
3684 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3685
3686 (pop @POST_INIT)->(0) while @POST_INIT;
3375 } 3687 };
3376 3688
3377 EV::loop; 3689 cf::object::thawer::errors_are_fatal 0;
3690 info "parse errors in files are no longer fatal from this point on.\n";
3691
3692 my $free_main; $free_main = EV::idle sub {
3693 undef $free_main;
3694 undef &main; # free gobs of memory :)
3695 };
3696
3697 goto &main_loop;
3378} 3698}
3379 3699
3380############################################################################# 3700#############################################################################
3381# initialisation and cleanup 3701# initialisation and cleanup
3382 3702
3383# install some emergency cleanup handlers 3703# install some emergency cleanup handlers
3384BEGIN { 3704BEGIN {
3385 our %SIGWATCHER = (); 3705 our %SIGWATCHER = ();
3386 for my $signal (qw(INT HUP TERM)) { 3706 for my $signal (qw(INT HUP TERM)) {
3387 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3707 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3388 cf::cleanup "SIG$signal"; 3708 cf::cleanup "SIG$signal";
3389 }; 3709 };
3390 } 3710 }
3391} 3711}
3392 3712
3393sub write_runtime_sync { 3713sub write_runtime_sync {
3394 my $runtime = "$LOCALDIR/runtime"; 3714 my $t0 = AE::time;
3395 3715
3396 # first touch the runtime file to show we are still running: 3716 # first touch the runtime file to show we are still running:
3397 # the fsync below can take a very very long time. 3717 # the fsync below can take a very very long time.
3398 3718
3399 IO::AIO::aio_utime $runtime, undef, undef; 3719 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3400 3720
3401 my $guard = cf::lock_acquire "write_runtime"; 3721 my $guard = cf::lock_acquire "write_runtime";
3402 3722
3403 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3723 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3404 or return; 3724 or return;
3405 3725
3406 my $value = $cf::RUNTIME + 90 + 10; 3726 my $value = $cf::RUNTIME + 90 + 10;
3407 # 10 is the runtime save interval, for a monotonic clock 3727 # 10 is the runtime save interval, for a monotonic clock
3408 # 60 allows for the watchdog to kill the server. 3728 # 60 allows for the watchdog to kill the server.
3418 aio_utime $fh, undef, undef; 3738 aio_utime $fh, undef, undef;
3419 3739
3420 close $fh 3740 close $fh
3421 or return; 3741 or return;
3422 3742
3423 aio_rename "$runtime~", $runtime 3743 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3424 and return; 3744 and return;
3425 3745
3426 warn "runtime file written.\n"; 3746 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3427 3747
3428 1 3748 1
3429} 3749}
3430 3750
3431our $uuid_lock; 3751our $uuid_lock;
3440 my $uuid = "$LOCALDIR/uuid"; 3760 my $uuid = "$LOCALDIR/uuid";
3441 3761
3442 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3762 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3443 or return; 3763 or return;
3444 3764
3445 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3765 my $value = uuid_seq uuid_cur;
3766
3767 unless ($value) {
3768 info "cowardly refusing to write zero uuid value!\n";
3769 return;
3770 }
3771
3772 my $value = uuid_str $value + $uuid_skip;
3446 $uuid_skip = 0; 3773 $uuid_skip = 0;
3447 3774
3448 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3775 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3449 and return; 3776 and return;
3450 3777
3456 or return; 3783 or return;
3457 3784
3458 aio_rename "$uuid~", $uuid 3785 aio_rename "$uuid~", $uuid
3459 and return; 3786 and return;
3460 3787
3461 warn "uuid file written ($value).\n"; 3788 trace "uuid file written ($value).\n";
3462 3789
3463 1 3790 1
3464 3791
3465} 3792}
3466 3793
3472} 3799}
3473 3800
3474sub emergency_save() { 3801sub emergency_save() {
3475 my $freeze_guard = cf::freeze_mainloop; 3802 my $freeze_guard = cf::freeze_mainloop;
3476 3803
3477 warn "enter emergency perl save\n"; 3804 info "emergency_perl_save: enter\n";
3805
3806 # this is a trade-off: we want to be very quick here, so
3807 # save all maps without fsync, and later call a global sync
3808 # (which in turn might be very very slow)
3809 local $USE_FSYNC = 0;
3478 3810
3479 cf::sync_job { 3811 cf::sync_job {
3812 cf::write_runtime_sync; # external watchdog should not bark
3813
3480 # use a peculiar iteration method to avoid tripping on perl 3814 # use a peculiar iteration method to avoid tripping on perl
3481 # refcount bugs in for. also avoids problems with players 3815 # refcount bugs in for. also avoids problems with players
3482 # and maps saved/destroyed asynchronously. 3816 # and maps saved/destroyed asynchronously.
3483 warn "begin emergency player save\n"; 3817 info "emergency_perl_save: begin player save\n";
3484 for my $login (keys %cf::PLAYER) { 3818 for my $login (keys %cf::PLAYER) {
3485 my $pl = $cf::PLAYER{$login} or next; 3819 my $pl = $cf::PLAYER{$login} or next;
3486 $pl->valid or next; 3820 $pl->valid or next;
3487 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3821 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3488 $pl->save; 3822 $pl->save;
3489 } 3823 }
3490 warn "end emergency player save\n"; 3824 info "emergency_perl_save: end player save\n";
3491 3825
3492 warn "begin emergency map save\n"; 3826 cf::write_runtime_sync; # external watchdog should not bark
3827
3828 info "emergency_perl_save: begin map save\n";
3493 for my $path (keys %cf::MAP) { 3829 for my $path (keys %cf::MAP) {
3494 my $map = $cf::MAP{$path} or next; 3830 my $map = $cf::MAP{$path} or next;
3495 $map->valid or next; 3831 $map->valid or next;
3496 $map->save; 3832 $map->save;
3497 } 3833 }
3498 warn "end emergency map save\n"; 3834 info "emergency_perl_save: end map save\n";
3499 3835
3500 warn "begin emergency database checkpoint\n"; 3836 cf::write_runtime_sync; # external watchdog should not bark
3837
3838 info "emergency_perl_save: begin database checkpoint\n";
3501 BDB::db_env_txn_checkpoint $DB_ENV; 3839 BDB::db_env_txn_checkpoint $DB_ENV;
3502 warn "end emergency database checkpoint\n"; 3840 info "emergency_perl_save: end database checkpoint\n";
3503 3841
3504 warn "begin write uuid\n"; 3842 info "emergency_perl_save: begin write uuid\n";
3505 write_uuid_sync 1; 3843 write_uuid_sync 1;
3506 warn "end write uuid\n"; 3844 info "emergency_perl_save: end write uuid\n";
3845
3846 cf::write_runtime_sync; # external watchdog should not bark
3847
3848 trace "emergency_perl_save: syncing database to disk";
3849 BDB::db_env_txn_checkpoint $DB_ENV;
3850
3851 info "emergency_perl_save: starting sync\n";
3852 IO::AIO::aio_sync sub {
3853 info "emergency_perl_save: finished sync\n";
3854 };
3855
3856 cf::write_runtime_sync; # external watchdog should not bark
3857
3858 trace "emergency_perl_save: flushing outstanding aio requests";
3859 while (IO::AIO::nreqs || BDB::nreqs) {
3860 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3861 }
3862
3863 cf::write_runtime_sync; # external watchdog should not bark
3507 }; 3864 };
3508 3865
3509 warn "leave emergency perl save\n"; 3866 info "emergency_perl_save: leave\n";
3510} 3867}
3511 3868
3512sub post_cleanup { 3869sub post_cleanup {
3513 my ($make_core) = @_; 3870 my ($make_core) = @_;
3514 3871
3872 IO::AIO::flush;
3873
3515 warn Carp::longmess "post_cleanup backtrace" 3874 error Carp::longmess "post_cleanup backtrace"
3516 if $make_core; 3875 if $make_core;
3876
3877 my $fh = pidfile;
3878 unlink $PIDFILE if <$fh> == $$;
3517} 3879}
3518 3880
3519# a safer delete_package, copied from Symbol 3881# a safer delete_package, copied from Symbol
3520sub clear_package($) { 3882sub clear_package($) {
3521 my $pkg = shift; 3883 my $pkg = shift;
3537 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3899 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3538 for my $name (keys %$leaf_symtab) { 3900 for my $name (keys %$leaf_symtab) {
3539 _gv_clear *{"$pkg$name"}; 3901 _gv_clear *{"$pkg$name"};
3540# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3902# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3541 } 3903 }
3542 warn "cleared package #$pkg\n";#d#
3543} 3904}
3544
3545our $RELOAD; # how many times to reload
3546 3905
3547sub do_reload_perl() { 3906sub do_reload_perl() {
3548 # can/must only be called in main 3907 # can/must only be called in main
3549 if ($Coro::current != $Coro::main) { 3908 if (in_main) {
3550 warn "can only reload from main coroutine"; 3909 error "can only reload from main coroutine";
3551 return; 3910 return;
3552 } 3911 }
3553 3912
3554 return if $RELOAD++; 3913 return if $RELOAD++;
3555 3914
3915 my $t1 = AE::time;
3916
3556 while ($RELOAD) { 3917 while ($RELOAD) {
3557 warn "reloading..."; 3918 info "reloading...";
3558 3919
3559 warn "entering sync_job"; 3920 trace "entering sync_job";
3560 3921
3561 cf::sync_job { 3922 cf::sync_job {
3562 cf::write_runtime_sync; # external watchdog should not bark
3563 cf::emergency_save; 3923 cf::emergency_save;
3564 cf::write_runtime_sync; # external watchdog should not bark
3565 3924
3566 warn "syncing database to disk";
3567 BDB::db_env_txn_checkpoint $DB_ENV;
3568
3569 # if anything goes wrong in here, we should simply crash as we already saved
3570
3571 warn "flushing outstanding aio requests";
3572 while (IO::AIO::nreqs || BDB::nreqs) {
3573 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3574 }
3575
3576 warn "cancelling all extension coros"; 3925 trace "cancelling all extension coros";
3577 $_->cancel for values %EXT_CORO; 3926 $_->cancel for values %EXT_CORO;
3578 %EXT_CORO = (); 3927 %EXT_CORO = ();
3579 3928
3580 warn "removing commands"; 3929 trace "removing commands";
3581 %COMMAND = (); 3930 %COMMAND = ();
3582 3931
3583 warn "removing ext/exti commands"; 3932 trace "removing ext/exti commands";
3584 %EXTCMD = (); 3933 %EXTCMD = ();
3585 %EXTICMD = (); 3934 %EXTICMD = ();
3586 3935
3587 warn "unloading/nuking all extensions"; 3936 trace "unloading/nuking all extensions";
3588 for my $pkg (@EXTS) { 3937 for my $pkg (@EXTS) {
3589 warn "... unloading $pkg"; 3938 trace "... unloading $pkg";
3590 3939
3591 if (my $cb = $pkg->can ("unload")) { 3940 if (my $cb = $pkg->can ("unload")) {
3592 eval { 3941 eval {
3593 $cb->($pkg); 3942 $cb->($pkg);
3594 1 3943 1
3595 } or warn "$pkg unloaded, but with errors: $@"; 3944 } or error "$pkg unloaded, but with errors: $@";
3596 } 3945 }
3597 3946
3598 warn "... clearing $pkg"; 3947 trace "... clearing $pkg";
3599 clear_package $pkg; 3948 clear_package $pkg;
3600 } 3949 }
3601 3950
3602 warn "unloading all perl modules loaded from $LIBDIR"; 3951 trace "unloading all perl modules loaded from $LIBDIR";
3603 while (my ($k, $v) = each %INC) { 3952 while (my ($k, $v) = each %INC) {
3604 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3953 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3605 3954
3606 warn "... unloading $k"; 3955 trace "... unloading $k";
3607 delete $INC{$k}; 3956 delete $INC{$k};
3608 3957
3609 $k =~ s/\.pm$//; 3958 $k =~ s/\.pm$//;
3610 $k =~ s/\//::/g; 3959 $k =~ s/\//::/g;
3611 3960
3614 } 3963 }
3615 3964
3616 clear_package $k; 3965 clear_package $k;
3617 } 3966 }
3618 3967
3619 warn "getting rid of safe::, as good as possible"; 3968 trace "getting rid of safe::, as good as possible";
3620 clear_package "safe::$_" 3969 clear_package "safe::$_"
3621 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3970 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3622 3971
3623 warn "unloading cf.pm \"a bit\""; 3972 trace "unloading cf.pm \"a bit\"";
3624 delete $INC{"cf.pm"}; 3973 delete $INC{"cf.pm"};
3625 delete $INC{"cf/pod.pm"}; 3974 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3626 3975
3627 # don't, removes xs symbols, too, 3976 # don't, removes xs symbols, too,
3628 # and global variables created in xs 3977 # and global variables created in xs
3629 #clear_package __PACKAGE__; 3978 #clear_package __PACKAGE__;
3630 3979
3631 warn "unload completed, starting to reload now"; 3980 info "unload completed, starting to reload now";
3632 3981
3633 warn "reloading cf.pm"; 3982 trace "reloading cf.pm";
3634 require cf; 3983 require cf;
3635 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3984 cf::_connect_to_perl_1;
3636 3985
3637 warn "loading config and database again"; 3986 trace "loading config and database again";
3638 cf::reload_config; 3987 cf::reload_config;
3639 3988
3640 warn "loading extensions"; 3989 trace "loading extensions";
3641 cf::load_extensions; 3990 cf::load_extensions;
3642 3991
3992 if ($REATTACH_ON_RELOAD) {
3643 warn "reattaching attachments to objects/players"; 3993 trace "reattaching attachments to objects/players";
3644 _global_reattach; # objects, sockets 3994 _global_reattach; # objects, sockets
3645 warn "reattaching attachments to maps"; 3995 trace "reattaching attachments to maps";
3646 reattach $_ for values %MAP; 3996 reattach $_ for values %MAP;
3647 warn "reattaching attachments to players"; 3997 trace "reattaching attachments to players";
3648 reattach $_ for values %PLAYER; 3998 reattach $_ for values %PLAYER;
3999 }
3649 4000
4001 trace "running post_init jobs";
4002 (pop @POST_INIT)->(1) while @POST_INIT;
4003
3650 warn "leaving sync_job"; 4004 trace "leaving sync_job";
3651 4005
3652 1 4006 1
3653 } or do { 4007 } or do {
3654 warn $@; 4008 error $@;
3655 cf::cleanup "error while reloading, exiting."; 4009 cf::cleanup "error while reloading, exiting.";
3656 }; 4010 };
3657 4011
3658 warn "reloaded"; 4012 info "reloaded";
3659 --$RELOAD; 4013 --$RELOAD;
3660 } 4014 }
4015
4016 $t1 = AE::time - $t1;
4017 info "reload completed in ${t1}s\n";
3661}; 4018};
3662 4019
3663our $RELOAD_WATCHER; # used only during reload 4020our $RELOAD_WATCHER; # used only during reload
3664 4021
3665sub reload_perl() { 4022sub reload_perl() {
3666 # doing reload synchronously and two reloads happen back-to-back, 4023 # doing reload synchronously and two reloads happen back-to-back,
3667 # coro crashes during coro_state_free->destroy here. 4024 # coro crashes during coro_state_free->destroy here.
3668 4025
4026 $RELOAD_WATCHER ||= cf::async {
4027 Coro::AIO::aio_wait cache_extensions;
4028
3669 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4029 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3670 do_reload_perl; 4030 do_reload_perl;
3671 undef $RELOAD_WATCHER; 4031 undef $RELOAD_WATCHER;
4032 };
3672 }; 4033 };
3673} 4034}
3674 4035
3675register_command "reload" => sub { 4036register_command "reload" => sub {
3676 my ($who, $arg) = @_; 4037 my ($who, $arg) = @_;
3682 reload_perl; 4043 reload_perl;
3683 }; 4044 };
3684 } 4045 }
3685}; 4046};
3686 4047
3687unshift @INC, $LIBDIR; 4048#############################################################################
3688 4049
3689my $bug_warning = 0; 4050my $bug_warning = 0;
3690 4051
3691our @WAIT_FOR_TICK; 4052our @WAIT_FOR_TICK;
3692our @WAIT_FOR_TICK_BEGIN; 4053our @WAIT_FOR_TICK_BEGIN;
3693 4054
3694sub wait_for_tick { 4055sub wait_for_tick {
3695 return if tick_inhibit || $Coro::current == $Coro::main; 4056 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3696 4057
3697 my $signal = new Coro::Signal; 4058 my $signal = new Coro::Signal;
3698 push @WAIT_FOR_TICK, $signal; 4059 push @WAIT_FOR_TICK, $signal;
3699 $signal->wait; 4060 $signal->wait;
3700} 4061}
3701 4062
3702sub wait_for_tick_begin { 4063sub wait_for_tick_begin {
3703 return if tick_inhibit || $Coro::current == $Coro::main; 4064 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3704 4065
3705 my $signal = new Coro::Signal; 4066 my $signal = new Coro::Signal;
3706 push @WAIT_FOR_TICK_BEGIN, $signal; 4067 push @WAIT_FOR_TICK_BEGIN, $signal;
3707 $signal->wait; 4068 $signal->wait;
3708} 4069}
3714 return; 4075 return;
3715 } 4076 }
3716 4077
3717 cf::server_tick; # one server iteration 4078 cf::server_tick; # one server iteration
3718 4079
4080 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4081
3719 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4082 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3720 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4083 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3721 Coro::async_pool { 4084 Coro::async_pool {
3722 $Coro::current->{desc} = "runtime saver"; 4085 $Coro::current->{desc} = "runtime saver";
3723 write_runtime_sync 4086 write_runtime_sync
3724 or warn "ERROR: unable to write runtime file: $!"; 4087 or error "ERROR: unable to write runtime file: $!";
3725 }; 4088 };
3726 } 4089 }
3727 4090
3728 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4091 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3729 $sig->send; 4092 $sig->send;
3737 4100
3738 if (0) { 4101 if (0) {
3739 if ($NEXT_TICK) { 4102 if ($NEXT_TICK) {
3740 my $jitter = $TICK_START - $NEXT_TICK; 4103 my $jitter = $TICK_START - $NEXT_TICK;
3741 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4104 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3742 warn "jitter $JITTER\n";#d# 4105 debug "jitter $JITTER\n";#d#
3743 } 4106 }
3744 } 4107 }
3745} 4108}
3746 4109
3747{ 4110{
3748 # configure BDB 4111 # configure BDB
3749 4112
3750 BDB::min_parallel 8; 4113 BDB::min_parallel 16;
3751 BDB::max_poll_reqs $TICK * 0.1; 4114 BDB::max_poll_reqs $TICK * 0.1;
3752 $AnyEvent::BDB::WATCHER->priority (1); 4115 $AnyEvent::BDB::WATCHER->priority (1);
3753 4116
3754 unless ($DB_ENV) { 4117 unless ($DB_ENV) {
3755 $DB_ENV = BDB::db_env_create; 4118 $DB_ENV = BDB::db_env_create;
3802 $msg =~ s/\n//; 4165 $msg =~ s/\n//;
3803 4166
3804 # limit the # of concurrent backtraces 4167 # limit the # of concurrent backtraces
3805 if ($_log_backtrace < 2) { 4168 if ($_log_backtrace < 2) {
3806 ++$_log_backtrace; 4169 ++$_log_backtrace;
4170 my $perl_bt = Carp::longmess $msg;
3807 async { 4171 async {
3808 $Coro::current->{desc} = "abt $msg"; 4172 $Coro::current->{desc} = "abt $msg";
3809 4173
3810 my @bt = fork_call { 4174 my @bt = fork_call {
3811 @addr = map { sprintf "%x", $_ } @addr; 4175 @addr = map { sprintf "%x", $_ } @addr;
3822 } 4186 }
3823 4187
3824 @funcs 4188 @funcs
3825 }; 4189 };
3826 4190
3827 LOG llevInfo, "[ABT] $msg\n"; 4191 LOG llevInfo, "[ABT] $perl_bt\n";
4192 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3828 LOG llevInfo, "[ABT] $_\n" for @bt; 4193 LOG llevInfo, "[ABT] $_\n" for @bt;
3829 --$_log_backtrace; 4194 --$_log_backtrace;
3830 }; 4195 };
3831 } else { 4196 } else {
3832 LOG llevInfo, "[ABT] $msg\n"; 4197 LOG llevInfo, "[ABT] $msg\n";
3833 LOG llevInfo, "[ABT] [suppressed]\n"; 4198 LOG llevInfo, "[ABT] [suppressed]\n";
3834 } 4199 }
3835} 4200}
3836 4201
3837# load additional modules 4202# load additional modules
3838use cf::pod; 4203require "cf/$_.pm" for @EXTRA_MODULES;
4204cf::_connect_to_perl_2;
3839 4205
3840END { cf::emergency_save } 4206END { cf::emergency_save }
3841 4207
38421 42081
3843 4209

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines