ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.440 by root, Mon Aug 11 23:23:41 2008 UTC vs.
Revision 1.522 by root, Sat Apr 17 02:22:14 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
25use 5.10.0;
24use utf8; 26use utf8;
25use strict; 27use strict qw(vars subs);
26 28
27use Symbol; 29use Symbol;
28use List::Util; 30use List::Util;
29use Socket; 31use Socket;
30use EV; 32use EV;
31use Opcode; 33use Opcode;
32use Safe; 34use Safe;
33use Safe::Hole; 35use Safe::Hole;
34use Storable (); 36use Storable ();
37use Carp ();
35 38
39use Guard ();
36use Coro (); 40use Coro ();
37use Coro::State; 41use Coro::State;
38use Coro::Handle; 42use Coro::Handle;
43use Coro::EV;
39use Coro::AnyEvent; 44use Coro::AnyEvent;
40use Coro::Timer; 45use Coro::Timer;
41use Coro::Signal; 46use Coro::Signal;
42use Coro::Semaphore; 47use Coro::Semaphore;
48use Coro::SemaphoreSet;
43use Coro::AnyEvent; 49use Coro::AnyEvent;
44use Coro::AIO; 50use Coro::AIO;
45use Coro::BDB 1.6; 51use Coro::BDB 1.6;
46use Coro::Storable; 52use Coro::Storable;
47use Coro::Util (); 53use Coro::Util ();
48 54
49use JSON::XS 2.01 (); 55use JSON::XS 2.01 ();
50use BDB (); 56use BDB ();
51use Data::Dumper; 57use Data::Dumper;
52use Digest::MD5;
53use Fcntl; 58use Fcntl;
54use YAML (); 59use YAML::XS ();
55use IO::AIO (); 60use IO::AIO ();
56use Time::HiRes; 61use Time::HiRes;
57use Compress::LZF; 62use Compress::LZF;
58use Digest::MD5 (); 63use Digest::MD5 ();
59 64
61 66
62# configure various modules to our taste 67# configure various modules to our taste
63# 68#
64$Storable::canonical = 1; # reduce rsync transfers 69$Storable::canonical = 1; # reduce rsync transfers
65Coro::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";
66Compress::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
67 77
68$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" };
69 80
70sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
71 82
72our %COMMAND = (); 83our %COMMAND = ();
73our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
76our %EXTCMD = (); 87our %EXTCMD = ();
77our %EXTICMD = (); 88our %EXTICMD = ();
78our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
79our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
80 91
81our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
82our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
83 96
84our $CONFDIR = confdir; 97our $CONFDIR = confdir;
85our $DATADIR = datadir; 98our $DATADIR = datadir;
86our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
87our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
88our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
89our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
90our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
91our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
92our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
93our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
94our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110
95our %RESOURCE; 111our %RESOURCE;
112
113our $OUTPUT_RATE_MIN = 4000;
114our $OUTPUT_RATE_MAX = 100000;
96 115
97our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 116our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
98our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 117our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
99our $NEXT_TICK; 118our $NEXT_TICK;
100our $USE_FSYNC = 1; # use fsync to write maps - default off 119our $USE_FSYNC = 1; # use fsync to write maps - default on
101 120
102our $BDB_DEADLOCK_WATCHER; 121our $BDB_DEADLOCK_WATCHER;
103our $BDB_CHECKPOINT_WATCHER; 122our $BDB_CHECKPOINT_WATCHER;
104our $BDB_TRICKLE_WATCHER; 123our $BDB_TRICKLE_WATCHER;
105our $DB_ENV; 124our $DB_ENV;
106 125
126our @EXTRA_MODULES = qw(pod match mapscript);
127
107our %CFG; 128our %CFG;
108 129
109our $UPTIME; $UPTIME ||= time; 130our $UPTIME; $UPTIME ||= time;
110our $RUNTIME; 131our $RUNTIME;
111our $NOW; 132our $NOW;
120our $LOAD; # a number between 0 (idle) and 1 (too many objects) 141our $LOAD; # a number between 0 (idle) and 1 (too many objects)
121our $LOADAVG; # same thing, but with alpha-smoothing 142our $LOADAVG; # same thing, but with alpha-smoothing
122our $JITTER; # average jitter 143our $JITTER; # average jitter
123our $TICK_START; # for load detecting purposes 144our $TICK_START; # for load detecting purposes
124 145
146our @POST_INIT;
147
148our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
149our $REALLY_UNLOOP; # never set to true, please :)
150
125binmode STDOUT; 151binmode STDOUT;
126binmode STDERR; 152binmode STDERR;
127 153
128# read virtual server time, if available 154# read virtual server time, if available
129unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 155unless ($RUNTIME || !-e $RUNTIMEFILE) {
130 open my $fh, "<", "$LOCALDIR/runtime" 156 open my $fh, "<", $RUNTIMEFILE
131 or die "unable to read runtime file: $!"; 157 or die "unable to read $RUNTIMEFILE file: $!";
132 $RUNTIME = <$fh> + 0.; 158 $RUNTIME = <$fh> + 0.;
133} 159}
160
161eval "sub TICK() { $TICK } 1" or die;
134 162
135mkdir $_ 163mkdir $_
136 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 164 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
137 165
138our $EMERGENCY_POSITION; 166our $EMERGENCY_POSITION;
139 167
140sub cf::map::normalise; 168sub cf::map::normalise;
169
170sub in_main() {
171 $Coro::current == $Coro::main
172}
173
174#############################################################################
175
176%REFLECT = ();
177for (@REFLECT) {
178 my $reflect = JSON::XS::decode_json $_;
179 $REFLECT{$reflect->{class}} = $reflect;
180}
181
182# this is decidedly evil
183$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
141 184
142############################################################################# 185#############################################################################
143 186
144=head2 GLOBAL VARIABLES 187=head2 GLOBAL VARIABLES
145 188
192returns directly I<after> the tick processing (and consequently, can only wake one process 235returns directly I<after> the tick processing (and consequently, can only wake one process
193per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 236per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
194 237
195=item @cf::INVOKE_RESULTS 238=item @cf::INVOKE_RESULTS
196 239
197This array contains the results of the last C<invoke ()> call. When 240This array contains the results of the last C<invoke ()> call. When
198C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 241C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
199that call. 242that call.
200 243
244=item %cf::REFLECT
245
246Contains, for each (C++) class name, a hash reference with information
247about object members (methods, scalars, arrays and flags) and other
248metadata, which is useful for introspection.
249
201=back 250=back
202 251
203=cut 252=cut
204 253
205BEGIN { 254$Coro::State::WARNHOOK = sub {
206 *CORE::GLOBAL::warn = sub {
207 my $msg = join "", @_; 255 my $msg = join "", @_;
208 256
209 $msg .= "\n" 257 $msg .= "\n"
210 unless $msg =~ /\n$/; 258 unless $msg =~ /\n$/;
211 259
212 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 260 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
213 261
214 LOG llevError, $msg; 262 LOG llevError, $msg;
215 }; 263};
216}
217 264
218$Coro::State::DIEHOOK = sub { 265$Coro::State::DIEHOOK = sub {
219 return unless $^S eq 0; # "eq", not "==" 266 return unless $^S eq 0; # "eq", not "=="
220 267
221 if ($Coro::current == $Coro::main) {#d# 268 warn Carp::longmess $_[0];
269
270 if (in_main) {#d#
222 warn "DIEHOOK called in main context, Coro bug?\n";#d# 271 warn "DIEHOOK called in main context, Coro bug?\n";#d#
223 return;#d# 272 return;#d#
224 }#d# 273 }#d#
225 274
226 # kill coroutine otherwise 275 # kill coroutine otherwise
227 warn Carp::longmess $_[0];
228 Coro::terminate 276 Coro::terminate
229}; 277};
230
231$SIG{__DIE__} = sub { }; #d#?
232 278
233@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 279@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
234@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 280@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
235@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 281@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
236@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 282@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
246 cf::client cf::player 292 cf::client cf::player
247 cf::arch cf::living 293 cf::arch cf::living
248 cf::map cf::mapspace 294 cf::map cf::mapspace
249 cf::party cf::region 295 cf::party cf::region
250)) { 296)) {
251 no strict 'refs';
252 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 297 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
253} 298}
254 299
255$EV::DIED = sub { 300$EV::DIED = sub {
256 warn "error in event callback: @_"; 301 Carp::cluck "error in event callback: @_";
257}; 302};
258 303
259############################################################################# 304#############################################################################
260 305
261=head2 UTILITY FUNCTIONS 306=head2 UTILITY FUNCTIONS
298our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 343our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
299 344
300sub encode_json($) { $json_coder->encode ($_[0]) } 345sub encode_json($) { $json_coder->encode ($_[0]) }
301sub decode_json($) { $json_coder->decode ($_[0]) } 346sub decode_json($) { $json_coder->decode ($_[0]) }
302 347
348=item cf::post_init { BLOCK }
349
350Execute the given codeblock, I<after> all extensions have been (re-)loaded,
351but I<before> the server starts ticking again.
352
353The cdoeblock will have a single boolean argument to indicate whether this
354is a reload or not.
355
356=cut
357
358sub post_init(&) {
359 push @POST_INIT, shift;
360}
361
303=item cf::lock_wait $string 362=item cf::lock_wait $string
304 363
305Wait until the given lock is available. See cf::lock_acquire. 364Wait until the given lock is available. See cf::lock_acquire.
306 365
307=item my $lock = cf::lock_acquire $string 366=item my $lock = cf::lock_acquire $string
308 367
309Wait until the given lock is available and then acquires it and returns 368Wait until the given lock is available and then acquires it and returns
310a Coro::guard object. If the guard object gets destroyed (goes out of scope, 369a L<Guard> object. If the guard object gets destroyed (goes out of scope,
311for example when the coroutine gets canceled), the lock is automatically 370for example when the coroutine gets canceled), the lock is automatically
312returned. 371returned.
313 372
314Locks are *not* recursive, locking from the same coro twice results in a 373Locks are *not* recursive, locking from the same coro twice results in a
315deadlocked coro. 374deadlocked coro.
321 380
322Return true if the lock is currently active, i.e. somebody has locked it. 381Return true if the lock is currently active, i.e. somebody has locked it.
323 382
324=cut 383=cut
325 384
326our %LOCK; 385our $LOCKS = new Coro::SemaphoreSet;
327our %LOCKER;#d#
328 386
329sub lock_wait($) { 387sub lock_wait($) {
330 my ($key) = @_; 388 $LOCKS->wait ($_[0]);
331
332 if ($LOCKER{$key} == $Coro::current) {#d#
333 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
334 return;#d#
335 }#d#
336
337 # wait for lock, if any
338 while ($LOCK{$key}) {
339 push @{ $LOCK{$key} }, $Coro::current;
340 Coro::schedule;
341 }
342} 389}
343 390
344sub lock_acquire($) { 391sub lock_acquire($) {
345 my ($key) = @_; 392 $LOCKS->guard ($_[0])
346
347 # wait, to be sure we are not locked
348 lock_wait $key;
349
350 $LOCK{$key} = [];
351 $LOCKER{$key} = $Coro::current;#d#
352
353 Coro::guard {
354 delete $LOCKER{$key};#d#
355 # wake up all waiters, to be on the safe side
356 $_->ready for @{ delete $LOCK{$key} };
357 }
358} 393}
359 394
360sub lock_active($) { 395sub lock_active($) {
361 my ($key) = @_; 396 $LOCKS->count ($_[0]) < 1
362
363 ! ! $LOCK{$key}
364} 397}
365 398
366sub freeze_mainloop { 399sub freeze_mainloop {
367 tick_inhibit_inc; 400 tick_inhibit_inc;
368 401
369 Coro::guard \&tick_inhibit_dec; 402 &Guard::guard (\&tick_inhibit_dec);
370} 403}
371 404
372=item cf::periodic $interval, $cb 405=item cf::periodic $interval, $cb
373 406
374Like EV::periodic, but randomly selects a starting point so that the actions 407Like EV::periodic, but randomly selects a starting point so that the actions
375get spread over timer. 408get spread over time.
376 409
377=cut 410=cut
378 411
379sub periodic($$) { 412sub periodic($$) {
380 my ($interval, $cb) = @_; 413 my ($interval, $cb) = @_;
397 430
398=cut 431=cut
399 432
400our @SLOT_QUEUE; 433our @SLOT_QUEUE;
401our $SLOT_QUEUE; 434our $SLOT_QUEUE;
435our $SLOT_DECAY = 0.9;
402 436
403$SLOT_QUEUE->cancel if $SLOT_QUEUE; 437$SLOT_QUEUE->cancel if $SLOT_QUEUE;
404$SLOT_QUEUE = Coro::async { 438$SLOT_QUEUE = Coro::async {
405 $Coro::current->desc ("timeslot manager"); 439 $Coro::current->desc ("timeslot manager");
406 440
407 my $signal = new Coro::Signal; 441 my $signal = new Coro::Signal;
442 my $busy;
408 443
409 while () { 444 while () {
410 next_job: 445 next_job:
446
411 my $avail = cf::till_tick; 447 my $avail = cf::till_tick;
412 if ($avail > 0.01) { 448
413 for (0 .. $#SLOT_QUEUE) { 449 for (0 .. $#SLOT_QUEUE) {
414 if ($SLOT_QUEUE[$_][0] < $avail) { 450 if ($SLOT_QUEUE[$_][0] <= $avail) {
451 $busy = 0;
415 my $job = splice @SLOT_QUEUE, $_, 1, (); 452 my $job = splice @SLOT_QUEUE, $_, 1, ();
416 $job->[2]->send; 453 $job->[2]->send;
417 Coro::cede; 454 Coro::cede;
418 goto next_job; 455 goto next_job;
419 } 456 } else {
457 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
420 } 458 }
421 } 459 }
422 460
423 if (@SLOT_QUEUE) { 461 if (@SLOT_QUEUE) {
424 # we do not use wait_for_tick() as it returns immediately when tick is inactive 462 # we do not use wait_for_tick() as it returns immediately when tick is inactive
425 push @cf::WAIT_FOR_TICK, $signal; 463 push @cf::WAIT_FOR_TICK, $signal;
426 $signal->wait; 464 $signal->wait;
427 } else { 465 } else {
466 $busy = 0;
428 Coro::schedule; 467 Coro::schedule;
429 } 468 }
430 } 469 }
431}; 470};
432 471
433sub get_slot($;$$) { 472sub get_slot($;$$) {
434 return if tick_inhibit || $Coro::current == $Coro::main; 473 return if tick_inhibit || $Coro::current == $Coro::main;
435 474
436 my ($time, $pri, $name) = @_; 475 my ($time, $pri, $name) = @_;
437 476
438 $time = $TICK * .6 if $time > $TICK * .6; 477 $time = clamp $time, 0.01, $TICK * .6;
478
439 my $sig = new Coro::Signal; 479 my $sig = new Coro::Signal;
440 480
441 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 481 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
442 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 482 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
443 $SLOT_QUEUE->ready; 483 $SLOT_QUEUE->ready;
470 510
471sub sync_job(&) { 511sub sync_job(&) {
472 my ($job) = @_; 512 my ($job) = @_;
473 513
474 if ($Coro::current == $Coro::main) { 514 if ($Coro::current == $Coro::main) {
475 my $time = EV::time; 515 my $time = AE::time;
476 516
477 # this is the main coro, too bad, we have to block 517 # this is the main coro, too bad, we have to block
478 # till the operation succeeds, freezing the server :/ 518 # till the operation succeeds, freezing the server :/
479 519
480 LOG llevError, Carp::longmess "sync job";#d# 520 LOG llevError, Carp::longmess "sync job";#d#
497 } else { 537 } else {
498 EV::loop EV::LOOP_ONESHOT; 538 EV::loop EV::LOOP_ONESHOT;
499 } 539 }
500 } 540 }
501 541
502 my $time = EV::time - $time; 542 my $time = AE::time - $time;
503 543
504 $TICK_START += $time; # do not account sync jobs to server load 544 $TICK_START += $time; # do not account sync jobs to server load
505 545
506 wantarray ? @res : $res[0] 546 wantarray ? @res : $res[0]
507 } else { 547 } else {
551 reset_signals; 591 reset_signals;
552 &$cb 592 &$cb
553 }, @args; 593 }, @args;
554 594
555 wantarray ? @res : $res[-1] 595 wantarray ? @res : $res[-1]
596}
597
598sub objinfo {
599 (
600 "counter value" => cf::object::object_count,
601 "objects created" => cf::object::create_count,
602 "objects destroyed" => cf::object::destroy_count,
603 "freelist size" => cf::object::free_count,
604 "allocated objects" => cf::object::objects_size,
605 "active objects" => cf::object::actives_size,
606 )
556} 607}
557 608
558=item $coin = coin_from_name $name 609=item $coin = coin_from_name $name
559 610
560=cut 611=cut
726 777
727############################################################################# 778#############################################################################
728 779
729=head2 ATTACHABLE OBJECTS 780=head2 ATTACHABLE OBJECTS
730 781
731Many objects in crossfire are so-called attachable objects. That means you can 782Many objects in deliantra are so-called attachable objects. That means you can
732attach callbacks/event handlers (a collection of which is called an "attachment") 783attach callbacks/event handlers (a collection of which is called an "attachment")
733to it. All such attachable objects support the following methods. 784to it. All such attachable objects support the following methods.
734 785
735In the following description, CLASS can be any of C<global>, C<object> 786In the following description, CLASS can be any of C<global>, C<object>
736C<player>, C<client> or C<map> (i.e. the attachable objects in 787C<player>, C<client> or C<map> (i.e. the attachable objects in
786=item cf::CLASS::attachment $name, ... 837=item cf::CLASS::attachment $name, ...
787 838
788Register an attachment by C<$name> through which attachable objects of the 839Register an attachment by C<$name> through which attachable objects of the
789given CLASS can refer to this attachment. 840given CLASS can refer to this attachment.
790 841
791Some classes such as crossfire maps and objects can specify attachments 842Some classes such as deliantra maps and objects can specify attachments
792that are attached at load/instantiate time, thus the need for a name. 843that are attached at load/instantiate time, thus the need for a name.
793 844
794These calls expect any number of the following handler/hook descriptions: 845These calls expect any number of the following handler/hook descriptions:
795 846
796=over 4 847=over 4
1087 1138
1088sub reattach { 1139sub reattach {
1089 # basically do the same as instantiate, without calling instantiate 1140 # basically do the same as instantiate, without calling instantiate
1090 my ($obj) = @_; 1141 my ($obj) = @_;
1091 1142
1143 # no longer needed after getting rid of delete_package?
1092 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1144 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1093 1145
1094 my $registry = $obj->registry; 1146 my $registry = $obj->registry;
1095 1147
1096 @$registry = (); 1148 @$registry = ();
1097 1149
1145 $decname, length $$rdata, scalar @$objs; 1197 $decname, length $$rdata, scalar @$objs;
1146 1198
1147 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1199 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1148 aio_chmod $fh, SAVE_MODE; 1200 aio_chmod $fh, SAVE_MODE;
1149 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1201 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1150 aio_fsync $fh if $cf::USE_FSYNC; 1202 if ($cf::USE_FSYNC) {
1203 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;
1204 aio_fsync $fh;
1205 }
1151 aio_close $fh; 1206 aio_close $fh;
1152 1207
1153 if (@$objs) { 1208 if (@$objs) {
1154 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1209 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1155 aio_chmod $fh, SAVE_MODE; 1210 aio_chmod $fh, SAVE_MODE;
1156 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1211 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1157 aio_write $fh, 0, (length $data), $data, 0; 1212 aio_write $fh, 0, (length $data), $data, 0;
1158 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 }
1159 aio_close $fh; 1217 aio_close $fh;
1160 aio_rename "$filename.pst~", "$filename.pst"; 1218 aio_rename "$filename.pst~", "$filename.pst";
1161 } 1219 }
1162 } else { 1220 } else {
1163 aio_unlink "$filename.pst"; 1221 aio_unlink "$filename.pst";
1164 } 1222 }
1165 1223
1166 aio_rename "$filename~", $filename; 1224 aio_rename "$filename~", $filename;
1225
1226 $filename =~ s%/[^/]+$%%;
1227 aio_pathsync $filename if $cf::USE_FSYNC;
1167 } else { 1228 } else {
1168 warn "FATAL: $filename~: $!\n"; 1229 warn "unable to save objects: $filename~: $!\n";
1169 } 1230 }
1170 } else { 1231 } else {
1171 aio_unlink $filename; 1232 aio_unlink $filename;
1172 aio_unlink "$filename.pst"; 1233 aio_unlink "$filename.pst";
1173 } 1234 }
1264 my ($name, $cb) = @_; 1325 my ($name, $cb) = @_;
1265 1326
1266 $EXTICMD{$name} = $cb; 1327 $EXTICMD{$name} = $cb;
1267} 1328}
1268 1329
1330use File::Glob ();
1331
1269cf::player->attach ( 1332cf::player->attach (
1270 on_command => sub { 1333 on_unknown_command => sub {
1271 my ($pl, $name, $params) = @_; 1334 my ($pl, $name, $params) = @_;
1272 1335
1273 my $cb = $COMMAND{$name} 1336 my $cb = $COMMAND{$name}
1274 or return; 1337 or return;
1275 1338
1305 1368
1306 cf::override; 1369 cf::override;
1307 }, 1370 },
1308); 1371);
1309 1372
1373# "readahead" all extensions
1374sub cache_extensions {
1375 my $grp = IO::AIO::aio_group;
1376
1377 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1378 for (grep /\.ext$/, @{$_[0]}) {
1379 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1380 }
1381 };
1382
1383 $grp
1384}
1385
1310sub load_extensions { 1386sub load_extensions {
1311 cf::sync_job { 1387 cf::sync_job {
1312 my %todo; 1388 my %todo;
1313 1389
1314 for my $path (<$LIBDIR/*.ext>) { 1390 for my $path (<$LIBDIR/*.ext>) {
1333 1409
1334 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1410 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1335 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1411 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1336 1412
1337 $ext{source} = 1413 $ext{source} =
1338 "package $pkg; use strict; use utf8;\n" 1414 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1339 . "#line 1 \"$path\"\n{\n" 1415 . "#line 1 \"$path\"\n{\n"
1340 . $source 1416 . $source
1341 . "\n};\n1"; 1417 . "\n};\n1";
1342 1418
1343 $todo{$base} = \%ext; 1419 $todo{$base} = \%ext;
1344 } 1420 }
1345 1421
1422 my $pass = 0;
1346 my %done; 1423 my %done;
1347 while (%todo) { 1424 while (%todo) {
1348 my $progress; 1425 my $progress;
1349 1426
1427 ++$pass;
1428
1429 ext:
1350 while (my ($k, $v) = each %todo) { 1430 while (my ($k, $v) = each %todo) {
1351 for (split /,\s*/, $v->{meta}{depends}) { 1431 for (split /,\s*/, $v->{meta}{depends}) {
1352 goto skip 1432 next ext
1353 unless exists $done{$_}; 1433 unless exists $done{$_};
1354 } 1434 }
1355 1435
1356 warn "... loading '$k' into '$v->{pkg}'\n"; 1436 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1357 1437
1358 unless (eval $v->{source}) { 1438 my $active = eval $v->{source};
1439
1440 if (length $@) {
1359 my $msg = $@ ? "$v->{path}: $@\n" 1441 warn "$v->{path}: $@\n";
1360 : "$v->{base}: extension inactive.\n";
1361 1442
1362 if (exists $v->{meta}{mandatory}) {
1363 warn $msg;
1364 cf::cleanup "mandatory extension failed to load, exiting."; 1443 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1365 } 1444 if exists $v->{meta}{mandatory};
1366 1445
1367 warn $msg; 1446 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1447 delete $todo{$k};
1448 } else {
1449 $done{$k} = delete $todo{$k};
1450 push @EXTS, $v->{pkg};
1451 $progress = 1;
1452
1453 warn "$v->{base}: extension inactive.\n"
1454 unless $active;
1368 } 1455 }
1369
1370 $done{$k} = delete $todo{$k};
1371 push @EXTS, $v->{pkg};
1372 $progress = 1;
1373 } 1456 }
1374 1457
1375 skip: 1458 unless ($progress) {
1376 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1459 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1377 unless $progress; 1460
1461 while (my ($k, $v) = each %todo) {
1462 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1463 if exists $v->{meta}{mandatory};
1464 }
1465 }
1378 } 1466 }
1379 }; 1467 };
1380} 1468}
1381 1469
1382############################################################################# 1470#############################################################################
1383 1471
1384=back 1472=back
1385 1473
1386=head2 CORE EXTENSIONS 1474=head2 CORE EXTENSIONS
1387 1475
1388Functions and methods that extend core crossfire objects. 1476Functions and methods that extend core deliantra objects.
1389 1477
1390=cut 1478=cut
1391 1479
1392package cf::player; 1480package cf::player;
1393 1481
1436 1524
1437sub exists($) { 1525sub exists($) {
1438 my ($login) = @_; 1526 my ($login) = @_;
1439 1527
1440 $cf::PLAYER{$login} 1528 $cf::PLAYER{$login}
1441 or cf::sync_job { !aio_stat path $login } 1529 or !aio_stat path $login
1442} 1530}
1443 1531
1444sub find($) { 1532sub find($) {
1445 return $cf::PLAYER{$_[0]} || do { 1533 return $cf::PLAYER{$_[0]} || do {
1446 my $login = $_[0]; 1534 my $login = $_[0];
1466 $cf::PLAYER{$login} = $pl 1554 $cf::PLAYER{$login} = $pl
1467 } 1555 }
1468 } 1556 }
1469} 1557}
1470 1558
1559cf::player->attach (
1560 on_load => sub {
1561 my ($pl, $path) = @_;
1562
1563 # restore slots saved in save, below
1564 my $slots = delete $pl->{_slots};
1565
1566 $pl->ob->current_weapon ($slots->[0]);
1567 $pl->combat_ob ($slots->[1]);
1568 $pl->ranged_ob ($slots->[2]);
1569 },
1570);
1571
1471sub save($) { 1572sub save($) {
1472 my ($pl) = @_; 1573 my ($pl) = @_;
1473 1574
1474 return if $pl->{deny_save}; 1575 return if $pl->{deny_save};
1475 1576
1480 1581
1481 aio_mkdir playerdir $pl, 0770; 1582 aio_mkdir playerdir $pl, 0770;
1482 $pl->{last_save} = $cf::RUNTIME; 1583 $pl->{last_save} = $cf::RUNTIME;
1483 1584
1484 cf::get_slot 0.01; 1585 cf::get_slot 0.01;
1586
1587 # save slots, to be restored later
1588 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1485 1589
1486 $pl->save_pl ($path); 1590 $pl->save_pl ($path);
1487 cf::cede_to_tick; 1591 cf::cede_to_tick;
1488} 1592}
1489 1593
1521 my ($pl) = @_; 1625 my ($pl) = @_;
1522 1626
1523 my $name = $pl->ob->name; 1627 my $name = $pl->ob->name;
1524 1628
1525 $pl->{deny_save} = 1; 1629 $pl->{deny_save} = 1;
1526 $pl->password ("*"); # this should lock out the player until we nuked the dir 1630 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1527 1631
1528 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1632 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1529 $pl->deactivate; 1633 $pl->deactivate;
1530 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1634 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1531 $pl->ob->check_score; 1635 $pl->ob->check_score;
1617 } 1721 }
1618 1722
1619 \@paths 1723 \@paths
1620} 1724}
1621 1725
1622=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1726=item $protocol_xml = $player->expand_cfpod ($cfpod)
1623 1727
1624Expand crossfire pod fragments into protocol xml. 1728Expand deliantra pod fragments into protocol xml.
1625
1626=cut
1627
1628use re 'eval';
1629
1630my $group;
1631my $interior; $interior = qr{
1632 # match a pod interior sequence sans C<< >>
1633 (?:
1634 \ (.*?)\ (?{ $group = $^N })
1635 | < (??{$interior}) >
1636 )
1637}x;
1638
1639sub expand_cfpod {
1640 my ($self, $pod) = @_;
1641
1642 my $xml;
1643
1644 while () {
1645 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1646 $group = $1;
1647
1648 $group =~ s/&/&amp;/g;
1649 $group =~ s/</&lt;/g;
1650
1651 $xml .= $group;
1652 } elsif ($pod =~ m%\G
1653 ([BCGHITU])
1654 <
1655 (?:
1656 ([^<>]*) (?{ $group = $^N })
1657 | < $interior >
1658 )
1659 >
1660 %gcsx
1661 ) {
1662 my ($code, $data) = ($1, $group);
1663
1664 if ($code eq "B") {
1665 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1666 } elsif ($code eq "I") {
1667 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1668 } elsif ($code eq "U") {
1669 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1670 } elsif ($code eq "C") {
1671 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1672 } elsif ($code eq "T") {
1673 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1674 } elsif ($code eq "G") {
1675 my ($male, $female) = split /\|/, $data;
1676 $data = $self->gender ? $female : $male;
1677 $xml .= expand_cfpod ($self, $data);
1678 } elsif ($code eq "H") {
1679 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1680 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1681 "")
1682 [$self->{hintmode}];
1683 } else {
1684 $xml .= "error processing '$code($data)' directive";
1685 }
1686 } else {
1687 if ($pod =~ /\G(.+)/) {
1688 warn "parse error while expanding $pod (at $1)";
1689 }
1690 last;
1691 }
1692 }
1693
1694 for ($xml) {
1695 # create single paragraphs (very hackish)
1696 s/(?<=\S)\n(?=\w)/ /g;
1697
1698 # compress some whitespace
1699 s/\s+\n/\n/g; # ws line-ends
1700 s/\n\n+/\n/g; # double lines
1701 s/^\n+//; # beginning lines
1702 s/\n+$//; # ending lines
1703 }
1704
1705 $xml
1706}
1707
1708no re 'eval';
1709
1710sub hintmode {
1711 $_[0]{hintmode} = $_[1] if @_ > 1;
1712 $_[0]{hintmode}
1713}
1714 1729
1715=item $player->ext_reply ($msgid, @msg) 1730=item $player->ext_reply ($msgid, @msg)
1716 1731
1717Sends an ext reply to the player. 1732Sends an ext reply to the player.
1718 1733
1791 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1806 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1792 1807
1793 # mit "rum" bekleckern, nicht 1808 # mit "rum" bekleckern, nicht
1794 $self->_create_random_map ( 1809 $self->_create_random_map (
1795 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1810 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1796 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1811 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1797 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1812 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1798 $rmp->{exit_on_final_map}, 1813 $rmp->{exit_on_final_map},
1799 $rmp->{xsize}, $rmp->{ysize}, 1814 $rmp->{xsize}, $rmp->{ysize},
1800 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1815 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1801 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1816 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1931 1946
1932 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1947 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1933 "$UNIQUEDIR/$path" 1948 "$UNIQUEDIR/$path"
1934} 1949}
1935 1950
1936# and all this just because we cannot iterate over
1937# all maps in C++...
1938sub change_all_map_light {
1939 my ($change) = @_;
1940
1941 $_->change_map_light ($change)
1942 for grep $_->outdoor, values %cf::MAP;
1943}
1944
1945sub decay_objects { 1951sub decay_objects {
1946 my ($self) = @_; 1952 my ($self) = @_;
1947 1953
1948 return if $self->{deny_reset}; 1954 return if $self->{deny_reset};
1949 1955
2031sub find { 2037sub find {
2032 my ($path, $origin) = @_; 2038 my ($path, $origin) = @_;
2033 2039
2034 $path = normalise $path, $origin && $origin->path; 2040 $path = normalise $path, $origin && $origin->path;
2035 2041
2036 cf::lock_wait "map_data:$path";#d#remove 2042 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2037 cf::lock_wait "map_find:$path"; 2043 my $guard2 = cf::lock_acquire "map_find:$path";
2038 2044
2039 $cf::MAP{$path} || do { 2045 $cf::MAP{$path} || do {
2040 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2041 my $guard2 = cf::lock_acquire "map_find:$path";
2042
2043 my $map = new_from_path cf::map $path 2046 my $map = new_from_path cf::map $path
2044 or return; 2047 or return;
2045 2048
2046 $map->{last_save} = $cf::RUNTIME; 2049 $map->{last_save} = $cf::RUNTIME;
2047 2050
2059 2062
2060 $cf::MAP{$path} = $map 2063 $cf::MAP{$path} = $map
2061 } 2064 }
2062} 2065}
2063 2066
2064sub pre_load { } 2067sub pre_load { }
2065sub post_load { } 2068#sub post_load { } # XS
2066 2069
2067sub load { 2070sub load {
2068 my ($self) = @_; 2071 my ($self) = @_;
2069 2072
2070 local $self->{deny_reset} = 1; # loading can take a long time 2073 local $self->{deny_reset} = 1; # loading can take a long time
2115 unless ($self->{deny_activate}) { 2118 unless ($self->{deny_activate}) {
2116 $self->decay_objects; 2119 $self->decay_objects;
2117 $self->fix_auto_apply; 2120 $self->fix_auto_apply;
2118 $self->update_buttons; 2121 $self->update_buttons;
2119 cf::cede_to_tick; 2122 cf::cede_to_tick;
2120 $self->set_darkness_map;
2121 cf::cede_to_tick;
2122 $self->activate; 2123 $self->activate;
2123 } 2124 }
2124 2125
2125 $self->{last_save} = $cf::RUNTIME; 2126 $self->{last_save} = $cf::RUNTIME;
2126 $self->last_access ($cf::RUNTIME); 2127 $self->last_access ($cf::RUNTIME);
2129 } 2130 }
2130 2131
2131 $self->post_load; 2132 $self->post_load;
2132} 2133}
2133 2134
2135# customize the map for a given player, i.e.
2136# return the _real_ map. used by e.g. per-player
2137# maps to change the path to ~playername/mappath
2134sub customise_for { 2138sub customise_for {
2135 my ($self, $ob) = @_; 2139 my ($self, $ob) = @_;
2136 2140
2137 return find "~" . $ob->name . "/" . $self->{path} 2141 return find "~" . $ob->name . "/" . $self->{path}
2138 if $self->per_player; 2142 if $self->per_player;
2215 $MAP_PREFETCHER->prio (6); 2219 $MAP_PREFETCHER->prio (6);
2216 2220
2217 () 2221 ()
2218} 2222}
2219 2223
2224# common code, used by both ->save and ->swapout
2220sub save { 2225sub _save {
2221 my ($self) = @_; 2226 my ($self) = @_;
2222
2223 my $lock = cf::lock_acquire "map_data:$self->{path}";
2224 2227
2225 $self->{last_save} = $cf::RUNTIME; 2228 $self->{last_save} = $cf::RUNTIME;
2226 2229
2227 return unless $self->dirty; 2230 return unless $self->dirty;
2228 2231
2248 } else { 2251 } else {
2249 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2252 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2250 } 2253 }
2251} 2254}
2252 2255
2256sub save {
2257 my ($self) = @_;
2258
2259 my $lock = cf::lock_acquire "map_data:$self->{path}";
2260
2261 $self->_save;
2262}
2263
2253sub swap_out { 2264sub swap_out {
2254 my ($self) = @_; 2265 my ($self) = @_;
2255 2266
2256 # save first because save cedes
2257 $self->save;
2258
2259 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2267 my $lock = cf::lock_acquire "map_data:$self->{path}";
2260 2268
2261 return if $self->players;
2262 return if $self->in_memory != cf::MAP_ACTIVE; 2269 return if $self->in_memory != cf::MAP_ACTIVE;
2263 return if $self->{deny_save}; 2270 return if $self->{deny_save};
2271 return if $self->players;
2264 2272
2265 $self->in_memory (cf::MAP_SWAPPED); 2273 # first deactivate the map and "unlink" it from the core
2266
2267 $self->deactivate; 2274 $self->deactivate;
2268 $_->clear_links_to ($self) for values %cf::MAP; 2275 $_->clear_links_to ($self) for values %cf::MAP;
2276 $self->in_memory (cf::MAP_SWAPPED);
2277
2278 # then atomically save
2279 $self->_save;
2280
2281 # then free the map
2269 $self->clear; 2282 $self->clear;
2270} 2283}
2271 2284
2272sub reset_at { 2285sub reset_at {
2273 my ($self) = @_; 2286 my ($self) = @_;
2292 2305
2293 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2306 my $lock = cf::lock_acquire "map_data:$self->{path}";
2294 2307
2295 return if $self->players; 2308 return if $self->players;
2296 2309
2297 warn "resetting map ", $self->path; 2310 warn "resetting map ", $self->path, "\n";
2298 2311
2299 $self->in_memory (cf::MAP_SWAPPED); 2312 $self->in_memory (cf::MAP_SWAPPED);
2300 2313
2301 # need to save uniques path 2314 # need to save uniques path
2302 unless ($self->{deny_save}) { 2315 unless ($self->{deny_save}) {
2393 : normalise $_ 2406 : normalise $_
2394 } @{ aio_readdir $UNIQUEDIR or [] } 2407 } @{ aio_readdir $UNIQUEDIR or [] }
2395 ] 2408 ]
2396} 2409}
2397 2410
2411=item cf::map::static_maps
2412
2413Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2414file in the shared directory excluding F</styles> and F</editor>). May
2415block.
2416
2417=cut
2418
2419sub static_maps() {
2420 my @dirs = "";
2421 my @maps;
2422
2423 while (@dirs) {
2424 my $dir = shift @dirs;
2425
2426 next if $dir eq "/styles" || $dir eq "/editor";
2427
2428 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2429 or return;
2430
2431 for (@$files) {
2432 s/\.map$// or next;
2433 utf8::decode $_;
2434 push @maps, "$dir/$_";
2435 }
2436
2437 push @dirs, map "$dir/$_", @$dirs;
2438 }
2439
2440 \@maps
2441}
2442
2398=back 2443=back
2399 2444
2400=head3 cf::object 2445=head3 cf::object
2401 2446
2402=cut 2447=cut
2467 2512
2468our $SAY_CHANNEL = { 2513our $SAY_CHANNEL = {
2469 id => "say", 2514 id => "say",
2470 title => "Map", 2515 title => "Map",
2471 reply => "say ", 2516 reply => "say ",
2472 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2517 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2473}; 2518};
2474 2519
2475our $CHAT_CHANNEL = { 2520our $CHAT_CHANNEL = {
2476 id => "chat", 2521 id => "chat",
2477 title => "Chat", 2522 title => "Chat",
2532 2577
2533=item $player_object->enter_link 2578=item $player_object->enter_link
2534 2579
2535Freezes the player and moves him/her to a special map (C<{link}>). 2580Freezes the player and moves him/her to a special map (C<{link}>).
2536 2581
2537The player should be reasonably safe there for short amounts of time. You 2582The player should be reasonably safe there for short amounts of time (e.g.
2538I<MUST> call C<leave_link> as soon as possible, though. 2583for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2584though, as the palyer cannot control the character while it is on the link
2585map.
2539 2586
2540Will never block. 2587Will never block.
2541 2588
2542=item $player_object->leave_link ($map, $x, $y) 2589=item $player_object->leave_link ($map, $x, $y)
2543 2590
2568 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2615 return if UNIVERSAL::isa $self->map, "ext::map_link";
2569 2616
2570 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2617 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2571 if $self->map && $self->map->{path} ne "{link}"; 2618 if $self->map && $self->map->{path} ne "{link}";
2572 2619
2573 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2620 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2574} 2621}
2575 2622
2576sub cf::object::player::leave_link { 2623sub cf::object::player::leave_link {
2577 my ($self, $map, $x, $y) = @_; 2624 my ($self, $map, $x, $y) = @_;
2578 2625
2595 ($x, $y) = (-1, -1) 2642 ($x, $y) = (-1, -1)
2596 unless (defined $x) && (defined $y); 2643 unless (defined $x) && (defined $y);
2597 2644
2598 # use -1 or undef as default coordinates, not 0, 0 2645 # use -1 or undef as default coordinates, not 0, 0
2599 ($x, $y) = ($map->enter_x, $map->enter_y) 2646 ($x, $y) = ($map->enter_x, $map->enter_y)
2600 if $x <=0 && $y <= 0; 2647 if $x <= 0 && $y <= 0;
2601 2648
2602 $map->load; 2649 $map->load;
2603 $map->load_neighbours; 2650 $map->load_neighbours;
2604 2651
2605 return unless $self->contr->active; 2652 return unless $self->contr->active;
2606 $self->activate_recursive;
2607 2653
2608 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2654 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2609 $self->enter_map ($map, $x, $y); 2655 $self->enter_map ($map, $x, $y);
2656
2657 # only activate afterwards, to support waiting in hooks
2658 $self->activate_recursive;
2610} 2659}
2611 2660
2612=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2661=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2613 2662
2614Moves the player to the given map-path and coordinates by first freezing 2663Moves the player to the given map-path and coordinates by first freezing
2773 $self->contr->savebed ($map, $x, $y) 2822 $self->contr->savebed ($map, $x, $y)
2774 if $exit->flag (cf::FLAG_DAMNED); 2823 if $exit->flag (cf::FLAG_DAMNED);
2775 2824
2776 1 2825 1
2777 }) { 2826 }) {
2778 $self->message ("Something went wrong deep within the crossfire server. " 2827 $self->message ("Something went wrong deep within the deliantra server. "
2779 . "I'll try to bring you back to the map you were before. " 2828 . "I'll try to bring you back to the map you were before. "
2780 . "Please report this to the dungeon master!", 2829 . "Please report this to the dungeon master!",
2781 cf::NDI_UNIQUE | cf::NDI_RED); 2830 cf::NDI_UNIQUE | cf::NDI_RED);
2782 2831
2783 warn "ERROR in enter_exit: $@"; 2832 warn "ERROR in enter_exit: $@";
2800sub cf::client::send_drawinfo { 2849sub cf::client::send_drawinfo {
2801 my ($self, $text, $flags) = @_; 2850 my ($self, $text, $flags) = @_;
2802 2851
2803 utf8::encode $text; 2852 utf8::encode $text;
2804 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2853 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2854}
2855
2856=item $client->send_big_packet ($pkt)
2857
2858Like C<send_packet>, but tries to compress large packets, and fragments
2859them as required.
2860
2861=cut
2862
2863our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2864
2865sub cf::client::send_big_packet {
2866 my ($self, $pkt) = @_;
2867
2868 # try lzf for large packets
2869 $pkt = "lzf " . Compress::LZF::compress $pkt
2870 if 1024 <= length $pkt and $self->{can_lzf};
2871
2872 # split very large packets
2873 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2874 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2875 $pkt = "frag";
2876 }
2877
2878 $self->send_packet ($pkt);
2805} 2879}
2806 2880
2807=item $client->send_msg ($channel, $msg, $color, [extra...]) 2881=item $client->send_msg ($channel, $msg, $color, [extra...])
2808 2882
2809Send a drawinfo or msg packet to the client, formatting the msg for the 2883Send a drawinfo or msg packet to the client, formatting the msg for the
2813 2887
2814=cut 2888=cut
2815 2889
2816# non-persistent channels (usually the info channel) 2890# non-persistent channels (usually the info channel)
2817our %CHANNEL = ( 2891our %CHANNEL = (
2892 "c/motd" => {
2893 id => "infobox",
2894 title => "MOTD",
2895 reply => undef,
2896 tooltip => "The message of the day",
2897 },
2818 "c/identify" => { 2898 "c/identify" => {
2819 id => "infobox", 2899 id => "infobox",
2820 title => "Identify", 2900 title => "Identify",
2821 reply => undef, 2901 reply => undef,
2822 tooltip => "Items recently identified", 2902 tooltip => "Items recently identified",
2824 "c/examine" => { 2904 "c/examine" => {
2825 id => "infobox", 2905 id => "infobox",
2826 title => "Examine", 2906 title => "Examine",
2827 reply => undef, 2907 reply => undef,
2828 tooltip => "Signs and other items you examined", 2908 tooltip => "Signs and other items you examined",
2909 },
2910 "c/shopinfo" => {
2911 id => "infobox",
2912 title => "Shop Info",
2913 reply => undef,
2914 tooltip => "What your bargaining skill tells you about the shop",
2829 }, 2915 },
2830 "c/book" => { 2916 "c/book" => {
2831 id => "infobox", 2917 id => "infobox",
2832 title => "Book", 2918 title => "Book",
2833 reply => undef, 2919 reply => undef,
2849 id => "infobox", 2935 id => "infobox",
2850 title => "Body Parts", 2936 title => "Body Parts",
2851 reply => undef, 2937 reply => undef,
2852 tooltip => "Shows which body parts you posess and are available", 2938 tooltip => "Shows which body parts you posess and are available",
2853 }, 2939 },
2940 "c/statistics" => {
2941 id => "infobox",
2942 title => "Statistics",
2943 reply => undef,
2944 tooltip => "Shows your primary statistics",
2945 },
2946 "c/skills" => {
2947 id => "infobox",
2948 title => "Skills",
2949 reply => undef,
2950 tooltip => "Shows your experience per skill and item power",
2951 },
2952 "c/shopitems" => {
2953 id => "infobox",
2954 title => "Shop Items",
2955 reply => undef,
2956 tooltip => "Shows the items currently for sale in this shop",
2957 },
2958 "c/resistances" => {
2959 id => "infobox",
2960 title => "Resistances",
2961 reply => undef,
2962 tooltip => "Shows your resistances",
2963 },
2964 "c/pets" => {
2965 id => "infobox",
2966 title => "Pets",
2967 reply => undef,
2968 tooltip => "Shows information abotu your pets/a specific pet",
2969 },
2970 "c/perceiveself" => {
2971 id => "infobox",
2972 title => "Perceive Self",
2973 reply => undef,
2974 tooltip => "You gained detailed knowledge about yourself",
2975 },
2854 "c/uptime" => { 2976 "c/uptime" => {
2855 id => "infobox", 2977 id => "infobox",
2856 title => "Uptime", 2978 title => "Uptime",
2857 reply => undef, 2979 reply => undef,
2858 tooltip => "How long the server has been running since last restart", 2980 tooltip => "How long the server has been running since last restart",
2867 id => "party", 2989 id => "party",
2868 title => "Party", 2990 title => "Party",
2869 reply => "gsay ", 2991 reply => "gsay ",
2870 tooltip => "Messages and chat related to your party", 2992 tooltip => "Messages and chat related to your party",
2871 }, 2993 },
2994 "c/death" => {
2995 id => "death",
2996 title => "Death",
2997 reply => undef,
2998 tooltip => "Reason for and more info about your most recent death",
2999 },
3000 "c/say" => $SAY_CHANNEL,
3001 "c/chat" => $CHAT_CHANNEL,
2872); 3002);
2873 3003
2874sub cf::client::send_msg { 3004sub cf::client::send_msg {
2875 my ($self, $channel, $msg, $color, @extra) = @_; 3005 my ($self, $channel, $msg, $color, @extra) = @_;
2876 3006
2877 $msg = $self->pl->expand_cfpod ($msg); 3007 $msg = $self->pl->expand_cfpod ($msg)
3008 unless $color & cf::NDI_VERBATIM;
2878 3009
2879 $color &= cf::NDI_CLIENT_MASK; # just in case... 3010 $color &= cf::NDI_CLIENT_MASK; # just in case...
2880 3011
2881 # check predefined channels, for the benefit of C 3012 # check predefined channels, for the benefit of C
2882 if ($CHANNEL{$channel}) { 3013 if ($CHANNEL{$channel}) {
2883 $channel = $CHANNEL{$channel}; 3014 $channel = $CHANNEL{$channel};
2884 3015
2885 $self->ext_msg (channel_info => $channel) 3016 $self->ext_msg (channel_info => $channel);
2886 if $self->can_msg;
2887
2888 $channel = $channel->{id}; 3017 $channel = $channel->{id};
2889 3018
2890 } elsif (ref $channel) { 3019 } elsif (ref $channel) {
2891 # send meta info to client, if not yet sent 3020 # send meta info to client, if not yet sent
2892 unless (exists $self->{channel}{$channel->{id}}) { 3021 unless (exists $self->{channel}{$channel->{id}}) {
2893 $self->{channel}{$channel->{id}} = $channel; 3022 $self->{channel}{$channel->{id}} = $channel;
2894 $self->ext_msg (channel_info => $channel) 3023 $self->ext_msg (channel_info => $channel);
2895 if $self->can_msg;
2896 } 3024 }
2897 3025
2898 $channel = $channel->{id}; 3026 $channel = $channel->{id};
2899 } 3027 }
2900 3028
2901 return unless @extra || length $msg; 3029 return unless @extra || length $msg;
2902 3030
2903 if ($self->can_msg) {
2904 # default colour, mask it out 3031 # default colour, mask it out
2905 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3032 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2906 if $color & cf::NDI_DEF; 3033 if $color & cf::NDI_DEF;
2907 3034
2908 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3035 my $pkt = "msg "
3036 . $self->{json_coder}->encode (
2909 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3037 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2910 } else { 3038 );
2911 if ($color >= 0) {
2912 # replace some tags by gcfclient-compatible ones
2913 for ($msg) {
2914 1 while
2915 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2916 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2917 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2918 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2919 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2920 }
2921 3039
2922 $color &= cf::NDI_COLOR_MASK; 3040 $self->send_big_packet ($pkt);
2923
2924 utf8::encode $msg;
2925
2926 if (0 && $msg =~ /\[/) {
2927 # COMMAND/INFO
2928 $self->send_packet ("drawextinfo $color 10 8 $msg")
2929 } else {
2930 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2931 $self->send_packet ("drawinfo $color $msg")
2932 }
2933 }
2934 }
2935} 3041}
2936 3042
2937=item $client->ext_msg ($type, @msg) 3043=item $client->ext_msg ($type, @msg)
2938 3044
2939Sends an ext event to the client. 3045Sends an ext event to the client.
2942 3048
2943sub cf::client::ext_msg($$@) { 3049sub cf::client::ext_msg($$@) {
2944 my ($self, $type, @msg) = @_; 3050 my ($self, $type, @msg) = @_;
2945 3051
2946 if ($self->extcmd == 2) { 3052 if ($self->extcmd == 2) {
2947 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3053 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2948 } elsif ($self->extcmd == 1) { # TODO: remove 3054 } elsif ($self->extcmd == 1) { # TODO: remove
2949 push @msg, msgtype => "event_$type"; 3055 push @msg, msgtype => "event_$type";
2950 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3056 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2951 } 3057 }
2952} 3058}
2953 3059
2954=item $client->ext_reply ($msgid, @msg) 3060=item $client->ext_reply ($msgid, @msg)
2955 3061
2959 3065
2960sub cf::client::ext_reply($$@) { 3066sub cf::client::ext_reply($$@) {
2961 my ($self, $id, @msg) = @_; 3067 my ($self, $id, @msg) = @_;
2962 3068
2963 if ($self->extcmd == 2) { 3069 if ($self->extcmd == 2) {
2964 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3070 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2965 } elsif ($self->extcmd == 1) { 3071 } elsif ($self->extcmd == 1) {
2966 #TODO: version 1, remove 3072 #TODO: version 1, remove
2967 unshift @msg, msgtype => "reply", msgid => $id; 3073 unshift @msg, msgtype => "reply", msgid => $id;
2968 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3074 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2969 } 3075 }
2970} 3076}
2971 3077
2972=item $success = $client->query ($flags, "text", \&cb) 3078=item $success = $client->query ($flags, "text", \&cb)
2973 3079
3074 3180
3075 $coro 3181 $coro
3076} 3182}
3077 3183
3078cf::client->attach ( 3184cf::client->attach (
3079 on_destroy => sub { 3185 on_client_destroy => sub {
3080 my ($ns) = @_; 3186 my ($ns) = @_;
3081 3187
3082 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3188 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3083 }, 3189 },
3084); 3190);
3100our $safe_hole = new Safe::Hole; 3206our $safe_hole = new Safe::Hole;
3101 3207
3102$SIG{FPE} = 'IGNORE'; 3208$SIG{FPE} = 'IGNORE';
3103 3209
3104$safe->permit_only (Opcode::opset qw( 3210$safe->permit_only (Opcode::opset qw(
3105 :base_core :base_mem :base_orig :base_math 3211 :base_core :base_mem :base_orig :base_math :base_loop
3106 grepstart grepwhile mapstart mapwhile 3212 grepstart grepwhile mapstart mapwhile
3107 sort time 3213 sort time
3108)); 3214));
3109 3215
3110# here we export the classes and methods available to script code 3216# here we export the classes and methods available to script code
3114The following functions and methods are available within a safe environment: 3220The following functions and methods are available within a safe environment:
3115 3221
3116 cf::object 3222 cf::object
3117 contr pay_amount pay_player map x y force_find force_add destroy 3223 contr pay_amount pay_player map x y force_find force_add destroy
3118 insert remove name archname title slaying race decrease split 3224 insert remove name archname title slaying race decrease split
3225 value
3119 3226
3120 cf::object::player 3227 cf::object::player
3121 player 3228 player
3122 3229
3123 cf::player 3230 cf::player
3129=cut 3236=cut
3130 3237
3131for ( 3238for (
3132 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3239 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3133 insert remove inv nrof name archname title slaying race 3240 insert remove inv nrof name archname title slaying race
3134 decrease split destroy change_exp)], 3241 decrease split destroy change_exp value msg lore send_msg)],
3135 ["cf::object::player" => qw(player)], 3242 ["cf::object::player" => qw(player)],
3136 ["cf::player" => qw(peaceful)], 3243 ["cf::player" => qw(peaceful send_msg)],
3137 ["cf::map" => qw(trigger)], 3244 ["cf::map" => qw(trigger)],
3138) { 3245) {
3139 no strict 'refs'; 3246 no strict 'refs';
3140 my ($pkg, @funs) = @$_; 3247 my ($pkg, @funs) = @$_;
3141 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3248 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3159 3266
3160 my $qcode = $code; 3267 my $qcode = $code;
3161 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3268 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3162 $qcode =~ s/\n/\\n/g; 3269 $qcode =~ s/\n/\\n/g;
3163 3270
3271 %vars = (_dummy => 0) unless %vars;
3272
3273 my @res;
3164 local $_; 3274 local $_;
3165 local @safe::cf::_safe_eval_args = values %vars;
3166 3275
3167 my $eval = 3276 my $eval =
3168 "do {\n" 3277 "do {\n"
3169 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3278 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3170 . "#line 0 \"{$qcode}\"\n" 3279 . "#line 0 \"{$qcode}\"\n"
3171 . $code 3280 . $code
3172 . "\n}" 3281 . "\n}"
3173 ; 3282 ;
3174 3283
3284 if ($CFG{safe_eval}) {
3175 sub_generation_inc; 3285 sub_generation_inc;
3286 local @safe::cf::_safe_eval_args = values %vars;
3176 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3287 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3177 sub_generation_inc; 3288 sub_generation_inc;
3289 } else {
3290 local @cf::_safe_eval_args = values %vars;
3291 @res = wantarray ? eval eval : scalar eval $eval;
3292 }
3178 3293
3179 if ($@) { 3294 if ($@) {
3180 warn "$@"; 3295 warn "$@";
3181 warn "while executing safe code '$code'\n"; 3296 warn "while executing safe code '$code'\n";
3182 warn "with arguments " . (join " ", %vars) . "\n"; 3297 warn "with arguments " . (join " ", %vars) . "\n";
3201=cut 3316=cut
3202 3317
3203sub register_script_function { 3318sub register_script_function {
3204 my ($fun, $cb) = @_; 3319 my ($fun, $cb) = @_;
3205 3320
3206 no strict 'refs'; 3321 $fun = "safe::$fun" if $CFG{safe_eval};
3207 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3322 *$fun = $safe_hole->wrap ($cb);
3208} 3323}
3209 3324
3210=back 3325=back
3211 3326
3212=cut 3327=cut
3233 3348
3234 $facedata->{version} == 2 3349 $facedata->{version} == 2
3235 or cf::cleanup "$path: version mismatch, cannot proceed."; 3350 or cf::cleanup "$path: version mismatch, cannot proceed.";
3236 3351
3237 # patch in the exptable 3352 # patch in the exptable
3353 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3238 $facedata->{resource}{"res/exp_table"} = { 3354 $facedata->{resource}{"res/exp_table"} = {
3239 type => FT_RSRC, 3355 type => FT_RSRC,
3240 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3356 data => $exp_table,
3357 hash => (Digest::MD5::md5 $exp_table),
3241 }; 3358 };
3242 cf::cede_to_tick; 3359 cf::cede_to_tick;
3243 3360
3244 { 3361 {
3245 my $faces = $facedata->{faceinfo}; 3362 my $faces = $facedata->{faceinfo};
3247 while (my ($face, $info) = each %$faces) { 3364 while (my ($face, $info) = each %$faces) {
3248 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3365 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3249 3366
3250 cf::face::set_visibility $idx, $info->{visibility}; 3367 cf::face::set_visibility $idx, $info->{visibility};
3251 cf::face::set_magicmap $idx, $info->{magicmap}; 3368 cf::face::set_magicmap $idx, $info->{magicmap};
3252 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3369 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3253 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3370 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3254 3371
3255 cf::cede_to_tick; 3372 cf::cede_to_tick;
3256 } 3373 }
3257 3374
3258 while (my ($face, $info) = each %$faces) { 3375 while (my ($face, $info) = each %$faces) {
3282 3399
3283 cf::anim::invalidate_all; # d'oh 3400 cf::anim::invalidate_all; # d'oh
3284 } 3401 }
3285 3402
3286 { 3403 {
3287 # TODO: for gcfclient pleasure, we should give resources
3288 # that gcfclient doesn't grok a >10000 face index.
3289 my $res = $facedata->{resource}; 3404 my $res = $facedata->{resource};
3290 3405
3291 while (my ($name, $info) = each %$res) { 3406 while (my ($name, $info) = each %$res) {
3292 if (defined $info->{type}) { 3407 if (defined $info->{type}) {
3293 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3408 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3294 my $data;
3295 3409
3296 if ($info->{type} & 1) { 3410 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3297 # prepend meta info
3298
3299 my $meta = $enc->encode ({
3300 name => $name,
3301 %{ $info->{meta} || {} },
3302 });
3303
3304 $data = pack "(w/a*)*", $meta, $info->{data};
3305 } else {
3306 $data = $info->{data};
3307 }
3308
3309 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3310 cf::face::set_type $idx, $info->{type}; 3411 cf::face::set_type $idx, $info->{type};
3311 } else { 3412 } else {
3312 $RESOURCE{$name} = $info; 3413 $RESOURCE{$name} = $info;
3313 } 3414 }
3314 3415
3397 reload_treasures; 3498 reload_treasures;
3398 3499
3399 warn "finished reloading resource files\n"; 3500 warn "finished reloading resource files\n";
3400} 3501}
3401 3502
3402sub init {
3403 my $guard = freeze_mainloop;
3404
3405 evthread_start IO::AIO::poll_fileno;
3406
3407 reload_resources;
3408}
3409
3410sub reload_config { 3503sub reload_config {
3504 warn "reloading config file...\n";
3505
3411 open my $fh, "<:utf8", "$CONFDIR/config" 3506 open my $fh, "<:utf8", "$CONFDIR/config"
3412 or return; 3507 or return;
3413 3508
3414 local $/; 3509 local $/;
3415 *CFG = YAML::Load <$fh>; 3510 *CFG = YAML::XS::Load scalar <$fh>;
3416 3511
3417 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3512 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3418 3513
3419 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3514 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3420 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3515 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3424 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3519 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3425 and die "WARNING: m(un)lockall failed: $!\n"; 3520 and die "WARNING: m(un)lockall failed: $!\n";
3426 }; 3521 };
3427 warn $@ if $@; 3522 warn $@ if $@;
3428 } 3523 }
3524
3525 warn "finished reloading resource files\n";
3526}
3527
3528sub pidfile() {
3529 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3530 or die "$PIDFILE: $!";
3531 flock $fh, &Fcntl::LOCK_EX
3532 or die "$PIDFILE: flock: $!";
3533 $fh
3534}
3535
3536# make sure only one server instance is running at any one time
3537sub atomic {
3538 my $fh = pidfile;
3539
3540 my $pid = <$fh>;
3541 kill 9, $pid if $pid > 0;
3542
3543 seek $fh, 0, 0;
3544 print $fh $$;
3545}
3546
3547sub main_loop {
3548 warn "EV::loop starting\n";
3549 if (1) {
3550 EV::loop;
3551 }
3552 warn "EV::loop returned\n";
3553 goto &main_loop unless $REALLY_UNLOOP;
3429} 3554}
3430 3555
3431sub main { 3556sub main {
3557 cf::init_globals; # initialise logging
3558
3559 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3560 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3561 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3562 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3563
3564 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3565
3432 # we must not ever block the main coroutine 3566 # we must not ever block the main coroutine
3433 local $Coro::idle = sub { 3567 local $Coro::idle = sub {
3434 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3568 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3435 (async { 3569 (async {
3436 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3570 $Coro::current->{desc} = "IDLE BUG HANDLER";
3437 EV::loop EV::LOOP_ONESHOT; 3571 EV::loop EV::LOOP_ONESHOT;
3438 })->prio (Coro::PRIO_MAX); 3572 })->prio (Coro::PRIO_MAX);
3439 }; 3573 };
3440 3574
3441 { 3575 evthread_start IO::AIO::poll_fileno;
3442 my $guard = freeze_mainloop; 3576
3577 cf::sync_job {
3578 cf::init_experience;
3579 cf::init_anim;
3580 cf::init_attackmess;
3581 cf::init_dynamic;
3582
3583 cf::load_settings;
3584 cf::load_materials;
3585
3586 reload_resources;
3443 reload_config; 3587 reload_config;
3444 db_init; 3588 db_init;
3589
3590 cf::init_uuid;
3591 cf::init_signals;
3592 cf::init_skills;
3593
3594 cf::init_beforeplay;
3595
3596 atomic;
3597
3445 load_extensions; 3598 load_extensions;
3446 3599
3447 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3600 utime time, time, $RUNTIMEFILE;
3601
3602 # no (long-running) fork's whatsoever before this point(!)
3603 use POSIX ();
3604 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3605
3606 (pop @POST_INIT)->(0) while @POST_INIT;
3448 } 3607 };
3449 3608
3450 EV::loop; 3609 cf::object::thawer::errors_are_fatal 0;
3610 warn "parse errors in files are no longer fatal from this point on.\n";
3611
3612 main_loop;
3451} 3613}
3452 3614
3453############################################################################# 3615#############################################################################
3454# initialisation and cleanup 3616# initialisation and cleanup
3455 3617
3456# install some emergency cleanup handlers 3618# install some emergency cleanup handlers
3457BEGIN { 3619BEGIN {
3458 our %SIGWATCHER = (); 3620 our %SIGWATCHER = ();
3459 for my $signal (qw(INT HUP TERM)) { 3621 for my $signal (qw(INT HUP TERM)) {
3460 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3622 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3461 cf::cleanup "SIG$signal"; 3623 cf::cleanup "SIG$signal";
3462 }; 3624 };
3463 } 3625 }
3464} 3626}
3465 3627
3466sub write_runtime_sync { 3628sub write_runtime_sync {
3467 my $runtime = "$LOCALDIR/runtime"; 3629 my $t0 = AE::time;
3468 3630
3469 # first touch the runtime file to show we are still running: 3631 # first touch the runtime file to show we are still running:
3470 # the fsync below can take a very very long time. 3632 # the fsync below can take a very very long time.
3471 3633
3472 IO::AIO::aio_utime $runtime, undef, undef; 3634 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3473 3635
3474 my $guard = cf::lock_acquire "write_runtime"; 3636 my $guard = cf::lock_acquire "write_runtime";
3475 3637
3476 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3638 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3477 or return; 3639 or return;
3478 3640
3479 my $value = $cf::RUNTIME + 90 + 10; 3641 my $value = $cf::RUNTIME + 90 + 10;
3480 # 10 is the runtime save interval, for a monotonic clock 3642 # 10 is the runtime save interval, for a monotonic clock
3481 # 60 allows for the watchdog to kill the server. 3643 # 60 allows for the watchdog to kill the server.
3491 aio_utime $fh, undef, undef; 3653 aio_utime $fh, undef, undef;
3492 3654
3493 close $fh 3655 close $fh
3494 or return; 3656 or return;
3495 3657
3496 aio_rename "$runtime~", $runtime 3658 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3497 and return; 3659 and return;
3498 3660
3499 warn "runtime file written.\n"; 3661 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3500 3662
3501 1 3663 1
3502} 3664}
3503 3665
3504our $uuid_lock; 3666our $uuid_lock;
3513 my $uuid = "$LOCALDIR/uuid"; 3675 my $uuid = "$LOCALDIR/uuid";
3514 3676
3515 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3677 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3516 or return; 3678 or return;
3517 3679
3518 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3680 my $value = uuid_seq uuid_cur;
3681
3682 unless ($value) {
3683 warn "cowardly refusing to write zero uuid value!\n";
3684 return;
3685 }
3686
3687 my $value = uuid_str $value + $uuid_skip;
3519 $uuid_skip = 0; 3688 $uuid_skip = 0;
3520 3689
3521 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3690 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3522 and return; 3691 and return;
3523 3692
3545} 3714}
3546 3715
3547sub emergency_save() { 3716sub emergency_save() {
3548 my $freeze_guard = cf::freeze_mainloop; 3717 my $freeze_guard = cf::freeze_mainloop;
3549 3718
3550 warn "enter emergency perl save\n"; 3719 warn "emergency_perl_save: enter\n";
3551 3720
3552 cf::sync_job { 3721 cf::sync_job {
3722 # this is a trade-off: we want to be very quick here, so
3723 # save all maps without fsync, and later call a global sync
3724 # (which in turn might be very very slow)
3725 local $USE_FSYNC = 0;
3726
3553 # use a peculiar iteration method to avoid tripping on perl 3727 # use a peculiar iteration method to avoid tripping on perl
3554 # refcount bugs in for. also avoids problems with players 3728 # refcount bugs in for. also avoids problems with players
3555 # and maps saved/destroyed asynchronously. 3729 # and maps saved/destroyed asynchronously.
3556 warn "begin emergency player save\n"; 3730 warn "emergency_perl_save: begin player save\n";
3557 for my $login (keys %cf::PLAYER) { 3731 for my $login (keys %cf::PLAYER) {
3558 my $pl = $cf::PLAYER{$login} or next; 3732 my $pl = $cf::PLAYER{$login} or next;
3559 $pl->valid or next; 3733 $pl->valid or next;
3560 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3734 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3561 $pl->save; 3735 $pl->save;
3562 } 3736 }
3563 warn "end emergency player save\n"; 3737 warn "emergency_perl_save: end player save\n";
3564 3738
3565 warn "begin emergency map save\n"; 3739 warn "emergency_perl_save: begin map save\n";
3566 for my $path (keys %cf::MAP) { 3740 for my $path (keys %cf::MAP) {
3567 my $map = $cf::MAP{$path} or next; 3741 my $map = $cf::MAP{$path} or next;
3568 $map->valid or next; 3742 $map->valid or next;
3569 $map->save; 3743 $map->save;
3570 } 3744 }
3571 warn "end emergency map save\n"; 3745 warn "emergency_perl_save: end map save\n";
3572 3746
3573 warn "begin emergency database checkpoint\n"; 3747 warn "emergency_perl_save: begin database checkpoint\n";
3574 BDB::db_env_txn_checkpoint $DB_ENV; 3748 BDB::db_env_txn_checkpoint $DB_ENV;
3575 warn "end emergency database checkpoint\n"; 3749 warn "emergency_perl_save: end database checkpoint\n";
3576 3750
3577 warn "begin write uuid\n"; 3751 warn "emergency_perl_save: begin write uuid\n";
3578 write_uuid_sync 1; 3752 write_uuid_sync 1;
3579 warn "end write uuid\n"; 3753 warn "emergency_perl_save: end write uuid\n";
3580 }; 3754 };
3581 3755
3756 warn "emergency_perl_save: starting sync()\n";
3757 IO::AIO::aio_sync sub {
3758 warn "emergency_perl_save: finished sync()\n";
3759 };
3760
3582 warn "leave emergency perl save\n"; 3761 warn "emergency_perl_save: leave\n";
3583} 3762}
3584 3763
3585sub post_cleanup { 3764sub post_cleanup {
3586 my ($make_core) = @_; 3765 my ($make_core) = @_;
3587 3766
3588 warn Carp::longmess "post_cleanup backtrace" 3767 warn Carp::longmess "post_cleanup backtrace"
3589 if $make_core; 3768 if $make_core;
3769
3770 my $fh = pidfile;
3771 unlink $PIDFILE if <$fh> == $$;
3772}
3773
3774# a safer delete_package, copied from Symbol
3775sub clear_package($) {
3776 my $pkg = shift;
3777
3778 # expand to full symbol table name if needed
3779 unless ($pkg =~ /^main::.*::$/) {
3780 $pkg = "main$pkg" if $pkg =~ /^::/;
3781 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3782 $pkg .= '::' unless $pkg =~ /::$/;
3783 }
3784
3785 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3786 my $stem_symtab = *{$stem}{HASH};
3787
3788 defined $stem_symtab and exists $stem_symtab->{$leaf}
3789 or return;
3790
3791 # clear all symbols
3792 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3793 for my $name (keys %$leaf_symtab) {
3794 _gv_clear *{"$pkg$name"};
3795# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3796 }
3590} 3797}
3591 3798
3592sub do_reload_perl() { 3799sub do_reload_perl() {
3593 # can/must only be called in main 3800 # can/must only be called in main
3594 if ($Coro::current != $Coro::main) { 3801 if (in_main) {
3595 warn "can only reload from main coroutine"; 3802 warn "can only reload from main coroutine";
3596 return; 3803 return;
3597 } 3804 }
3598 3805
3806 return if $RELOAD++;
3807
3808 my $t1 = AE::time;
3809
3810 while ($RELOAD) {
3599 warn "reloading..."; 3811 warn "reloading...";
3600 3812
3601 warn "entering sync_job"; 3813 warn "entering sync_job";
3602 3814
3603 cf::sync_job { 3815 cf::sync_job {
3604 cf::write_runtime_sync; # external watchdog should not bark 3816 cf::write_runtime_sync; # external watchdog should not bark
3605 cf::emergency_save; 3817 cf::emergency_save;
3606 cf::write_runtime_sync; # external watchdog should not bark 3818 cf::write_runtime_sync; # external watchdog should not bark
3607 3819
3608 warn "syncing database to disk"; 3820 warn "syncing database to disk";
3609 BDB::db_env_txn_checkpoint $DB_ENV; 3821 BDB::db_env_txn_checkpoint $DB_ENV;
3610 3822
3611 # if anything goes wrong in here, we should simply crash as we already saved 3823 # if anything goes wrong in here, we should simply crash as we already saved
3612 3824
3613 warn "flushing outstanding aio requests"; 3825 warn "flushing outstanding aio requests";
3614 for (;;) {
3615 BDB::flush;
3616 IO::AIO::flush;
3617 Coro::cede_notself;
3618 last unless IO::AIO::nreqs || BDB::nreqs; 3826 while (IO::AIO::nreqs || BDB::nreqs) {
3619 warn "iterate..."; 3827 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3620 }
3621
3622 ++$RELOAD;
3623
3624 warn "cancelling all extension coros";
3625 $_->cancel for values %EXT_CORO;
3626 %EXT_CORO = ();
3627
3628 warn "removing commands";
3629 %COMMAND = ();
3630
3631 warn "removing ext/exti commands";
3632 %EXTCMD = ();
3633 %EXTICMD = ();
3634
3635 warn "unloading/nuking all extensions";
3636 for my $pkg (@EXTS) {
3637 warn "... unloading $pkg";
3638
3639 if (my $cb = $pkg->can ("unload")) {
3640 eval {
3641 $cb->($pkg);
3642 1
3643 } or warn "$pkg unloaded, but with errors: $@";
3644 } 3828 }
3645 3829
3646 warn "... nuking $pkg"; 3830 warn "cancelling all extension coros";
3647 Symbol::delete_package $pkg; 3831 $_->cancel for values %EXT_CORO;
3648 } 3832 %EXT_CORO = ();
3649 3833
3650 warn "unloading all perl modules loaded from $LIBDIR"; 3834 warn "removing commands";
3651 while (my ($k, $v) = each %INC) { 3835 %COMMAND = ();
3652 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3653 3836
3837 warn "removing ext/exti commands";
3838 %EXTCMD = ();
3839 %EXTICMD = ();
3840
3841 warn "unloading/nuking all extensions";
3842 for my $pkg (@EXTS) {
3654 warn "... unloading $k"; 3843 warn "... unloading $pkg";
3655 delete $INC{$k};
3656 3844
3657 $k =~ s/\.pm$//;
3658 $k =~ s/\//::/g;
3659
3660 if (my $cb = $k->can ("unload_module")) { 3845 if (my $cb = $pkg->can ("unload")) {
3846 eval {
3661 $cb->(); 3847 $cb->($pkg);
3848 1
3849 } or warn "$pkg unloaded, but with errors: $@";
3850 }
3851
3852 warn "... clearing $pkg";
3853 clear_package $pkg;
3662 } 3854 }
3663 3855
3664 Symbol::delete_package $k; 3856 warn "unloading all perl modules loaded from $LIBDIR";
3857 while (my ($k, $v) = each %INC) {
3858 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3859
3860 warn "... unloading $k";
3861 delete $INC{$k};
3862
3863 $k =~ s/\.pm$//;
3864 $k =~ s/\//::/g;
3865
3866 if (my $cb = $k->can ("unload_module")) {
3867 $cb->();
3868 }
3869
3870 clear_package $k;
3665 } 3871 }
3666 3872
3667 warn "getting rid of safe::, as good as possible"; 3873 warn "getting rid of safe::, as good as possible";
3668 Symbol::delete_package "safe::$_" 3874 clear_package "safe::$_"
3669 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3875 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3670 3876
3671 warn "unloading cf.pm \"a bit\""; 3877 warn "unloading cf.pm \"a bit\"";
3672 delete $INC{"cf.pm"}; 3878 delete $INC{"cf.pm"};
3673 delete $INC{"cf/pod.pm"}; 3879 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3674 3880
3675 # don't, removes xs symbols, too, 3881 # don't, removes xs symbols, too,
3676 # and global variables created in xs 3882 # and global variables created in xs
3677 #Symbol::delete_package __PACKAGE__; 3883 #clear_package __PACKAGE__;
3678 3884
3679 warn "unload completed, starting to reload now"; 3885 warn "unload completed, starting to reload now";
3680 3886
3681 warn "reloading cf.pm"; 3887 warn "reloading cf.pm";
3682 require cf; 3888 require cf;
3683 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3889 cf::_connect_to_perl_1;
3684 3890
3685 warn "loading config and database again"; 3891 warn "loading config and database again";
3686 cf::reload_config; 3892 cf::reload_config;
3687 3893
3688 warn "loading extensions"; 3894 warn "loading extensions";
3689 cf::load_extensions; 3895 cf::load_extensions;
3690 3896
3897 if ($REATTACH_ON_RELOAD) {
3691 warn "reattaching attachments to objects/players"; 3898 warn "reattaching attachments to objects/players";
3692 _global_reattach; # objects, sockets 3899 _global_reattach; # objects, sockets
3693 warn "reattaching attachments to maps"; 3900 warn "reattaching attachments to maps";
3694 reattach $_ for values %MAP; 3901 reattach $_ for values %MAP;
3695 warn "reattaching attachments to players"; 3902 warn "reattaching attachments to players";
3696 reattach $_ for values %PLAYER; 3903 reattach $_ for values %PLAYER;
3904 }
3697 3905
3906 warn "running post_init jobs";
3907 (pop @POST_INIT)->(1) while @POST_INIT;
3908
3698 warn "leaving sync_job"; 3909 warn "leaving sync_job";
3699 3910
3700 1 3911 1
3701 } or do { 3912 } or do {
3702 warn $@; 3913 warn $@;
3703 cf::cleanup "error while reloading, exiting."; 3914 cf::cleanup "error while reloading, exiting.";
3704 }; 3915 };
3705 3916
3706 warn "reloaded"; 3917 warn "reloaded";
3918 --$RELOAD;
3919 }
3920
3921 $t1 = AE::time - $t1;
3922 warn "reload completed in ${t1}s\n";
3707}; 3923};
3708 3924
3709our $RELOAD_WATCHER; # used only during reload 3925our $RELOAD_WATCHER; # used only during reload
3710 3926
3711sub reload_perl() { 3927sub reload_perl() {
3712 # doing reload synchronously and two reloads happen back-to-back, 3928 # doing reload synchronously and two reloads happen back-to-back,
3713 # coro crashes during coro_state_free->destroy here. 3929 # coro crashes during coro_state_free->destroy here.
3714 3930
3931 $RELOAD_WATCHER ||= cf::async {
3932 Coro::AIO::aio_wait cache_extensions;
3933
3715 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3934 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3716 do_reload_perl; 3935 do_reload_perl;
3717 undef $RELOAD_WATCHER; 3936 undef $RELOAD_WATCHER;
3937 };
3718 }; 3938 };
3719} 3939}
3720 3940
3721register_command "reload" => sub { 3941register_command "reload" => sub {
3722 my ($who, $arg) = @_; 3942 my ($who, $arg) = @_;
3736 3956
3737our @WAIT_FOR_TICK; 3957our @WAIT_FOR_TICK;
3738our @WAIT_FOR_TICK_BEGIN; 3958our @WAIT_FOR_TICK_BEGIN;
3739 3959
3740sub wait_for_tick { 3960sub wait_for_tick {
3741 return if tick_inhibit || $Coro::current == $Coro::main; 3961 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3742 3962
3743 my $signal = new Coro::Signal; 3963 my $signal = new Coro::Signal;
3744 push @WAIT_FOR_TICK, $signal; 3964 push @WAIT_FOR_TICK, $signal;
3745 $signal->wait; 3965 $signal->wait;
3746} 3966}
3747 3967
3748sub wait_for_tick_begin { 3968sub wait_for_tick_begin {
3749 return if tick_inhibit || $Coro::current == $Coro::main; 3969 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3750 3970
3751 my $signal = new Coro::Signal; 3971 my $signal = new Coro::Signal;
3752 push @WAIT_FOR_TICK_BEGIN, $signal; 3972 push @WAIT_FOR_TICK_BEGIN, $signal;
3753 $signal->wait; 3973 $signal->wait;
3754} 3974}
3759 unless ++$bug_warning > 10; 3979 unless ++$bug_warning > 10;
3760 return; 3980 return;
3761 } 3981 }
3762 3982
3763 cf::server_tick; # one server iteration 3983 cf::server_tick; # one server iteration
3984
3985 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3764 3986
3765 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3987 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3766 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3988 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3767 Coro::async_pool { 3989 Coro::async_pool {
3768 $Coro::current->{desc} = "runtime saver"; 3990 $Coro::current->{desc} = "runtime saver";
3791} 4013}
3792 4014
3793{ 4015{
3794 # configure BDB 4016 # configure BDB
3795 4017
3796 BDB::min_parallel 8; 4018 BDB::min_parallel 16;
3797 BDB::max_poll_reqs $TICK * 0.1; 4019 BDB::max_poll_reqs $TICK * 0.1;
3798 $AnyEvent::BDB::WATCHER->priority (1); 4020 $AnyEvent::BDB::WATCHER->priority (1);
3799 4021
3800 unless ($DB_ENV) { 4022 unless ($DB_ENV) {
3801 $DB_ENV = BDB::db_env_create; 4023 $DB_ENV = BDB::db_env_create;
3848 $msg =~ s/\n//; 4070 $msg =~ s/\n//;
3849 4071
3850 # limit the # of concurrent backtraces 4072 # limit the # of concurrent backtraces
3851 if ($_log_backtrace < 2) { 4073 if ($_log_backtrace < 2) {
3852 ++$_log_backtrace; 4074 ++$_log_backtrace;
4075 my $perl_bt = Carp::longmess $msg;
3853 async { 4076 async {
3854 $Coro::current->{desc} = "abt $msg"; 4077 $Coro::current->{desc} = "abt $msg";
3855 4078
3856 my @bt = fork_call { 4079 my @bt = fork_call {
3857 @addr = map { sprintf "%x", $_ } @addr; 4080 @addr = map { sprintf "%x", $_ } @addr;
3868 } 4091 }
3869 4092
3870 @funcs 4093 @funcs
3871 }; 4094 };
3872 4095
3873 LOG llevInfo, "[ABT] $msg\n"; 4096 LOG llevInfo, "[ABT] $perl_bt\n";
4097 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3874 LOG llevInfo, "[ABT] $_\n" for @bt; 4098 LOG llevInfo, "[ABT] $_\n" for @bt;
3875 --$_log_backtrace; 4099 --$_log_backtrace;
3876 }; 4100 };
3877 } else { 4101 } else {
3878 LOG llevInfo, "[ABT] $msg\n"; 4102 LOG llevInfo, "[ABT] $msg\n";
3879 LOG llevInfo, "[ABT] [suppressed]\n"; 4103 LOG llevInfo, "[ABT] [suppressed]\n";
3880 } 4104 }
3881} 4105}
3882 4106
3883# load additional modules 4107# load additional modules
3884use cf::pod; 4108require "cf/$_.pm" for @EXTRA_MODULES;
4109cf::_connect_to_perl_2;
3885 4110
3886END { cf::emergency_save } 4111END { cf::emergency_save }
3887 4112
38881 41131
3889 4114

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines