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.416 by root, Fri Apr 11 13:59:06 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 3.2; 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 4.50 (); 40use Coro ();
37use Coro::State; 41use Coro::State;
38use Coro::Handle; 42use Coro::Handle;
39use Coro::EV; 43use Coro::EV;
44use Coro::AnyEvent;
40use Coro::Timer; 45use Coro::Timer;
41use Coro::Signal; 46use Coro::Signal;
42use Coro::Semaphore; 47use Coro::Semaphore;
48use Coro::SemaphoreSet;
49use Coro::AnyEvent;
43use Coro::AIO; 50use Coro::AIO;
44use Coro::BDB; 51use Coro::BDB 1.6;
45use Coro::Storable; 52use Coro::Storable;
46use Coro::Util (); 53use Coro::Util ();
47 54
48use JSON::XS 2.01 (); 55use JSON::XS 2.01 ();
49use BDB (); 56use BDB ();
50use Data::Dumper; 57use Data::Dumper;
51use Digest::MD5;
52use Fcntl; 58use Fcntl;
53use YAML (); 59use YAML::XS ();
54use IO::AIO 2.51 (); 60use IO::AIO ();
55use Time::HiRes; 61use Time::HiRes;
56use Compress::LZF; 62use Compress::LZF;
57use Digest::MD5 (); 63use Digest::MD5 ();
64
65AnyEvent::detect;
58 66
59# configure various modules to our taste 67# configure various modules to our taste
60# 68#
61$Storable::canonical = 1; # reduce rsync transfers 69$Storable::canonical = 1; # reduce rsync transfers
62Coro::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";
63Compress::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
64 77
65$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" };
66 80
67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
68 82
69our %COMMAND = (); 83our %COMMAND = ();
70our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
73our %EXTCMD = (); 87our %EXTCMD = ();
74our %EXTICMD = (); 88our %EXTICMD = ();
75our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
76our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
77 91
78our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
79our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
80 96
81our $CONFDIR = confdir; 97our $CONFDIR = confdir;
82our $DATADIR = datadir; 98our $DATADIR = datadir;
83our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
84our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
85our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
86our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
87our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
89our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
90our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
91our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110
92our %RESOURCE; 111our %RESOURCE;
93 112
113our $OUTPUT_RATE_MIN = 4000;
114our $OUTPUT_RATE_MAX = 100000;
115
94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 116our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
95our $AIO_POLL_WATCHER;
96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 117our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
97our $NEXT_TICK; 118our $NEXT_TICK;
98our $USE_FSYNC = 1; # use fsync to write maps - default off 119our $USE_FSYNC = 1; # use fsync to write maps - default on
99 120
100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER; 121our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER; 122our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER; 123our $BDB_TRICKLE_WATCHER;
104our $DB_ENV; 124our $DB_ENV;
105 125
126our @EXTRA_MODULES = qw(pod match mapscript);
127
106our %CFG; 128our %CFG;
107 129
108our $UPTIME; $UPTIME ||= time; 130our $UPTIME; $UPTIME ||= time;
109our $RUNTIME; 131our $RUNTIME;
110our $NOW; 132our $NOW;
119our $LOAD; # a number between 0 (idle) and 1 (too many objects) 141our $LOAD; # a number between 0 (idle) and 1 (too many objects)
120our $LOADAVG; # same thing, but with alpha-smoothing 142our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter 143our $JITTER; # average jitter
122our $TICK_START; # for load detecting purposes 144our $TICK_START; # for load detecting purposes
123 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
124binmode STDOUT; 151binmode STDOUT;
125binmode STDERR; 152binmode STDERR;
126 153
127# read virtual server time, if available 154# read virtual server time, if available
128unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 155unless ($RUNTIME || !-e $RUNTIMEFILE) {
129 open my $fh, "<", "$LOCALDIR/runtime" 156 open my $fh, "<", $RUNTIMEFILE
130 or die "unable to read runtime file: $!"; 157 or die "unable to read $RUNTIMEFILE file: $!";
131 $RUNTIME = <$fh> + 0.; 158 $RUNTIME = <$fh> + 0.;
132} 159}
160
161eval "sub TICK() { $TICK } 1" or die;
133 162
134mkdir $_ 163mkdir $_
135 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 164 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
136 165
137our $EMERGENCY_POSITION; 166our $EMERGENCY_POSITION;
138 167
139sub 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::"} };
140 184
141############################################################################# 185#############################################################################
142 186
143=head2 GLOBAL VARIABLES 187=head2 GLOBAL VARIABLES
144 188
191returns 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
192per 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.
193 237
194=item @cf::INVOKE_RESULTS 238=item @cf::INVOKE_RESULTS
195 239
196This array contains the results of the last C<invoke ()> call. When 240This array contains the results of the last C<invoke ()> call. When
197C<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
198that call. 242that call.
199 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
200=back 250=back
201 251
202=cut 252=cut
203 253
204BEGIN { 254$Coro::State::WARNHOOK = sub {
205 *CORE::GLOBAL::warn = sub {
206 my $msg = join "", @_; 255 my $msg = join "", @_;
207 256
208 $msg .= "\n" 257 $msg .= "\n"
209 unless $msg =~ /\n$/; 258 unless $msg =~ /\n$/;
210 259
211 $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;
212 261
213 LOG llevError, $msg; 262 LOG llevError, $msg;
214 }; 263};
215}
216 264
217$Coro::State::DIEHOOK = sub { 265$Coro::State::DIEHOOK = sub {
218 return unless $^S eq 0; # "eq", not "==" 266 return unless $^S eq 0; # "eq", not "=="
219 267
220 if ($Coro::current == $Coro::main) {#d# 268 warn Carp::longmess $_[0];
269
270 if (in_main) {#d#
221 warn "DIEHOOK called in main context, Coro bug?\n";#d# 271 warn "DIEHOOK called in main context, Coro bug?\n";#d#
222 return;#d# 272 return;#d#
223 }#d# 273 }#d#
224 274
225 # kill coroutine otherwise 275 # kill coroutine otherwise
226 warn Carp::longmess $_[0];
227 Coro::terminate 276 Coro::terminate
228}; 277};
229
230$SIG{__DIE__} = sub { }; #d#?
231 278
232@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 279@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
233@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 280@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
234@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 281@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
235@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 282@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
242for my $pkg (qw( 289for my $pkg (qw(
243 cf::global cf::attachable 290 cf::global cf::attachable
244 cf::object cf::object::player 291 cf::object cf::object::player
245 cf::client cf::player 292 cf::client cf::player
246 cf::arch cf::living 293 cf::arch cf::living
294 cf::map cf::mapspace
247 cf::map cf::party cf::region 295 cf::party cf::region
248)) { 296)) {
249 no strict 'refs';
250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 297 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
251} 298}
252 299
253$EV::DIED = sub { 300$EV::DIED = sub {
254 warn "error in event callback: @_"; 301 Carp::cluck "error in event callback: @_";
255}; 302};
256 303
257############################################################################# 304#############################################################################
258 305
259=head2 UTILITY FUNCTIONS 306=head2 UTILITY FUNCTIONS
296our $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
297 344
298sub encode_json($) { $json_coder->encode ($_[0]) } 345sub encode_json($) { $json_coder->encode ($_[0]) }
299sub decode_json($) { $json_coder->decode ($_[0]) } 346sub decode_json($) { $json_coder->decode ($_[0]) }
300 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
301=item cf::lock_wait $string 362=item cf::lock_wait $string
302 363
303Wait until the given lock is available. See cf::lock_acquire. 364Wait until the given lock is available. See cf::lock_acquire.
304 365
305=item my $lock = cf::lock_acquire $string 366=item my $lock = cf::lock_acquire $string
306 367
307Wait 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
308a 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,
309for example when the coroutine gets canceled), the lock is automatically 370for example when the coroutine gets canceled), the lock is automatically
310returned. 371returned.
311 372
312Locks 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
313deadlocked coro. 374deadlocked coro.
319 380
320Return 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.
321 382
322=cut 383=cut
323 384
324our %LOCK; 385our $LOCKS = new Coro::SemaphoreSet;
325our %LOCKER;#d#
326 386
327sub lock_wait($) { 387sub lock_wait($) {
328 my ($key) = @_; 388 $LOCKS->wait ($_[0]);
329
330 if ($LOCKER{$key} == $Coro::current) {#d#
331 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
332 return;#d#
333 }#d#
334
335 # wait for lock, if any
336 while ($LOCK{$key}) {
337 push @{ $LOCK{$key} }, $Coro::current;
338 Coro::schedule;
339 }
340} 389}
341 390
342sub lock_acquire($) { 391sub lock_acquire($) {
343 my ($key) = @_; 392 $LOCKS->guard ($_[0])
344
345 # wait, to be sure we are not locked
346 lock_wait $key;
347
348 $LOCK{$key} = [];
349 $LOCKER{$key} = $Coro::current;#d#
350
351 Coro::guard {
352 delete $LOCKER{$key};#d#
353 # wake up all waiters, to be on the safe side
354 $_->ready for @{ delete $LOCK{$key} };
355 }
356} 393}
357 394
358sub lock_active($) { 395sub lock_active($) {
359 my ($key) = @_; 396 $LOCKS->count ($_[0]) < 1
360
361 ! ! $LOCK{$key}
362} 397}
363 398
364sub freeze_mainloop { 399sub freeze_mainloop {
365 tick_inhibit_inc; 400 tick_inhibit_inc;
366 401
367 Coro::guard \&tick_inhibit_dec; 402 &Guard::guard (\&tick_inhibit_dec);
368} 403}
369 404
370=item cf::periodic $interval, $cb 405=item cf::periodic $interval, $cb
371 406
372Like 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
373get spread over timer. 408get spread over time.
374 409
375=cut 410=cut
376 411
377sub periodic($$) { 412sub periodic($$) {
378 my ($interval, $cb) = @_; 413 my ($interval, $cb) = @_;
395 430
396=cut 431=cut
397 432
398our @SLOT_QUEUE; 433our @SLOT_QUEUE;
399our $SLOT_QUEUE; 434our $SLOT_QUEUE;
435our $SLOT_DECAY = 0.9;
400 436
401$SLOT_QUEUE->cancel if $SLOT_QUEUE; 437$SLOT_QUEUE->cancel if $SLOT_QUEUE;
402$SLOT_QUEUE = Coro::async { 438$SLOT_QUEUE = Coro::async {
403 $Coro::current->desc ("timeslot manager"); 439 $Coro::current->desc ("timeslot manager");
404 440
405 my $signal = new Coro::Signal; 441 my $signal = new Coro::Signal;
442 my $busy;
406 443
407 while () { 444 while () {
408 next_job: 445 next_job:
446
409 my $avail = cf::till_tick; 447 my $avail = cf::till_tick;
410 if ($avail > 0.01) { 448
411 for (0 .. $#SLOT_QUEUE) { 449 for (0 .. $#SLOT_QUEUE) {
412 if ($SLOT_QUEUE[$_][0] < $avail) { 450 if ($SLOT_QUEUE[$_][0] <= $avail) {
451 $busy = 0;
413 my $job = splice @SLOT_QUEUE, $_, 1, (); 452 my $job = splice @SLOT_QUEUE, $_, 1, ();
414 $job->[2]->send; 453 $job->[2]->send;
415 Coro::cede; 454 Coro::cede;
416 goto next_job; 455 goto next_job;
417 } 456 } else {
457 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
418 } 458 }
419 } 459 }
420 460
421 if (@SLOT_QUEUE) { 461 if (@SLOT_QUEUE) {
422 # 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
423 push @cf::WAIT_FOR_TICK, $signal; 463 push @cf::WAIT_FOR_TICK, $signal;
424 $signal->wait; 464 $signal->wait;
425 } else { 465 } else {
466 $busy = 0;
426 Coro::schedule; 467 Coro::schedule;
427 } 468 }
428 } 469 }
429}; 470};
430 471
431sub get_slot($;$$) { 472sub get_slot($;$$) {
473 return if tick_inhibit || $Coro::current == $Coro::main;
474
432 my ($time, $pri, $name) = @_; 475 my ($time, $pri, $name) = @_;
433 476
434 $time = $TICK * .6 if $time > $TICK * .6; 477 $time = clamp $time, 0.01, $TICK * .6;
478
435 my $sig = new Coro::Signal; 479 my $sig = new Coro::Signal;
436 480
437 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 481 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
438 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 482 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
439 $SLOT_QUEUE->ready; 483 $SLOT_QUEUE->ready;
466 510
467sub sync_job(&) { 511sub sync_job(&) {
468 my ($job) = @_; 512 my ($job) = @_;
469 513
470 if ($Coro::current == $Coro::main) { 514 if ($Coro::current == $Coro::main) {
471 my $time = EV::time; 515 my $time = AE::time;
472 516
473 # this is the main coro, too bad, we have to block 517 # this is the main coro, too bad, we have to block
474 # till the operation succeeds, freezing the server :/ 518 # till the operation succeeds, freezing the server :/
475 519
476 LOG llevError, Carp::longmess "sync job";#d# 520 LOG llevError, Carp::longmess "sync job";#d#
493 } else { 537 } else {
494 EV::loop EV::LOOP_ONESHOT; 538 EV::loop EV::LOOP_ONESHOT;
495 } 539 }
496 } 540 }
497 541
498 my $time = EV::time - $time; 542 my $time = AE::time - $time;
499 543
500 $TICK_START += $time; # do not account sync jobs to server load 544 $TICK_START += $time; # do not account sync jobs to server load
501 545
502 wantarray ? @res : $res[0] 546 wantarray ? @res : $res[0]
503 } else { 547 } else {
547 reset_signals; 591 reset_signals;
548 &$cb 592 &$cb
549 }, @args; 593 }, @args;
550 594
551 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 )
552} 607}
553 608
554=item $coin = coin_from_name $name 609=item $coin = coin_from_name $name
555 610
556=cut 611=cut
722 777
723############################################################################# 778#############################################################################
724 779
725=head2 ATTACHABLE OBJECTS 780=head2 ATTACHABLE OBJECTS
726 781
727Many 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
728attach callbacks/event handlers (a collection of which is called an "attachment") 783attach callbacks/event handlers (a collection of which is called an "attachment")
729to it. All such attachable objects support the following methods. 784to it. All such attachable objects support the following methods.
730 785
731In 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>
732C<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
782=item cf::CLASS::attachment $name, ... 837=item cf::CLASS::attachment $name, ...
783 838
784Register an attachment by C<$name> through which attachable objects of the 839Register an attachment by C<$name> through which attachable objects of the
785given CLASS can refer to this attachment. 840given CLASS can refer to this attachment.
786 841
787Some classes such as crossfire maps and objects can specify attachments 842Some classes such as deliantra maps and objects can specify attachments
788that 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.
789 844
790These calls expect any number of the following handler/hook descriptions: 845These calls expect any number of the following handler/hook descriptions:
791 846
792=over 4 847=over 4
1083 1138
1084sub reattach { 1139sub reattach {
1085 # basically do the same as instantiate, without calling instantiate 1140 # basically do the same as instantiate, without calling instantiate
1086 my ($obj) = @_; 1141 my ($obj) = @_;
1087 1142
1143 # no longer needed after getting rid of delete_package?
1088 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
1089 1145
1090 my $registry = $obj->registry; 1146 my $registry = $obj->registry;
1091 1147
1092 @$registry = (); 1148 @$registry = ();
1093 1149
1139 utf8::decode (my $decname = $filename); 1195 utf8::decode (my $decname = $filename);
1140 warn sprintf "saving %s (%d,%d)\n", 1196 warn sprintf "saving %s (%d,%d)\n",
1141 $decname, length $$rdata, scalar @$objs; 1197 $decname, length $$rdata, scalar @$objs;
1142 1198
1143 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1199 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1144 chmod SAVE_MODE, $fh; 1200 aio_chmod $fh, SAVE_MODE;
1145 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1201 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1146 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 }
1147 close $fh; 1206 aio_close $fh;
1148 1207
1149 if (@$objs) { 1208 if (@$objs) {
1150 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) {
1151 chmod SAVE_MODE, $fh; 1210 aio_chmod $fh, SAVE_MODE;
1152 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1211 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1153 aio_write $fh, 0, (length $data), $data, 0; 1212 aio_write $fh, 0, (length $data), $data, 0;
1154 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 }
1155 close $fh; 1217 aio_close $fh;
1156 aio_rename "$filename.pst~", "$filename.pst"; 1218 aio_rename "$filename.pst~", "$filename.pst";
1157 } 1219 }
1158 } else { 1220 } else {
1159 aio_unlink "$filename.pst"; 1221 aio_unlink "$filename.pst";
1160 } 1222 }
1161 1223
1162 aio_rename "$filename~", $filename; 1224 aio_rename "$filename~", $filename;
1225
1226 $filename =~ s%/[^/]+$%%;
1227 aio_pathsync $filename if $cf::USE_FSYNC;
1163 } else { 1228 } else {
1164 warn "FATAL: $filename~: $!\n"; 1229 warn "unable to save objects: $filename~: $!\n";
1165 } 1230 }
1166 } else { 1231 } else {
1167 aio_unlink $filename; 1232 aio_unlink $filename;
1168 aio_unlink "$filename.pst"; 1233 aio_unlink "$filename.pst";
1169 } 1234 }
1260 my ($name, $cb) = @_; 1325 my ($name, $cb) = @_;
1261 1326
1262 $EXTICMD{$name} = $cb; 1327 $EXTICMD{$name} = $cb;
1263} 1328}
1264 1329
1330use File::Glob ();
1331
1265cf::player->attach ( 1332cf::player->attach (
1266 on_command => sub { 1333 on_unknown_command => sub {
1267 my ($pl, $name, $params) = @_; 1334 my ($pl, $name, $params) = @_;
1268 1335
1269 my $cb = $COMMAND{$name} 1336 my $cb = $COMMAND{$name}
1270 or return; 1337 or return;
1271 1338
1301 1368
1302 cf::override; 1369 cf::override;
1303 }, 1370 },
1304); 1371);
1305 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
1306sub load_extensions { 1386sub load_extensions {
1307 cf::sync_job { 1387 cf::sync_job {
1308 my %todo; 1388 my %todo;
1309 1389
1310 for my $path (<$LIBDIR/*.ext>) { 1390 for my $path (<$LIBDIR/*.ext>) {
1329 1409
1330 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1410 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1331 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1411 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1332 1412
1333 $ext{source} = 1413 $ext{source} =
1334 "package $pkg; use strict; use utf8;\n" 1414 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1335 . "#line 1 \"$path\"\n{\n" 1415 . "#line 1 \"$path\"\n{\n"
1336 . $source 1416 . $source
1337 . "\n};\n1"; 1417 . "\n};\n1";
1338 1418
1339 $todo{$base} = \%ext; 1419 $todo{$base} = \%ext;
1340 } 1420 }
1341 1421
1422 my $pass = 0;
1342 my %done; 1423 my %done;
1343 while (%todo) { 1424 while (%todo) {
1344 my $progress; 1425 my $progress;
1345 1426
1427 ++$pass;
1428
1429 ext:
1346 while (my ($k, $v) = each %todo) { 1430 while (my ($k, $v) = each %todo) {
1347 for (split /,\s*/, $v->{meta}{depends}) { 1431 for (split /,\s*/, $v->{meta}{depends}) {
1348 goto skip 1432 next ext
1349 unless exists $done{$_}; 1433 unless exists $done{$_};
1350 } 1434 }
1351 1435
1352 warn "... loading '$k' into '$v->{pkg}'\n"; 1436 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1353 1437
1354 unless (eval $v->{source}) { 1438 my $active = eval $v->{source};
1439
1440 if (length $@) {
1355 my $msg = $@ ? "$v->{path}: $@\n" 1441 warn "$v->{path}: $@\n";
1356 : "$v->{base}: extension inactive.\n";
1357 1442
1358 if (exists $v->{meta}{mandatory}) {
1359 warn $msg;
1360 cf::cleanup "mandatory extension failed to load, exiting."; 1443 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1361 } 1444 if exists $v->{meta}{mandatory};
1362 1445
1363 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;
1364 } 1455 }
1365
1366 $done{$k} = delete $todo{$k};
1367 push @EXTS, $v->{pkg};
1368 $progress = 1;
1369 } 1456 }
1370 1457
1371 skip: 1458 unless ($progress) {
1372 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1459 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1373 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 }
1374 } 1466 }
1375 }; 1467 };
1376} 1468}
1377 1469
1378############################################################################# 1470#############################################################################
1379 1471
1380=back 1472=back
1381 1473
1382=head2 CORE EXTENSIONS 1474=head2 CORE EXTENSIONS
1383 1475
1384Functions and methods that extend core crossfire objects. 1476Functions and methods that extend core deliantra objects.
1385 1477
1386=cut 1478=cut
1387 1479
1388package cf::player; 1480package cf::player;
1389 1481
1432 1524
1433sub exists($) { 1525sub exists($) {
1434 my ($login) = @_; 1526 my ($login) = @_;
1435 1527
1436 $cf::PLAYER{$login} 1528 $cf::PLAYER{$login}
1437 or cf::sync_job { !aio_stat path $login } 1529 or !aio_stat path $login
1438} 1530}
1439 1531
1440sub find($) { 1532sub find($) {
1441 return $cf::PLAYER{$_[0]} || do { 1533 return $cf::PLAYER{$_[0]} || do {
1442 my $login = $_[0]; 1534 my $login = $_[0];
1454 my $f = new_from_file cf::object::thawer path $login 1546 my $f = new_from_file cf::object::thawer path $login
1455 or return; 1547 or return;
1456 1548
1457 my $pl = cf::player::load_pl $f 1549 my $pl = cf::player::load_pl $f
1458 or return; 1550 or return;
1551
1459 local $cf::PLAYER_LOADING{$login} = $pl; 1552 local $cf::PLAYER_LOADING{$login} = $pl;
1460 $f->resolve_delayed_derefs; 1553 $f->resolve_delayed_derefs;
1461 $cf::PLAYER{$login} = $pl 1554 $cf::PLAYER{$login} = $pl
1462 } 1555 }
1463 } 1556 }
1464} 1557}
1465 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
1466sub save($) { 1572sub save($) {
1467 my ($pl) = @_; 1573 my ($pl) = @_;
1468 1574
1469 return if $pl->{deny_save}; 1575 return if $pl->{deny_save};
1470 1576
1473 1579
1474 return if $pl->{deny_save}; 1580 return if $pl->{deny_save};
1475 1581
1476 aio_mkdir playerdir $pl, 0770; 1582 aio_mkdir playerdir $pl, 0770;
1477 $pl->{last_save} = $cf::RUNTIME; 1583 $pl->{last_save} = $cf::RUNTIME;
1584
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];
1478 1589
1479 $pl->save_pl ($path); 1590 $pl->save_pl ($path);
1480 cf::cede_to_tick; 1591 cf::cede_to_tick;
1481} 1592}
1482 1593
1514 my ($pl) = @_; 1625 my ($pl) = @_;
1515 1626
1516 my $name = $pl->ob->name; 1627 my $name = $pl->ob->name;
1517 1628
1518 $pl->{deny_save} = 1; 1629 $pl->{deny_save} = 1;
1519 $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
1520 1631
1521 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1632 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1522 $pl->deactivate; 1633 $pl->deactivate;
1634 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1635 $pl->ob->check_score;
1523 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1636 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1524 $pl->ns->destroy if $pl->ns; 1637 $pl->ns->destroy if $pl->ns;
1525 1638
1526 my $path = playerdir $pl; 1639 my $path = playerdir $pl;
1527 my $temp = "$path~$cf::RUNTIME~deleting~"; 1640 my $temp = "$path~$cf::RUNTIME~deleting~";
1566 1679
1567 for my $login (@$dirs) { 1680 for my $login (@$dirs) {
1568 my $path = path $login; 1681 my $path = path $login;
1569 1682
1570 # a .pst is a dead give-away for a valid player 1683 # a .pst is a dead give-away for a valid player
1571 unless (-e "$path.pst") { 1684 # if no pst file found, open and chekc for blocked users
1685 if (aio_stat "$path.pst") {
1572 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1686 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1573 aio_read $fh, 0, 512, my $buf, 0 or next; 1687 aio_read $fh, 0, 512, my $buf, 0 or next;
1574 $buf !~ /^password -------------$/m or next; # official not-valid tag 1688 $buf !~ /^password -------------$/m or next; # official not-valid tag
1575 } 1689 }
1576 1690
1607 } 1721 }
1608 1722
1609 \@paths 1723 \@paths
1610} 1724}
1611 1725
1612=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1726=item $protocol_xml = $player->expand_cfpod ($cfpod)
1613 1727
1614Expand crossfire pod fragments into protocol xml. 1728Expand deliantra pod fragments into protocol xml.
1615
1616=cut
1617
1618use re 'eval';
1619
1620my $group;
1621my $interior; $interior = qr{
1622 # match a pod interior sequence sans C<< >>
1623 (?:
1624 \ (.*?)\ (?{ $group = $^N })
1625 | < (??{$interior}) >
1626 )
1627}x;
1628
1629sub expand_cfpod {
1630 my ($self, $pod) = @_;
1631
1632 my $xml;
1633
1634 while () {
1635 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1636 $group = $1;
1637
1638 $group =~ s/&/&amp;/g;
1639 $group =~ s/</&lt;/g;
1640
1641 $xml .= $group;
1642 } elsif ($pod =~ m%\G
1643 ([BCGHITU])
1644 <
1645 (?:
1646 ([^<>]*) (?{ $group = $^N })
1647 | < $interior >
1648 )
1649 >
1650 %gcsx
1651 ) {
1652 my ($code, $data) = ($1, $group);
1653
1654 if ($code eq "B") {
1655 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1656 } elsif ($code eq "I") {
1657 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1658 } elsif ($code eq "U") {
1659 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1660 } elsif ($code eq "C") {
1661 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1662 } elsif ($code eq "T") {
1663 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1664 } elsif ($code eq "G") {
1665 my ($male, $female) = split /\|/, $data;
1666 $data = $self->gender ? $female : $male;
1667 $xml .= expand_cfpod ($self, $data);
1668 } elsif ($code eq "H") {
1669 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1670 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1671 "")
1672 [$self->{hintmode}];
1673 } else {
1674 $xml .= "error processing '$code($data)' directive";
1675 }
1676 } else {
1677 if ($pod =~ /\G(.+)/) {
1678 warn "parse error while expanding $pod (at $1)";
1679 }
1680 last;
1681 }
1682 }
1683
1684 for ($xml) {
1685 # create single paragraphs (very hackish)
1686 s/(?<=\S)\n(?=\w)/ /g;
1687
1688 # compress some whitespace
1689 s/\s+\n/\n/g; # ws line-ends
1690 s/\n\n+/\n/g; # double lines
1691 s/^\n+//; # beginning lines
1692 s/\n+$//; # ending lines
1693 }
1694
1695 $xml
1696}
1697
1698no re 'eval';
1699
1700sub hintmode {
1701 $_[0]{hintmode} = $_[1] if @_ > 1;
1702 $_[0]{hintmode}
1703}
1704 1729
1705=item $player->ext_reply ($msgid, @msg) 1730=item $player->ext_reply ($msgid, @msg)
1706 1731
1707Sends an ext reply to the player. 1732Sends an ext reply to the player.
1708 1733
1775our $MAX_RESET = 3600; 1800our $MAX_RESET = 3600;
1776our $DEFAULT_RESET = 3000; 1801our $DEFAULT_RESET = 3000;
1777 1802
1778sub generate_random_map { 1803sub generate_random_map {
1779 my ($self, $rmp) = @_; 1804 my ($self, $rmp) = @_;
1805
1806 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1807
1780 # mit "rum" bekleckern, nicht 1808 # mit "rum" bekleckern, nicht
1781 $self->_create_random_map ( 1809 $self->_create_random_map (
1782 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1810 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1783 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1811 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1784 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1812 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1785 $rmp->{exit_on_final_map}, 1813 $rmp->{exit_on_final_map},
1786 $rmp->{xsize}, $rmp->{ysize}, 1814 $rmp->{xsize}, $rmp->{ysize},
1787 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1815 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1788 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1816 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1906 1934
1907# the temporary/swap location 1935# the temporary/swap location
1908sub save_path { 1936sub save_path {
1909 my ($self) = @_; 1937 my ($self) = @_;
1910 1938
1911 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1939 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1912 "$TMPDIR/$path.map" 1940 "$TMPDIR/$path.map"
1913} 1941}
1914 1942
1915# the unique path, undef == no special unique path 1943# the unique path, undef == no special unique path
1916sub uniq_path { 1944sub uniq_path {
1917 my ($self) = @_; 1945 my ($self) = @_;
1918 1946
1919 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1947 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1920 "$UNIQUEDIR/$path" 1948 "$UNIQUEDIR/$path"
1921}
1922
1923# and all this just because we cannot iterate over
1924# all maps in C++...
1925sub change_all_map_light {
1926 my ($change) = @_;
1927
1928 $_->change_map_light ($change)
1929 for grep $_->outdoor, values %cf::MAP;
1930} 1949}
1931 1950
1932sub decay_objects { 1951sub decay_objects {
1933 my ($self) = @_; 1952 my ($self) = @_;
1934 1953
2018sub find { 2037sub find {
2019 my ($path, $origin) = @_; 2038 my ($path, $origin) = @_;
2020 2039
2021 $path = normalise $path, $origin && $origin->path; 2040 $path = normalise $path, $origin && $origin->path;
2022 2041
2023 cf::lock_wait "map_data:$path";#d#remove 2042 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2024 cf::lock_wait "map_find:$path"; 2043 my $guard2 = cf::lock_acquire "map_find:$path";
2025 2044
2026 $cf::MAP{$path} || do { 2045 $cf::MAP{$path} || do {
2027 my $guard1 = cf::lock_acquire "map_find:$path";
2028 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2029
2030 my $map = new_from_path cf::map $path 2046 my $map = new_from_path cf::map $path
2031 or return; 2047 or return;
2032 2048
2033 $map->{last_save} = $cf::RUNTIME; 2049 $map->{last_save} = $cf::RUNTIME;
2034 2050
2036 or return; 2052 or return;
2037 2053
2038 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2054 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2039 # doing this can freeze the server in a sync job, obviously 2055 # doing this can freeze the server in a sync job, obviously
2040 #$cf::WAIT_FOR_TICK->wait; 2056 #$cf::WAIT_FOR_TICK->wait;
2057 undef $guard2;
2041 undef $guard1; 2058 undef $guard1;
2042 undef $guard2;
2043 $map->reset; 2059 $map->reset;
2044 return find $path; 2060 return find $path;
2045 } 2061 }
2046 2062
2047 $cf::MAP{$path} = $map 2063 $cf::MAP{$path} = $map
2048 } 2064 }
2049} 2065}
2050 2066
2051sub pre_load { } 2067sub pre_load { }
2052sub post_load { } 2068#sub post_load { } # XS
2053 2069
2054sub load { 2070sub load {
2055 my ($self) = @_; 2071 my ($self) = @_;
2056 2072
2057 local $self->{deny_reset} = 1; # loading can take a long time 2073 local $self->{deny_reset} = 1; # loading can take a long time
2074 my $f = new_from_file cf::object::thawer $self->{load_path}; 2090 my $f = new_from_file cf::object::thawer $self->{load_path};
2075 $f->skip_block; 2091 $f->skip_block;
2076 $self->_load_objects ($f) 2092 $self->_load_objects ($f)
2077 or return; 2093 or return;
2078 2094
2079 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2095 $self->post_load_original
2080 if delete $self->{load_original}; 2096 if delete $self->{load_original};
2081 2097
2082 if (my $uniq = $self->uniq_path) { 2098 if (my $uniq = $self->uniq_path) {
2083 utf8::encode $uniq; 2099 utf8::encode $uniq;
2084 unless (aio_stat $uniq) { 2100 unless (aio_stat $uniq) {
2102 unless ($self->{deny_activate}) { 2118 unless ($self->{deny_activate}) {
2103 $self->decay_objects; 2119 $self->decay_objects;
2104 $self->fix_auto_apply; 2120 $self->fix_auto_apply;
2105 $self->update_buttons; 2121 $self->update_buttons;
2106 cf::cede_to_tick; 2122 cf::cede_to_tick;
2107 $self->set_darkness_map;
2108 cf::cede_to_tick;
2109 $self->activate; 2123 $self->activate;
2110 } 2124 }
2111 2125
2112 $self->{last_save} = $cf::RUNTIME; 2126 $self->{last_save} = $cf::RUNTIME;
2113 $self->last_access ($cf::RUNTIME); 2127 $self->last_access ($cf::RUNTIME);
2114 2128
2115 $self->in_memory (cf::MAP_IN_MEMORY); 2129 $self->in_memory (cf::MAP_ACTIVE);
2116 } 2130 }
2117 2131
2118 $self->post_load; 2132 $self->post_load;
2119} 2133}
2120 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
2121sub customise_for { 2138sub customise_for {
2122 my ($self, $ob) = @_; 2139 my ($self, $ob) = @_;
2123 2140
2124 return find "~" . $ob->name . "/" . $self->{path} 2141 return find "~" . $ob->name . "/" . $self->{path}
2125 if $self->per_player; 2142 if $self->per_player;
2178 my ($path, $origin, $load) = @_; 2195 my ($path, $origin, $load) = @_;
2179 2196
2180 $path = normalise $path, $origin && $origin->{path}; 2197 $path = normalise $path, $origin && $origin->{path};
2181 2198
2182 if (my $map = $cf::MAP{$path}) { 2199 if (my $map = $cf::MAP{$path}) {
2183 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2200 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2184 } 2201 }
2185 2202
2186 $MAP_PREFETCH{$path} |= $load; 2203 $MAP_PREFETCH{$path} |= $load;
2187 2204
2188 $MAP_PREFETCHER ||= cf::async { 2205 $MAP_PREFETCHER ||= cf::async {
2202 $MAP_PREFETCHER->prio (6); 2219 $MAP_PREFETCHER->prio (6);
2203 2220
2204 () 2221 ()
2205} 2222}
2206 2223
2224# common code, used by both ->save and ->swapout
2207sub save { 2225sub _save {
2208 my ($self) = @_; 2226 my ($self) = @_;
2209
2210 my $lock = cf::lock_acquire "map_data:$self->{path}";
2211 2227
2212 $self->{last_save} = $cf::RUNTIME; 2228 $self->{last_save} = $cf::RUNTIME;
2213 2229
2214 return unless $self->dirty; 2230 return unless $self->dirty;
2215 2231
2224 2240
2225 cf::async { 2241 cf::async {
2226 $Coro::current->{desc} = "map player save"; 2242 $Coro::current->{desc} = "map player save";
2227 $_->contr->save for $self->players; 2243 $_->contr->save for $self->players;
2228 }; 2244 };
2245
2246 cf::get_slot 0.02;
2229 2247
2230 if ($uniq) { 2248 if ($uniq) {
2231 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2249 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2232 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2250 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2233 } else { 2251 } else {
2234 $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);
2235 } 2253 }
2236} 2254}
2237 2255
2256sub save {
2257 my ($self) = @_;
2258
2259 my $lock = cf::lock_acquire "map_data:$self->{path}";
2260
2261 $self->_save;
2262}
2263
2238sub swap_out { 2264sub swap_out {
2239 my ($self) = @_; 2265 my ($self) = @_;
2240 2266
2241 # save first because save cedes
2242 $self->save;
2243
2244 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2267 my $lock = cf::lock_acquire "map_data:$self->{path}";
2245 2268
2269 return if $self->in_memory != cf::MAP_ACTIVE;
2270 return if $self->{deny_save};
2246 return if $self->players; 2271 return if $self->players;
2247 return if $self->in_memory != cf::MAP_IN_MEMORY;
2248 return if $self->{deny_save};
2249 2272
2250 $self->in_memory (cf::MAP_SWAPPED); 2273 # first deactivate the map and "unlink" it from the core
2251
2252 $self->deactivate; 2274 $self->deactivate;
2253 $_->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
2254 $self->clear; 2282 $self->clear;
2255} 2283}
2256 2284
2257sub reset_at { 2285sub reset_at {
2258 my ($self) = @_; 2286 my ($self) = @_;
2277 2305
2278 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2306 my $lock = cf::lock_acquire "map_data:$self->{path}";
2279 2307
2280 return if $self->players; 2308 return if $self->players;
2281 2309
2282 warn "resetting map ", $self->path; 2310 warn "resetting map ", $self->path, "\n";
2283 2311
2284 $self->in_memory (cf::MAP_SWAPPED); 2312 $self->in_memory (cf::MAP_SWAPPED);
2285 2313
2286 # need to save uniques path 2314 # need to save uniques path
2287 unless ($self->{deny_save}) { 2315 unless ($self->{deny_save}) {
2370 2398
2371sub unique_maps() { 2399sub unique_maps() {
2372 [ 2400 [
2373 map { 2401 map {
2374 utf8::decode $_; 2402 utf8::decode $_;
2375 /\.map$/ 2403 s/\.map$//; # TODO future compatibility hack
2404 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2405 ? ()
2376 ? normalise $_ 2406 : normalise $_
2377 : ()
2378 } @{ aio_readdir $UNIQUEDIR or [] } 2407 } @{ aio_readdir $UNIQUEDIR or [] }
2379 ] 2408 ]
2380} 2409}
2381 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
2382=back 2443=back
2383 2444
2384=head3 cf::object 2445=head3 cf::object
2385 2446
2386=cut 2447=cut
2389 2450
2390=over 4 2451=over 4
2391 2452
2392=item $ob->inv_recursive 2453=item $ob->inv_recursive
2393 2454
2394Returns the inventory of the object _and_ their inventories, recursively. 2455Returns the inventory of the object I<and> their inventories, recursively,
2456but I<not> the object itself.
2395 2457
2396=cut 2458=cut
2397 2459
2398sub inv_recursive_; 2460sub inv_recursive_;
2399sub inv_recursive_ { 2461sub inv_recursive_ {
2404 inv_recursive_ inv $_[0] 2466 inv_recursive_ inv $_[0]
2405} 2467}
2406 2468
2407=item $ref = $ob->ref 2469=item $ref = $ob->ref
2408 2470
2409creates and returns a persistent reference to an objetc that can be stored as a string. 2471Creates and returns a persistent reference to an object that can be stored as a string.
2410 2472
2411=item $ob = cf::object::deref ($refstring) 2473=item $ob = cf::object::deref ($refstring)
2412 2474
2413returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2475returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2414even if the object actually exists. May block. 2476even if the object actually exists. May block.
2446can be C<undef>. Does the right thing when the player is currently in a 2508can be C<undef>. Does the right thing when the player is currently in a
2447dialogue with the given NPC character. 2509dialogue with the given NPC character.
2448 2510
2449=cut 2511=cut
2450 2512
2513our $SAY_CHANNEL = {
2514 id => "say",
2515 title => "Map",
2516 reply => "say ",
2517 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2518};
2519
2520our $CHAT_CHANNEL = {
2521 id => "chat",
2522 title => "Chat",
2523 reply => "chat ",
2524 tooltip => "Player chat and shouts, global to the server.",
2525};
2526
2451# rough implementation of a future "reply" method that works 2527# rough implementation of a future "reply" method that works
2452# with dialog boxes. 2528# with dialog boxes.
2453#TODO: the first argument must go, split into a $npc->reply_to ( method 2529#TODO: the first argument must go, split into a $npc->reply_to ( method
2454sub cf::object::player::reply($$$;$) { 2530sub cf::object::player::reply($$$;$) {
2455 my ($self, $npc, $msg, $flags) = @_; 2531 my ($self, $npc, $msg, $flags) = @_;
2466 my $dialog = $pl->{npc_dialog}; 2542 my $dialog = $pl->{npc_dialog};
2467 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2543 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2468 2544
2469 } else { 2545 } else {
2470 $msg = $npc->name . " says: $msg" if $npc; 2546 $msg = $npc->name . " says: $msg" if $npc;
2471 $self->message ($msg, $flags); 2547 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2472 } 2548 }
2473 } 2549 }
2474} 2550}
2475 2551
2476=item $object->send_msg ($channel, $msg, $color, [extra...]) 2552=item $object->send_msg ($channel, $msg, $color, [extra...])
2501 2577
2502=item $player_object->enter_link 2578=item $player_object->enter_link
2503 2579
2504Freezes 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}>).
2505 2581
2506The 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.
2507I<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.
2508 2586
2509Will never block. 2587Will never block.
2510 2588
2511=item $player_object->leave_link ($map, $x, $y) 2589=item $player_object->leave_link ($map, $x, $y)
2512 2590
2537 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2615 return if UNIVERSAL::isa $self->map, "ext::map_link";
2538 2616
2539 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2617 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2540 if $self->map && $self->map->{path} ne "{link}"; 2618 if $self->map && $self->map->{path} ne "{link}";
2541 2619
2542 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2620 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2543} 2621}
2544 2622
2545sub cf::object::player::leave_link { 2623sub cf::object::player::leave_link {
2546 my ($self, $map, $x, $y) = @_; 2624 my ($self, $map, $x, $y) = @_;
2547 2625
2564 ($x, $y) = (-1, -1) 2642 ($x, $y) = (-1, -1)
2565 unless (defined $x) && (defined $y); 2643 unless (defined $x) && (defined $y);
2566 2644
2567 # use -1 or undef as default coordinates, not 0, 0 2645 # use -1 or undef as default coordinates, not 0, 0
2568 ($x, $y) = ($map->enter_x, $map->enter_y) 2646 ($x, $y) = ($map->enter_x, $map->enter_y)
2569 if $x <=0 && $y <= 0; 2647 if $x <= 0 && $y <= 0;
2570 2648
2571 $map->load; 2649 $map->load;
2572 $map->load_neighbours; 2650 $map->load_neighbours;
2573 2651
2574 return unless $self->contr->active; 2652 return unless $self->contr->active;
2575 $self->activate_recursive;
2576 2653
2577 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2654 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2578 $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;
2579} 2659}
2580 2660
2581=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2661=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2582 2662
2583Moves 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
2584her, loading and preparing them map, calling the provided $check callback 2664her, loading and preparing them map, calling the provided $check callback
2585that has to return the map if sucecssful, and then unfreezes the player on 2665that has to return the map if sucecssful, and then unfreezes the player on
2586the new (success) or old (failed) map position. In either case, $done will 2666the new (success) or old (failed) map position. In either case, $done will
2587be called at the end of this process. 2667be called at the end of this process.
2668
2669Note that $check will be called with a potentially non-loaded map, so if
2670it needs a loaded map it has to call C<< ->load >>.
2588 2671
2589=cut 2672=cut
2590 2673
2591our $GOTOGEN; 2674our $GOTOGEN;
2592 2675
2671} 2754}
2672 2755
2673sub prepare_random_map { 2756sub prepare_random_map {
2674 my ($exit) = @_; 2757 my ($exit) = @_;
2675 2758
2676 my $guard = cf::lock_acquire "exit_prepare:$exit";
2677
2678 # all this does is basically replace the /! path by 2759 # all this does is basically replace the /! path by
2679 # a new random map path (?random/...) with a seed 2760 # a new random map path (?random/...) with a seed
2680 # that depends on the exit object 2761 # that depends on the exit object
2681 2762
2682 my $rmp = parse_random_map_params $exit->msg; 2763 my $rmp = parse_random_map_params $exit->msg;
2684 if ($exit->map) { 2765 if ($exit->map) {
2685 $rmp->{region} = $exit->region->name; 2766 $rmp->{region} = $exit->region->name;
2686 $rmp->{origin_map} = $exit->map->path; 2767 $rmp->{origin_map} = $exit->map->path;
2687 $rmp->{origin_x} = $exit->x; 2768 $rmp->{origin_x} = $exit->x;
2688 $rmp->{origin_y} = $exit->y; 2769 $rmp->{origin_y} = $exit->y;
2770
2771 $exit->map->touch;
2689 } 2772 }
2690 2773
2691 $rmp->{random_seed} ||= $exit->random_seed; 2774 $rmp->{random_seed} ||= $exit->random_seed;
2692 2775
2693 my $data = cf::encode_json $rmp; 2776 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2694 my $md5 = Digest::MD5::md5_hex $data; 2777 my $md5 = Digest::MD5::md5_hex $data;
2695 my $meta = "$RANDOMDIR/$md5.meta"; 2778 my $meta = "$RANDOMDIR/$md5.meta";
2696 2779
2697 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2780 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2698 aio_write $fh, 0, (length $data), $data, 0; 2781 aio_write $fh, 0, (length $data), $data, 0;
2699 undef $fh; 2782 undef $fh;
2700 aio_rename "$meta~", $meta; 2783 aio_rename "$meta~", $meta;
2701 2784
2785 my $slaying = "?random/$md5";
2786
2787 if ($exit->valid) {
2702 $exit->slaying ("?random/$md5"); 2788 $exit->slaying ("?random/$md5");
2703 $exit->msg (undef); 2789 $exit->msg (undef);
2790 }
2704 } 2791 }
2705} 2792}
2706 2793
2707sub cf::object::player::enter_exit { 2794sub cf::object::player::enter_exit {
2708 my ($self, $exit) = @_; 2795 my ($self, $exit) = @_;
2709 2796
2710 return unless $self->type == cf::PLAYER; 2797 return unless $self->type == cf::PLAYER;
2711 2798
2712 if ($exit->slaying eq "/!") {
2713 #TODO: this should de-fi-ni-te-ly not be a sync-job
2714 # the problem is that $exit might not survive long enough
2715 # so it needs to be done right now, right here
2716 cf::sync_job { prepare_random_map $exit };
2717 }
2718
2719 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2720 my $hp = $exit->stats->hp;
2721 my $sp = $exit->stats->sp;
2722
2723 $self->enter_link; 2799 $self->enter_link;
2724 2800
2725 # if exit is damned, update players death & WoR home-position
2726 $self->contr->savebed ($slaying, $hp, $sp)
2727 if $exit->flag (FLAG_DAMNED);
2728
2729 (async { 2801 (async {
2730 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2802 $Coro::current->{desc} = "enter_exit";
2731 2803
2732 $self->deactivate_recursive; # just to be sure
2733 unless (eval { 2804 unless (eval {
2805 $self->deactivate_recursive; # just to be sure
2806
2807 # random map handling
2808 {
2809 my $guard = cf::lock_acquire "exit_prepare:$exit";
2810
2811 prepare_random_map $exit
2812 if $exit->slaying eq "/!";
2813 }
2814
2815 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2816 my $x = $exit->stats->hp;
2817 my $y = $exit->stats->sp;
2818
2734 $self->goto ($slaying, $hp, $sp); 2819 $self->goto ($map, $x, $y);
2735 2820
2821 # if exit is damned, update players death & WoR home-position
2822 $self->contr->savebed ($map, $x, $y)
2823 if $exit->flag (cf::FLAG_DAMNED);
2824
2736 1; 2825 1
2737 }) { 2826 }) {
2738 $self->message ("Something went wrong deep within the crossfire server. " 2827 $self->message ("Something went wrong deep within the deliantra server. "
2739 . "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. "
2740 . "Please report this to the dungeon master!", 2829 . "Please report this to the dungeon master!",
2741 cf::NDI_UNIQUE | cf::NDI_RED); 2830 cf::NDI_UNIQUE | cf::NDI_RED);
2742 2831
2743 warn "ERROR in enter_exit: $@"; 2832 warn "ERROR in enter_exit: $@";
2760sub cf::client::send_drawinfo { 2849sub cf::client::send_drawinfo {
2761 my ($self, $text, $flags) = @_; 2850 my ($self, $text, $flags) = @_;
2762 2851
2763 utf8::encode $text; 2852 utf8::encode $text;
2764 $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);
2765} 2879}
2766 2880
2767=item $client->send_msg ($channel, $msg, $color, [extra...]) 2881=item $client->send_msg ($channel, $msg, $color, [extra...])
2768 2882
2769Send 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
2773 2887
2774=cut 2888=cut
2775 2889
2776# non-persistent channels (usually the info channel) 2890# non-persistent channels (usually the info channel)
2777our %CHANNEL = ( 2891our %CHANNEL = (
2892 "c/motd" => {
2893 id => "infobox",
2894 title => "MOTD",
2895 reply => undef,
2896 tooltip => "The message of the day",
2897 },
2778 "c/identify" => { 2898 "c/identify" => {
2779 id => "infobox", 2899 id => "infobox",
2780 title => "Identify", 2900 title => "Identify",
2781 reply => undef, 2901 reply => undef,
2782 tooltip => "Items recently identified", 2902 tooltip => "Items recently identified",
2784 "c/examine" => { 2904 "c/examine" => {
2785 id => "infobox", 2905 id => "infobox",
2786 title => "Examine", 2906 title => "Examine",
2787 reply => undef, 2907 reply => undef,
2788 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",
2789 }, 2915 },
2790 "c/book" => { 2916 "c/book" => {
2791 id => "infobox", 2917 id => "infobox",
2792 title => "Book", 2918 title => "Book",
2793 reply => undef, 2919 reply => undef,
2809 id => "infobox", 2935 id => "infobox",
2810 title => "Body Parts", 2936 title => "Body Parts",
2811 reply => undef, 2937 reply => undef,
2812 tooltip => "Shows which body parts you posess and are available", 2938 tooltip => "Shows which body parts you posess and are available",
2813 }, 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 },
2814 "c/uptime" => { 2976 "c/uptime" => {
2815 id => "infobox", 2977 id => "infobox",
2816 title => "Uptime", 2978 title => "Uptime",
2817 reply => undef, 2979 reply => undef,
2818 tooltip => "How long the server has been running since last restart", 2980 tooltip => "How long the server has been running since last restart",
2821 id => "infobox", 2983 id => "infobox",
2822 title => "Map Info", 2984 title => "Map Info",
2823 reply => undef, 2985 reply => undef,
2824 tooltip => "Information related to the maps", 2986 tooltip => "Information related to the maps",
2825 }, 2987 },
2988 "c/party" => {
2989 id => "party",
2990 title => "Party",
2991 reply => "gsay ",
2992 tooltip => "Messages and chat related to your party",
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,
2826); 3002);
2827 3003
2828sub cf::client::send_msg { 3004sub cf::client::send_msg {
2829 my ($self, $channel, $msg, $color, @extra) = @_; 3005 my ($self, $channel, $msg, $color, @extra) = @_;
2830 3006
2831 $msg = $self->pl->expand_cfpod ($msg); 3007 $msg = $self->pl->expand_cfpod ($msg)
3008 unless $color & cf::NDI_VERBATIM;
2832 3009
2833 $color &= cf::NDI_CLIENT_MASK; # just in case... 3010 $color &= cf::NDI_CLIENT_MASK; # just in case...
2834 3011
2835 # check predefined channels, for the benefit of C 3012 # check predefined channels, for the benefit of C
2836 if ($CHANNEL{$channel}) { 3013 if ($CHANNEL{$channel}) {
2837 $channel = $CHANNEL{$channel}; 3014 $channel = $CHANNEL{$channel};
2838 3015
2839 $self->ext_msg (channel_info => $channel) 3016 $self->ext_msg (channel_info => $channel);
2840 if $self->can_msg;
2841
2842 $channel = $channel->{id}; 3017 $channel = $channel->{id};
2843 3018
2844 } elsif (ref $channel) { 3019 } elsif (ref $channel) {
2845 # send meta info to client, if not yet sent 3020 # send meta info to client, if not yet sent
2846 unless (exists $self->{channel}{$channel->{id}}) { 3021 unless (exists $self->{channel}{$channel->{id}}) {
2847 $self->{channel}{$channel->{id}} = $channel; 3022 $self->{channel}{$channel->{id}} = $channel;
2848 $self->ext_msg (channel_info => $channel) 3023 $self->ext_msg (channel_info => $channel);
2849 if $self->can_msg;
2850 } 3024 }
2851 3025
2852 $channel = $channel->{id}; 3026 $channel = $channel->{id};
2853 } 3027 }
2854 3028
2855 return unless @extra || length $msg; 3029 return unless @extra || length $msg;
2856 3030
2857 if ($self->can_msg) {
2858 # default colour, mask it out 3031 # default colour, mask it out
2859 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3032 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2860 if $color & cf::NDI_DEF; 3033 if $color & cf::NDI_DEF;
2861 3034
2862 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3035 my $pkt = "msg "
3036 . $self->{json_coder}->encode (
2863 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3037 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2864 } else { 3038 );
2865 if ($color >= 0) {
2866 # replace some tags by gcfclient-compatible ones
2867 for ($msg) {
2868 1 while
2869 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2870 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2871 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2872 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2873 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2874 }
2875 3039
2876 $color &= cf::NDI_COLOR_MASK; 3040 $self->send_big_packet ($pkt);
2877
2878 utf8::encode $msg;
2879
2880 if (0 && $msg =~ /\[/) {
2881 # COMMAND/INFO
2882 $self->send_packet ("drawextinfo $color 10 8 $msg")
2883 } else {
2884 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2885 $self->send_packet ("drawinfo $color $msg")
2886 }
2887 }
2888 }
2889} 3041}
2890 3042
2891=item $client->ext_msg ($type, @msg) 3043=item $client->ext_msg ($type, @msg)
2892 3044
2893Sends an ext event to the client. 3045Sends an ext event to the client.
2896 3048
2897sub cf::client::ext_msg($$@) { 3049sub cf::client::ext_msg($$@) {
2898 my ($self, $type, @msg) = @_; 3050 my ($self, $type, @msg) = @_;
2899 3051
2900 if ($self->extcmd == 2) { 3052 if ($self->extcmd == 2) {
2901 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3053 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2902 } elsif ($self->extcmd == 1) { # TODO: remove 3054 } elsif ($self->extcmd == 1) { # TODO: remove
2903 push @msg, msgtype => "event_$type"; 3055 push @msg, msgtype => "event_$type";
2904 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3056 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2905 } 3057 }
2906} 3058}
2907 3059
2908=item $client->ext_reply ($msgid, @msg) 3060=item $client->ext_reply ($msgid, @msg)
2909 3061
2913 3065
2914sub cf::client::ext_reply($$@) { 3066sub cf::client::ext_reply($$@) {
2915 my ($self, $id, @msg) = @_; 3067 my ($self, $id, @msg) = @_;
2916 3068
2917 if ($self->extcmd == 2) { 3069 if ($self->extcmd == 2) {
2918 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3070 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2919 } elsif ($self->extcmd == 1) { 3071 } elsif ($self->extcmd == 1) {
2920 #TODO: version 1, remove 3072 #TODO: version 1, remove
2921 unshift @msg, msgtype => "reply", msgid => $id; 3073 unshift @msg, msgtype => "reply", msgid => $id;
2922 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3074 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2923 } 3075 }
2924} 3076}
2925 3077
2926=item $success = $client->query ($flags, "text", \&cb) 3078=item $success = $client->query ($flags, "text", \&cb)
2927 3079
3028 3180
3029 $coro 3181 $coro
3030} 3182}
3031 3183
3032cf::client->attach ( 3184cf::client->attach (
3033 on_destroy => sub { 3185 on_client_destroy => sub {
3034 my ($ns) = @_; 3186 my ($ns) = @_;
3035 3187
3036 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3188 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3037 }, 3189 },
3038); 3190);
3054our $safe_hole = new Safe::Hole; 3206our $safe_hole = new Safe::Hole;
3055 3207
3056$SIG{FPE} = 'IGNORE'; 3208$SIG{FPE} = 'IGNORE';
3057 3209
3058$safe->permit_only (Opcode::opset qw( 3210$safe->permit_only (Opcode::opset qw(
3059 :base_core :base_mem :base_orig :base_math 3211 :base_core :base_mem :base_orig :base_math :base_loop
3060 grepstart grepwhile mapstart mapwhile 3212 grepstart grepwhile mapstart mapwhile
3061 sort time 3213 sort time
3062)); 3214));
3063 3215
3064# here we export the classes and methods available to script code 3216# here we export the classes and methods available to script code
3067 3219
3068The following functions and methods are available within a safe environment: 3220The following functions and methods are available within a safe environment:
3069 3221
3070 cf::object 3222 cf::object
3071 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
3072 insert remove name archname title slaying race decrease_ob_nr 3224 insert remove name archname title slaying race decrease split
3225 value
3073 3226
3074 cf::object::player 3227 cf::object::player
3075 player 3228 player
3076 3229
3077 cf::player 3230 cf::player
3082 3235
3083=cut 3236=cut
3084 3237
3085for ( 3238for (
3086 ["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
3087 insert remove inv name archname title slaying race 3240 insert remove inv nrof name archname title slaying race
3088 decrease_ob_nr destroy)], 3241 decrease split destroy change_exp value msg lore send_msg)],
3089 ["cf::object::player" => qw(player)], 3242 ["cf::object::player" => qw(player)],
3090 ["cf::player" => qw(peaceful)], 3243 ["cf::player" => qw(peaceful send_msg)],
3091 ["cf::map" => qw(trigger)], 3244 ["cf::map" => qw(trigger)],
3092) { 3245) {
3093 no strict 'refs'; 3246 no strict 'refs';
3094 my ($pkg, @funs) = @$_; 3247 my ($pkg, @funs) = @$_;
3095 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3248 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3113 3266
3114 my $qcode = $code; 3267 my $qcode = $code;
3115 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3268 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3116 $qcode =~ s/\n/\\n/g; 3269 $qcode =~ s/\n/\\n/g;
3117 3270
3271 %vars = (_dummy => 0) unless %vars;
3272
3273 my @res;
3118 local $_; 3274 local $_;
3119 local @safe::cf::_safe_eval_args = values %vars;
3120 3275
3121 my $eval = 3276 my $eval =
3122 "do {\n" 3277 "do {\n"
3123 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3278 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3124 . "#line 0 \"{$qcode}\"\n" 3279 . "#line 0 \"{$qcode}\"\n"
3125 . $code 3280 . $code
3126 . "\n}" 3281 . "\n}"
3127 ; 3282 ;
3128 3283
3284 if ($CFG{safe_eval}) {
3129 sub_generation_inc; 3285 sub_generation_inc;
3286 local @safe::cf::_safe_eval_args = values %vars;
3130 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3287 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3131 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 }
3132 3293
3133 if ($@) { 3294 if ($@) {
3134 warn "$@"; 3295 warn "$@";
3135 warn "while executing safe code '$code'\n"; 3296 warn "while executing safe code '$code'\n";
3136 warn "with arguments " . (join " ", %vars) . "\n"; 3297 warn "with arguments " . (join " ", %vars) . "\n";
3155=cut 3316=cut
3156 3317
3157sub register_script_function { 3318sub register_script_function {
3158 my ($fun, $cb) = @_; 3319 my ($fun, $cb) = @_;
3159 3320
3160 no strict 'refs'; 3321 $fun = "safe::$fun" if $CFG{safe_eval};
3161 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3322 *$fun = $safe_hole->wrap ($cb);
3162} 3323}
3163 3324
3164=back 3325=back
3165 3326
3166=cut 3327=cut
3187 3348
3188 $facedata->{version} == 2 3349 $facedata->{version} == 2
3189 or cf::cleanup "$path: version mismatch, cannot proceed."; 3350 or cf::cleanup "$path: version mismatch, cannot proceed.";
3190 3351
3191 # 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]);
3192 $facedata->{resource}{"res/exp_table"} = { 3354 $facedata->{resource}{"res/exp_table"} = {
3193 type => FT_RSRC, 3355 type => FT_RSRC,
3194 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),
3195 }; 3358 };
3196 cf::cede_to_tick; 3359 cf::cede_to_tick;
3197 3360
3198 { 3361 {
3199 my $faces = $facedata->{faceinfo}; 3362 my $faces = $facedata->{faceinfo};
3201 while (my ($face, $info) = each %$faces) { 3364 while (my ($face, $info) = each %$faces) {
3202 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3365 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3203 3366
3204 cf::face::set_visibility $idx, $info->{visibility}; 3367 cf::face::set_visibility $idx, $info->{visibility};
3205 cf::face::set_magicmap $idx, $info->{magicmap}; 3368 cf::face::set_magicmap $idx, $info->{magicmap};
3206 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3369 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3207 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3370 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3208 3371
3209 cf::cede_to_tick; 3372 cf::cede_to_tick;
3210 } 3373 }
3211 3374
3212 while (my ($face, $info) = each %$faces) { 3375 while (my ($face, $info) = each %$faces) {
3236 3399
3237 cf::anim::invalidate_all; # d'oh 3400 cf::anim::invalidate_all; # d'oh
3238 } 3401 }
3239 3402
3240 { 3403 {
3241 # TODO: for gcfclient pleasure, we should give resources
3242 # that gcfclient doesn't grok a >10000 face index.
3243 my $res = $facedata->{resource}; 3404 my $res = $facedata->{resource};
3244 3405
3245 while (my ($name, $info) = each %$res) { 3406 while (my ($name, $info) = each %$res) {
3246 if (defined $info->{type}) { 3407 if (defined $info->{type}) {
3247 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3408 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3248 my $data;
3249 3409
3250 if ($info->{type} & 1) { 3410 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3251 # prepend meta info
3252
3253 my $meta = $enc->encode ({
3254 name => $name,
3255 %{ $info->{meta} || {} },
3256 });
3257
3258 $data = pack "(w/a*)*", $meta, $info->{data};
3259 } else {
3260 $data = $info->{data};
3261 }
3262
3263 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3264 cf::face::set_type $idx, $info->{type}; 3411 cf::face::set_type $idx, $info->{type};
3265 } else { 3412 } else {
3266 $RESOURCE{$name} = $info; 3413 $RESOURCE{$name} = $info;
3267 } 3414 }
3268 3415
3301 while (my ($k, $v) = each %$want) { 3448 while (my ($k, $v) = each %$want) {
3302 $ns->fx_want ($k, $v); 3449 $ns->fx_want ($k, $v);
3303 } 3450 }
3304}; 3451};
3305 3452
3453sub load_resource_file($) {
3454 my $guard = lock_acquire "load_resource_file";
3455
3456 my $status = load_resource_file_ $_[0];
3457 get_slot 0.1, 100;
3458 cf::arch::commit_load;
3459
3460 $status
3461}
3462
3306sub reload_regions { 3463sub reload_regions {
3307 # HACK to clear player env face cache, we need some signal framework 3464 # HACK to clear player env face cache, we need some signal framework
3308 # for this (global event?) 3465 # for this (global event?)
3309 %ext::player_env::MUSIC_FACE_CACHE = (); 3466 %ext::player_env::MUSIC_FACE_CACHE = ();
3310 3467
3323} 3480}
3324 3481
3325sub reload_archetypes { 3482sub reload_archetypes {
3326 load_resource_file "$DATADIR/archetypes" 3483 load_resource_file "$DATADIR/archetypes"
3327 or die "unable to load archetypes\n"; 3484 or die "unable to load archetypes\n";
3328 #d# NEED to laod twice to resolve forward references
3329 # this really needs to be done in an extra post-pass
3330 # (which needs to be synchronous, so solve it differently)
3331 load_resource_file "$DATADIR/archetypes"
3332 or die "unable to load archetypes\n";
3333} 3485}
3334 3486
3335sub reload_treasures { 3487sub reload_treasures {
3336 load_resource_file "$DATADIR/treasures" 3488 load_resource_file "$DATADIR/treasures"
3337 or die "unable to load treasurelists\n"; 3489 or die "unable to load treasurelists\n";
3338} 3490}
3339 3491
3340sub reload_resources { 3492sub reload_resources {
3341 warn "reloading resource files...\n"; 3493 warn "reloading resource files...\n";
3342 3494
3495 reload_facedata;
3496 reload_archetypes;
3343 reload_regions; 3497 reload_regions;
3344 reload_facedata;
3345 #reload_archetypes;#d#
3346 reload_archetypes;
3347 reload_treasures; 3498 reload_treasures;
3348 3499
3349 warn "finished reloading resource files\n"; 3500 warn "finished reloading resource files\n";
3350} 3501}
3351 3502
3352sub init {
3353 reload_resources;
3354}
3355
3356sub reload_config { 3503sub reload_config {
3504 warn "reloading config file...\n";
3505
3357 open my $fh, "<:utf8", "$CONFDIR/config" 3506 open my $fh, "<:utf8", "$CONFDIR/config"
3358 or return; 3507 or return;
3359 3508
3360 local $/; 3509 local $/;
3361 *CFG = YAML::Load <$fh>; 3510 *CFG = YAML::XS::Load scalar <$fh>;
3362 3511
3363 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3512 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3364 3513
3365 $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};
3366 $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};
3370 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3519 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3371 and die "WARNING: m(un)lockall failed: $!\n"; 3520 and die "WARNING: m(un)lockall failed: $!\n";
3372 }; 3521 };
3373 warn $@ if $@; 3522 warn $@ if $@;
3374 } 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;
3375} 3554}
3376 3555
3377sub 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
3378 # we must not ever block the main coroutine 3566 # we must not ever block the main coroutine
3379 local $Coro::idle = sub { 3567 local $Coro::idle = sub {
3380 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#
3381 (async { 3569 (async {
3382 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3570 $Coro::current->{desc} = "IDLE BUG HANDLER";
3383 EV::loop EV::LOOP_ONESHOT; 3571 EV::loop EV::LOOP_ONESHOT;
3384 })->prio (Coro::PRIO_MAX); 3572 })->prio (Coro::PRIO_MAX);
3385 }; 3573 };
3386 3574
3387 reload_config;
3388 db_init;
3389 load_extensions;
3390
3391 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3392 evthread_start IO::AIO::poll_fileno; 3575 evthread_start IO::AIO::poll_fileno;
3393 EV::loop; 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;
3587 reload_config;
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
3598 load_extensions;
3599
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;
3607 };
3608
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;
3394} 3613}
3395 3614
3396############################################################################# 3615#############################################################################
3397# initialisation and cleanup 3616# initialisation and cleanup
3398 3617
3399# install some emergency cleanup handlers 3618# install some emergency cleanup handlers
3400BEGIN { 3619BEGIN {
3401 our %SIGWATCHER = (); 3620 our %SIGWATCHER = ();
3402 for my $signal (qw(INT HUP TERM)) { 3621 for my $signal (qw(INT HUP TERM)) {
3403 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3622 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3404 cf::cleanup "SIG$signal"; 3623 cf::cleanup "SIG$signal";
3405 }; 3624 };
3406 } 3625 }
3407} 3626}
3408 3627
3409sub write_runtime { 3628sub write_runtime_sync {
3410 my $runtime = "$LOCALDIR/runtime"; 3629 my $t0 = AE::time;
3411 3630
3412 # first touch the runtime file to show we are still running: 3631 # first touch the runtime file to show we are still running:
3413 # the fsync below can take a very very long time. 3632 # the fsync below can take a very very long time.
3414 3633
3415 IO::AIO::aio_utime $runtime, undef, undef; 3634 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3416 3635
3417 my $guard = cf::lock_acquire "write_runtime"; 3636 my $guard = cf::lock_acquire "write_runtime";
3418 3637
3419 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3638 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3420 or return; 3639 or return;
3421 3640
3422 my $value = $cf::RUNTIME + 90 + 10; 3641 my $value = $cf::RUNTIME + 90 + 10;
3423 # 10 is the runtime save interval, for a monotonic clock 3642 # 10 is the runtime save interval, for a monotonic clock
3424 # 60 allows for the watchdog to kill the server. 3643 # 60 allows for the watchdog to kill the server.
3434 aio_utime $fh, undef, undef; 3653 aio_utime $fh, undef, undef;
3435 3654
3436 close $fh 3655 close $fh
3437 or return; 3656 or return;
3438 3657
3439 aio_rename "$runtime~", $runtime 3658 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3440 and return; 3659 and return;
3441 3660
3442 warn "runtime file written.\n"; 3661 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3443 3662
3444 1 3663 1
3445} 3664}
3446 3665
3447our $uuid_lock; 3666our $uuid_lock;
3456 my $uuid = "$LOCALDIR/uuid"; 3675 my $uuid = "$LOCALDIR/uuid";
3457 3676
3458 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3677 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3459 or return; 3678 or return;
3460 3679
3461 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;
3462 $uuid_skip = 0; 3688 $uuid_skip = 0;
3463 3689
3464 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3690 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3465 and return; 3691 and return;
3466 3692
3488} 3714}
3489 3715
3490sub emergency_save() { 3716sub emergency_save() {
3491 my $freeze_guard = cf::freeze_mainloop; 3717 my $freeze_guard = cf::freeze_mainloop;
3492 3718
3493 warn "enter emergency perl save\n"; 3719 warn "emergency_perl_save: enter\n";
3494 3720
3495 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
3496 # use a peculiar iteration method to avoid tripping on perl 3727 # use a peculiar iteration method to avoid tripping on perl
3497 # refcount bugs in for. also avoids problems with players 3728 # refcount bugs in for. also avoids problems with players
3498 # and maps saved/destroyed asynchronously. 3729 # and maps saved/destroyed asynchronously.
3499 warn "begin emergency player save\n"; 3730 warn "emergency_perl_save: begin player save\n";
3500 for my $login (keys %cf::PLAYER) { 3731 for my $login (keys %cf::PLAYER) {
3501 my $pl = $cf::PLAYER{$login} or next; 3732 my $pl = $cf::PLAYER{$login} or next;
3502 $pl->valid or next; 3733 $pl->valid or next;
3503 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3734 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3504 $pl->save; 3735 $pl->save;
3505 } 3736 }
3506 warn "end emergency player save\n"; 3737 warn "emergency_perl_save: end player save\n";
3507 3738
3508 warn "begin emergency map save\n"; 3739 warn "emergency_perl_save: begin map save\n";
3509 for my $path (keys %cf::MAP) { 3740 for my $path (keys %cf::MAP) {
3510 my $map = $cf::MAP{$path} or next; 3741 my $map = $cf::MAP{$path} or next;
3511 $map->valid or next; 3742 $map->valid or next;
3512 $map->save; 3743 $map->save;
3513 } 3744 }
3514 warn "end emergency map save\n"; 3745 warn "emergency_perl_save: end map save\n";
3515 3746
3516 warn "begin emergency database checkpoint\n"; 3747 warn "emergency_perl_save: begin database checkpoint\n";
3517 BDB::db_env_txn_checkpoint $DB_ENV; 3748 BDB::db_env_txn_checkpoint $DB_ENV;
3518 warn "end emergency database checkpoint\n"; 3749 warn "emergency_perl_save: end database checkpoint\n";
3519 3750
3520 warn "begin write uuid\n"; 3751 warn "emergency_perl_save: begin write uuid\n";
3521 write_uuid_sync 1; 3752 write_uuid_sync 1;
3522 warn "end write uuid\n"; 3753 warn "emergency_perl_save: end write uuid\n";
3523 }; 3754 };
3524 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
3525 warn "leave emergency perl save\n"; 3761 warn "emergency_perl_save: leave\n";
3526} 3762}
3527 3763
3528sub post_cleanup { 3764sub post_cleanup {
3529 my ($make_core) = @_; 3765 my ($make_core) = @_;
3530 3766
3531 warn Carp::longmess "post_cleanup backtrace" 3767 warn Carp::longmess "post_cleanup backtrace"
3532 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 }
3533} 3797}
3534 3798
3535sub do_reload_perl() { 3799sub do_reload_perl() {
3536 # can/must only be called in main 3800 # can/must only be called in main
3537 if ($Coro::current != $Coro::main) { 3801 if (in_main) {
3538 warn "can only reload from main coroutine"; 3802 warn "can only reload from main coroutine";
3539 return; 3803 return;
3540 } 3804 }
3541 3805
3806 return if $RELOAD++;
3807
3808 my $t1 = AE::time;
3809
3810 while ($RELOAD) {
3542 warn "reloading..."; 3811 warn "reloading...";
3543 3812
3544 warn "entering sync_job"; 3813 warn "entering sync_job";
3545 3814
3546 cf::sync_job { 3815 cf::sync_job {
3547 cf::write_runtime; # external watchdog should not bark 3816 cf::write_runtime_sync; # external watchdog should not bark
3548 cf::emergency_save; 3817 cf::emergency_save;
3549 cf::write_runtime; # external watchdog should not bark 3818 cf::write_runtime_sync; # external watchdog should not bark
3550 3819
3551 warn "syncing database to disk"; 3820 warn "syncing database to disk";
3552 BDB::db_env_txn_checkpoint $DB_ENV; 3821 BDB::db_env_txn_checkpoint $DB_ENV;
3553 3822
3554 # 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
3555 3824
3556 warn "flushing outstanding aio requests"; 3825 warn "flushing outstanding aio requests";
3557 for (;;) {
3558 BDB::flush;
3559 IO::AIO::flush;
3560 Coro::cede_notself;
3561 last unless IO::AIO::nreqs || BDB::nreqs; 3826 while (IO::AIO::nreqs || BDB::nreqs) {
3562 warn "iterate..."; 3827 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3563 }
3564
3565 ++$RELOAD;
3566
3567 warn "cancelling all extension coros";
3568 $_->cancel for values %EXT_CORO;
3569 %EXT_CORO = ();
3570
3571 warn "removing commands";
3572 %COMMAND = ();
3573
3574 warn "removing ext/exti commands";
3575 %EXTCMD = ();
3576 %EXTICMD = ();
3577
3578 warn "unloading/nuking all extensions";
3579 for my $pkg (@EXTS) {
3580 warn "... unloading $pkg";
3581
3582 if (my $cb = $pkg->can ("unload")) {
3583 eval {
3584 $cb->($pkg);
3585 1
3586 } or warn "$pkg unloaded, but with errors: $@";
3587 } 3828 }
3588 3829
3589 warn "... nuking $pkg"; 3830 warn "cancelling all extension coros";
3590 Symbol::delete_package $pkg; 3831 $_->cancel for values %EXT_CORO;
3591 } 3832 %EXT_CORO = ();
3592 3833
3593 warn "unloading all perl modules loaded from $LIBDIR"; 3834 warn "removing commands";
3594 while (my ($k, $v) = each %INC) { 3835 %COMMAND = ();
3595 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3596 3836
3837 warn "removing ext/exti commands";
3838 %EXTCMD = ();
3839 %EXTICMD = ();
3840
3841 warn "unloading/nuking all extensions";
3842 for my $pkg (@EXTS) {
3597 warn "... unloading $k"; 3843 warn "... unloading $pkg";
3598 delete $INC{$k};
3599 3844
3600 $k =~ s/\.pm$//;
3601 $k =~ s/\//::/g;
3602
3603 if (my $cb = $k->can ("unload_module")) { 3845 if (my $cb = $pkg->can ("unload")) {
3846 eval {
3604 $cb->(); 3847 $cb->($pkg);
3848 1
3849 } or warn "$pkg unloaded, but with errors: $@";
3850 }
3851
3852 warn "... clearing $pkg";
3853 clear_package $pkg;
3605 } 3854 }
3606 3855
3607 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;
3608 } 3871 }
3609 3872
3610 warn "getting rid of safe::, as good as possible"; 3873 warn "getting rid of safe::, as good as possible";
3611 Symbol::delete_package "safe::$_" 3874 clear_package "safe::$_"
3612 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);
3613 3876
3614 warn "unloading cf.pm \"a bit\""; 3877 warn "unloading cf.pm \"a bit\"";
3615 delete $INC{"cf.pm"}; 3878 delete $INC{"cf.pm"};
3616 delete $INC{"cf/pod.pm"}; 3879 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3617 3880
3618 # don't, removes xs symbols, too, 3881 # don't, removes xs symbols, too,
3619 # and global variables created in xs 3882 # and global variables created in xs
3620 #Symbol::delete_package __PACKAGE__; 3883 #clear_package __PACKAGE__;
3621 3884
3622 warn "unload completed, starting to reload now"; 3885 warn "unload completed, starting to reload now";
3623 3886
3624 warn "reloading cf.pm"; 3887 warn "reloading cf.pm";
3625 require cf; 3888 require cf;
3626 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3889 cf::_connect_to_perl_1;
3627 3890
3628 warn "loading config and database again"; 3891 warn "loading config and database again";
3629 cf::reload_config; 3892 cf::reload_config;
3630 3893
3631 warn "loading extensions"; 3894 warn "loading extensions";
3632 cf::load_extensions; 3895 cf::load_extensions;
3633 3896
3897 if ($REATTACH_ON_RELOAD) {
3634 warn "reattaching attachments to objects/players"; 3898 warn "reattaching attachments to objects/players";
3635 _global_reattach; # objects, sockets 3899 _global_reattach; # objects, sockets
3636 warn "reattaching attachments to maps"; 3900 warn "reattaching attachments to maps";
3637 reattach $_ for values %MAP; 3901 reattach $_ for values %MAP;
3638 warn "reattaching attachments to players"; 3902 warn "reattaching attachments to players";
3639 reattach $_ for values %PLAYER; 3903 reattach $_ for values %PLAYER;
3904 }
3640 3905
3906 warn "running post_init jobs";
3907 (pop @POST_INIT)->(1) while @POST_INIT;
3908
3641 warn "leaving sync_job"; 3909 warn "leaving sync_job";
3642 3910
3643 1 3911 1
3644 } or do { 3912 } or do {
3645 warn $@; 3913 warn $@;
3646 cf::cleanup "error while reloading, exiting."; 3914 cf::cleanup "error while reloading, exiting.";
3647 }; 3915 };
3648 3916
3649 warn "reloaded"; 3917 warn "reloaded";
3918 --$RELOAD;
3919 }
3920
3921 $t1 = AE::time - $t1;
3922 warn "reload completed in ${t1}s\n";
3650}; 3923};
3651 3924
3652our $RELOAD_WATCHER; # used only during reload 3925our $RELOAD_WATCHER; # used only during reload
3653 3926
3654sub reload_perl() { 3927sub reload_perl() {
3655 # doing reload synchronously and two reloads happen back-to-back, 3928 # doing reload synchronously and two reloads happen back-to-back,
3656 # coro crashes during coro_state_free->destroy here. 3929 # coro crashes during coro_state_free->destroy here.
3657 3930
3931 $RELOAD_WATCHER ||= cf::async {
3932 Coro::AIO::aio_wait cache_extensions;
3933
3658 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3934 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3659 do_reload_perl; 3935 do_reload_perl;
3660 undef $RELOAD_WATCHER; 3936 undef $RELOAD_WATCHER;
3937 };
3661 }; 3938 };
3662} 3939}
3663 3940
3664register_command "reload" => sub { 3941register_command "reload" => sub {
3665 my ($who, $arg) = @_; 3942 my ($who, $arg) = @_;
3679 3956
3680our @WAIT_FOR_TICK; 3957our @WAIT_FOR_TICK;
3681our @WAIT_FOR_TICK_BEGIN; 3958our @WAIT_FOR_TICK_BEGIN;
3682 3959
3683sub wait_for_tick { 3960sub wait_for_tick {
3684 return if tick_inhibit;
3685 return if $Coro::current == $Coro::main; 3961 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3686 3962
3687 my $signal = new Coro::Signal; 3963 my $signal = new Coro::Signal;
3688 push @WAIT_FOR_TICK, $signal; 3964 push @WAIT_FOR_TICK, $signal;
3689 $signal->wait; 3965 $signal->wait;
3690} 3966}
3691 3967
3692sub wait_for_tick_begin { 3968sub wait_for_tick_begin {
3693 return if tick_inhibit;
3694 return if $Coro::current == $Coro::main; 3969 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3695 3970
3696 my $signal = new Coro::Signal; 3971 my $signal = new Coro::Signal;
3697 push @WAIT_FOR_TICK_BEGIN, $signal; 3972 push @WAIT_FOR_TICK_BEGIN, $signal;
3698 $signal->wait; 3973 $signal->wait;
3699} 3974}
3705 return; 3980 return;
3706 } 3981 }
3707 3982
3708 cf::server_tick; # one server iteration 3983 cf::server_tick; # one server iteration
3709 3984
3985 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3986
3710 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3987 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3711 $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.;
3712 Coro::async_pool { 3989 Coro::async_pool {
3713 $Coro::current->{desc} = "runtime saver"; 3990 $Coro::current->{desc} = "runtime saver";
3714 write_runtime 3991 write_runtime_sync
3715 or warn "ERROR: unable to write runtime file: $!"; 3992 or warn "ERROR: unable to write runtime file: $!";
3716 }; 3993 };
3717 } 3994 }
3718 3995
3719 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3996 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3736} 4013}
3737 4014
3738{ 4015{
3739 # configure BDB 4016 # configure BDB
3740 4017
3741 BDB::min_parallel 8; 4018 BDB::min_parallel 16;
3742 BDB::max_poll_reqs $TICK * 0.1; 4019 BDB::max_poll_reqs $TICK * 0.1;
3743 $Coro::BDB::WATCHER->priority (1); 4020 $AnyEvent::BDB::WATCHER->priority (1);
3744 4021
3745 unless ($DB_ENV) { 4022 unless ($DB_ENV) {
3746 $DB_ENV = BDB::db_env_create; 4023 $DB_ENV = BDB::db_env_create;
3747 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4024 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3748 | BDB::LOG_AUTOREMOVE, 1); 4025 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4026 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3749 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4027 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3750 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4028 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3751 4029
3752 cf::sync_job { 4030 cf::sync_job {
3753 eval { 4031 eval {
3779{ 4057{
3780 # configure IO::AIO 4058 # configure IO::AIO
3781 4059
3782 IO::AIO::min_parallel 8; 4060 IO::AIO::min_parallel 8;
3783 IO::AIO::max_poll_time $TICK * 0.1; 4061 IO::AIO::max_poll_time $TICK * 0.1;
3784 $Coro::AIO::WATCHER->priority (1); 4062 undef $AnyEvent::AIO::WATCHER;
3785} 4063}
3786 4064
3787my $_log_backtrace; 4065my $_log_backtrace;
3788 4066
3789sub _log_backtrace { 4067sub _log_backtrace {
3792 $msg =~ s/\n//; 4070 $msg =~ s/\n//;
3793 4071
3794 # limit the # of concurrent backtraces 4072 # limit the # of concurrent backtraces
3795 if ($_log_backtrace < 2) { 4073 if ($_log_backtrace < 2) {
3796 ++$_log_backtrace; 4074 ++$_log_backtrace;
4075 my $perl_bt = Carp::longmess $msg;
3797 async { 4076 async {
3798 $Coro::current->{desc} = "abt $msg"; 4077 $Coro::current->{desc} = "abt $msg";
3799 4078
3800 my @bt = fork_call { 4079 my @bt = fork_call {
3801 @addr = map { sprintf "%x", $_ } @addr; 4080 @addr = map { sprintf "%x", $_ } @addr;
3812 } 4091 }
3813 4092
3814 @funcs 4093 @funcs
3815 }; 4094 };
3816 4095
3817 LOG llevInfo, "[ABT] $msg\n"; 4096 LOG llevInfo, "[ABT] $perl_bt\n";
4097 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3818 LOG llevInfo, "[ABT] $_\n" for @bt; 4098 LOG llevInfo, "[ABT] $_\n" for @bt;
3819 --$_log_backtrace; 4099 --$_log_backtrace;
3820 }; 4100 };
3821 } else { 4101 } else {
3822 LOG llevInfo, "[ABT] $msg\n"; 4102 LOG llevInfo, "[ABT] $msg\n";
3823 LOG llevInfo, "[ABT] [suppressed]\n"; 4103 LOG llevInfo, "[ABT] [suppressed]\n";
3824 } 4104 }
3825} 4105}
3826 4106
3827# load additional modules 4107# load additional modules
3828use cf::pod; 4108require "cf/$_.pm" for @EXTRA_MODULES;
4109cf::_connect_to_perl_2;
3829 4110
3830END { cf::emergency_save } 4111END { cf::emergency_save }
3831 4112
38321 41131
3833 4114

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines