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.526 by root, Wed Apr 21 05:48:35 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 = 4000;
114our $OUTPUT_RATE_MAX = 100000;
115
102our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 116our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
103our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 117our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
104our $NEXT_TICK; 118our $NEXT_TICK;
105our $USE_FSYNC = 1; # use fsync to write maps - default off 119our $USE_FSYNC = 1; # use fsync to write maps - default on
106 120
107our $BDB_DEADLOCK_WATCHER; 121our $BDB_DEADLOCK_WATCHER;
108our $BDB_CHECKPOINT_WATCHER; 122our $BDB_CHECKPOINT_WATCHER;
109our $BDB_TRICKLE_WATCHER; 123our $BDB_TRICKLE_WATCHER;
110our $DB_ENV; 124our $DB_ENV;
111 125
126our @EXTRA_MODULES = qw(pod match mapscript);
127
112our %CFG; 128our %CFG;
113 129
114our $UPTIME; $UPTIME ||= time; 130our $UPTIME; $UPTIME ||= time;
115our $RUNTIME; 131our $RUNTIME;
116our $NOW; 132our $NOW;
124 140
125our $LOAD; # a number between 0 (idle) and 1 (too many objects) 141our $LOAD; # a number between 0 (idle) and 1 (too many objects)
126our $LOADAVG; # same thing, but with alpha-smoothing 142our $LOADAVG; # same thing, but with alpha-smoothing
127our $JITTER; # average jitter 143our $JITTER; # average jitter
128our $TICK_START; # for load detecting purposes 144our $TICK_START; # for load detecting purposes
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 :)
129 150
130binmode STDOUT; 151binmode STDOUT;
131binmode STDERR; 152binmode STDERR;
132 153
133# read virtual server time, if available 154# read virtual server time, if available
135 open my $fh, "<", $RUNTIMEFILE 156 open my $fh, "<", $RUNTIMEFILE
136 or die "unable to read $RUNTIMEFILE file: $!"; 157 or die "unable to read $RUNTIMEFILE file: $!";
137 $RUNTIME = <$fh> + 0.; 158 $RUNTIME = <$fh> + 0.;
138} 159}
139 160
161eval "sub TICK() { $TICK } 1" or die;
162
140mkdir $_ 163mkdir $_
141 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 164 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
142 165
143our $EMERGENCY_POSITION; 166our $EMERGENCY_POSITION;
144 167
145sub 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::"} };
146 184
147############################################################################# 185#############################################################################
148 186
149=head2 GLOBAL VARIABLES 187=head2 GLOBAL VARIABLES
150 188
197returns 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
198per 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.
199 237
200=item @cf::INVOKE_RESULTS 238=item @cf::INVOKE_RESULTS
201 239
202This array contains the results of the last C<invoke ()> call. When 240This 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 241C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
204that call. 242that call.
205 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
206=back 250=back
207 251
208=cut 252=cut
209 253
210BEGIN { 254$Coro::State::WARNHOOK = sub {
211 *CORE::GLOBAL::warn = sub {
212 my $msg = join "", @_; 255 my $msg = join "", @_;
213 256
214 $msg .= "\n" 257 $msg .= "\n"
215 unless $msg =~ /\n$/; 258 unless $msg =~ /\n$/;
216 259
217 $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;
218 261
219 LOG llevError, $msg; 262 LOG llevError, $msg;
220 }; 263};
221}
222 264
223$Coro::State::DIEHOOK = sub { 265$Coro::State::DIEHOOK = sub {
224 return unless $^S eq 0; # "eq", not "==" 266 return unless $^S eq 0; # "eq", not "=="
225 267
226 if ($Coro::current == $Coro::main) {#d# 268 warn Carp::longmess $_[0];
269
270 if (in_main) {#d#
227 warn "DIEHOOK called in main context, Coro bug?\n";#d# 271 warn "DIEHOOK called in main context, Coro bug?\n";#d#
228 return;#d# 272 return;#d#
229 }#d# 273 }#d#
230 274
231 # kill coroutine otherwise 275 # kill coroutine otherwise
232 warn Carp::longmess $_[0];
233 Coro::terminate 276 Coro::terminate
234}; 277};
235
236$SIG{__DIE__} = sub { }; #d#?
237 278
238@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 279@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
239@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 280@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
240@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 281@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
241@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 282@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
255)) { 296)) {
256 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 297 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
257} 298}
258 299
259$EV::DIED = sub { 300$EV::DIED = sub {
260 warn "error in event callback: @_"; 301 Carp::cluck "error in event callback: @_";
261}; 302};
262 303
263############################################################################# 304#############################################################################
264 305
265=head2 UTILITY FUNCTIONS 306=head2 UTILITY FUNCTIONS
302our $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
303 344
304sub encode_json($) { $json_coder->encode ($_[0]) } 345sub encode_json($) { $json_coder->encode ($_[0]) }
305sub decode_json($) { $json_coder->decode ($_[0]) } 346sub decode_json($) { $json_coder->decode ($_[0]) }
306 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
307=item cf::lock_wait $string 362=item cf::lock_wait $string
308 363
309Wait until the given lock is available. See cf::lock_acquire. 364Wait until the given lock is available. See cf::lock_acquire.
310 365
311=item my $lock = cf::lock_acquire $string 366=item my $lock = cf::lock_acquire $string
312 367
313Wait 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
314a 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,
315for example when the coroutine gets canceled), the lock is automatically 370for example when the coroutine gets canceled), the lock is automatically
316returned. 371returned.
317 372
318Locks 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
319deadlocked coro. 374deadlocked coro.
325 380
326Return 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.
327 382
328=cut 383=cut
329 384
330our %LOCK; 385our $LOCKS = new Coro::SemaphoreSet;
331our %LOCKER;#d#
332 386
333sub lock_wait($) { 387sub lock_wait($) {
334 my ($key) = @_; 388 $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} 389}
347 390
348sub lock_acquire($) { 391sub lock_acquire($) {
349 my ($key) = @_; 392 $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} 393}
363 394
364sub lock_active($) { 395sub lock_active($) {
365 my ($key) = @_; 396 $LOCKS->count ($_[0]) < 1
366
367 ! ! $LOCK{$key}
368} 397}
369 398
370sub freeze_mainloop { 399sub freeze_mainloop {
371 tick_inhibit_inc; 400 tick_inhibit_inc;
372 401
373 Coro::guard \&tick_inhibit_dec; 402 &Guard::guard (\&tick_inhibit_dec);
374} 403}
375 404
376=item cf::periodic $interval, $cb 405=item cf::periodic $interval, $cb
377 406
378Like 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
379get spread over timer. 408get spread over time.
380 409
381=cut 410=cut
382 411
383sub periodic($$) { 412sub periodic($$) {
384 my ($interval, $cb) = @_; 413 my ($interval, $cb) = @_;
401 430
402=cut 431=cut
403 432
404our @SLOT_QUEUE; 433our @SLOT_QUEUE;
405our $SLOT_QUEUE; 434our $SLOT_QUEUE;
435our $SLOT_DECAY = 0.9;
406 436
407$SLOT_QUEUE->cancel if $SLOT_QUEUE; 437$SLOT_QUEUE->cancel if $SLOT_QUEUE;
408$SLOT_QUEUE = Coro::async { 438$SLOT_QUEUE = Coro::async {
409 $Coro::current->desc ("timeslot manager"); 439 $Coro::current->desc ("timeslot manager");
410 440
411 my $signal = new Coro::Signal; 441 my $signal = new Coro::Signal;
442 my $busy;
412 443
413 while () { 444 while () {
414 next_job: 445 next_job:
446
415 my $avail = cf::till_tick; 447 my $avail = cf::till_tick;
416 if ($avail > 0.01) { 448
417 for (0 .. $#SLOT_QUEUE) { 449 for (0 .. $#SLOT_QUEUE) {
418 if ($SLOT_QUEUE[$_][0] < $avail) { 450 if ($SLOT_QUEUE[$_][0] <= $avail) {
451 $busy = 0;
419 my $job = splice @SLOT_QUEUE, $_, 1, (); 452 my $job = splice @SLOT_QUEUE, $_, 1, ();
420 $job->[2]->send; 453 $job->[2]->send;
421 Coro::cede; 454 Coro::cede;
422 goto next_job; 455 goto next_job;
423 } 456 } else {
457 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
424 } 458 }
425 } 459 }
426 460
427 if (@SLOT_QUEUE) { 461 if (@SLOT_QUEUE) {
428 # 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
429 push @cf::WAIT_FOR_TICK, $signal; 463 push @cf::WAIT_FOR_TICK, $signal;
430 $signal->wait; 464 $signal->wait;
431 } else { 465 } else {
466 $busy = 0;
432 Coro::schedule; 467 Coro::schedule;
433 } 468 }
434 } 469 }
435}; 470};
436 471
437sub get_slot($;$$) { 472sub get_slot($;$$) {
438 return if tick_inhibit || $Coro::current == $Coro::main; 473 return if tick_inhibit || $Coro::current == $Coro::main;
439 474
440 my ($time, $pri, $name) = @_; 475 my ($time, $pri, $name) = @_;
441 476
442 $time = $TICK * .6 if $time > $TICK * .6; 477 $time = clamp $time, 0.01, $TICK * .6;
478
443 my $sig = new Coro::Signal; 479 my $sig = new Coro::Signal;
444 480
445 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 481 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
446 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 482 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
447 $SLOT_QUEUE->ready; 483 $SLOT_QUEUE->ready;
474 510
475sub sync_job(&) { 511sub sync_job(&) {
476 my ($job) = @_; 512 my ($job) = @_;
477 513
478 if ($Coro::current == $Coro::main) { 514 if ($Coro::current == $Coro::main) {
479 my $time = EV::time; 515 my $time = AE::time;
480 516
481 # this is the main coro, too bad, we have to block 517 # this is the main coro, too bad, we have to block
482 # till the operation succeeds, freezing the server :/ 518 # till the operation succeeds, freezing the server :/
483 519
484 LOG llevError, Carp::longmess "sync job";#d# 520 LOG llevError, Carp::longmess "sync job";#d#
501 } else { 537 } else {
502 EV::loop EV::LOOP_ONESHOT; 538 EV::loop EV::LOOP_ONESHOT;
503 } 539 }
504 } 540 }
505 541
506 my $time = EV::time - $time; 542 my $time = AE::time - $time;
507 543
508 $TICK_START += $time; # do not account sync jobs to server load 544 $TICK_START += $time; # do not account sync jobs to server load
509 545
510 wantarray ? @res : $res[0] 546 wantarray ? @res : $res[0]
511 } else { 547 } else {
555 reset_signals; 591 reset_signals;
556 &$cb 592 &$cb
557 }, @args; 593 }, @args;
558 594
559 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 )
560} 607}
561 608
562=item $coin = coin_from_name $name 609=item $coin = coin_from_name $name
563 610
564=cut 611=cut
730 777
731############################################################################# 778#############################################################################
732 779
733=head2 ATTACHABLE OBJECTS 780=head2 ATTACHABLE OBJECTS
734 781
735Many 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
736attach callbacks/event handlers (a collection of which is called an "attachment") 783attach callbacks/event handlers (a collection of which is called an "attachment")
737to it. All such attachable objects support the following methods. 784to it. All such attachable objects support the following methods.
738 785
739In 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>
740C<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
790=item cf::CLASS::attachment $name, ... 837=item cf::CLASS::attachment $name, ...
791 838
792Register an attachment by C<$name> through which attachable objects of the 839Register an attachment by C<$name> through which attachable objects of the
793given CLASS can refer to this attachment. 840given CLASS can refer to this attachment.
794 841
795Some classes such as crossfire maps and objects can specify attachments 842Some classes such as deliantra maps and objects can specify attachments
796that 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.
797 844
798These calls expect any number of the following handler/hook descriptions: 845These calls expect any number of the following handler/hook descriptions:
799 846
800=over 4 847=over 4
1150 $decname, length $$rdata, scalar @$objs; 1197 $decname, length $$rdata, scalar @$objs;
1151 1198
1152 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1199 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1153 aio_chmod $fh, SAVE_MODE; 1200 aio_chmod $fh, SAVE_MODE;
1154 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1201 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1155 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 }
1156 aio_close $fh; 1206 aio_close $fh;
1157 1207
1158 if (@$objs) { 1208 if (@$objs) {
1159 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) {
1160 aio_chmod $fh, SAVE_MODE; 1210 aio_chmod $fh, SAVE_MODE;
1161 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1211 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1162 aio_write $fh, 0, (length $data), $data, 0; 1212 aio_write $fh, 0, (length $data), $data, 0;
1163 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 }
1164 aio_close $fh; 1217 aio_close $fh;
1165 aio_rename "$filename.pst~", "$filename.pst"; 1218 aio_rename "$filename.pst~", "$filename.pst";
1166 } 1219 }
1167 } else { 1220 } else {
1168 aio_unlink "$filename.pst"; 1221 aio_unlink "$filename.pst";
1169 } 1222 }
1170 1223
1171 aio_rename "$filename~", $filename; 1224 aio_rename "$filename~", $filename;
1225
1226 $filename =~ s%/[^/]+$%%;
1227 aio_pathsync $filename if $cf::USE_FSYNC;
1172 } else { 1228 } else {
1173 warn "FATAL: $filename~: $!\n"; 1229 warn "unable to save objects: $filename~: $!\n";
1174 } 1230 }
1175 } else { 1231 } else {
1176 aio_unlink $filename; 1232 aio_unlink $filename;
1177 aio_unlink "$filename.pst"; 1233 aio_unlink "$filename.pst";
1178 } 1234 }
1269 my ($name, $cb) = @_; 1325 my ($name, $cb) = @_;
1270 1326
1271 $EXTICMD{$name} = $cb; 1327 $EXTICMD{$name} = $cb;
1272} 1328}
1273 1329
1330use File::Glob ();
1331
1274cf::player->attach ( 1332cf::player->attach (
1275 on_command => sub { 1333 on_unknown_command => sub {
1276 my ($pl, $name, $params) = @_; 1334 my ($pl, $name, $params) = @_;
1277 1335
1278 my $cb = $COMMAND{$name} 1336 my $cb = $COMMAND{$name}
1279 or return; 1337 or return;
1280 1338
1310 1368
1311 cf::override; 1369 cf::override;
1312 }, 1370 },
1313); 1371);
1314 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
1315sub load_extensions { 1386sub load_extensions {
1316 cf::sync_job { 1387 cf::sync_job {
1317 my %todo; 1388 my %todo;
1318 1389
1319 for my $path (<$LIBDIR/*.ext>) { 1390 for my $path (<$LIBDIR/*.ext>) {
1346 . "\n};\n1"; 1417 . "\n};\n1";
1347 1418
1348 $todo{$base} = \%ext; 1419 $todo{$base} = \%ext;
1349 } 1420 }
1350 1421
1422 my $pass = 0;
1351 my %done; 1423 my %done;
1352 while (%todo) { 1424 while (%todo) {
1353 my $progress; 1425 my $progress;
1354 1426
1427 ++$pass;
1428
1429 ext:
1355 while (my ($k, $v) = each %todo) { 1430 while (my ($k, $v) = each %todo) {
1356 for (split /,\s*/, $v->{meta}{depends}) { 1431 for (split /,\s*/, $v->{meta}{depends}) {
1357 goto skip 1432 next ext
1358 unless exists $done{$_}; 1433 unless exists $done{$_};
1359 } 1434 }
1360 1435
1361 warn "... loading '$k' into '$v->{pkg}'\n"; 1436 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1362 1437
1363 unless (eval $v->{source}) { 1438 my $active = eval $v->{source};
1439
1440 if (length $@) {
1364 my $msg = $@ ? "$v->{path}: $@\n" 1441 warn "$v->{path}: $@\n";
1365 : "$v->{base}: extension inactive.\n";
1366 1442
1367 if (exists $v->{meta}{mandatory}) {
1368 warn $msg;
1369 cf::cleanup "mandatory extension failed to load, exiting."; 1443 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1370 } 1444 if exists $v->{meta}{mandatory};
1371 1445
1372 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;
1373 } 1455 }
1374
1375 $done{$k} = delete $todo{$k};
1376 push @EXTS, $v->{pkg};
1377 $progress = 1;
1378 } 1456 }
1379 1457
1380 skip: 1458 unless ($progress) {
1381 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1459 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1382 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 }
1383 } 1466 }
1384 }; 1467 };
1385} 1468}
1386 1469
1387############################################################################# 1470#############################################################################
1388 1471
1389=back 1472=back
1390 1473
1391=head2 CORE EXTENSIONS 1474=head2 CORE EXTENSIONS
1392 1475
1393Functions and methods that extend core crossfire objects. 1476Functions and methods that extend core deliantra objects.
1394 1477
1395=cut 1478=cut
1396 1479
1397package cf::player; 1480package cf::player;
1398 1481
1441 1524
1442sub exists($) { 1525sub exists($) {
1443 my ($login) = @_; 1526 my ($login) = @_;
1444 1527
1445 $cf::PLAYER{$login} 1528 $cf::PLAYER{$login}
1446 or cf::sync_job { !aio_stat path $login } 1529 or !aio_stat path $login
1447} 1530}
1448 1531
1449sub find($) { 1532sub find($) {
1450 return $cf::PLAYER{$_[0]} || do { 1533 return $cf::PLAYER{$_[0]} || do {
1451 my $login = $_[0]; 1534 my $login = $_[0];
1471 $cf::PLAYER{$login} = $pl 1554 $cf::PLAYER{$login} = $pl
1472 } 1555 }
1473 } 1556 }
1474} 1557}
1475 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
1476sub save($) { 1572sub save($) {
1477 my ($pl) = @_; 1573 my ($pl) = @_;
1478 1574
1479 return if $pl->{deny_save}; 1575 return if $pl->{deny_save};
1480 1576
1485 1581
1486 aio_mkdir playerdir $pl, 0770; 1582 aio_mkdir playerdir $pl, 0770;
1487 $pl->{last_save} = $cf::RUNTIME; 1583 $pl->{last_save} = $cf::RUNTIME;
1488 1584
1489 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];
1490 1589
1491 $pl->save_pl ($path); 1590 $pl->save_pl ($path);
1492 cf::cede_to_tick; 1591 cf::cede_to_tick;
1493} 1592}
1494 1593
1596 \@logins 1695 \@logins
1597} 1696}
1598 1697
1599=item $player->maps 1698=item $player->maps
1600 1699
1700=item cf::player::maps $login
1701
1601Returns an arrayref of map paths that are private for this 1702Returns an arrayref of map paths that are private for this
1602player. May block. 1703player. May block.
1603 1704
1604=cut 1705=cut
1605 1706
1622 } 1723 }
1623 1724
1624 \@paths 1725 \@paths
1625} 1726}
1626 1727
1627=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1728=item $protocol_xml = $player->expand_cfpod ($cfpod)
1628 1729
1629Expand crossfire pod fragments into protocol xml. 1730Expand deliantra pod fragments into protocol xml.
1630 1731
1631=item $player->ext_reply ($msgid, @msg) 1732=item $player->ext_reply ($msgid, @msg)
1632 1733
1633Sends an ext reply to the player. 1734Sends an ext reply to the player.
1634 1735
1666 1767
1667=cut 1768=cut
1668 1769
1669sub find_by_path($) { 1770sub find_by_path($) {
1670 my ($path) = @_; 1771 my ($path) = @_;
1772
1773 $path =~ s/^~[^\/]*//; # skip ~login
1671 1774
1672 my ($match, $specificity); 1775 my ($match, $specificity);
1673 1776
1674 for my $region (list) { 1777 for my $region (list) {
1675 if ($region->{match} && $path =~ $region->{match}) { 1778 if ($region->{match} && $path =~ $region->{match}) {
1707 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1810 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1708 1811
1709 # mit "rum" bekleckern, nicht 1812 # mit "rum" bekleckern, nicht
1710 $self->_create_random_map ( 1813 $self->_create_random_map (
1711 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1814 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1712 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1815 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1713 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1816 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1714 $rmp->{exit_on_final_map}, 1817 $rmp->{exit_on_final_map},
1715 $rmp->{xsize}, $rmp->{ysize}, 1818 $rmp->{xsize}, $rmp->{ysize},
1716 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1819 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1717 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1820 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1739 1842
1740 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1843 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1741} 1844}
1742 1845
1743# also paths starting with '/' 1846# also paths starting with '/'
1744$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1847$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1745 1848
1746sub thawer_merge { 1849sub thawer_merge {
1747 my ($self, $merge) = @_; 1850 my ($self, $merge) = @_;
1748 1851
1749 # we have to keep some variables in memory intact 1852 # we have to keep some variables in memory intact
1847 1950
1848 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1951 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1849 "$UNIQUEDIR/$path" 1952 "$UNIQUEDIR/$path"
1850} 1953}
1851 1954
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 { 1955sub decay_objects {
1862 my ($self) = @_; 1956 my ($self) = @_;
1863 1957
1864 return if $self->{deny_reset}; 1958 return if $self->{deny_reset};
1865 1959
1947sub find { 2041sub find {
1948 my ($path, $origin) = @_; 2042 my ($path, $origin) = @_;
1949 2043
1950 $path = normalise $path, $origin && $origin->path; 2044 $path = normalise $path, $origin && $origin->path;
1951 2045
1952 cf::lock_wait "map_data:$path";#d#remove 2046 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1953 cf::lock_wait "map_find:$path"; 2047 my $guard2 = cf::lock_acquire "map_find:$path";
1954 2048
1955 $cf::MAP{$path} || do { 2049 $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 2050 my $map = new_from_path cf::map $path
1960 or return; 2051 or return;
1961 2052
1962 $map->{last_save} = $cf::RUNTIME; 2053 $map->{last_save} = $cf::RUNTIME;
1963 2054
1975 2066
1976 $cf::MAP{$path} = $map 2067 $cf::MAP{$path} = $map
1977 } 2068 }
1978} 2069}
1979 2070
1980sub pre_load { } 2071sub pre_load { }
1981sub post_load { } 2072#sub post_load { } # XS
1982 2073
1983sub load { 2074sub load {
1984 my ($self) = @_; 2075 my ($self) = @_;
1985 2076
1986 local $self->{deny_reset} = 1; # loading can take a long time 2077 local $self->{deny_reset} = 1; # loading can take a long time
2031 unless ($self->{deny_activate}) { 2122 unless ($self->{deny_activate}) {
2032 $self->decay_objects; 2123 $self->decay_objects;
2033 $self->fix_auto_apply; 2124 $self->fix_auto_apply;
2034 $self->update_buttons; 2125 $self->update_buttons;
2035 cf::cede_to_tick; 2126 cf::cede_to_tick;
2036 $self->set_darkness_map;
2037 cf::cede_to_tick;
2038 $self->activate; 2127 $self->activate;
2039 } 2128 }
2040 2129
2041 $self->{last_save} = $cf::RUNTIME; 2130 $self->{last_save} = $cf::RUNTIME;
2042 $self->last_access ($cf::RUNTIME); 2131 $self->last_access ($cf::RUNTIME);
2045 } 2134 }
2046 2135
2047 $self->post_load; 2136 $self->post_load;
2048} 2137}
2049 2138
2139# customize the map for a given player, i.e.
2140# return the _real_ map. used by e.g. per-player
2141# maps to change the path to ~playername/mappath
2050sub customise_for { 2142sub customise_for {
2051 my ($self, $ob) = @_; 2143 my ($self, $ob) = @_;
2052 2144
2053 return find "~" . $ob->name . "/" . $self->{path} 2145 return find "~" . $ob->name . "/" . $self->{path}
2054 if $self->per_player; 2146 if $self->per_player;
2131 $MAP_PREFETCHER->prio (6); 2223 $MAP_PREFETCHER->prio (6);
2132 2224
2133 () 2225 ()
2134} 2226}
2135 2227
2228# common code, used by both ->save and ->swapout
2136sub save { 2229sub _save {
2137 my ($self) = @_; 2230 my ($self) = @_;
2138
2139 my $lock = cf::lock_acquire "map_data:$self->{path}";
2140 2231
2141 $self->{last_save} = $cf::RUNTIME; 2232 $self->{last_save} = $cf::RUNTIME;
2142 2233
2143 return unless $self->dirty; 2234 return unless $self->dirty;
2144 2235
2164 } else { 2255 } else {
2165 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2256 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2166 } 2257 }
2167} 2258}
2168 2259
2260sub save {
2261 my ($self) = @_;
2262
2263 my $lock = cf::lock_acquire "map_data:$self->{path}";
2264
2265 $self->_save;
2266}
2267
2169sub swap_out { 2268sub swap_out {
2170 my ($self) = @_; 2269 my ($self) = @_;
2171 2270
2172 # save first because save cedes
2173 $self->save;
2174
2175 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2271 my $lock = cf::lock_acquire "map_data:$self->{path}";
2176 2272
2177 return if $self->players;
2178 return if $self->in_memory != cf::MAP_ACTIVE; 2273 return if $self->in_memory != cf::MAP_ACTIVE;
2179 return if $self->{deny_save}; 2274 return if $self->{deny_save};
2275 return if $self->players;
2180 2276
2277 # first deactivate the map and "unlink" it from the core
2278 $self->deactivate;
2279 $_->clear_links_to ($self) for values %cf::MAP;
2181 $self->in_memory (cf::MAP_SWAPPED); 2280 $self->in_memory (cf::MAP_SWAPPED);
2281
2282 # then atomically save
2283 $self->_save;
2284
2285 # then free the map
2286 $self->clear;
2287}
2288
2289sub reset_at {
2290 my ($self) = @_;
2291
2292 # TODO: safety, remove and allow resettable per-player maps
2293 return 1e99 if $self->{deny_reset};
2294
2295 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2296 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2297
2298 $time + $to
2299}
2300
2301sub should_reset {
2302 my ($self) = @_;
2303
2304 $self->reset_at <= $cf::RUNTIME
2305}
2306
2307sub reset {
2308 my ($self) = @_;
2309
2310 my $lock = cf::lock_acquire "map_data:$self->{path}";
2311
2312 return if $self->players;
2313
2314 warn "resetting map ", $self->path, "\n";
2315
2316 $self->in_memory (cf::MAP_SWAPPED);
2317
2318 # need to save uniques path
2319 unless ($self->{deny_save}) {
2320 my $uniq = $self->uniq_path; utf8::encode $uniq;
2321
2322 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2323 if $uniq;
2324 }
2325
2326 delete $cf::MAP{$self->path};
2182 2327
2183 $self->deactivate; 2328 $self->deactivate;
2184 $_->clear_links_to ($self) for values %cf::MAP; 2329 $_->clear_links_to ($self) for values %cf::MAP;
2185 $self->clear; 2330 $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 2331
2231 $self->unlink_save; 2332 $self->unlink_save;
2232 $self->destroy; 2333 $self->destroy;
2233} 2334}
2234 2335
2242 2343
2243 delete $cf::MAP{$self->path}; 2344 delete $cf::MAP{$self->path};
2244 2345
2245 $self->unlink_save; 2346 $self->unlink_save;
2246 2347
2247 bless $self, "cf::map"; 2348 bless $self, "cf::map::wrap";
2248 delete $self->{deny_reset}; 2349 delete $self->{deny_reset};
2249 $self->{deny_save} = 1; 2350 $self->{deny_save} = 1;
2250 $self->reset_timeout (1); 2351 $self->reset_timeout (1);
2251 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2352 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2252 2353
2309 : normalise $_ 2410 : normalise $_
2310 } @{ aio_readdir $UNIQUEDIR or [] } 2411 } @{ aio_readdir $UNIQUEDIR or [] }
2311 ] 2412 ]
2312} 2413}
2313 2414
2415=item cf::map::static_maps
2416
2417Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2418file in the shared directory excluding F</styles> and F</editor>). May
2419block.
2420
2421=cut
2422
2423sub static_maps() {
2424 my @dirs = "";
2425 my @maps;
2426
2427 while (@dirs) {
2428 my $dir = shift @dirs;
2429
2430 next if $dir eq "/styles" || $dir eq "/editor";
2431
2432 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2433 or return;
2434
2435 for (@$files) {
2436 s/\.map$// or next;
2437 utf8::decode $_;
2438 push @maps, "$dir/$_";
2439 }
2440
2441 push @dirs, map "$dir/$_", @$dirs;
2442 }
2443
2444 \@maps
2445}
2446
2314=back 2447=back
2315 2448
2316=head3 cf::object 2449=head3 cf::object
2317 2450
2318=cut 2451=cut
2383 2516
2384our $SAY_CHANNEL = { 2517our $SAY_CHANNEL = {
2385 id => "say", 2518 id => "say",
2386 title => "Map", 2519 title => "Map",
2387 reply => "say ", 2520 reply => "say ",
2388 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2521 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2389}; 2522};
2390 2523
2391our $CHAT_CHANNEL = { 2524our $CHAT_CHANNEL = {
2392 id => "chat", 2525 id => "chat",
2393 title => "Chat", 2526 title => "Chat",
2448 2581
2449=item $player_object->enter_link 2582=item $player_object->enter_link
2450 2583
2451Freezes the player and moves him/her to a special map (C<{link}>). 2584Freezes the player and moves him/her to a special map (C<{link}>).
2452 2585
2453The player should be reasonably safe there for short amounts of time. You 2586The player should be reasonably safe there for short amounts of time (e.g.
2454I<MUST> call C<leave_link> as soon as possible, though. 2587for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2588though, as the palyer cannot control the character while it is on the link
2589map.
2455 2590
2456Will never block. 2591Will never block.
2457 2592
2458=item $player_object->leave_link ($map, $x, $y) 2593=item $player_object->leave_link ($map, $x, $y)
2459 2594
2484 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2619 return if UNIVERSAL::isa $self->map, "ext::map_link";
2485 2620
2486 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2621 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2487 if $self->map && $self->map->{path} ne "{link}"; 2622 if $self->map && $self->map->{path} ne "{link}";
2488 2623
2489 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2624 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2490} 2625}
2491 2626
2492sub cf::object::player::leave_link { 2627sub cf::object::player::leave_link {
2493 my ($self, $map, $x, $y) = @_; 2628 my ($self, $map, $x, $y) = @_;
2494 2629
2511 ($x, $y) = (-1, -1) 2646 ($x, $y) = (-1, -1)
2512 unless (defined $x) && (defined $y); 2647 unless (defined $x) && (defined $y);
2513 2648
2514 # use -1 or undef as default coordinates, not 0, 0 2649 # use -1 or undef as default coordinates, not 0, 0
2515 ($x, $y) = ($map->enter_x, $map->enter_y) 2650 ($x, $y) = ($map->enter_x, $map->enter_y)
2516 if $x <=0 && $y <= 0; 2651 if $x <= 0 && $y <= 0;
2517 2652
2518 $map->load; 2653 $map->load;
2519 $map->load_neighbours; 2654 $map->load_neighbours;
2520 2655
2521 return unless $self->contr->active; 2656 return unless $self->contr->active;
2522 $self->activate_recursive;
2523 2657
2524 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2658 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2525 $self->enter_map ($map, $x, $y); 2659 $self->enter_map ($map, $x, $y);
2660
2661 # only activate afterwards, to support waiting in hooks
2662 $self->activate_recursive;
2663# unless exists $self->{_link_pos}; # maybe we re in-flight again
2526} 2664}
2527 2665
2528=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2666=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2529 2667
2530Moves the player to the given map-path and coordinates by first freezing 2668Moves the player to the given map-path and coordinates by first freezing
2689 $self->contr->savebed ($map, $x, $y) 2827 $self->contr->savebed ($map, $x, $y)
2690 if $exit->flag (cf::FLAG_DAMNED); 2828 if $exit->flag (cf::FLAG_DAMNED);
2691 2829
2692 1 2830 1
2693 }) { 2831 }) {
2694 $self->message ("Something went wrong deep within the crossfire server. " 2832 $self->message ("Something went wrong deep within the deliantra server. "
2695 . "I'll try to bring you back to the map you were before. " 2833 . "I'll try to bring you back to the map you were before. "
2696 . "Please report this to the dungeon master!", 2834 . "Please report this to the dungeon master!",
2697 cf::NDI_UNIQUE | cf::NDI_RED); 2835 cf::NDI_UNIQUE | cf::NDI_RED);
2698 2836
2699 warn "ERROR in enter_exit: $@"; 2837 warn "ERROR in enter_exit: $@";
2716sub cf::client::send_drawinfo { 2854sub cf::client::send_drawinfo {
2717 my ($self, $text, $flags) = @_; 2855 my ($self, $text, $flags) = @_;
2718 2856
2719 utf8::encode $text; 2857 utf8::encode $text;
2720 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2858 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2859}
2860
2861=item $client->send_big_packet ($pkt)
2862
2863Like C<send_packet>, but tries to compress large packets, and fragments
2864them as required.
2865
2866=cut
2867
2868our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2869
2870sub cf::client::send_big_packet {
2871 my ($self, $pkt) = @_;
2872
2873 # try lzf for large packets
2874 $pkt = "lzf " . Compress::LZF::compress $pkt
2875 if 1024 <= length $pkt and $self->{can_lzf};
2876
2877 # split very large packets
2878 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2879 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2880 $pkt = "frag";
2881 }
2882
2883 $self->send_packet ($pkt);
2721} 2884}
2722 2885
2723=item $client->send_msg ($channel, $msg, $color, [extra...]) 2886=item $client->send_msg ($channel, $msg, $color, [extra...])
2724 2887
2725Send a drawinfo or msg packet to the client, formatting the msg for the 2888Send a drawinfo or msg packet to the client, formatting the msg for the
2729 2892
2730=cut 2893=cut
2731 2894
2732# non-persistent channels (usually the info channel) 2895# non-persistent channels (usually the info channel)
2733our %CHANNEL = ( 2896our %CHANNEL = (
2897 "c/motd" => {
2898 id => "infobox",
2899 title => "MOTD",
2900 reply => undef,
2901 tooltip => "The message of the day",
2902 },
2734 "c/identify" => { 2903 "c/identify" => {
2735 id => "infobox", 2904 id => "infobox",
2736 title => "Identify", 2905 title => "Identify",
2737 reply => undef, 2906 reply => undef,
2738 tooltip => "Items recently identified", 2907 tooltip => "Items recently identified",
2740 "c/examine" => { 2909 "c/examine" => {
2741 id => "infobox", 2910 id => "infobox",
2742 title => "Examine", 2911 title => "Examine",
2743 reply => undef, 2912 reply => undef,
2744 tooltip => "Signs and other items you examined", 2913 tooltip => "Signs and other items you examined",
2914 },
2915 "c/shopinfo" => {
2916 id => "infobox",
2917 title => "Shop Info",
2918 reply => undef,
2919 tooltip => "What your bargaining skill tells you about the shop",
2745 }, 2920 },
2746 "c/book" => { 2921 "c/book" => {
2747 id => "infobox", 2922 id => "infobox",
2748 title => "Book", 2923 title => "Book",
2749 reply => undef, 2924 reply => undef,
2765 id => "infobox", 2940 id => "infobox",
2766 title => "Body Parts", 2941 title => "Body Parts",
2767 reply => undef, 2942 reply => undef,
2768 tooltip => "Shows which body parts you posess and are available", 2943 tooltip => "Shows which body parts you posess and are available",
2769 }, 2944 },
2945 "c/statistics" => {
2946 id => "infobox",
2947 title => "Statistics",
2948 reply => undef,
2949 tooltip => "Shows your primary statistics",
2950 },
2951 "c/skills" => {
2952 id => "infobox",
2953 title => "Skills",
2954 reply => undef,
2955 tooltip => "Shows your experience per skill and item power",
2956 },
2957 "c/shopitems" => {
2958 id => "infobox",
2959 title => "Shop Items",
2960 reply => undef,
2961 tooltip => "Shows the items currently for sale in this shop",
2962 },
2963 "c/resistances" => {
2964 id => "infobox",
2965 title => "Resistances",
2966 reply => undef,
2967 tooltip => "Shows your resistances",
2968 },
2969 "c/pets" => {
2970 id => "infobox",
2971 title => "Pets",
2972 reply => undef,
2973 tooltip => "Shows information abotu your pets/a specific pet",
2974 },
2975 "c/perceiveself" => {
2976 id => "infobox",
2977 title => "Perceive Self",
2978 reply => undef,
2979 tooltip => "You gained detailed knowledge about yourself",
2980 },
2770 "c/uptime" => { 2981 "c/uptime" => {
2771 id => "infobox", 2982 id => "infobox",
2772 title => "Uptime", 2983 title => "Uptime",
2773 reply => undef, 2984 reply => undef,
2774 tooltip => "How long the server has been running since last restart", 2985 tooltip => "How long the server has been running since last restart",
2783 id => "party", 2994 id => "party",
2784 title => "Party", 2995 title => "Party",
2785 reply => "gsay ", 2996 reply => "gsay ",
2786 tooltip => "Messages and chat related to your party", 2997 tooltip => "Messages and chat related to your party",
2787 }, 2998 },
2999 "c/death" => {
3000 id => "death",
3001 title => "Death",
3002 reply => undef,
3003 tooltip => "Reason for and more info about your most recent death",
3004 },
3005 "c/say" => $SAY_CHANNEL,
3006 "c/chat" => $CHAT_CHANNEL,
2788); 3007);
2789 3008
2790sub cf::client::send_msg { 3009sub cf::client::send_msg {
2791 my ($self, $channel, $msg, $color, @extra) = @_; 3010 my ($self, $channel, $msg, $color, @extra) = @_;
2792 3011
2793 $msg = $self->pl->expand_cfpod ($msg); 3012 $msg = $self->pl->expand_cfpod ($msg)
3013 unless $color & cf::NDI_VERBATIM;
2794 3014
2795 $color &= cf::NDI_CLIENT_MASK; # just in case... 3015 $color &= cf::NDI_CLIENT_MASK; # just in case...
2796 3016
2797 # check predefined channels, for the benefit of C 3017 # check predefined channels, for the benefit of C
2798 if ($CHANNEL{$channel}) { 3018 if ($CHANNEL{$channel}) {
2799 $channel = $CHANNEL{$channel}; 3019 $channel = $CHANNEL{$channel};
2800 3020
2801 $self->ext_msg (channel_info => $channel) 3021 $self->ext_msg (channel_info => $channel);
2802 if $self->can_msg;
2803
2804 $channel = $channel->{id}; 3022 $channel = $channel->{id};
2805 3023
2806 } elsif (ref $channel) { 3024 } elsif (ref $channel) {
2807 # send meta info to client, if not yet sent 3025 # send meta info to client, if not yet sent
2808 unless (exists $self->{channel}{$channel->{id}}) { 3026 unless (exists $self->{channel}{$channel->{id}}) {
2809 $self->{channel}{$channel->{id}} = $channel; 3027 $self->{channel}{$channel->{id}} = $channel;
2810 $self->ext_msg (channel_info => $channel) 3028 $self->ext_msg (channel_info => $channel);
2811 if $self->can_msg;
2812 } 3029 }
2813 3030
2814 $channel = $channel->{id}; 3031 $channel = $channel->{id};
2815 } 3032 }
2816 3033
2817 return unless @extra || length $msg; 3034 return unless @extra || length $msg;
2818 3035
2819 if ($self->can_msg) {
2820 # default colour, mask it out 3036 # default colour, mask it out
2821 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3037 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2822 if $color & cf::NDI_DEF; 3038 if $color & cf::NDI_DEF;
2823 3039
2824 my $pkt = "msg " 3040 my $pkt = "msg "
2825 . $self->{json_coder}->encode ( 3041 . $self->{json_coder}->encode (
2826 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3042 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2827 ); 3043 );
2828 3044
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); 3045 $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} 3046}
2866 3047
2867=item $client->ext_msg ($type, @msg) 3048=item $client->ext_msg ($type, @msg)
2868 3049
2869Sends an ext event to the client. 3050Sends an ext event to the client.
2872 3053
2873sub cf::client::ext_msg($$@) { 3054sub cf::client::ext_msg($$@) {
2874 my ($self, $type, @msg) = @_; 3055 my ($self, $type, @msg) = @_;
2875 3056
2876 if ($self->extcmd == 2) { 3057 if ($self->extcmd == 2) {
2877 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3058 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2878 } elsif ($self->extcmd == 1) { # TODO: remove 3059 } elsif ($self->extcmd == 1) { # TODO: remove
2879 push @msg, msgtype => "event_$type"; 3060 push @msg, msgtype => "event_$type";
2880 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3061 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2881 } 3062 }
2882} 3063}
2883 3064
2884=item $client->ext_reply ($msgid, @msg) 3065=item $client->ext_reply ($msgid, @msg)
2885 3066
2889 3070
2890sub cf::client::ext_reply($$@) { 3071sub cf::client::ext_reply($$@) {
2891 my ($self, $id, @msg) = @_; 3072 my ($self, $id, @msg) = @_;
2892 3073
2893 if ($self->extcmd == 2) { 3074 if ($self->extcmd == 2) {
2894 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3075 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2895 } elsif ($self->extcmd == 1) { 3076 } elsif ($self->extcmd == 1) {
2896 #TODO: version 1, remove 3077 #TODO: version 1, remove
2897 unshift @msg, msgtype => "reply", msgid => $id; 3078 unshift @msg, msgtype => "reply", msgid => $id;
2898 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3079 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2899 } 3080 }
2900} 3081}
2901 3082
2902=item $success = $client->query ($flags, "text", \&cb) 3083=item $success = $client->query ($flags, "text", \&cb)
2903 3084
3004 3185
3005 $coro 3186 $coro
3006} 3187}
3007 3188
3008cf::client->attach ( 3189cf::client->attach (
3009 on_destroy => sub { 3190 on_client_destroy => sub {
3010 my ($ns) = @_; 3191 my ($ns) = @_;
3011 3192
3012 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3193 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3013 }, 3194 },
3014); 3195);
3030our $safe_hole = new Safe::Hole; 3211our $safe_hole = new Safe::Hole;
3031 3212
3032$SIG{FPE} = 'IGNORE'; 3213$SIG{FPE} = 'IGNORE';
3033 3214
3034$safe->permit_only (Opcode::opset qw( 3215$safe->permit_only (Opcode::opset qw(
3035 :base_core :base_mem :base_orig :base_math 3216 :base_core :base_mem :base_orig :base_math :base_loop
3036 grepstart grepwhile mapstart mapwhile 3217 grepstart grepwhile mapstart mapwhile
3037 sort time 3218 sort time
3038)); 3219));
3039 3220
3040# here we export the classes and methods available to script code 3221# here we export the classes and methods available to script code
3044The following functions and methods are available within a safe environment: 3225The following functions and methods are available within a safe environment:
3045 3226
3046 cf::object 3227 cf::object
3047 contr pay_amount pay_player map x y force_find force_add destroy 3228 contr pay_amount pay_player map x y force_find force_add destroy
3048 insert remove name archname title slaying race decrease split 3229 insert remove name archname title slaying race decrease split
3230 value
3049 3231
3050 cf::object::player 3232 cf::object::player
3051 player 3233 player
3052 3234
3053 cf::player 3235 cf::player
3059=cut 3241=cut
3060 3242
3061for ( 3243for (
3062 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3244 ["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 3245 insert remove inv nrof name archname title slaying race
3064 decrease split destroy change_exp)], 3246 decrease split destroy change_exp value msg lore send_msg)],
3065 ["cf::object::player" => qw(player)], 3247 ["cf::object::player" => qw(player)],
3066 ["cf::player" => qw(peaceful)], 3248 ["cf::player" => qw(peaceful send_msg)],
3067 ["cf::map" => qw(trigger)], 3249 ["cf::map" => qw(trigger)],
3068) { 3250) {
3069 no strict 'refs'; 3251 no strict 'refs';
3070 my ($pkg, @funs) = @$_; 3252 my ($pkg, @funs) = @$_;
3071 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3253 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3089 3271
3090 my $qcode = $code; 3272 my $qcode = $code;
3091 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3273 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3092 $qcode =~ s/\n/\\n/g; 3274 $qcode =~ s/\n/\\n/g;
3093 3275
3276 %vars = (_dummy => 0) unless %vars;
3277
3278 my @res;
3094 local $_; 3279 local $_;
3095 local @safe::cf::_safe_eval_args = values %vars;
3096 3280
3097 my $eval = 3281 my $eval =
3098 "do {\n" 3282 "do {\n"
3099 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3283 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3100 . "#line 0 \"{$qcode}\"\n" 3284 . "#line 0 \"{$qcode}\"\n"
3101 . $code 3285 . $code
3102 . "\n}" 3286 . "\n}"
3103 ; 3287 ;
3104 3288
3289 if ($CFG{safe_eval}) {
3105 sub_generation_inc; 3290 sub_generation_inc;
3291 local @safe::cf::_safe_eval_args = values %vars;
3106 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3292 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3107 sub_generation_inc; 3293 sub_generation_inc;
3294 } else {
3295 local @cf::_safe_eval_args = values %vars;
3296 @res = wantarray ? eval eval : scalar eval $eval;
3297 }
3108 3298
3109 if ($@) { 3299 if ($@) {
3110 warn "$@"; 3300 warn "$@";
3111 warn "while executing safe code '$code'\n"; 3301 warn "while executing safe code '$code'\n";
3112 warn "with arguments " . (join " ", %vars) . "\n"; 3302 warn "with arguments " . (join " ", %vars) . "\n";
3131=cut 3321=cut
3132 3322
3133sub register_script_function { 3323sub register_script_function {
3134 my ($fun, $cb) = @_; 3324 my ($fun, $cb) = @_;
3135 3325
3136 no strict 'refs'; 3326 $fun = "safe::$fun" if $CFG{safe_eval};
3137 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3327 *$fun = $safe_hole->wrap ($cb);
3138} 3328}
3139 3329
3140=back 3330=back
3141 3331
3142=cut 3332=cut
3163 3353
3164 $facedata->{version} == 2 3354 $facedata->{version} == 2
3165 or cf::cleanup "$path: version mismatch, cannot proceed."; 3355 or cf::cleanup "$path: version mismatch, cannot proceed.";
3166 3356
3167 # patch in the exptable 3357 # patch in the exptable
3358 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3168 $facedata->{resource}{"res/exp_table"} = { 3359 $facedata->{resource}{"res/exp_table"} = {
3169 type => FT_RSRC, 3360 type => FT_RSRC,
3170 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3361 data => $exp_table,
3362 hash => (Digest::MD5::md5 $exp_table),
3171 }; 3363 };
3172 cf::cede_to_tick; 3364 cf::cede_to_tick;
3173 3365
3174 { 3366 {
3175 my $faces = $facedata->{faceinfo}; 3367 my $faces = $facedata->{faceinfo};
3177 while (my ($face, $info) = each %$faces) { 3369 while (my ($face, $info) = each %$faces) {
3178 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3370 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3179 3371
3180 cf::face::set_visibility $idx, $info->{visibility}; 3372 cf::face::set_visibility $idx, $info->{visibility};
3181 cf::face::set_magicmap $idx, $info->{magicmap}; 3373 cf::face::set_magicmap $idx, $info->{magicmap};
3182 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3374 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3183 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3375 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3184 3376
3185 cf::cede_to_tick; 3377 cf::cede_to_tick;
3186 } 3378 }
3187 3379
3188 while (my ($face, $info) = each %$faces) { 3380 while (my ($face, $info) = each %$faces) {
3212 3404
3213 cf::anim::invalidate_all; # d'oh 3405 cf::anim::invalidate_all; # d'oh
3214 } 3406 }
3215 3407
3216 { 3408 {
3217 # TODO: for gcfclient pleasure, we should give resources
3218 # that gcfclient doesn't grok a >10000 face index.
3219 my $res = $facedata->{resource}; 3409 my $res = $facedata->{resource};
3220 3410
3221 while (my ($name, $info) = each %$res) { 3411 while (my ($name, $info) = each %$res) {
3222 if (defined $info->{type}) { 3412 if (defined $info->{type}) {
3223 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3413 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3224 my $data;
3225 3414
3226 if ($info->{type} & 1) { 3415 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}; 3416 cf::face::set_type $idx, $info->{type};
3241 } else { 3417 } else {
3242 $RESOURCE{$name} = $info; 3418 $RESOURCE{$name} = $info;
3243 } 3419 }
3244 3420
3327 reload_treasures; 3503 reload_treasures;
3328 3504
3329 warn "finished reloading resource files\n"; 3505 warn "finished reloading resource files\n";
3330} 3506}
3331 3507
3332sub init {
3333 my $guard = freeze_mainloop;
3334
3335 evthread_start IO::AIO::poll_fileno;
3336
3337 reload_resources;
3338}
3339
3340sub reload_config { 3508sub reload_config {
3509 warn "reloading config file...\n";
3510
3341 open my $fh, "<:utf8", "$CONFDIR/config" 3511 open my $fh, "<:utf8", "$CONFDIR/config"
3342 or return; 3512 or return;
3343 3513
3344 local $/; 3514 local $/;
3345 *CFG = YAML::Load <$fh>; 3515 *CFG = YAML::XS::Load scalar <$fh>;
3346 3516
3347 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3517 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3348 3518
3349 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3519 $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}; 3520 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3354 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3524 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3355 and die "WARNING: m(un)lockall failed: $!\n"; 3525 and die "WARNING: m(un)lockall failed: $!\n";
3356 }; 3526 };
3357 warn $@ if $@; 3527 warn $@ if $@;
3358 } 3528 }
3529
3530 warn "finished reloading resource files\n";
3359} 3531}
3360 3532
3361sub pidfile() { 3533sub pidfile() {
3362 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3534 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3363 or die "$PIDFILE: $!"; 3535 or die "$PIDFILE: $!";
3375 3547
3376 seek $fh, 0, 0; 3548 seek $fh, 0, 0;
3377 print $fh $$; 3549 print $fh $$;
3378} 3550}
3379 3551
3552sub main_loop {
3553 warn "EV::loop starting\n";
3554 if (1) {
3555 EV::loop;
3556 }
3557 warn "EV::loop returned\n";
3558 goto &main_loop unless $REALLY_UNLOOP;
3559}
3560
3380sub main { 3561sub main {
3381 atomic; 3562 cf::init_globals; # initialise logging
3563
3564 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3565 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3566 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3567 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3568
3569 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3382 3570
3383 # we must not ever block the main coroutine 3571 # we must not ever block the main coroutine
3384 local $Coro::idle = sub { 3572 local $Coro::idle = sub {
3385 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3573 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3386 (async { 3574 (async {
3387 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3575 $Coro::current->{desc} = "IDLE BUG HANDLER";
3388 EV::loop EV::LOOP_ONESHOT; 3576 EV::loop EV::LOOP_ONESHOT;
3389 })->prio (Coro::PRIO_MAX); 3577 })->prio (Coro::PRIO_MAX);
3390 }; 3578 };
3391 3579
3392 { 3580 evthread_start IO::AIO::poll_fileno;
3393 my $guard = freeze_mainloop; 3581
3582 cf::sync_job {
3583 cf::init_experience;
3584 cf::init_anim;
3585 cf::init_attackmess;
3586 cf::init_dynamic;
3587
3588 cf::load_settings;
3589 cf::load_materials;
3590
3591 reload_resources;
3394 reload_config; 3592 reload_config;
3395 db_init; 3593 db_init;
3594
3595 cf::init_uuid;
3596 cf::init_signals;
3597 cf::init_skills;
3598
3599 cf::init_beforeplay;
3600
3601 atomic;
3602
3396 load_extensions; 3603 load_extensions;
3397 3604
3398 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3399 }
3400
3401 utime time, time, $RUNTIMEFILE; 3605 utime time, time, $RUNTIMEFILE;
3402 3606
3403 # no (long-running) fork's whatsoever before this point(!) 3607 # no (long-running) fork's whatsoever before this point(!)
3608 use POSIX ();
3404 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3609 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3405 3610
3406 EV::loop; 3611 (pop @POST_INIT)->(0) while @POST_INIT;
3612 };
3613
3614 cf::object::thawer::errors_are_fatal 0;
3615 warn "parse errors in files are no longer fatal from this point on.\n";
3616
3617 main_loop;
3407} 3618}
3408 3619
3409############################################################################# 3620#############################################################################
3410# initialisation and cleanup 3621# initialisation and cleanup
3411 3622
3412# install some emergency cleanup handlers 3623# install some emergency cleanup handlers
3413BEGIN { 3624BEGIN {
3414 our %SIGWATCHER = (); 3625 our %SIGWATCHER = ();
3415 for my $signal (qw(INT HUP TERM)) { 3626 for my $signal (qw(INT HUP TERM)) {
3416 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3627 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3417 cf::cleanup "SIG$signal"; 3628 cf::cleanup "SIG$signal";
3418 }; 3629 };
3419 } 3630 }
3420} 3631}
3421 3632
3422sub write_runtime_sync { 3633sub write_runtime_sync {
3634 my $t0 = AE::time;
3635
3423 # first touch the runtime file to show we are still running: 3636 # first touch the runtime file to show we are still running:
3424 # the fsync below can take a very very long time. 3637 # the fsync below can take a very very long time.
3425 3638
3426 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3639 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3427 3640
3428 my $guard = cf::lock_acquire "write_runtime"; 3641 my $guard = cf::lock_acquire "write_runtime";
3429 3642
3430 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3643 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3431 or return; 3644 or return;
3432 3645
3433 my $value = $cf::RUNTIME + 90 + 10; 3646 my $value = $cf::RUNTIME + 90 + 10;
3434 # 10 is the runtime save interval, for a monotonic clock 3647 # 10 is the runtime save interval, for a monotonic clock
3435 # 60 allows for the watchdog to kill the server. 3648 # 60 allows for the watchdog to kill the server.
3448 or return; 3661 or return;
3449 3662
3450 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3663 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3451 and return; 3664 and return;
3452 3665
3453 warn "runtime file written.\n"; 3666 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3454 3667
3455 1 3668 1
3456} 3669}
3457 3670
3458our $uuid_lock; 3671our $uuid_lock;
3467 my $uuid = "$LOCALDIR/uuid"; 3680 my $uuid = "$LOCALDIR/uuid";
3468 3681
3469 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3682 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3470 or return; 3683 or return;
3471 3684
3472 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3685 my $value = uuid_seq uuid_cur;
3686
3687 unless ($value) {
3688 warn "cowardly refusing to write zero uuid value!\n";
3689 return;
3690 }
3691
3692 my $value = uuid_str $value + $uuid_skip;
3473 $uuid_skip = 0; 3693 $uuid_skip = 0;
3474 3694
3475 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3695 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3476 and return; 3696 and return;
3477 3697
3499} 3719}
3500 3720
3501sub emergency_save() { 3721sub emergency_save() {
3502 my $freeze_guard = cf::freeze_mainloop; 3722 my $freeze_guard = cf::freeze_mainloop;
3503 3723
3504 warn "enter emergency perl save\n"; 3724 warn "emergency_perl_save: enter\n";
3505 3725
3506 cf::sync_job { 3726 cf::sync_job {
3727 # this is a trade-off: we want to be very quick here, so
3728 # save all maps without fsync, and later call a global sync
3729 # (which in turn might be very very slow)
3730 local $USE_FSYNC = 0;
3731
3507 # use a peculiar iteration method to avoid tripping on perl 3732 # use a peculiar iteration method to avoid tripping on perl
3508 # refcount bugs in for. also avoids problems with players 3733 # refcount bugs in for. also avoids problems with players
3509 # and maps saved/destroyed asynchronously. 3734 # and maps saved/destroyed asynchronously.
3510 warn "begin emergency player save\n"; 3735 warn "emergency_perl_save: begin player save\n";
3511 for my $login (keys %cf::PLAYER) { 3736 for my $login (keys %cf::PLAYER) {
3512 my $pl = $cf::PLAYER{$login} or next; 3737 my $pl = $cf::PLAYER{$login} or next;
3513 $pl->valid or next; 3738 $pl->valid or next;
3514 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3739 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3515 $pl->save; 3740 $pl->save;
3516 } 3741 }
3517 warn "end emergency player save\n"; 3742 warn "emergency_perl_save: end player save\n";
3518 3743
3519 warn "begin emergency map save\n"; 3744 warn "emergency_perl_save: begin map save\n";
3520 for my $path (keys %cf::MAP) { 3745 for my $path (keys %cf::MAP) {
3521 my $map = $cf::MAP{$path} or next; 3746 my $map = $cf::MAP{$path} or next;
3522 $map->valid or next; 3747 $map->valid or next;
3523 $map->save; 3748 $map->save;
3524 } 3749 }
3525 warn "end emergency map save\n"; 3750 warn "emergency_perl_save: end map save\n";
3526 3751
3527 warn "begin emergency database checkpoint\n"; 3752 warn "emergency_perl_save: begin database checkpoint\n";
3528 BDB::db_env_txn_checkpoint $DB_ENV; 3753 BDB::db_env_txn_checkpoint $DB_ENV;
3529 warn "end emergency database checkpoint\n"; 3754 warn "emergency_perl_save: end database checkpoint\n";
3530 3755
3531 warn "begin write uuid\n"; 3756 warn "emergency_perl_save: begin write uuid\n";
3532 write_uuid_sync 1; 3757 write_uuid_sync 1;
3533 warn "end write uuid\n"; 3758 warn "emergency_perl_save: end write uuid\n";
3534 }; 3759 };
3535 3760
3761 warn "emergency_perl_save: starting sync()\n";
3762 IO::AIO::aio_sync sub {
3763 warn "emergency_perl_save: finished sync()\n";
3764 };
3765
3536 warn "leave emergency perl save\n"; 3766 warn "emergency_perl_save: leave\n";
3537} 3767}
3538 3768
3539sub post_cleanup { 3769sub post_cleanup {
3540 my ($make_core) = @_; 3770 my ($make_core) = @_;
3541 3771
3567 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3797 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3568 for my $name (keys %$leaf_symtab) { 3798 for my $name (keys %$leaf_symtab) {
3569 _gv_clear *{"$pkg$name"}; 3799 _gv_clear *{"$pkg$name"};
3570# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3800# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3571 } 3801 }
3572 warn "cleared package #$pkg\n";#d#
3573} 3802}
3574
3575our $RELOAD; # how many times to reload
3576 3803
3577sub do_reload_perl() { 3804sub do_reload_perl() {
3578 # can/must only be called in main 3805 # can/must only be called in main
3579 if ($Coro::current != $Coro::main) { 3806 if (in_main) {
3580 warn "can only reload from main coroutine"; 3807 warn "can only reload from main coroutine";
3581 return; 3808 return;
3582 } 3809 }
3583 3810
3584 return if $RELOAD++; 3811 return if $RELOAD++;
3812
3813 my $t1 = AE::time;
3585 3814
3586 while ($RELOAD) { 3815 while ($RELOAD) {
3587 warn "reloading..."; 3816 warn "reloading...";
3588 3817
3589 warn "entering sync_job"; 3818 warn "entering sync_job";
3650 clear_package "safe::$_" 3879 clear_package "safe::$_"
3651 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3880 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3652 3881
3653 warn "unloading cf.pm \"a bit\""; 3882 warn "unloading cf.pm \"a bit\"";
3654 delete $INC{"cf.pm"}; 3883 delete $INC{"cf.pm"};
3655 delete $INC{"cf/pod.pm"}; 3884 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3656 3885
3657 # don't, removes xs symbols, too, 3886 # don't, removes xs symbols, too,
3658 # and global variables created in xs 3887 # and global variables created in xs
3659 #clear_package __PACKAGE__; 3888 #clear_package __PACKAGE__;
3660 3889
3661 warn "unload completed, starting to reload now"; 3890 warn "unload completed, starting to reload now";
3662 3891
3663 warn "reloading cf.pm"; 3892 warn "reloading cf.pm";
3664 require cf; 3893 require cf;
3665 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3894 cf::_connect_to_perl_1;
3666 3895
3667 warn "loading config and database again"; 3896 warn "loading config and database again";
3668 cf::reload_config; 3897 cf::reload_config;
3669 3898
3670 warn "loading extensions"; 3899 warn "loading extensions";
3671 cf::load_extensions; 3900 cf::load_extensions;
3672 3901
3902 if ($REATTACH_ON_RELOAD) {
3673 warn "reattaching attachments to objects/players"; 3903 warn "reattaching attachments to objects/players";
3674 _global_reattach; # objects, sockets 3904 _global_reattach; # objects, sockets
3675 warn "reattaching attachments to maps"; 3905 warn "reattaching attachments to maps";
3676 reattach $_ for values %MAP; 3906 reattach $_ for values %MAP;
3677 warn "reattaching attachments to players"; 3907 warn "reattaching attachments to players";
3678 reattach $_ for values %PLAYER; 3908 reattach $_ for values %PLAYER;
3909 }
3910
3911 warn "running post_init jobs";
3912 (pop @POST_INIT)->(1) while @POST_INIT;
3679 3913
3680 warn "leaving sync_job"; 3914 warn "leaving sync_job";
3681 3915
3682 1 3916 1
3683 } or do { 3917 } or do {
3686 }; 3920 };
3687 3921
3688 warn "reloaded"; 3922 warn "reloaded";
3689 --$RELOAD; 3923 --$RELOAD;
3690 } 3924 }
3925
3926 $t1 = AE::time - $t1;
3927 warn "reload completed in ${t1}s\n";
3691}; 3928};
3692 3929
3693our $RELOAD_WATCHER; # used only during reload 3930our $RELOAD_WATCHER; # used only during reload
3694 3931
3695sub reload_perl() { 3932sub reload_perl() {
3696 # doing reload synchronously and two reloads happen back-to-back, 3933 # doing reload synchronously and two reloads happen back-to-back,
3697 # coro crashes during coro_state_free->destroy here. 3934 # coro crashes during coro_state_free->destroy here.
3698 3935
3936 $RELOAD_WATCHER ||= cf::async {
3937 Coro::AIO::aio_wait cache_extensions;
3938
3699 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3939 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3700 do_reload_perl; 3940 do_reload_perl;
3701 undef $RELOAD_WATCHER; 3941 undef $RELOAD_WATCHER;
3942 };
3702 }; 3943 };
3703} 3944}
3704 3945
3705register_command "reload" => sub { 3946register_command "reload" => sub {
3706 my ($who, $arg) = @_; 3947 my ($who, $arg) = @_;
3720 3961
3721our @WAIT_FOR_TICK; 3962our @WAIT_FOR_TICK;
3722our @WAIT_FOR_TICK_BEGIN; 3963our @WAIT_FOR_TICK_BEGIN;
3723 3964
3724sub wait_for_tick { 3965sub wait_for_tick {
3725 return if tick_inhibit || $Coro::current == $Coro::main; 3966 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3726 3967
3727 my $signal = new Coro::Signal; 3968 my $signal = new Coro::Signal;
3728 push @WAIT_FOR_TICK, $signal; 3969 push @WAIT_FOR_TICK, $signal;
3729 $signal->wait; 3970 $signal->wait;
3730} 3971}
3731 3972
3732sub wait_for_tick_begin { 3973sub wait_for_tick_begin {
3733 return if tick_inhibit || $Coro::current == $Coro::main; 3974 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3734 3975
3735 my $signal = new Coro::Signal; 3976 my $signal = new Coro::Signal;
3736 push @WAIT_FOR_TICK_BEGIN, $signal; 3977 push @WAIT_FOR_TICK_BEGIN, $signal;
3737 $signal->wait; 3978 $signal->wait;
3738} 3979}
3743 unless ++$bug_warning > 10; 3984 unless ++$bug_warning > 10;
3744 return; 3985 return;
3745 } 3986 }
3746 3987
3747 cf::server_tick; # one server iteration 3988 cf::server_tick; # one server iteration
3989
3990 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3748 3991
3749 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3992 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3750 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3993 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3751 Coro::async_pool { 3994 Coro::async_pool {
3752 $Coro::current->{desc} = "runtime saver"; 3995 $Coro::current->{desc} = "runtime saver";
3775} 4018}
3776 4019
3777{ 4020{
3778 # configure BDB 4021 # configure BDB
3779 4022
3780 BDB::min_parallel 8; 4023 BDB::min_parallel 16;
3781 BDB::max_poll_reqs $TICK * 0.1; 4024 BDB::max_poll_reqs $TICK * 0.1;
3782 $AnyEvent::BDB::WATCHER->priority (1); 4025 $AnyEvent::BDB::WATCHER->priority (1);
3783 4026
3784 unless ($DB_ENV) { 4027 unless ($DB_ENV) {
3785 $DB_ENV = BDB::db_env_create; 4028 $DB_ENV = BDB::db_env_create;
3832 $msg =~ s/\n//; 4075 $msg =~ s/\n//;
3833 4076
3834 # limit the # of concurrent backtraces 4077 # limit the # of concurrent backtraces
3835 if ($_log_backtrace < 2) { 4078 if ($_log_backtrace < 2) {
3836 ++$_log_backtrace; 4079 ++$_log_backtrace;
4080 my $perl_bt = Carp::longmess $msg;
3837 async { 4081 async {
3838 $Coro::current->{desc} = "abt $msg"; 4082 $Coro::current->{desc} = "abt $msg";
3839 4083
3840 my @bt = fork_call { 4084 my @bt = fork_call {
3841 @addr = map { sprintf "%x", $_ } @addr; 4085 @addr = map { sprintf "%x", $_ } @addr;
3852 } 4096 }
3853 4097
3854 @funcs 4098 @funcs
3855 }; 4099 };
3856 4100
3857 LOG llevInfo, "[ABT] $msg\n"; 4101 LOG llevInfo, "[ABT] $perl_bt\n";
4102 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3858 LOG llevInfo, "[ABT] $_\n" for @bt; 4103 LOG llevInfo, "[ABT] $_\n" for @bt;
3859 --$_log_backtrace; 4104 --$_log_backtrace;
3860 }; 4105 };
3861 } else { 4106 } else {
3862 LOG llevInfo, "[ABT] $msg\n"; 4107 LOG llevInfo, "[ABT] $msg\n";
3863 LOG llevInfo, "[ABT] [suppressed]\n"; 4108 LOG llevInfo, "[ABT] [suppressed]\n";
3864 } 4109 }
3865} 4110}
3866 4111
3867# load additional modules 4112# load additional modules
3868use cf::pod; 4113require "cf/$_.pm" for @EXTRA_MODULES;
4114cf::_connect_to_perl_2;
3869 4115
3870END { cf::emergency_save } 4116END { cf::emergency_save }
3871 4117
38721 41181
3873 4119

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines