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.445 by root, Wed Sep 10 18:18:10 2008 UTC vs.
Revision 1.528 by root, Fri Apr 23 04:42:12 2010 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
18# 19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use 5.10.0; 25use 5.10.0;
25use utf8; 26use utf8;
26use strict "vars", "subs"; 27use strict qw(vars subs);
27 28
28use Symbol; 29use Symbol;
29use List::Util; 30use List::Util;
30use Socket; 31use Socket;
31use EV; 32use EV;
32use Opcode; 33use Opcode;
33use Safe; 34use Safe;
34use Safe::Hole; 35use Safe::Hole;
35use Storable (); 36use Storable ();
37use Carp ();
36 38
39use Guard ();
37use Coro (); 40use Coro ();
38use Coro::State; 41use Coro::State;
39use Coro::Handle; 42use Coro::Handle;
40use Coro::EV; 43use Coro::EV;
41use Coro::AnyEvent; 44use Coro::AnyEvent;
42use Coro::Timer; 45use Coro::Timer;
43use Coro::Signal; 46use Coro::Signal;
44use Coro::Semaphore; 47use Coro::Semaphore;
48use Coro::SemaphoreSet;
45use Coro::AnyEvent; 49use Coro::AnyEvent;
46use Coro::AIO; 50use Coro::AIO;
47use Coro::BDB 1.6; 51use Coro::BDB 1.6;
48use Coro::Storable; 52use Coro::Storable;
49use Coro::Util (); 53use Coro::Util ();
50 54
51use JSON::XS 2.01 (); 55use JSON::XS 2.01 ();
52use BDB (); 56use BDB ();
53use Data::Dumper; 57use Data::Dumper;
54use Digest::MD5;
55use Fcntl; 58use Fcntl;
56use YAML (); 59use YAML::XS ();
57use IO::AIO (); 60use IO::AIO ();
58use Time::HiRes; 61use Time::HiRes;
59use Compress::LZF; 62use Compress::LZF;
60use Digest::MD5 (); 63use Digest::MD5 ();
61 64
63 66
64# configure various modules to our taste 67# configure various modules to our taste
65# 68#
66$Storable::canonical = 1; # reduce rsync transfers 69$Storable::canonical = 1; # reduce rsync transfers
67Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 70Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
71
72$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
73
74# make sure c-lzf reinitialises itself
75Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
68Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 76Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
69 77
70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 78# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
71 80
72sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
73 82
74our %COMMAND = (); 83our %COMMAND = ();
75our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
78our %EXTCMD = (); 87our %EXTCMD = ();
79our %EXTICMD = (); 88our %EXTICMD = ();
80our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
81our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
82 91
83our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
84our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
85 96
86our $CONFDIR = confdir; 97our $CONFDIR = confdir;
87our $DATADIR = datadir; 98our $DATADIR = datadir;
88our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
89our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
97our $PIDFILE = "$LOCALDIR/pid"; 108our $PIDFILE = "$LOCALDIR/pid";
98our $RUNTIMEFILE = "$LOCALDIR/runtime"; 109our $RUNTIMEFILE = "$LOCALDIR/runtime";
99 110
100our %RESOURCE; 111our %RESOURCE;
101 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;
118
102our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
103our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
104our $NEXT_TICK; 121our $NEXT_TICK;
105our $USE_FSYNC = 1; # use fsync to write maps - default off 122our $USE_FSYNC = 1; # use fsync to write maps - default on
106 123
107our $BDB_DEADLOCK_WATCHER; 124our $BDB_DEADLOCK_WATCHER;
108our $BDB_CHECKPOINT_WATCHER; 125our $BDB_CHECKPOINT_WATCHER;
109our $BDB_TRICKLE_WATCHER; 126our $BDB_TRICKLE_WATCHER;
110our $DB_ENV; 127our $DB_ENV;
111 128
129our @EXTRA_MODULES = qw(pod match mapscript);
130
112our %CFG; 131our %CFG;
113 132
114our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
115our $RUNTIME; 134our $RUNTIME;
116our $NOW; 135our $NOW;
124 143
125our $LOAD; # a number between 0 (idle) and 1 (too many objects) 144our $LOAD; # a number between 0 (idle) and 1 (too many objects)
126our $LOADAVG; # same thing, but with alpha-smoothing 145our $LOADAVG; # same thing, but with alpha-smoothing
127our $JITTER; # average jitter 146our $JITTER; # average jitter
128our $TICK_START; # for load detecting purposes 147our $TICK_START; # for load detecting purposes
148
149our @POST_INIT;
150
151our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
152our $REALLY_UNLOOP; # never set to true, please :)
129 153
130binmode STDOUT; 154binmode STDOUT;
131binmode STDERR; 155binmode STDERR;
132 156
133# read virtual server time, if available 157# read virtual server time, if available
135 open my $fh, "<", $RUNTIMEFILE 159 open my $fh, "<", $RUNTIMEFILE
136 or die "unable to read $RUNTIMEFILE file: $!"; 160 or die "unable to read $RUNTIMEFILE file: $!";
137 $RUNTIME = <$fh> + 0.; 161 $RUNTIME = <$fh> + 0.;
138} 162}
139 163
164eval "sub TICK() { $TICK } 1" or die;
165
140mkdir $_ 166mkdir $_
141 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 167 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
142 168
143our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
144 170
145sub cf::map::normalise; 171sub cf::map::normalise;
172
173sub in_main() {
174 $Coro::current == $Coro::main
175}
176
177#############################################################################
178
179%REFLECT = ();
180for (@REFLECT) {
181 my $reflect = JSON::XS::decode_json $_;
182 $REFLECT{$reflect->{class}} = $reflect;
183}
184
185# this is decidedly evil
186$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
146 187
147############################################################################# 188#############################################################################
148 189
149=head2 GLOBAL VARIABLES 190=head2 GLOBAL VARIABLES
150 191
197returns directly I<after> the tick processing (and consequently, can only wake one process 238returns directly I<after> the tick processing (and consequently, can only wake one process
198per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 239per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
199 240
200=item @cf::INVOKE_RESULTS 241=item @cf::INVOKE_RESULTS
201 242
202This array contains the results of the last C<invoke ()> call. When 243This array contains the results of the last C<invoke ()> call. When
203C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 244C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
204that call. 245that call.
205 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
206=back 253=back
207 254
208=cut 255=cut
209 256
210BEGIN { 257$Coro::State::WARNHOOK = sub {
211 *CORE::GLOBAL::warn = sub {
212 my $msg = join "", @_; 258 my $msg = join "", @_;
213 259
214 $msg .= "\n" 260 $msg .= "\n"
215 unless $msg =~ /\n$/; 261 unless $msg =~ /\n$/;
216 262
217 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 263 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
218 264
219 LOG llevError, $msg; 265 LOG llevError, $msg;
220 }; 266};
221}
222 267
223$Coro::State::DIEHOOK = sub { 268$Coro::State::DIEHOOK = sub {
224 return unless $^S eq 0; # "eq", not "==" 269 return unless $^S eq 0; # "eq", not "=="
225 270
226 if ($Coro::current == $Coro::main) {#d# 271 warn Carp::longmess $_[0];
272
273 if (in_main) {#d#
227 warn "DIEHOOK called in main context, Coro bug?\n";#d# 274 warn "DIEHOOK called in main context, Coro bug?\n";#d#
228 return;#d# 275 return;#d#
229 }#d# 276 }#d#
230 277
231 # kill coroutine otherwise 278 # kill coroutine otherwise
232 warn Carp::longmess $_[0];
233 Coro::terminate 279 Coro::terminate
234}; 280};
235
236$SIG{__DIE__} = sub { }; #d#?
237 281
238@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 282@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
239@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 283@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
240@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 284@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
241@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 285@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
255)) { 299)) {
256 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 300 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
257} 301}
258 302
259$EV::DIED = sub { 303$EV::DIED = sub {
260 warn "error in event callback: @_"; 304 Carp::cluck "error in event callback: @_";
261}; 305};
262 306
263############################################################################# 307#############################################################################
264 308
265=head2 UTILITY FUNCTIONS 309=head2 UTILITY FUNCTIONS
302our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 346our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
303 347
304sub encode_json($) { $json_coder->encode ($_[0]) } 348sub encode_json($) { $json_coder->encode ($_[0]) }
305sub decode_json($) { $json_coder->decode ($_[0]) } 349sub decode_json($) { $json_coder->decode ($_[0]) }
306 350
351=item cf::post_init { BLOCK }
352
353Execute the given codeblock, I<after> all extensions have been (re-)loaded,
354but I<before> the server starts ticking again.
355
356The cdoeblock will have a single boolean argument to indicate whether this
357is a reload or not.
358
359=cut
360
361sub post_init(&) {
362 push @POST_INIT, shift;
363}
364
307=item cf::lock_wait $string 365=item cf::lock_wait $string
308 366
309Wait until the given lock is available. See cf::lock_acquire. 367Wait until the given lock is available. See cf::lock_acquire.
310 368
311=item my $lock = cf::lock_acquire $string 369=item my $lock = cf::lock_acquire $string
312 370
313Wait until the given lock is available and then acquires it and returns 371Wait until the given lock is available and then acquires it and returns
314a Coro::guard object. If the guard object gets destroyed (goes out of scope, 372a L<Guard> object. If the guard object gets destroyed (goes out of scope,
315for example when the coroutine gets canceled), the lock is automatically 373for example when the coroutine gets canceled), the lock is automatically
316returned. 374returned.
317 375
318Locks are *not* recursive, locking from the same coro twice results in a 376Locks are *not* recursive, locking from the same coro twice results in a
319deadlocked coro. 377deadlocked coro.
325 383
326Return true if the lock is currently active, i.e. somebody has locked it. 384Return true if the lock is currently active, i.e. somebody has locked it.
327 385
328=cut 386=cut
329 387
330our %LOCK; 388our $LOCKS = new Coro::SemaphoreSet;
331our %LOCKER;#d#
332 389
333sub lock_wait($) { 390sub lock_wait($) {
334 my ($key) = @_; 391 $LOCKS->wait ($_[0]);
335
336 if ($LOCKER{$key} == $Coro::current) {#d#
337 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
338 return;#d#
339 }#d#
340
341 # wait for lock, if any
342 while ($LOCK{$key}) {
343 push @{ $LOCK{$key} }, $Coro::current;
344 Coro::schedule;
345 }
346} 392}
347 393
348sub lock_acquire($) { 394sub lock_acquire($) {
349 my ($key) = @_; 395 $LOCKS->guard ($_[0])
350
351 # wait, to be sure we are not locked
352 lock_wait $key;
353
354 $LOCK{$key} = [];
355 $LOCKER{$key} = $Coro::current;#d#
356
357 Coro::guard {
358 delete $LOCKER{$key};#d#
359 # wake up all waiters, to be on the safe side
360 $_->ready for @{ delete $LOCK{$key} };
361 }
362} 396}
363 397
364sub lock_active($) { 398sub lock_active($) {
365 my ($key) = @_; 399 $LOCKS->count ($_[0]) < 1
366
367 ! ! $LOCK{$key}
368} 400}
369 401
370sub freeze_mainloop { 402sub freeze_mainloop {
371 tick_inhibit_inc; 403 tick_inhibit_inc;
372 404
373 Coro::guard \&tick_inhibit_dec; 405 &Guard::guard (\&tick_inhibit_dec);
374} 406}
375 407
376=item cf::periodic $interval, $cb 408=item cf::periodic $interval, $cb
377 409
378Like EV::periodic, but randomly selects a starting point so that the actions 410Like EV::periodic, but randomly selects a starting point so that the actions
379get spread over timer. 411get spread over time.
380 412
381=cut 413=cut
382 414
383sub periodic($$) { 415sub periodic($$) {
384 my ($interval, $cb) = @_; 416 my ($interval, $cb) = @_;
401 433
402=cut 434=cut
403 435
404our @SLOT_QUEUE; 436our @SLOT_QUEUE;
405our $SLOT_QUEUE; 437our $SLOT_QUEUE;
438our $SLOT_DECAY = 0.9;
406 439
407$SLOT_QUEUE->cancel if $SLOT_QUEUE; 440$SLOT_QUEUE->cancel if $SLOT_QUEUE;
408$SLOT_QUEUE = Coro::async { 441$SLOT_QUEUE = Coro::async {
409 $Coro::current->desc ("timeslot manager"); 442 $Coro::current->desc ("timeslot manager");
410 443
411 my $signal = new Coro::Signal; 444 my $signal = new Coro::Signal;
445 my $busy;
412 446
413 while () { 447 while () {
414 next_job: 448 next_job:
449
415 my $avail = cf::till_tick; 450 my $avail = cf::till_tick;
416 if ($avail > 0.01) { 451
417 for (0 .. $#SLOT_QUEUE) { 452 for (0 .. $#SLOT_QUEUE) {
418 if ($SLOT_QUEUE[$_][0] < $avail) { 453 if ($SLOT_QUEUE[$_][0] <= $avail) {
454 $busy = 0;
419 my $job = splice @SLOT_QUEUE, $_, 1, (); 455 my $job = splice @SLOT_QUEUE, $_, 1, ();
420 $job->[2]->send; 456 $job->[2]->send;
421 Coro::cede; 457 Coro::cede;
422 goto next_job; 458 goto next_job;
423 } 459 } else {
460 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
424 } 461 }
425 } 462 }
426 463
427 if (@SLOT_QUEUE) { 464 if (@SLOT_QUEUE) {
428 # we do not use wait_for_tick() as it returns immediately when tick is inactive 465 # we do not use wait_for_tick() as it returns immediately when tick is inactive
429 push @cf::WAIT_FOR_TICK, $signal; 466 push @cf::WAIT_FOR_TICK, $signal;
430 $signal->wait; 467 $signal->wait;
431 } else { 468 } else {
469 $busy = 0;
432 Coro::schedule; 470 Coro::schedule;
433 } 471 }
434 } 472 }
435}; 473};
436 474
437sub get_slot($;$$) { 475sub get_slot($;$$) {
438 return if tick_inhibit || $Coro::current == $Coro::main; 476 return if tick_inhibit || $Coro::current == $Coro::main;
439 477
440 my ($time, $pri, $name) = @_; 478 my ($time, $pri, $name) = @_;
441 479
442 $time = $TICK * .6 if $time > $TICK * .6; 480 $time = clamp $time, 0.01, $TICK * .6;
481
443 my $sig = new Coro::Signal; 482 my $sig = new Coro::Signal;
444 483
445 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 484 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
446 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 485 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
447 $SLOT_QUEUE->ready; 486 $SLOT_QUEUE->ready;
474 513
475sub sync_job(&) { 514sub sync_job(&) {
476 my ($job) = @_; 515 my ($job) = @_;
477 516
478 if ($Coro::current == $Coro::main) { 517 if ($Coro::current == $Coro::main) {
479 my $time = EV::time; 518 my $time = AE::time;
480 519
481 # this is the main coro, too bad, we have to block 520 # this is the main coro, too bad, we have to block
482 # till the operation succeeds, freezing the server :/ 521 # till the operation succeeds, freezing the server :/
483 522
484 LOG llevError, Carp::longmess "sync job";#d# 523 LOG llevError, Carp::longmess "sync job";#d#
501 } else { 540 } else {
502 EV::loop EV::LOOP_ONESHOT; 541 EV::loop EV::LOOP_ONESHOT;
503 } 542 }
504 } 543 }
505 544
506 my $time = EV::time - $time; 545 my $time = AE::time - $time;
507 546
508 $TICK_START += $time; # do not account sync jobs to server load 547 $TICK_START += $time; # do not account sync jobs to server load
509 548
510 wantarray ? @res : $res[0] 549 wantarray ? @res : $res[0]
511 } else { 550 } else {
555 reset_signals; 594 reset_signals;
556 &$cb 595 &$cb
557 }, @args; 596 }, @args;
558 597
559 wantarray ? @res : $res[-1] 598 wantarray ? @res : $res[-1]
599}
600
601sub objinfo {
602 (
603 "counter value" => cf::object::object_count,
604 "objects created" => cf::object::create_count,
605 "objects destroyed" => cf::object::destroy_count,
606 "freelist size" => cf::object::free_count,
607 "allocated objects" => cf::object::objects_size,
608 "active objects" => cf::object::actives_size,
609 )
560} 610}
561 611
562=item $coin = coin_from_name $name 612=item $coin = coin_from_name $name
563 613
564=cut 614=cut
730 780
731############################################################################# 781#############################################################################
732 782
733=head2 ATTACHABLE OBJECTS 783=head2 ATTACHABLE OBJECTS
734 784
735Many objects in crossfire are so-called attachable objects. That means you can 785Many objects in deliantra are so-called attachable objects. That means you can
736attach callbacks/event handlers (a collection of which is called an "attachment") 786attach callbacks/event handlers (a collection of which is called an "attachment")
737to it. All such attachable objects support the following methods. 787to it. All such attachable objects support the following methods.
738 788
739In the following description, CLASS can be any of C<global>, C<object> 789In the following description, CLASS can be any of C<global>, C<object>
740C<player>, C<client> or C<map> (i.e. the attachable objects in 790C<player>, C<client> or C<map> (i.e. the attachable objects in
790=item cf::CLASS::attachment $name, ... 840=item cf::CLASS::attachment $name, ...
791 841
792Register an attachment by C<$name> through which attachable objects of the 842Register an attachment by C<$name> through which attachable objects of the
793given CLASS can refer to this attachment. 843given CLASS can refer to this attachment.
794 844
795Some classes such as crossfire maps and objects can specify attachments 845Some classes such as deliantra maps and objects can specify attachments
796that are attached at load/instantiate time, thus the need for a name. 846that are attached at load/instantiate time, thus the need for a name.
797 847
798These calls expect any number of the following handler/hook descriptions: 848These calls expect any number of the following handler/hook descriptions:
799 849
800=over 4 850=over 4
1145 1195
1146 sync_job { 1196 sync_job {
1147 if (length $$rdata) { 1197 if (length $$rdata) {
1148 utf8::decode (my $decname = $filename); 1198 utf8::decode (my $decname = $filename);
1149 warn sprintf "saving %s (%d,%d)\n", 1199 warn sprintf "saving %s (%d,%d)\n",
1150 $decname, length $$rdata, scalar @$objs; 1200 $decname, length $$rdata, scalar @$objs
1201 if $VERBOSE_IO;
1151 1202
1152 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1203 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1153 aio_chmod $fh, SAVE_MODE; 1204 aio_chmod $fh, SAVE_MODE;
1154 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1205 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1155 aio_fsync $fh if $cf::USE_FSYNC; 1206 if ($cf::USE_FSYNC) {
1207 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;
1208 aio_fsync $fh;
1209 }
1156 aio_close $fh; 1210 aio_close $fh;
1157 1211
1158 if (@$objs) { 1212 if (@$objs) {
1159 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1213 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1160 aio_chmod $fh, SAVE_MODE; 1214 aio_chmod $fh, SAVE_MODE;
1161 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1215 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1162 aio_write $fh, 0, (length $data), $data, 0; 1216 aio_write $fh, 0, (length $data), $data, 0;
1163 aio_fsync $fh if $cf::USE_FSYNC; 1217 if ($cf::USE_FSYNC) {
1218 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;
1219 aio_fsync $fh;
1220 }
1164 aio_close $fh; 1221 aio_close $fh;
1165 aio_rename "$filename.pst~", "$filename.pst"; 1222 aio_rename "$filename.pst~", "$filename.pst";
1166 } 1223 }
1167 } else { 1224 } else {
1168 aio_unlink "$filename.pst"; 1225 aio_unlink "$filename.pst";
1169 } 1226 }
1170 1227
1171 aio_rename "$filename~", $filename; 1228 aio_rename "$filename~", $filename;
1229
1230 $filename =~ s%/[^/]+$%%;
1231 aio_pathsync $filename if $cf::USE_FSYNC;
1172 } else { 1232 } else {
1173 warn "FATAL: $filename~: $!\n"; 1233 warn "unable to save objects: $filename~: $!\n";
1174 } 1234 }
1175 } else { 1235 } else {
1176 aio_unlink $filename; 1236 aio_unlink $filename;
1177 aio_unlink "$filename.pst"; 1237 aio_unlink "$filename.pst";
1178 } 1238 }
1203 $av = $st->{objs}; 1263 $av = $st->{objs};
1204 } 1264 }
1205 1265
1206 utf8::decode (my $decname = $filename); 1266 utf8::decode (my $decname = $filename);
1207 warn sprintf "loading %s (%d,%d)\n", 1267 warn sprintf "loading %s (%d,%d)\n",
1208 $decname, length $data, scalar @{$av || []}; 1268 $decname, length $data, scalar @{$av || []}
1269 if $VERBOSE_IO;
1209 1270
1210 ($data, $av) 1271 ($data, $av)
1211} 1272}
1212 1273
1213=head2 COMMAND CALLBACKS 1274=head2 COMMAND CALLBACKS
1269 my ($name, $cb) = @_; 1330 my ($name, $cb) = @_;
1270 1331
1271 $EXTICMD{$name} = $cb; 1332 $EXTICMD{$name} = $cb;
1272} 1333}
1273 1334
1335use File::Glob ();
1336
1274cf::player->attach ( 1337cf::player->attach (
1275 on_command => sub { 1338 on_unknown_command => sub {
1276 my ($pl, $name, $params) = @_; 1339 my ($pl, $name, $params) = @_;
1277 1340
1278 my $cb = $COMMAND{$name} 1341 my $cb = $COMMAND{$name}
1279 or return; 1342 or return;
1280 1343
1310 1373
1311 cf::override; 1374 cf::override;
1312 }, 1375 },
1313); 1376);
1314 1377
1378# "readahead" all extensions
1379sub cache_extensions {
1380 my $grp = IO::AIO::aio_group;
1381
1382 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1383 for (grep /\.ext$/, @{$_[0]}) {
1384 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1385 }
1386 };
1387
1388 $grp
1389}
1390
1315sub load_extensions { 1391sub load_extensions {
1316 cf::sync_job { 1392 cf::sync_job {
1317 my %todo; 1393 my %todo;
1318 1394
1319 for my $path (<$LIBDIR/*.ext>) { 1395 for my $path (<$LIBDIR/*.ext>) {
1346 . "\n};\n1"; 1422 . "\n};\n1";
1347 1423
1348 $todo{$base} = \%ext; 1424 $todo{$base} = \%ext;
1349 } 1425 }
1350 1426
1427 my $pass = 0;
1351 my %done; 1428 my %done;
1352 while (%todo) { 1429 while (%todo) {
1353 my $progress; 1430 my $progress;
1354 1431
1432 ++$pass;
1433
1434 ext:
1355 while (my ($k, $v) = each %todo) { 1435 while (my ($k, $v) = each %todo) {
1356 for (split /,\s*/, $v->{meta}{depends}) { 1436 for (split /,\s*/, $v->{meta}{depends}) {
1357 goto skip 1437 next ext
1358 unless exists $done{$_}; 1438 unless exists $done{$_};
1359 } 1439 }
1360 1440
1361 warn "... loading '$k' into '$v->{pkg}'\n"; 1441 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1362 1442
1363 unless (eval $v->{source}) { 1443 my $active = eval $v->{source};
1444
1445 if (length $@) {
1364 my $msg = $@ ? "$v->{path}: $@\n" 1446 warn "$v->{path}: $@\n";
1365 : "$v->{base}: extension inactive.\n";
1366 1447
1367 if (exists $v->{meta}{mandatory}) {
1368 warn $msg;
1369 cf::cleanup "mandatory extension failed to load, exiting."; 1448 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1370 } 1449 if exists $v->{meta}{mandatory};
1371 1450
1372 warn $msg; 1451 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1452 delete $todo{$k};
1453 } else {
1454 $done{$k} = delete $todo{$k};
1455 push @EXTS, $v->{pkg};
1456 $progress = 1;
1457
1458 warn "$v->{base}: extension inactive.\n"
1459 unless $active;
1373 } 1460 }
1374
1375 $done{$k} = delete $todo{$k};
1376 push @EXTS, $v->{pkg};
1377 $progress = 1;
1378 } 1461 }
1379 1462
1380 skip: 1463 unless ($progress) {
1381 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1464 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1382 unless $progress; 1465
1466 while (my ($k, $v) = each %todo) {
1467 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1468 if exists $v->{meta}{mandatory};
1469 }
1470 }
1383 } 1471 }
1384 }; 1472 };
1385} 1473}
1386 1474
1387############################################################################# 1475#############################################################################
1388 1476
1389=back 1477=back
1390 1478
1391=head2 CORE EXTENSIONS 1479=head2 CORE EXTENSIONS
1392 1480
1393Functions and methods that extend core crossfire objects. 1481Functions and methods that extend core deliantra objects.
1394 1482
1395=cut 1483=cut
1396 1484
1397package cf::player; 1485package cf::player;
1398 1486
1441 1529
1442sub exists($) { 1530sub exists($) {
1443 my ($login) = @_; 1531 my ($login) = @_;
1444 1532
1445 $cf::PLAYER{$login} 1533 $cf::PLAYER{$login}
1446 or cf::sync_job { !aio_stat path $login } 1534 or !aio_stat path $login
1447} 1535}
1448 1536
1449sub find($) { 1537sub find($) {
1450 return $cf::PLAYER{$_[0]} || do { 1538 return $cf::PLAYER{$_[0]} || do {
1451 my $login = $_[0]; 1539 my $login = $_[0];
1471 $cf::PLAYER{$login} = $pl 1559 $cf::PLAYER{$login} = $pl
1472 } 1560 }
1473 } 1561 }
1474} 1562}
1475 1563
1564cf::player->attach (
1565 on_load => sub {
1566 my ($pl, $path) = @_;
1567
1568 # restore slots saved in save, below
1569 my $slots = delete $pl->{_slots};
1570
1571 $pl->ob->current_weapon ($slots->[0]);
1572 $pl->combat_ob ($slots->[1]);
1573 $pl->ranged_ob ($slots->[2]);
1574 },
1575);
1576
1476sub save($) { 1577sub save($) {
1477 my ($pl) = @_; 1578 my ($pl) = @_;
1478 1579
1479 return if $pl->{deny_save}; 1580 return if $pl->{deny_save};
1480 1581
1485 1586
1486 aio_mkdir playerdir $pl, 0770; 1587 aio_mkdir playerdir $pl, 0770;
1487 $pl->{last_save} = $cf::RUNTIME; 1588 $pl->{last_save} = $cf::RUNTIME;
1488 1589
1489 cf::get_slot 0.01; 1590 cf::get_slot 0.01;
1591
1592 # save slots, to be restored later
1593 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1490 1594
1491 $pl->save_pl ($path); 1595 $pl->save_pl ($path);
1492 cf::cede_to_tick; 1596 cf::cede_to_tick;
1493} 1597}
1494 1598
1596 \@logins 1700 \@logins
1597} 1701}
1598 1702
1599=item $player->maps 1703=item $player->maps
1600 1704
1705=item cf::player::maps $login
1706
1601Returns an arrayref of map paths that are private for this 1707Returns an arrayref of map paths that are private for this
1602player. May block. 1708player. May block.
1603 1709
1604=cut 1710=cut
1605 1711
1622 } 1728 }
1623 1729
1624 \@paths 1730 \@paths
1625} 1731}
1626 1732
1627=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1733=item $protocol_xml = $player->expand_cfpod ($cfpod)
1628 1734
1629Expand crossfire pod fragments into protocol xml. 1735Expand deliantra pod fragments into protocol xml.
1630 1736
1631=item $player->ext_reply ($msgid, @msg) 1737=item $player->ext_reply ($msgid, @msg)
1632 1738
1633Sends an ext reply to the player. 1739Sends an ext reply to the player.
1634 1740
1666 1772
1667=cut 1773=cut
1668 1774
1669sub find_by_path($) { 1775sub find_by_path($) {
1670 my ($path) = @_; 1776 my ($path) = @_;
1777
1778 $path =~ s/^~[^\/]*//; # skip ~login
1671 1779
1672 my ($match, $specificity); 1780 my ($match, $specificity);
1673 1781
1674 for my $region (list) { 1782 for my $region (list) {
1675 if ($region->{match} && $path =~ $region->{match}) { 1783 if ($region->{match} && $path =~ $region->{match}) {
1707 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1815 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1708 1816
1709 # mit "rum" bekleckern, nicht 1817 # mit "rum" bekleckern, nicht
1710 $self->_create_random_map ( 1818 $self->_create_random_map (
1711 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1819 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1712 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1820 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1713 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1821 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1714 $rmp->{exit_on_final_map}, 1822 $rmp->{exit_on_final_map},
1715 $rmp->{xsize}, $rmp->{ysize}, 1823 $rmp->{xsize}, $rmp->{ysize},
1716 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1824 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1717 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1825 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1739 1847
1740 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1848 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1741} 1849}
1742 1850
1743# also paths starting with '/' 1851# also paths starting with '/'
1744$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1852$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1745 1853
1746sub thawer_merge { 1854sub thawer_merge {
1747 my ($self, $merge) = @_; 1855 my ($self, $merge) = @_;
1748 1856
1749 # we have to keep some variables in memory intact 1857 # we have to keep some variables in memory intact
1847 1955
1848 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1956 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1849 "$UNIQUEDIR/$path" 1957 "$UNIQUEDIR/$path"
1850} 1958}
1851 1959
1852# and all this just because we cannot iterate over
1853# all maps in C++...
1854sub change_all_map_light {
1855 my ($change) = @_;
1856
1857 $_->change_map_light ($change)
1858 for grep $_->outdoor, values %cf::MAP;
1859}
1860
1861sub decay_objects { 1960sub decay_objects {
1862 my ($self) = @_; 1961 my ($self) = @_;
1863 1962
1864 return if $self->{deny_reset}; 1963 return if $self->{deny_reset};
1865 1964
1947sub find { 2046sub find {
1948 my ($path, $origin) = @_; 2047 my ($path, $origin) = @_;
1949 2048
1950 $path = normalise $path, $origin && $origin->path; 2049 $path = normalise $path, $origin && $origin->path;
1951 2050
1952 cf::lock_wait "map_data:$path";#d#remove 2051 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1953 cf::lock_wait "map_find:$path"; 2052 my $guard2 = cf::lock_acquire "map_find:$path";
1954 2053
1955 $cf::MAP{$path} || do { 2054 $cf::MAP{$path} || do {
1956 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1957 my $guard2 = cf::lock_acquire "map_find:$path";
1958
1959 my $map = new_from_path cf::map $path 2055 my $map = new_from_path cf::map $path
1960 or return; 2056 or return;
1961 2057
1962 $map->{last_save} = $cf::RUNTIME; 2058 $map->{last_save} = $cf::RUNTIME;
1963 2059
1975 2071
1976 $cf::MAP{$path} = $map 2072 $cf::MAP{$path} = $map
1977 } 2073 }
1978} 2074}
1979 2075
1980sub pre_load { } 2076sub pre_load { }
1981sub post_load { } 2077#sub post_load { } # XS
1982 2078
1983sub load { 2079sub load {
1984 my ($self) = @_; 2080 my ($self) = @_;
1985 2081
1986 local $self->{deny_reset} = 1; # loading can take a long time 2082 local $self->{deny_reset} = 1; # loading can take a long time
2031 unless ($self->{deny_activate}) { 2127 unless ($self->{deny_activate}) {
2032 $self->decay_objects; 2128 $self->decay_objects;
2033 $self->fix_auto_apply; 2129 $self->fix_auto_apply;
2034 $self->update_buttons; 2130 $self->update_buttons;
2035 cf::cede_to_tick; 2131 cf::cede_to_tick;
2036 $self->set_darkness_map;
2037 cf::cede_to_tick;
2038 $self->activate; 2132 $self->activate;
2039 } 2133 }
2040 2134
2041 $self->{last_save} = $cf::RUNTIME; 2135 $self->{last_save} = $cf::RUNTIME;
2042 $self->last_access ($cf::RUNTIME); 2136 $self->last_access ($cf::RUNTIME);
2045 } 2139 }
2046 2140
2047 $self->post_load; 2141 $self->post_load;
2048} 2142}
2049 2143
2144# customize the map for a given player, i.e.
2145# return the _real_ map. used by e.g. per-player
2146# maps to change the path to ~playername/mappath
2050sub customise_for { 2147sub customise_for {
2051 my ($self, $ob) = @_; 2148 my ($self, $ob) = @_;
2052 2149
2053 return find "~" . $ob->name . "/" . $self->{path} 2150 return find "~" . $ob->name . "/" . $self->{path}
2054 if $self->per_player; 2151 if $self->per_player;
2070 or next; 2167 or next;
2071 $neigh = find $neigh, $map 2168 $neigh = find $neigh, $map
2072 or next; 2169 or next;
2073 $neigh->load; 2170 $neigh->load;
2074 2171
2172 # now find the diagonal neighbours
2075 push @neigh, 2173 push @neigh,
2076 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2174 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2077 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2175 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2078 } 2176 }
2079 2177
2131 $MAP_PREFETCHER->prio (6); 2229 $MAP_PREFETCHER->prio (6);
2132 2230
2133 () 2231 ()
2134} 2232}
2135 2233
2234# common code, used by both ->save and ->swapout
2136sub save { 2235sub _save {
2137 my ($self) = @_; 2236 my ($self) = @_;
2138
2139 my $lock = cf::lock_acquire "map_data:$self->{path}";
2140 2237
2141 $self->{last_save} = $cf::RUNTIME; 2238 $self->{last_save} = $cf::RUNTIME;
2142 2239
2143 return unless $self->dirty; 2240 return unless $self->dirty;
2144 2241
2164 } else { 2261 } else {
2165 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2262 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2166 } 2263 }
2167} 2264}
2168 2265
2266sub save {
2267 my ($self) = @_;
2268
2269 my $lock = cf::lock_acquire "map_data:$self->{path}";
2270
2271 $self->_save;
2272}
2273
2169sub swap_out { 2274sub swap_out {
2170 my ($self) = @_; 2275 my ($self) = @_;
2171 2276
2172 # save first because save cedes
2173 $self->save;
2174
2175 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2277 my $lock = cf::lock_acquire "map_data:$self->{path}";
2176 2278
2177 return if $self->players;
2178 return if $self->in_memory != cf::MAP_ACTIVE; 2279 return if $self->in_memory != cf::MAP_ACTIVE;
2179 return if $self->{deny_save}; 2280 return if $self->{deny_save};
2281 return if $self->players;
2180 2282
2283 # first deactivate the map and "unlink" it from the core
2284 $self->deactivate;
2285 $_->clear_links_to ($self) for values %cf::MAP;
2181 $self->in_memory (cf::MAP_SWAPPED); 2286 $self->in_memory (cf::MAP_SWAPPED);
2287
2288 # then atomically save
2289 $self->_save;
2290
2291 # then free the map
2292 $self->clear;
2293}
2294
2295sub reset_at {
2296 my ($self) = @_;
2297
2298 # TODO: safety, remove and allow resettable per-player maps
2299 return 1e99 if $self->{deny_reset};
2300
2301 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2302 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2303
2304 $time + $to
2305}
2306
2307sub should_reset {
2308 my ($self) = @_;
2309
2310 $self->reset_at <= $cf::RUNTIME
2311}
2312
2313sub reset {
2314 my ($self) = @_;
2315
2316 my $lock = cf::lock_acquire "map_data:$self->{path}";
2317
2318 return if $self->players;
2319
2320 warn "resetting map ", $self->path, "\n";
2321
2322 $self->in_memory (cf::MAP_SWAPPED);
2323
2324 # need to save uniques path
2325 unless ($self->{deny_save}) {
2326 my $uniq = $self->uniq_path; utf8::encode $uniq;
2327
2328 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2329 if $uniq;
2330 }
2331
2332 delete $cf::MAP{$self->path};
2182 2333
2183 $self->deactivate; 2334 $self->deactivate;
2184 $_->clear_links_to ($self) for values %cf::MAP; 2335 $_->clear_links_to ($self) for values %cf::MAP;
2185 $self->clear; 2336 $self->clear;
2186}
2187
2188sub reset_at {
2189 my ($self) = @_;
2190
2191 # TODO: safety, remove and allow resettable per-player maps
2192 return 1e99 if $self->{deny_reset};
2193
2194 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2195 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2196
2197 $time + $to
2198}
2199
2200sub should_reset {
2201 my ($self) = @_;
2202
2203 $self->reset_at <= $cf::RUNTIME
2204}
2205
2206sub reset {
2207 my ($self) = @_;
2208
2209 my $lock = cf::lock_acquire "map_data:$self->{path}";
2210
2211 return if $self->players;
2212
2213 warn "resetting map ", $self->path;
2214
2215 $self->in_memory (cf::MAP_SWAPPED);
2216
2217 # need to save uniques path
2218 unless ($self->{deny_save}) {
2219 my $uniq = $self->uniq_path; utf8::encode $uniq;
2220
2221 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2222 if $uniq;
2223 }
2224
2225 delete $cf::MAP{$self->path};
2226
2227 $self->deactivate;
2228 $_->clear_links_to ($self) for values %cf::MAP;
2229 $self->clear;
2230 2337
2231 $self->unlink_save; 2338 $self->unlink_save;
2232 $self->destroy; 2339 $self->destroy;
2233} 2340}
2234 2341
2242 2349
2243 delete $cf::MAP{$self->path}; 2350 delete $cf::MAP{$self->path};
2244 2351
2245 $self->unlink_save; 2352 $self->unlink_save;
2246 2353
2247 bless $self, "cf::map"; 2354 bless $self, "cf::map::wrap";
2248 delete $self->{deny_reset}; 2355 delete $self->{deny_reset};
2249 $self->{deny_save} = 1; 2356 $self->{deny_save} = 1;
2250 $self->reset_timeout (1); 2357 $self->reset_timeout (1);
2251 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2358 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2252 2359
2309 : normalise $_ 2416 : normalise $_
2310 } @{ aio_readdir $UNIQUEDIR or [] } 2417 } @{ aio_readdir $UNIQUEDIR or [] }
2311 ] 2418 ]
2312} 2419}
2313 2420
2421=item cf::map::static_maps
2422
2423Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2424file in the shared directory excluding F</styles> and F</editor>). May
2425block.
2426
2427=cut
2428
2429sub static_maps() {
2430 my @dirs = "";
2431 my @maps;
2432
2433 while (@dirs) {
2434 my $dir = shift @dirs;
2435
2436 next if $dir eq "/styles" || $dir eq "/editor";
2437
2438 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2439 or return;
2440
2441 for (@$files) {
2442 s/\.map$// or next;
2443 utf8::decode $_;
2444 push @maps, "$dir/$_";
2445 }
2446
2447 push @dirs, map "$dir/$_", @$dirs;
2448 }
2449
2450 \@maps
2451}
2452
2314=back 2453=back
2315 2454
2316=head3 cf::object 2455=head3 cf::object
2317 2456
2318=cut 2457=cut
2383 2522
2384our $SAY_CHANNEL = { 2523our $SAY_CHANNEL = {
2385 id => "say", 2524 id => "say",
2386 title => "Map", 2525 title => "Map",
2387 reply => "say ", 2526 reply => "say ",
2388 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2527 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2389}; 2528};
2390 2529
2391our $CHAT_CHANNEL = { 2530our $CHAT_CHANNEL = {
2392 id => "chat", 2531 id => "chat",
2393 title => "Chat", 2532 title => "Chat",
2448 2587
2449=item $player_object->enter_link 2588=item $player_object->enter_link
2450 2589
2451Freezes the player and moves him/her to a special map (C<{link}>). 2590Freezes the player and moves him/her to a special map (C<{link}>).
2452 2591
2453The player should be reasonably safe there for short amounts of time. You 2592The player should be reasonably safe there for short amounts of time (e.g.
2454I<MUST> call C<leave_link> as soon as possible, though. 2593for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2594though, as the player cannot control the character while it is on the link
2595map.
2455 2596
2456Will never block. 2597Will never block.
2457 2598
2458=item $player_object->leave_link ($map, $x, $y) 2599=item $player_object->leave_link ($map, $x, $y)
2459 2600
2479sub cf::object::player::enter_link { 2620sub cf::object::player::enter_link {
2480 my ($self) = @_; 2621 my ($self) = @_;
2481 2622
2482 $self->deactivate_recursive; 2623 $self->deactivate_recursive;
2483 2624
2625 ++$self->{_link_recursion};
2626
2484 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2627 return if UNIVERSAL::isa $self->map, "ext::map_link";
2485 2628
2486 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2629 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2487 if $self->map && $self->map->{path} ne "{link}"; 2630 if $self->map && $self->map->{path} ne "{link}";
2488 2631
2489 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2632 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2490} 2633}
2491 2634
2492sub cf::object::player::leave_link { 2635sub cf::object::player::leave_link {
2493 my ($self, $map, $x, $y) = @_; 2636 my ($self, $map, $x, $y) = @_;
2494 2637
2511 ($x, $y) = (-1, -1) 2654 ($x, $y) = (-1, -1)
2512 unless (defined $x) && (defined $y); 2655 unless (defined $x) && (defined $y);
2513 2656
2514 # use -1 or undef as default coordinates, not 0, 0 2657 # use -1 or undef as default coordinates, not 0, 0
2515 ($x, $y) = ($map->enter_x, $map->enter_y) 2658 ($x, $y) = ($map->enter_x, $map->enter_y)
2516 if $x <=0 && $y <= 0; 2659 if $x <= 0 && $y <= 0;
2517 2660
2518 $map->load; 2661 $map->load;
2519 $map->load_neighbours; 2662 $map->load_neighbours;
2520 2663
2521 return unless $self->contr->active; 2664 return unless $self->contr->active;
2522 $self->activate_recursive;
2523 2665
2524 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2666 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2525 $self->enter_map ($map, $x, $y); 2667 if ($self->enter_map ($map, $x, $y)) {
2526} 2668 # entering was successful
2669 delete $self->{_link_recursion};
2670 # only activate afterwards, to support waiting in hooks
2671 $self->activate_recursive;
2672 }
2527 2673
2674}
2675
2528=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2676=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2529 2677
2530Moves the player to the given map-path and coordinates by first freezing 2678Moves the player to the given map-path and coordinates by first freezing
2531her, loading and preparing them map, calling the provided $check callback 2679her, loading and preparing them map, calling the provided $check callback
2532that has to return the map if sucecssful, and then unfreezes the player on 2680that has to return the map if sucecssful, and then unfreezes the player on
2533the new (success) or old (failed) map position. In either case, $done will 2681the new (success) or old (failed) map position. In either case, $done will
2540 2688
2541our $GOTOGEN; 2689our $GOTOGEN;
2542 2690
2543sub cf::object::player::goto { 2691sub cf::object::player::goto {
2544 my ($self, $path, $x, $y, $check, $done) = @_; 2692 my ($self, $path, $x, $y, $check, $done) = @_;
2693
2694 if ($self->{_link_recursion} >= $MAX_LINKS) {
2695 warn "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2696 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2697 ($path, $x, $y) = @$EMERGENCY_POSITION;
2698 }
2545 2699
2546 # do generation counting so two concurrent goto's will be executed in-order 2700 # do generation counting so two concurrent goto's will be executed in-order
2547 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2701 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2548 2702
2549 $self->enter_link; 2703 $self->enter_link;
2573 my $map = eval { 2727 my $map = eval {
2574 my $map = defined $path ? cf::map::find $path : undef; 2728 my $map = defined $path ? cf::map::find $path : undef;
2575 2729
2576 if ($map) { 2730 if ($map) {
2577 $map = $map->customise_for ($self); 2731 $map = $map->customise_for ($self);
2578 $map = $check->($map) if $check && $map; 2732 $map = $check->($map, $x, $y, $self) if $check && $map;
2579 } else { 2733 } else {
2580 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2734 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2581 } 2735 }
2582 2736
2583 $map 2737 $map
2591 if ($gen == $self->{_goto_generation}) { 2745 if ($gen == $self->{_goto_generation}) {
2592 delete $self->{_goto_generation}; 2746 delete $self->{_goto_generation};
2593 $self->leave_link ($map, $x, $y); 2747 $self->leave_link ($map, $x, $y);
2594 } 2748 }
2595 2749
2596 $done->() if $done; 2750 $done->($self) if $done;
2597 })->prio (1); 2751 })->prio (1);
2598} 2752}
2599 2753
2600=item $player_object->enter_exit ($exit_object) 2754=item $player_object->enter_exit ($exit_object)
2601 2755
2689 $self->contr->savebed ($map, $x, $y) 2843 $self->contr->savebed ($map, $x, $y)
2690 if $exit->flag (cf::FLAG_DAMNED); 2844 if $exit->flag (cf::FLAG_DAMNED);
2691 2845
2692 1 2846 1
2693 }) { 2847 }) {
2694 $self->message ("Something went wrong deep within the crossfire server. " 2848 $self->message ("Something went wrong deep within the deliantra server. "
2695 . "I'll try to bring you back to the map you were before. " 2849 . "I'll try to bring you back to the map you were before. "
2696 . "Please report this to the dungeon master!", 2850 . "Please report this to the dungeon master!",
2697 cf::NDI_UNIQUE | cf::NDI_RED); 2851 cf::NDI_UNIQUE | cf::NDI_RED);
2698 2852
2699 warn "ERROR in enter_exit: $@"; 2853 warn "ERROR in enter_exit: $@";
2716sub cf::client::send_drawinfo { 2870sub cf::client::send_drawinfo {
2717 my ($self, $text, $flags) = @_; 2871 my ($self, $text, $flags) = @_;
2718 2872
2719 utf8::encode $text; 2873 utf8::encode $text;
2720 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2874 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2875}
2876
2877=item $client->send_big_packet ($pkt)
2878
2879Like C<send_packet>, but tries to compress large packets, and fragments
2880them as required.
2881
2882=cut
2883
2884our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2885
2886sub cf::client::send_big_packet {
2887 my ($self, $pkt) = @_;
2888
2889 # try lzf for large packets
2890 $pkt = "lzf " . Compress::LZF::compress $pkt
2891 if 1024 <= length $pkt and $self->{can_lzf};
2892
2893 # split very large packets
2894 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2895 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2896 $pkt = "frag";
2897 }
2898
2899 $self->send_packet ($pkt);
2721} 2900}
2722 2901
2723=item $client->send_msg ($channel, $msg, $color, [extra...]) 2902=item $client->send_msg ($channel, $msg, $color, [extra...])
2724 2903
2725Send a drawinfo or msg packet to the client, formatting the msg for the 2904Send a drawinfo or msg packet to the client, formatting the msg for the
2729 2908
2730=cut 2909=cut
2731 2910
2732# non-persistent channels (usually the info channel) 2911# non-persistent channels (usually the info channel)
2733our %CHANNEL = ( 2912our %CHANNEL = (
2913 "c/motd" => {
2914 id => "infobox",
2915 title => "MOTD",
2916 reply => undef,
2917 tooltip => "The message of the day",
2918 },
2734 "c/identify" => { 2919 "c/identify" => {
2735 id => "infobox", 2920 id => "infobox",
2736 title => "Identify", 2921 title => "Identify",
2737 reply => undef, 2922 reply => undef,
2738 tooltip => "Items recently identified", 2923 tooltip => "Items recently identified",
2740 "c/examine" => { 2925 "c/examine" => {
2741 id => "infobox", 2926 id => "infobox",
2742 title => "Examine", 2927 title => "Examine",
2743 reply => undef, 2928 reply => undef,
2744 tooltip => "Signs and other items you examined", 2929 tooltip => "Signs and other items you examined",
2930 },
2931 "c/shopinfo" => {
2932 id => "infobox",
2933 title => "Shop Info",
2934 reply => undef,
2935 tooltip => "What your bargaining skill tells you about the shop",
2745 }, 2936 },
2746 "c/book" => { 2937 "c/book" => {
2747 id => "infobox", 2938 id => "infobox",
2748 title => "Book", 2939 title => "Book",
2749 reply => undef, 2940 reply => undef,
2765 id => "infobox", 2956 id => "infobox",
2766 title => "Body Parts", 2957 title => "Body Parts",
2767 reply => undef, 2958 reply => undef,
2768 tooltip => "Shows which body parts you posess and are available", 2959 tooltip => "Shows which body parts you posess and are available",
2769 }, 2960 },
2961 "c/statistics" => {
2962 id => "infobox",
2963 title => "Statistics",
2964 reply => undef,
2965 tooltip => "Shows your primary statistics",
2966 },
2967 "c/skills" => {
2968 id => "infobox",
2969 title => "Skills",
2970 reply => undef,
2971 tooltip => "Shows your experience per skill and item power",
2972 },
2973 "c/shopitems" => {
2974 id => "infobox",
2975 title => "Shop Items",
2976 reply => undef,
2977 tooltip => "Shows the items currently for sale in this shop",
2978 },
2979 "c/resistances" => {
2980 id => "infobox",
2981 title => "Resistances",
2982 reply => undef,
2983 tooltip => "Shows your resistances",
2984 },
2985 "c/pets" => {
2986 id => "infobox",
2987 title => "Pets",
2988 reply => undef,
2989 tooltip => "Shows information abotu your pets/a specific pet",
2990 },
2991 "c/perceiveself" => {
2992 id => "infobox",
2993 title => "Perceive Self",
2994 reply => undef,
2995 tooltip => "You gained detailed knowledge about yourself",
2996 },
2770 "c/uptime" => { 2997 "c/uptime" => {
2771 id => "infobox", 2998 id => "infobox",
2772 title => "Uptime", 2999 title => "Uptime",
2773 reply => undef, 3000 reply => undef,
2774 tooltip => "How long the server has been running since last restart", 3001 tooltip => "How long the server has been running since last restart",
2783 id => "party", 3010 id => "party",
2784 title => "Party", 3011 title => "Party",
2785 reply => "gsay ", 3012 reply => "gsay ",
2786 tooltip => "Messages and chat related to your party", 3013 tooltip => "Messages and chat related to your party",
2787 }, 3014 },
3015 "c/death" => {
3016 id => "death",
3017 title => "Death",
3018 reply => undef,
3019 tooltip => "Reason for and more info about your most recent death",
3020 },
3021 "c/say" => $SAY_CHANNEL,
3022 "c/chat" => $CHAT_CHANNEL,
2788); 3023);
2789 3024
2790sub cf::client::send_msg { 3025sub cf::client::send_msg {
2791 my ($self, $channel, $msg, $color, @extra) = @_; 3026 my ($self, $channel, $msg, $color, @extra) = @_;
2792 3027
2793 $msg = $self->pl->expand_cfpod ($msg); 3028 $msg = $self->pl->expand_cfpod ($msg)
3029 unless $color & cf::NDI_VERBATIM;
2794 3030
2795 $color &= cf::NDI_CLIENT_MASK; # just in case... 3031 $color &= cf::NDI_CLIENT_MASK; # just in case...
2796 3032
2797 # check predefined channels, for the benefit of C 3033 # check predefined channels, for the benefit of C
2798 if ($CHANNEL{$channel}) { 3034 if ($CHANNEL{$channel}) {
2799 $channel = $CHANNEL{$channel}; 3035 $channel = $CHANNEL{$channel};
2800 3036
2801 $self->ext_msg (channel_info => $channel) 3037 $self->ext_msg (channel_info => $channel);
2802 if $self->can_msg;
2803
2804 $channel = $channel->{id}; 3038 $channel = $channel->{id};
2805 3039
2806 } elsif (ref $channel) { 3040 } elsif (ref $channel) {
2807 # send meta info to client, if not yet sent 3041 # send meta info to client, if not yet sent
2808 unless (exists $self->{channel}{$channel->{id}}) { 3042 unless (exists $self->{channel}{$channel->{id}}) {
2809 $self->{channel}{$channel->{id}} = $channel; 3043 $self->{channel}{$channel->{id}} = $channel;
2810 $self->ext_msg (channel_info => $channel) 3044 $self->ext_msg (channel_info => $channel);
2811 if $self->can_msg;
2812 } 3045 }
2813 3046
2814 $channel = $channel->{id}; 3047 $channel = $channel->{id};
2815 } 3048 }
2816 3049
2817 return unless @extra || length $msg; 3050 return unless @extra || length $msg;
2818 3051
2819 if ($self->can_msg) {
2820 # default colour, mask it out 3052 # default colour, mask it out
2821 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3053 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2822 if $color & cf::NDI_DEF; 3054 if $color & cf::NDI_DEF;
2823 3055
2824 my $pkt = "msg " 3056 my $pkt = "msg "
2825 . $self->{json_coder}->encode ( 3057 . $self->{json_coder}->encode (
2826 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3058 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2827 ); 3059 );
2828 3060
2829 # try lzf for large packets
2830 $pkt = "lzf " . Compress::LZF::compress $pkt
2831 if 1024 <= length $pkt and $self->{can_lzf};
2832
2833 # split very large packets
2834 if (8192 < length $pkt and $self->{can_lzf}) {
2835 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2836 $pkt = "frag";
2837 }
2838
2839 $self->send_packet ($pkt); 3061 $self->send_big_packet ($pkt);
2840 } else {
2841 if ($color >= 0) {
2842 # replace some tags by gcfclient-compatible ones
2843 for ($msg) {
2844 1 while
2845 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2846 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2847 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2848 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2849 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2850 }
2851
2852 $color &= cf::NDI_COLOR_MASK;
2853
2854 utf8::encode $msg;
2855
2856 if (0 && $msg =~ /\[/) {
2857 # COMMAND/INFO
2858 $self->send_packet ("drawextinfo $color 10 8 $msg")
2859 } else {
2860 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2861 $self->send_packet ("drawinfo $color $msg")
2862 }
2863 }
2864 }
2865} 3062}
2866 3063
2867=item $client->ext_msg ($type, @msg) 3064=item $client->ext_msg ($type, @msg)
2868 3065
2869Sends an ext event to the client. 3066Sends an ext event to the client.
2872 3069
2873sub cf::client::ext_msg($$@) { 3070sub cf::client::ext_msg($$@) {
2874 my ($self, $type, @msg) = @_; 3071 my ($self, $type, @msg) = @_;
2875 3072
2876 if ($self->extcmd == 2) { 3073 if ($self->extcmd == 2) {
2877 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3074 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2878 } elsif ($self->extcmd == 1) { # TODO: remove 3075 } elsif ($self->extcmd == 1) { # TODO: remove
2879 push @msg, msgtype => "event_$type"; 3076 push @msg, msgtype => "event_$type";
2880 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3077 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2881 } 3078 }
2882} 3079}
2883 3080
2884=item $client->ext_reply ($msgid, @msg) 3081=item $client->ext_reply ($msgid, @msg)
2885 3082
2889 3086
2890sub cf::client::ext_reply($$@) { 3087sub cf::client::ext_reply($$@) {
2891 my ($self, $id, @msg) = @_; 3088 my ($self, $id, @msg) = @_;
2892 3089
2893 if ($self->extcmd == 2) { 3090 if ($self->extcmd == 2) {
2894 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3091 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2895 } elsif ($self->extcmd == 1) { 3092 } elsif ($self->extcmd == 1) {
2896 #TODO: version 1, remove 3093 #TODO: version 1, remove
2897 unshift @msg, msgtype => "reply", msgid => $id; 3094 unshift @msg, msgtype => "reply", msgid => $id;
2898 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3095 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2899 } 3096 }
2900} 3097}
2901 3098
2902=item $success = $client->query ($flags, "text", \&cb) 3099=item $success = $client->query ($flags, "text", \&cb)
2903 3100
3004 3201
3005 $coro 3202 $coro
3006} 3203}
3007 3204
3008cf::client->attach ( 3205cf::client->attach (
3009 on_destroy => sub { 3206 on_client_destroy => sub {
3010 my ($ns) = @_; 3207 my ($ns) = @_;
3011 3208
3012 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3209 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3013 }, 3210 },
3014); 3211);
3030our $safe_hole = new Safe::Hole; 3227our $safe_hole = new Safe::Hole;
3031 3228
3032$SIG{FPE} = 'IGNORE'; 3229$SIG{FPE} = 'IGNORE';
3033 3230
3034$safe->permit_only (Opcode::opset qw( 3231$safe->permit_only (Opcode::opset qw(
3035 :base_core :base_mem :base_orig :base_math 3232 :base_core :base_mem :base_orig :base_math :base_loop
3036 grepstart grepwhile mapstart mapwhile 3233 grepstart grepwhile mapstart mapwhile
3037 sort time 3234 sort time
3038)); 3235));
3039 3236
3040# here we export the classes and methods available to script code 3237# here we export the classes and methods available to script code
3044The following functions and methods are available within a safe environment: 3241The following functions and methods are available within a safe environment:
3045 3242
3046 cf::object 3243 cf::object
3047 contr pay_amount pay_player map x y force_find force_add destroy 3244 contr pay_amount pay_player map x y force_find force_add destroy
3048 insert remove name archname title slaying race decrease split 3245 insert remove name archname title slaying race decrease split
3246 value
3049 3247
3050 cf::object::player 3248 cf::object::player
3051 player 3249 player
3052 3250
3053 cf::player 3251 cf::player
3059=cut 3257=cut
3060 3258
3061for ( 3259for (
3062 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3260 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3063 insert remove inv nrof name archname title slaying race 3261 insert remove inv nrof name archname title slaying race
3064 decrease split destroy change_exp)], 3262 decrease split destroy change_exp value msg lore send_msg)],
3065 ["cf::object::player" => qw(player)], 3263 ["cf::object::player" => qw(player)],
3066 ["cf::player" => qw(peaceful)], 3264 ["cf::player" => qw(peaceful send_msg)],
3067 ["cf::map" => qw(trigger)], 3265 ["cf::map" => qw(trigger)],
3068) { 3266) {
3069 no strict 'refs'; 3267 no strict 'refs';
3070 my ($pkg, @funs) = @$_; 3268 my ($pkg, @funs) = @$_;
3071 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3269 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3089 3287
3090 my $qcode = $code; 3288 my $qcode = $code;
3091 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3289 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3092 $qcode =~ s/\n/\\n/g; 3290 $qcode =~ s/\n/\\n/g;
3093 3291
3292 %vars = (_dummy => 0) unless %vars;
3293
3294 my @res;
3094 local $_; 3295 local $_;
3095 local @safe::cf::_safe_eval_args = values %vars;
3096 3296
3097 my $eval = 3297 my $eval =
3098 "do {\n" 3298 "do {\n"
3099 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3299 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3100 . "#line 0 \"{$qcode}\"\n" 3300 . "#line 0 \"{$qcode}\"\n"
3101 . $code 3301 . $code
3102 . "\n}" 3302 . "\n}"
3103 ; 3303 ;
3104 3304
3305 if ($CFG{safe_eval}) {
3105 sub_generation_inc; 3306 sub_generation_inc;
3307 local @safe::cf::_safe_eval_args = values %vars;
3106 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3308 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3107 sub_generation_inc; 3309 sub_generation_inc;
3310 } else {
3311 local @cf::_safe_eval_args = values %vars;
3312 @res = wantarray ? eval eval : scalar eval $eval;
3313 }
3108 3314
3109 if ($@) { 3315 if ($@) {
3110 warn "$@"; 3316 warn "$@";
3111 warn "while executing safe code '$code'\n"; 3317 warn "while executing safe code '$code'\n";
3112 warn "with arguments " . (join " ", %vars) . "\n"; 3318 warn "with arguments " . (join " ", %vars) . "\n";
3131=cut 3337=cut
3132 3338
3133sub register_script_function { 3339sub register_script_function {
3134 my ($fun, $cb) = @_; 3340 my ($fun, $cb) = @_;
3135 3341
3136 no strict 'refs'; 3342 $fun = "safe::$fun" if $CFG{safe_eval};
3137 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3343 *$fun = $safe_hole->wrap ($cb);
3138} 3344}
3139 3345
3140=back 3346=back
3141 3347
3142=cut 3348=cut
3163 3369
3164 $facedata->{version} == 2 3370 $facedata->{version} == 2
3165 or cf::cleanup "$path: version mismatch, cannot proceed."; 3371 or cf::cleanup "$path: version mismatch, cannot proceed.";
3166 3372
3167 # patch in the exptable 3373 # patch in the exptable
3374 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3168 $facedata->{resource}{"res/exp_table"} = { 3375 $facedata->{resource}{"res/exp_table"} = {
3169 type => FT_RSRC, 3376 type => FT_RSRC,
3170 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3377 data => $exp_table,
3378 hash => (Digest::MD5::md5 $exp_table),
3171 }; 3379 };
3172 cf::cede_to_tick; 3380 cf::cede_to_tick;
3173 3381
3174 { 3382 {
3175 my $faces = $facedata->{faceinfo}; 3383 my $faces = $facedata->{faceinfo};
3177 while (my ($face, $info) = each %$faces) { 3385 while (my ($face, $info) = each %$faces) {
3178 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3386 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3179 3387
3180 cf::face::set_visibility $idx, $info->{visibility}; 3388 cf::face::set_visibility $idx, $info->{visibility};
3181 cf::face::set_magicmap $idx, $info->{magicmap}; 3389 cf::face::set_magicmap $idx, $info->{magicmap};
3182 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3390 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3183 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3391 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3184 3392
3185 cf::cede_to_tick; 3393 cf::cede_to_tick;
3186 } 3394 }
3187 3395
3188 while (my ($face, $info) = each %$faces) { 3396 while (my ($face, $info) = each %$faces) {
3212 3420
3213 cf::anim::invalidate_all; # d'oh 3421 cf::anim::invalidate_all; # d'oh
3214 } 3422 }
3215 3423
3216 { 3424 {
3217 # TODO: for gcfclient pleasure, we should give resources
3218 # that gcfclient doesn't grok a >10000 face index.
3219 my $res = $facedata->{resource}; 3425 my $res = $facedata->{resource};
3220 3426
3221 while (my ($name, $info) = each %$res) { 3427 while (my ($name, $info) = each %$res) {
3222 if (defined $info->{type}) { 3428 if (defined $info->{type}) {
3223 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3429 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3224 my $data;
3225 3430
3226 if ($info->{type} & 1) { 3431 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3227 # prepend meta info
3228
3229 my $meta = $enc->encode ({
3230 name => $name,
3231 %{ $info->{meta} || {} },
3232 });
3233
3234 $data = pack "(w/a*)*", $meta, $info->{data};
3235 } else {
3236 $data = $info->{data};
3237 }
3238
3239 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3240 cf::face::set_type $idx, $info->{type}; 3432 cf::face::set_type $idx, $info->{type};
3241 } else { 3433 } else {
3242 $RESOURCE{$name} = $info; 3434 $RESOURCE{$name} = $info;
3243 } 3435 }
3244 3436
3327 reload_treasures; 3519 reload_treasures;
3328 3520
3329 warn "finished reloading resource files\n"; 3521 warn "finished reloading resource files\n";
3330} 3522}
3331 3523
3332sub init {
3333 my $guard = freeze_mainloop;
3334
3335 evthread_start IO::AIO::poll_fileno;
3336
3337 reload_resources;
3338}
3339
3340sub reload_config { 3524sub reload_config {
3525 warn "reloading config file...\n";
3526
3341 open my $fh, "<:utf8", "$CONFDIR/config" 3527 open my $fh, "<:utf8", "$CONFDIR/config"
3342 or return; 3528 or return;
3343 3529
3344 local $/; 3530 local $/;
3345 *CFG = YAML::Load <$fh>; 3531 *CFG = YAML::XS::Load scalar <$fh>;
3346 3532
3347 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3533 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3348 3534
3349 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3535 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3350 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3536 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3351 3537
3352 if (exists $CFG{mlockall}) { 3538 if (exists $CFG{mlockall}) {
3354 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3540 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3355 and die "WARNING: m(un)lockall failed: $!\n"; 3541 and die "WARNING: m(un)lockall failed: $!\n";
3356 }; 3542 };
3357 warn $@ if $@; 3543 warn $@ if $@;
3358 } 3544 }
3545
3546 warn "finished reloading resource files\n";
3359} 3547}
3360 3548
3361sub pidfile() { 3549sub pidfile() {
3362 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3550 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3363 or die "$PIDFILE: $!"; 3551 or die "$PIDFILE: $!";
3375 3563
3376 seek $fh, 0, 0; 3564 seek $fh, 0, 0;
3377 print $fh $$; 3565 print $fh $$;
3378} 3566}
3379 3567
3568sub main_loop {
3569 warn "EV::loop starting\n";
3570 if (1) {
3571 EV::loop;
3572 }
3573 warn "EV::loop returned\n";
3574 goto &main_loop unless $REALLY_UNLOOP;
3575}
3576
3380sub main { 3577sub main {
3381 atomic; 3578 cf::init_globals; # initialise logging
3579
3580 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3581 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3582 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3583 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3584
3585 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3382 3586
3383 # we must not ever block the main coroutine 3587 # we must not ever block the main coroutine
3384 local $Coro::idle = sub { 3588 local $Coro::idle = sub {
3385 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3589 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3386 (async { 3590 (async {
3387 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3591 $Coro::current->{desc} = "IDLE BUG HANDLER";
3388 EV::loop EV::LOOP_ONESHOT; 3592 EV::loop EV::LOOP_ONESHOT;
3389 })->prio (Coro::PRIO_MAX); 3593 })->prio (Coro::PRIO_MAX);
3390 }; 3594 };
3391 3595
3392 { 3596 evthread_start IO::AIO::poll_fileno;
3393 my $guard = freeze_mainloop; 3597
3598 cf::sync_job {
3599 cf::init_experience;
3600 cf::init_anim;
3601 cf::init_attackmess;
3602 cf::init_dynamic;
3603
3604 cf::load_settings;
3605 cf::load_materials;
3606
3607 reload_resources;
3394 reload_config; 3608 reload_config;
3395 db_init; 3609 db_init;
3610
3611 cf::init_uuid;
3612 cf::init_signals;
3613 cf::init_skills;
3614
3615 cf::init_beforeplay;
3616
3617 atomic;
3618
3396 load_extensions; 3619 load_extensions;
3397 3620
3398 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3399 }
3400
3401 utime time, time, $RUNTIMEFILE; 3621 utime time, time, $RUNTIMEFILE;
3402 3622
3403 # no (long-running) fork's whatsoever before this point(!) 3623 # no (long-running) fork's whatsoever before this point(!)
3624 use POSIX ();
3404 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3625 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3405 3626
3406 EV::loop; 3627 (pop @POST_INIT)->(0) while @POST_INIT;
3628 };
3629
3630 cf::object::thawer::errors_are_fatal 0;
3631 warn "parse errors in files are no longer fatal from this point on.\n";
3632
3633 main_loop;
3407} 3634}
3408 3635
3409############################################################################# 3636#############################################################################
3410# initialisation and cleanup 3637# initialisation and cleanup
3411 3638
3412# install some emergency cleanup handlers 3639# install some emergency cleanup handlers
3413BEGIN { 3640BEGIN {
3414 our %SIGWATCHER = (); 3641 our %SIGWATCHER = ();
3415 for my $signal (qw(INT HUP TERM)) { 3642 for my $signal (qw(INT HUP TERM)) {
3416 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3643 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3417 cf::cleanup "SIG$signal"; 3644 cf::cleanup "SIG$signal";
3418 }; 3645 };
3419 } 3646 }
3420} 3647}
3421 3648
3422sub write_runtime_sync { 3649sub write_runtime_sync {
3650 my $t0 = AE::time;
3651
3423 # first touch the runtime file to show we are still running: 3652 # first touch the runtime file to show we are still running:
3424 # the fsync below can take a very very long time. 3653 # the fsync below can take a very very long time.
3425 3654
3426 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3655 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3427 3656
3428 my $guard = cf::lock_acquire "write_runtime"; 3657 my $guard = cf::lock_acquire "write_runtime";
3429 3658
3430 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3659 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3431 or return; 3660 or return;
3432 3661
3433 my $value = $cf::RUNTIME + 90 + 10; 3662 my $value = $cf::RUNTIME + 90 + 10;
3434 # 10 is the runtime save interval, for a monotonic clock 3663 # 10 is the runtime save interval, for a monotonic clock
3435 # 60 allows for the watchdog to kill the server. 3664 # 60 allows for the watchdog to kill the server.
3448 or return; 3677 or return;
3449 3678
3450 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3679 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3451 and return; 3680 and return;
3452 3681
3453 warn "runtime file written.\n"; 3682 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3454 3683
3455 1 3684 1
3456} 3685}
3457 3686
3458our $uuid_lock; 3687our $uuid_lock;
3467 my $uuid = "$LOCALDIR/uuid"; 3696 my $uuid = "$LOCALDIR/uuid";
3468 3697
3469 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3698 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3470 or return; 3699 or return;
3471 3700
3472 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3701 my $value = uuid_seq uuid_cur;
3702
3703 unless ($value) {
3704 warn "cowardly refusing to write zero uuid value!\n";
3705 return;
3706 }
3707
3708 my $value = uuid_str $value + $uuid_skip;
3473 $uuid_skip = 0; 3709 $uuid_skip = 0;
3474 3710
3475 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3711 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3476 and return; 3712 and return;
3477 3713
3499} 3735}
3500 3736
3501sub emergency_save() { 3737sub emergency_save() {
3502 my $freeze_guard = cf::freeze_mainloop; 3738 my $freeze_guard = cf::freeze_mainloop;
3503 3739
3504 warn "enter emergency perl save\n"; 3740 warn "emergency_perl_save: enter\n";
3505 3741
3506 cf::sync_job { 3742 cf::sync_job {
3743 # this is a trade-off: we want to be very quick here, so
3744 # save all maps without fsync, and later call a global sync
3745 # (which in turn might be very very slow)
3746 local $USE_FSYNC = 0;
3747
3507 # use a peculiar iteration method to avoid tripping on perl 3748 # use a peculiar iteration method to avoid tripping on perl
3508 # refcount bugs in for. also avoids problems with players 3749 # refcount bugs in for. also avoids problems with players
3509 # and maps saved/destroyed asynchronously. 3750 # and maps saved/destroyed asynchronously.
3510 warn "begin emergency player save\n"; 3751 warn "emergency_perl_save: begin player save\n";
3511 for my $login (keys %cf::PLAYER) { 3752 for my $login (keys %cf::PLAYER) {
3512 my $pl = $cf::PLAYER{$login} or next; 3753 my $pl = $cf::PLAYER{$login} or next;
3513 $pl->valid or next; 3754 $pl->valid or next;
3514 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3755 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3515 $pl->save; 3756 $pl->save;
3516 } 3757 }
3517 warn "end emergency player save\n"; 3758 warn "emergency_perl_save: end player save\n";
3518 3759
3519 warn "begin emergency map save\n"; 3760 warn "emergency_perl_save: begin map save\n";
3520 for my $path (keys %cf::MAP) { 3761 for my $path (keys %cf::MAP) {
3521 my $map = $cf::MAP{$path} or next; 3762 my $map = $cf::MAP{$path} or next;
3522 $map->valid or next; 3763 $map->valid or next;
3523 $map->save; 3764 $map->save;
3524 } 3765 }
3525 warn "end emergency map save\n"; 3766 warn "emergency_perl_save: end map save\n";
3526 3767
3527 warn "begin emergency database checkpoint\n"; 3768 warn "emergency_perl_save: begin database checkpoint\n";
3528 BDB::db_env_txn_checkpoint $DB_ENV; 3769 BDB::db_env_txn_checkpoint $DB_ENV;
3529 warn "end emergency database checkpoint\n"; 3770 warn "emergency_perl_save: end database checkpoint\n";
3530 3771
3531 warn "begin write uuid\n"; 3772 warn "emergency_perl_save: begin write uuid\n";
3532 write_uuid_sync 1; 3773 write_uuid_sync 1;
3533 warn "end write uuid\n"; 3774 warn "emergency_perl_save: end write uuid\n";
3534 }; 3775 };
3535 3776
3777 warn "emergency_perl_save: starting sync()\n";
3778 IO::AIO::aio_sync sub {
3779 warn "emergency_perl_save: finished sync()\n";
3780 };
3781
3536 warn "leave emergency perl save\n"; 3782 warn "emergency_perl_save: leave\n";
3537} 3783}
3538 3784
3539sub post_cleanup { 3785sub post_cleanup {
3540 my ($make_core) = @_; 3786 my ($make_core) = @_;
3541 3787
3567 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3813 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3568 for my $name (keys %$leaf_symtab) { 3814 for my $name (keys %$leaf_symtab) {
3569 _gv_clear *{"$pkg$name"}; 3815 _gv_clear *{"$pkg$name"};
3570# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3816# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3571 } 3817 }
3572 warn "cleared package #$pkg\n";#d#
3573} 3818}
3574
3575our $RELOAD; # how many times to reload
3576 3819
3577sub do_reload_perl() { 3820sub do_reload_perl() {
3578 # can/must only be called in main 3821 # can/must only be called in main
3579 if ($Coro::current != $Coro::main) { 3822 if (in_main) {
3580 warn "can only reload from main coroutine"; 3823 warn "can only reload from main coroutine";
3581 return; 3824 return;
3582 } 3825 }
3583 3826
3584 return if $RELOAD++; 3827 return if $RELOAD++;
3828
3829 my $t1 = AE::time;
3585 3830
3586 while ($RELOAD) { 3831 while ($RELOAD) {
3587 warn "reloading..."; 3832 warn "reloading...";
3588 3833
3589 warn "entering sync_job"; 3834 warn "entering sync_job";
3650 clear_package "safe::$_" 3895 clear_package "safe::$_"
3651 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3896 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3652 3897
3653 warn "unloading cf.pm \"a bit\""; 3898 warn "unloading cf.pm \"a bit\"";
3654 delete $INC{"cf.pm"}; 3899 delete $INC{"cf.pm"};
3655 delete $INC{"cf/pod.pm"}; 3900 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3656 3901
3657 # don't, removes xs symbols, too, 3902 # don't, removes xs symbols, too,
3658 # and global variables created in xs 3903 # and global variables created in xs
3659 #clear_package __PACKAGE__; 3904 #clear_package __PACKAGE__;
3660 3905
3661 warn "unload completed, starting to reload now"; 3906 warn "unload completed, starting to reload now";
3662 3907
3663 warn "reloading cf.pm"; 3908 warn "reloading cf.pm";
3664 require cf; 3909 require cf;
3665 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3910 cf::_connect_to_perl_1;
3666 3911
3667 warn "loading config and database again"; 3912 warn "loading config and database again";
3668 cf::reload_config; 3913 cf::reload_config;
3669 3914
3670 warn "loading extensions"; 3915 warn "loading extensions";
3671 cf::load_extensions; 3916 cf::load_extensions;
3672 3917
3918 if ($REATTACH_ON_RELOAD) {
3673 warn "reattaching attachments to objects/players"; 3919 warn "reattaching attachments to objects/players";
3674 _global_reattach; # objects, sockets 3920 _global_reattach; # objects, sockets
3675 warn "reattaching attachments to maps"; 3921 warn "reattaching attachments to maps";
3676 reattach $_ for values %MAP; 3922 reattach $_ for values %MAP;
3677 warn "reattaching attachments to players"; 3923 warn "reattaching attachments to players";
3678 reattach $_ for values %PLAYER; 3924 reattach $_ for values %PLAYER;
3925 }
3926
3927 warn "running post_init jobs";
3928 (pop @POST_INIT)->(1) while @POST_INIT;
3679 3929
3680 warn "leaving sync_job"; 3930 warn "leaving sync_job";
3681 3931
3682 1 3932 1
3683 } or do { 3933 } or do {
3686 }; 3936 };
3687 3937
3688 warn "reloaded"; 3938 warn "reloaded";
3689 --$RELOAD; 3939 --$RELOAD;
3690 } 3940 }
3941
3942 $t1 = AE::time - $t1;
3943 warn "reload completed in ${t1}s\n";
3691}; 3944};
3692 3945
3693our $RELOAD_WATCHER; # used only during reload 3946our $RELOAD_WATCHER; # used only during reload
3694 3947
3695sub reload_perl() { 3948sub reload_perl() {
3696 # doing reload synchronously and two reloads happen back-to-back, 3949 # doing reload synchronously and two reloads happen back-to-back,
3697 # coro crashes during coro_state_free->destroy here. 3950 # coro crashes during coro_state_free->destroy here.
3698 3951
3952 $RELOAD_WATCHER ||= cf::async {
3953 Coro::AIO::aio_wait cache_extensions;
3954
3699 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3955 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3700 do_reload_perl; 3956 do_reload_perl;
3701 undef $RELOAD_WATCHER; 3957 undef $RELOAD_WATCHER;
3958 };
3702 }; 3959 };
3703} 3960}
3704 3961
3705register_command "reload" => sub { 3962register_command "reload" => sub {
3706 my ($who, $arg) = @_; 3963 my ($who, $arg) = @_;
3720 3977
3721our @WAIT_FOR_TICK; 3978our @WAIT_FOR_TICK;
3722our @WAIT_FOR_TICK_BEGIN; 3979our @WAIT_FOR_TICK_BEGIN;
3723 3980
3724sub wait_for_tick { 3981sub wait_for_tick {
3725 return if tick_inhibit || $Coro::current == $Coro::main; 3982 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3726 3983
3727 my $signal = new Coro::Signal; 3984 my $signal = new Coro::Signal;
3728 push @WAIT_FOR_TICK, $signal; 3985 push @WAIT_FOR_TICK, $signal;
3729 $signal->wait; 3986 $signal->wait;
3730} 3987}
3731 3988
3732sub wait_for_tick_begin { 3989sub wait_for_tick_begin {
3733 return if tick_inhibit || $Coro::current == $Coro::main; 3990 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3734 3991
3735 my $signal = new Coro::Signal; 3992 my $signal = new Coro::Signal;
3736 push @WAIT_FOR_TICK_BEGIN, $signal; 3993 push @WAIT_FOR_TICK_BEGIN, $signal;
3737 $signal->wait; 3994 $signal->wait;
3738} 3995}
3743 unless ++$bug_warning > 10; 4000 unless ++$bug_warning > 10;
3744 return; 4001 return;
3745 } 4002 }
3746 4003
3747 cf::server_tick; # one server iteration 4004 cf::server_tick; # one server iteration
4005
4006 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3748 4007
3749 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4008 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3750 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4009 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3751 Coro::async_pool { 4010 Coro::async_pool {
3752 $Coro::current->{desc} = "runtime saver"; 4011 $Coro::current->{desc} = "runtime saver";
3775} 4034}
3776 4035
3777{ 4036{
3778 # configure BDB 4037 # configure BDB
3779 4038
3780 BDB::min_parallel 8; 4039 BDB::min_parallel 16;
3781 BDB::max_poll_reqs $TICK * 0.1; 4040 BDB::max_poll_reqs $TICK * 0.1;
3782 $AnyEvent::BDB::WATCHER->priority (1); 4041 $AnyEvent::BDB::WATCHER->priority (1);
3783 4042
3784 unless ($DB_ENV) { 4043 unless ($DB_ENV) {
3785 $DB_ENV = BDB::db_env_create; 4044 $DB_ENV = BDB::db_env_create;
3832 $msg =~ s/\n//; 4091 $msg =~ s/\n//;
3833 4092
3834 # limit the # of concurrent backtraces 4093 # limit the # of concurrent backtraces
3835 if ($_log_backtrace < 2) { 4094 if ($_log_backtrace < 2) {
3836 ++$_log_backtrace; 4095 ++$_log_backtrace;
4096 my $perl_bt = Carp::longmess $msg;
3837 async { 4097 async {
3838 $Coro::current->{desc} = "abt $msg"; 4098 $Coro::current->{desc} = "abt $msg";
3839 4099
3840 my @bt = fork_call { 4100 my @bt = fork_call {
3841 @addr = map { sprintf "%x", $_ } @addr; 4101 @addr = map { sprintf "%x", $_ } @addr;
3852 } 4112 }
3853 4113
3854 @funcs 4114 @funcs
3855 }; 4115 };
3856 4116
3857 LOG llevInfo, "[ABT] $msg\n"; 4117 LOG llevInfo, "[ABT] $perl_bt\n";
4118 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3858 LOG llevInfo, "[ABT] $_\n" for @bt; 4119 LOG llevInfo, "[ABT] $_\n" for @bt;
3859 --$_log_backtrace; 4120 --$_log_backtrace;
3860 }; 4121 };
3861 } else { 4122 } else {
3862 LOG llevInfo, "[ABT] $msg\n"; 4123 LOG llevInfo, "[ABT] $msg\n";
3863 LOG llevInfo, "[ABT] [suppressed]\n"; 4124 LOG llevInfo, "[ABT] [suppressed]\n";
3864 } 4125 }
3865} 4126}
3866 4127
3867# load additional modules 4128# load additional modules
3868use cf::pod; 4129require "cf/$_.pm" for @EXTRA_MODULES;
4130cf::_connect_to_perl_2;
3869 4131
3870END { cf::emergency_save } 4132END { cf::emergency_save }
3871 4133
38721 41341
3873 4135

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines