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.418 by root, Fri Apr 11 21:09:53 2008 UTC vs.
Revision 1.515 by root, Thu Apr 15 04:56:47 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
170#############################################################################
171
172%REFLECT = ();
173for (@REFLECT) {
174 my $reflect = JSON::XS::decode_json $_;
175 $REFLECT{$reflect->{class}} = $reflect;
176}
177
178# this is decidedly evil
179$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
140 180
141############################################################################# 181#############################################################################
142 182
143=head2 GLOBAL VARIABLES 183=head2 GLOBAL VARIABLES
144 184
191returns directly I<after> the tick processing (and consequently, can only wake one process 231returns 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. 232per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
193 233
194=item @cf::INVOKE_RESULTS 234=item @cf::INVOKE_RESULTS
195 235
196This array contains the results of the last C<invoke ()> call. When 236This 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 237C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
198that call. 238that call.
199 239
240=item %cf::REFLECT
241
242Contains, for each (C++) class name, a hash reference with information
243about object members (methods, scalars, arrays and flags) and other
244metadata, which is useful for introspection.
245
200=back 246=back
201 247
202=cut 248=cut
203 249
204BEGIN { 250$Coro::State::WARNHOOK = sub {
205 *CORE::GLOBAL::warn = sub {
206 my $msg = join "", @_; 251 my $msg = join "", @_;
207 252
208 $msg .= "\n" 253 $msg .= "\n"
209 unless $msg =~ /\n$/; 254 unless $msg =~ /\n$/;
210 255
211 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 256 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
212 257
213 LOG llevError, $msg; 258 LOG llevError, $msg;
214 }; 259};
215}
216 260
217$Coro::State::DIEHOOK = sub { 261$Coro::State::DIEHOOK = sub {
218 return unless $^S eq 0; # "eq", not "==" 262 return unless $^S eq 0; # "eq", not "=="
263
264 warn Carp::longmess $_[0];
219 265
220 if ($Coro::current == $Coro::main) {#d# 266 if ($Coro::current == $Coro::main) {#d#
221 warn "DIEHOOK called in main context, Coro bug?\n";#d# 267 warn "DIEHOOK called in main context, Coro bug?\n";#d#
222 return;#d# 268 return;#d#
223 }#d# 269 }#d#
224 270
225 # kill coroutine otherwise 271 # kill coroutine otherwise
226 warn Carp::longmess $_[0];
227 Coro::terminate 272 Coro::terminate
228}; 273};
229
230$SIG{__DIE__} = sub { }; #d#?
231 274
232@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 275@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
233@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 276@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
234@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 277@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
235@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 278@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
242for my $pkg (qw( 285for my $pkg (qw(
243 cf::global cf::attachable 286 cf::global cf::attachable
244 cf::object cf::object::player 287 cf::object cf::object::player
245 cf::client cf::player 288 cf::client cf::player
246 cf::arch cf::living 289 cf::arch cf::living
290 cf::map cf::mapspace
247 cf::map cf::party cf::region 291 cf::party cf::region
248)) { 292)) {
249 no strict 'refs';
250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 293 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
251} 294}
252 295
253$EV::DIED = sub { 296$EV::DIED = sub {
254 warn "error in event callback: @_"; 297 Carp::cluck "error in event callback: @_";
255}; 298};
256 299
257############################################################################# 300#############################################################################
258 301
259=head2 UTILITY FUNCTIONS 302=head2 UTILITY FUNCTIONS
296our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 339our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
297 340
298sub encode_json($) { $json_coder->encode ($_[0]) } 341sub encode_json($) { $json_coder->encode ($_[0]) }
299sub decode_json($) { $json_coder->decode ($_[0]) } 342sub decode_json($) { $json_coder->decode ($_[0]) }
300 343
344=item cf::post_init { BLOCK }
345
346Execute the given codeblock, I<after> all extensions have been (re-)loaded,
347but I<before> the server starts ticking again.
348
349The cdoeblock will have a single boolean argument to indicate whether this
350is a reload or not.
351
352=cut
353
354sub post_init(&) {
355 push @POST_INIT, shift;
356}
357
301=item cf::lock_wait $string 358=item cf::lock_wait $string
302 359
303Wait until the given lock is available. See cf::lock_acquire. 360Wait until the given lock is available. See cf::lock_acquire.
304 361
305=item my $lock = cf::lock_acquire $string 362=item my $lock = cf::lock_acquire $string
306 363
307Wait until the given lock is available and then acquires it and returns 364Wait 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, 365a L<Guard> object. If the guard object gets destroyed (goes out of scope,
309for example when the coroutine gets canceled), the lock is automatically 366for example when the coroutine gets canceled), the lock is automatically
310returned. 367returned.
311 368
312Locks are *not* recursive, locking from the same coro twice results in a 369Locks are *not* recursive, locking from the same coro twice results in a
313deadlocked coro. 370deadlocked coro.
319 376
320Return true if the lock is currently active, i.e. somebody has locked it. 377Return true if the lock is currently active, i.e. somebody has locked it.
321 378
322=cut 379=cut
323 380
324our %LOCK; 381our $LOCKS = new Coro::SemaphoreSet;
325our %LOCKER;#d#
326 382
327sub lock_wait($) { 383sub lock_wait($) {
328 my ($key) = @_; 384 $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} 385}
341 386
342sub lock_acquire($) { 387sub lock_acquire($) {
343 my ($key) = @_; 388 $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} 389}
357 390
358sub lock_active($) { 391sub lock_active($) {
359 my ($key) = @_; 392 $LOCKS->count ($_[0]) < 1
360
361 ! ! $LOCK{$key}
362} 393}
363 394
364sub freeze_mainloop { 395sub freeze_mainloop {
365 tick_inhibit_inc; 396 tick_inhibit_inc;
366 397
367 Coro::guard \&tick_inhibit_dec; 398 &Guard::guard (\&tick_inhibit_dec);
368} 399}
369 400
370=item cf::periodic $interval, $cb 401=item cf::periodic $interval, $cb
371 402
372Like EV::periodic, but randomly selects a starting point so that the actions 403Like EV::periodic, but randomly selects a starting point so that the actions
373get spread over timer. 404get spread over time.
374 405
375=cut 406=cut
376 407
377sub periodic($$) { 408sub periodic($$) {
378 my ($interval, $cb) = @_; 409 my ($interval, $cb) = @_;
395 426
396=cut 427=cut
397 428
398our @SLOT_QUEUE; 429our @SLOT_QUEUE;
399our $SLOT_QUEUE; 430our $SLOT_QUEUE;
431our $SLOT_DECAY = 0.9;
400 432
401$SLOT_QUEUE->cancel if $SLOT_QUEUE; 433$SLOT_QUEUE->cancel if $SLOT_QUEUE;
402$SLOT_QUEUE = Coro::async { 434$SLOT_QUEUE = Coro::async {
403 $Coro::current->desc ("timeslot manager"); 435 $Coro::current->desc ("timeslot manager");
404 436
405 my $signal = new Coro::Signal; 437 my $signal = new Coro::Signal;
438 my $busy;
406 439
407 while () { 440 while () {
408 next_job: 441 next_job:
442
409 my $avail = cf::till_tick; 443 my $avail = cf::till_tick;
410 if ($avail > 0.01) { 444
411 for (0 .. $#SLOT_QUEUE) { 445 for (0 .. $#SLOT_QUEUE) {
412 if ($SLOT_QUEUE[$_][0] < $avail) { 446 if ($SLOT_QUEUE[$_][0] <= $avail) {
447 $busy = 0;
413 my $job = splice @SLOT_QUEUE, $_, 1, (); 448 my $job = splice @SLOT_QUEUE, $_, 1, ();
414 $job->[2]->send; 449 $job->[2]->send;
415 Coro::cede; 450 Coro::cede;
416 goto next_job; 451 goto next_job;
417 } 452 } else {
453 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
418 } 454 }
419 } 455 }
420 456
421 if (@SLOT_QUEUE) { 457 if (@SLOT_QUEUE) {
422 # we do not use wait_for_tick() as it returns immediately when tick is inactive 458 # we do not use wait_for_tick() as it returns immediately when tick is inactive
423 push @cf::WAIT_FOR_TICK, $signal; 459 push @cf::WAIT_FOR_TICK, $signal;
424 $signal->wait; 460 $signal->wait;
425 } else { 461 } else {
462 $busy = 0;
426 Coro::schedule; 463 Coro::schedule;
427 } 464 }
428 } 465 }
429}; 466};
430 467
431sub get_slot($;$$) { 468sub get_slot($;$$) {
469 return if tick_inhibit || $Coro::current == $Coro::main;
470
432 my ($time, $pri, $name) = @_; 471 my ($time, $pri, $name) = @_;
433 472
434 $time = $TICK * .6 if $time > $TICK * .6; 473 $time = clamp $time, 0.01, $TICK * .6;
474
435 my $sig = new Coro::Signal; 475 my $sig = new Coro::Signal;
436 476
437 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 477 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
438 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 478 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
439 $SLOT_QUEUE->ready; 479 $SLOT_QUEUE->ready;
466 506
467sub sync_job(&) { 507sub sync_job(&) {
468 my ($job) = @_; 508 my ($job) = @_;
469 509
470 if ($Coro::current == $Coro::main) { 510 if ($Coro::current == $Coro::main) {
471 my $time = EV::time; 511 my $time = AE::time;
472 512
473 # this is the main coro, too bad, we have to block 513 # this is the main coro, too bad, we have to block
474 # till the operation succeeds, freezing the server :/ 514 # till the operation succeeds, freezing the server :/
475 515
476 LOG llevError, Carp::longmess "sync job";#d# 516 LOG llevError, Carp::longmess "sync job";#d#
493 } else { 533 } else {
494 EV::loop EV::LOOP_ONESHOT; 534 EV::loop EV::LOOP_ONESHOT;
495 } 535 }
496 } 536 }
497 537
498 my $time = EV::time - $time; 538 my $time = AE::time - $time;
499 539
500 $TICK_START += $time; # do not account sync jobs to server load 540 $TICK_START += $time; # do not account sync jobs to server load
501 541
502 wantarray ? @res : $res[0] 542 wantarray ? @res : $res[0]
503 } else { 543 } else {
547 reset_signals; 587 reset_signals;
548 &$cb 588 &$cb
549 }, @args; 589 }, @args;
550 590
551 wantarray ? @res : $res[-1] 591 wantarray ? @res : $res[-1]
592}
593
594sub objinfo {
595 (
596 "counter value" => cf::object::object_count,
597 "objects created" => cf::object::create_count,
598 "objects destroyed" => cf::object::destroy_count,
599 "freelist size" => cf::object::free_count,
600 "allocated objects" => cf::object::objects_size,
601 "active objects" => cf::object::actives_size,
602 )
552} 603}
553 604
554=item $coin = coin_from_name $name 605=item $coin = coin_from_name $name
555 606
556=cut 607=cut
722 773
723############################################################################# 774#############################################################################
724 775
725=head2 ATTACHABLE OBJECTS 776=head2 ATTACHABLE OBJECTS
726 777
727Many objects in crossfire are so-called attachable objects. That means you can 778Many objects in deliantra are so-called attachable objects. That means you can
728attach callbacks/event handlers (a collection of which is called an "attachment") 779attach callbacks/event handlers (a collection of which is called an "attachment")
729to it. All such attachable objects support the following methods. 780to it. All such attachable objects support the following methods.
730 781
731In the following description, CLASS can be any of C<global>, C<object> 782In 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 783C<player>, C<client> or C<map> (i.e. the attachable objects in
782=item cf::CLASS::attachment $name, ... 833=item cf::CLASS::attachment $name, ...
783 834
784Register an attachment by C<$name> through which attachable objects of the 835Register an attachment by C<$name> through which attachable objects of the
785given CLASS can refer to this attachment. 836given CLASS can refer to this attachment.
786 837
787Some classes such as crossfire maps and objects can specify attachments 838Some classes such as deliantra maps and objects can specify attachments
788that are attached at load/instantiate time, thus the need for a name. 839that are attached at load/instantiate time, thus the need for a name.
789 840
790These calls expect any number of the following handler/hook descriptions: 841These calls expect any number of the following handler/hook descriptions:
791 842
792=over 4 843=over 4
1083 1134
1084sub reattach { 1135sub reattach {
1085 # basically do the same as instantiate, without calling instantiate 1136 # basically do the same as instantiate, without calling instantiate
1086 my ($obj) = @_; 1137 my ($obj) = @_;
1087 1138
1139 # no longer needed after getting rid of delete_package?
1088 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1140 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1089 1141
1090 my $registry = $obj->registry; 1142 my $registry = $obj->registry;
1091 1143
1092 @$registry = (); 1144 @$registry = ();
1093 1145
1139 utf8::decode (my $decname = $filename); 1191 utf8::decode (my $decname = $filename);
1140 warn sprintf "saving %s (%d,%d)\n", 1192 warn sprintf "saving %s (%d,%d)\n",
1141 $decname, length $$rdata, scalar @$objs; 1193 $decname, length $$rdata, scalar @$objs;
1142 1194
1143 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1195 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1144 chmod SAVE_MODE, $fh; 1196 aio_chmod $fh, SAVE_MODE;
1145 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1197 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1146 aio_fsync $fh if $cf::USE_FSYNC; 1198 if ($cf::USE_FSYNC) {
1199 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;
1200 aio_fsync $fh;
1201 }
1147 close $fh; 1202 aio_close $fh;
1148 1203
1149 if (@$objs) { 1204 if (@$objs) {
1150 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1205 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1151 chmod SAVE_MODE, $fh; 1206 aio_chmod $fh, SAVE_MODE;
1152 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1207 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1153 aio_write $fh, 0, (length $data), $data, 0; 1208 aio_write $fh, 0, (length $data), $data, 0;
1154 aio_fsync $fh if $cf::USE_FSYNC; 1209 if ($cf::USE_FSYNC) {
1210 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;
1211 aio_fsync $fh;
1212 }
1155 close $fh; 1213 aio_close $fh;
1156 aio_rename "$filename.pst~", "$filename.pst"; 1214 aio_rename "$filename.pst~", "$filename.pst";
1157 } 1215 }
1158 } else { 1216 } else {
1159 aio_unlink "$filename.pst"; 1217 aio_unlink "$filename.pst";
1160 } 1218 }
1161 1219
1162 aio_rename "$filename~", $filename; 1220 aio_rename "$filename~", $filename;
1221
1222 $filename =~ s%/[^/]+$%%;
1223 aio_pathsync $filename if $cf::USE_FSYNC;
1163 } else { 1224 } else {
1164 warn "FATAL: $filename~: $!\n"; 1225 warn "unable to save objects: $filename~: $!\n";
1165 } 1226 }
1166 } else { 1227 } else {
1167 aio_unlink $filename; 1228 aio_unlink $filename;
1168 aio_unlink "$filename.pst"; 1229 aio_unlink "$filename.pst";
1169 } 1230 }
1260 my ($name, $cb) = @_; 1321 my ($name, $cb) = @_;
1261 1322
1262 $EXTICMD{$name} = $cb; 1323 $EXTICMD{$name} = $cb;
1263} 1324}
1264 1325
1326use File::Glob ();
1327
1265cf::player->attach ( 1328cf::player->attach (
1266 on_command => sub { 1329 on_unknown_command => sub {
1267 my ($pl, $name, $params) = @_; 1330 my ($pl, $name, $params) = @_;
1268 1331
1269 my $cb = $COMMAND{$name} 1332 my $cb = $COMMAND{$name}
1270 or return; 1333 or return;
1271 1334
1301 1364
1302 cf::override; 1365 cf::override;
1303 }, 1366 },
1304); 1367);
1305 1368
1369# "readahead" all extensions
1370sub cache_extensions {
1371 my $grp = IO::AIO::aio_group;
1372
1373 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1374 for (grep /\.ext$/, @{$_[0]}) {
1375 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1376 }
1377 };
1378
1379 $grp
1380}
1381
1306sub load_extensions { 1382sub load_extensions {
1307 cf::sync_job { 1383 cf::sync_job {
1308 my %todo; 1384 my %todo;
1309 1385
1310 for my $path (<$LIBDIR/*.ext>) { 1386 for my $path (<$LIBDIR/*.ext>) {
1329 1405
1330 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1406 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1331 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1407 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1332 1408
1333 $ext{source} = 1409 $ext{source} =
1334 "package $pkg; use strict; use utf8;\n" 1410 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1335 . "#line 1 \"$path\"\n{\n" 1411 . "#line 1 \"$path\"\n{\n"
1336 . $source 1412 . $source
1337 . "\n};\n1"; 1413 . "\n};\n1";
1338 1414
1339 $todo{$base} = \%ext; 1415 $todo{$base} = \%ext;
1340 } 1416 }
1341 1417
1418 my $pass = 0;
1342 my %done; 1419 my %done;
1343 while (%todo) { 1420 while (%todo) {
1344 my $progress; 1421 my $progress;
1345 1422
1423 ++$pass;
1424
1425 ext:
1346 while (my ($k, $v) = each %todo) { 1426 while (my ($k, $v) = each %todo) {
1347 for (split /,\s*/, $v->{meta}{depends}) { 1427 for (split /,\s*/, $v->{meta}{depends}) {
1348 goto skip 1428 next ext
1349 unless exists $done{$_}; 1429 unless exists $done{$_};
1350 } 1430 }
1351 1431
1352 warn "... loading '$k' into '$v->{pkg}'\n"; 1432 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1353 1433
1354 unless (eval $v->{source}) { 1434 my $active = eval $v->{source};
1435
1436 if (length $@) {
1355 my $msg = $@ ? "$v->{path}: $@\n" 1437 warn "$v->{path}: $@\n";
1356 : "$v->{base}: extension inactive.\n";
1357 1438
1358 if (exists $v->{meta}{mandatory}) {
1359 warn $msg;
1360 cf::cleanup "mandatory extension failed to load, exiting."; 1439 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1361 } 1440 if exists $v->{meta}{mandatory};
1362 1441 } else {
1363 warn $msg; 1442 $done{$k} = delete $todo{$k};
1443 push @EXTS, $v->{pkg};
1444 $progress = 1;
1445
1446 warn "$v->{base}: extension inactive.\n"
1447 unless $active;
1364 } 1448 }
1365
1366 $done{$k} = delete $todo{$k};
1367 push @EXTS, $v->{pkg};
1368 $progress = 1;
1369 } 1449 }
1370 1450
1371 skip: 1451 unless ($progress) {
1372 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1452 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1373 unless $progress; 1453
1454 while (my ($k, $v) = each %todo) {
1455 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1456 if exists $v->{meta}{mandatory};
1457 }
1458 }
1374 } 1459 }
1375 }; 1460 };
1376} 1461}
1377 1462
1378############################################################################# 1463#############################################################################
1379 1464
1380=back 1465=back
1381 1466
1382=head2 CORE EXTENSIONS 1467=head2 CORE EXTENSIONS
1383 1468
1384Functions and methods that extend core crossfire objects. 1469Functions and methods that extend core deliantra objects.
1385 1470
1386=cut 1471=cut
1387 1472
1388package cf::player; 1473package cf::player;
1389 1474
1432 1517
1433sub exists($) { 1518sub exists($) {
1434 my ($login) = @_; 1519 my ($login) = @_;
1435 1520
1436 $cf::PLAYER{$login} 1521 $cf::PLAYER{$login}
1437 or cf::sync_job { !aio_stat path $login } 1522 or !aio_stat path $login
1438} 1523}
1439 1524
1440sub find($) { 1525sub find($) {
1441 return $cf::PLAYER{$_[0]} || do { 1526 return $cf::PLAYER{$_[0]} || do {
1442 my $login = $_[0]; 1527 my $login = $_[0];
1454 my $f = new_from_file cf::object::thawer path $login 1539 my $f = new_from_file cf::object::thawer path $login
1455 or return; 1540 or return;
1456 1541
1457 my $pl = cf::player::load_pl $f 1542 my $pl = cf::player::load_pl $f
1458 or return; 1543 or return;
1544
1459 local $cf::PLAYER_LOADING{$login} = $pl; 1545 local $cf::PLAYER_LOADING{$login} = $pl;
1460 $f->resolve_delayed_derefs; 1546 $f->resolve_delayed_derefs;
1461 $cf::PLAYER{$login} = $pl 1547 $cf::PLAYER{$login} = $pl
1462 } 1548 }
1463 } 1549 }
1464} 1550}
1465 1551
1552cf::player->attach (
1553 on_load => sub {
1554 my ($pl, $path) = @_;
1555
1556 # restore slots saved in save, below
1557 my $slots = delete $pl->{_slots};
1558
1559 $pl->ob->current_weapon ($slots->[0]);
1560 $pl->combat_ob ($slots->[1]);
1561 $pl->ranged_ob ($slots->[2]);
1562 },
1563);
1564
1466sub save($) { 1565sub save($) {
1467 my ($pl) = @_; 1566 my ($pl) = @_;
1468 1567
1469 return if $pl->{deny_save}; 1568 return if $pl->{deny_save};
1470 1569
1473 1572
1474 return if $pl->{deny_save}; 1573 return if $pl->{deny_save};
1475 1574
1476 aio_mkdir playerdir $pl, 0770; 1575 aio_mkdir playerdir $pl, 0770;
1477 $pl->{last_save} = $cf::RUNTIME; 1576 $pl->{last_save} = $cf::RUNTIME;
1577
1578 cf::get_slot 0.01;
1579
1580 # save slots, to be restored later
1581 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1478 1582
1479 $pl->save_pl ($path); 1583 $pl->save_pl ($path);
1480 cf::cede_to_tick; 1584 cf::cede_to_tick;
1481} 1585}
1482 1586
1514 my ($pl) = @_; 1618 my ($pl) = @_;
1515 1619
1516 my $name = $pl->ob->name; 1620 my $name = $pl->ob->name;
1517 1621
1518 $pl->{deny_save} = 1; 1622 $pl->{deny_save} = 1;
1519 $pl->password ("*"); # this should lock out the player until we nuked the dir 1623 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1520 1624
1521 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1625 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1522 $pl->deactivate; 1626 $pl->deactivate;
1627 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1628 $pl->ob->check_score;
1523 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1629 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1524 $pl->ns->destroy if $pl->ns; 1630 $pl->ns->destroy if $pl->ns;
1525 1631
1526 my $path = playerdir $pl; 1632 my $path = playerdir $pl;
1527 my $temp = "$path~$cf::RUNTIME~deleting~"; 1633 my $temp = "$path~$cf::RUNTIME~deleting~";
1566 1672
1567 for my $login (@$dirs) { 1673 for my $login (@$dirs) {
1568 my $path = path $login; 1674 my $path = path $login;
1569 1675
1570 # a .pst is a dead give-away for a valid player 1676 # a .pst is a dead give-away for a valid player
1571 unless (-e "$path.pst") { 1677 # if no pst file found, open and chekc for blocked users
1678 if (aio_stat "$path.pst") {
1572 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1679 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1573 aio_read $fh, 0, 512, my $buf, 0 or next; 1680 aio_read $fh, 0, 512, my $buf, 0 or next;
1574 $buf !~ /^password -------------$/m or next; # official not-valid tag 1681 $buf !~ /^password -------------$/m or next; # official not-valid tag
1575 } 1682 }
1576 1683
1607 } 1714 }
1608 1715
1609 \@paths 1716 \@paths
1610} 1717}
1611 1718
1612=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1719=item $protocol_xml = $player->expand_cfpod ($cfpod)
1613 1720
1614Expand crossfire pod fragments into protocol xml. 1721Expand 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 1722
1705=item $player->ext_reply ($msgid, @msg) 1723=item $player->ext_reply ($msgid, @msg)
1706 1724
1707Sends an ext reply to the player. 1725Sends an ext reply to the player.
1708 1726
1781 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1799 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1782 1800
1783 # mit "rum" bekleckern, nicht 1801 # mit "rum" bekleckern, nicht
1784 $self->_create_random_map ( 1802 $self->_create_random_map (
1785 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1803 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1786 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1804 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1787 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1805 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1788 $rmp->{exit_on_final_map}, 1806 $rmp->{exit_on_final_map},
1789 $rmp->{xsize}, $rmp->{ysize}, 1807 $rmp->{xsize}, $rmp->{ysize},
1790 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1808 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1791 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1809 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1909 1927
1910# the temporary/swap location 1928# the temporary/swap location
1911sub save_path { 1929sub save_path {
1912 my ($self) = @_; 1930 my ($self) = @_;
1913 1931
1914 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1932 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1915 "$TMPDIR/$path.map" 1933 "$TMPDIR/$path.map"
1916} 1934}
1917 1935
1918# the unique path, undef == no special unique path 1936# the unique path, undef == no special unique path
1919sub uniq_path { 1937sub uniq_path {
1920 my ($self) = @_; 1938 my ($self) = @_;
1921 1939
1922 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1940 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1923 "$UNIQUEDIR/$path" 1941 "$UNIQUEDIR/$path"
1924}
1925
1926# and all this just because we cannot iterate over
1927# all maps in C++...
1928sub change_all_map_light {
1929 my ($change) = @_;
1930
1931 $_->change_map_light ($change)
1932 for grep $_->outdoor, values %cf::MAP;
1933} 1942}
1934 1943
1935sub decay_objects { 1944sub decay_objects {
1936 my ($self) = @_; 1945 my ($self) = @_;
1937 1946
2021sub find { 2030sub find {
2022 my ($path, $origin) = @_; 2031 my ($path, $origin) = @_;
2023 2032
2024 $path = normalise $path, $origin && $origin->path; 2033 $path = normalise $path, $origin && $origin->path;
2025 2034
2026 cf::lock_wait "map_data:$path";#d#remove 2035 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2027 cf::lock_wait "map_find:$path"; 2036 my $guard2 = cf::lock_acquire "map_find:$path";
2028 2037
2029 $cf::MAP{$path} || do { 2038 $cf::MAP{$path} || do {
2030 my $guard1 = cf::lock_acquire "map_find:$path";
2031 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2032
2033 my $map = new_from_path cf::map $path 2039 my $map = new_from_path cf::map $path
2034 or return; 2040 or return;
2035 2041
2036 $map->{last_save} = $cf::RUNTIME; 2042 $map->{last_save} = $cf::RUNTIME;
2037 2043
2039 or return; 2045 or return;
2040 2046
2041 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2047 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2042 # doing this can freeze the server in a sync job, obviously 2048 # doing this can freeze the server in a sync job, obviously
2043 #$cf::WAIT_FOR_TICK->wait; 2049 #$cf::WAIT_FOR_TICK->wait;
2050 undef $guard2;
2044 undef $guard1; 2051 undef $guard1;
2045 undef $guard2;
2046 $map->reset; 2052 $map->reset;
2047 return find $path; 2053 return find $path;
2048 } 2054 }
2049 2055
2050 $cf::MAP{$path} = $map 2056 $cf::MAP{$path} = $map
2051 } 2057 }
2052} 2058}
2053 2059
2054sub pre_load { } 2060sub pre_load { }
2055sub post_load { } 2061#sub post_load { } # XS
2056 2062
2057sub load { 2063sub load {
2058 my ($self) = @_; 2064 my ($self) = @_;
2059 2065
2060 local $self->{deny_reset} = 1; # loading can take a long time 2066 local $self->{deny_reset} = 1; # loading can take a long time
2077 my $f = new_from_file cf::object::thawer $self->{load_path}; 2083 my $f = new_from_file cf::object::thawer $self->{load_path};
2078 $f->skip_block; 2084 $f->skip_block;
2079 $self->_load_objects ($f) 2085 $self->_load_objects ($f)
2080 or return; 2086 or return;
2081 2087
2082 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2088 $self->post_load_original
2083 if delete $self->{load_original}; 2089 if delete $self->{load_original};
2084 2090
2085 if (my $uniq = $self->uniq_path) { 2091 if (my $uniq = $self->uniq_path) {
2086 utf8::encode $uniq; 2092 utf8::encode $uniq;
2087 unless (aio_stat $uniq) { 2093 unless (aio_stat $uniq) {
2105 unless ($self->{deny_activate}) { 2111 unless ($self->{deny_activate}) {
2106 $self->decay_objects; 2112 $self->decay_objects;
2107 $self->fix_auto_apply; 2113 $self->fix_auto_apply;
2108 $self->update_buttons; 2114 $self->update_buttons;
2109 cf::cede_to_tick; 2115 cf::cede_to_tick;
2110 $self->set_darkness_map;
2111 cf::cede_to_tick;
2112 $self->activate; 2116 $self->activate;
2113 } 2117 }
2114 2118
2115 $self->{last_save} = $cf::RUNTIME; 2119 $self->{last_save} = $cf::RUNTIME;
2116 $self->last_access ($cf::RUNTIME); 2120 $self->last_access ($cf::RUNTIME);
2117 2121
2118 $self->in_memory (cf::MAP_IN_MEMORY); 2122 $self->in_memory (cf::MAP_ACTIVE);
2119 } 2123 }
2120 2124
2121 $self->post_load; 2125 $self->post_load;
2122} 2126}
2123 2127
2128# customize the map for a given player, i.e.
2129# return the _real_ map. used by e.g. per-player
2130# maps to change the path to ~playername/mappath
2124sub customise_for { 2131sub customise_for {
2125 my ($self, $ob) = @_; 2132 my ($self, $ob) = @_;
2126 2133
2127 return find "~" . $ob->name . "/" . $self->{path} 2134 return find "~" . $ob->name . "/" . $self->{path}
2128 if $self->per_player; 2135 if $self->per_player;
2181 my ($path, $origin, $load) = @_; 2188 my ($path, $origin, $load) = @_;
2182 2189
2183 $path = normalise $path, $origin && $origin->{path}; 2190 $path = normalise $path, $origin && $origin->{path};
2184 2191
2185 if (my $map = $cf::MAP{$path}) { 2192 if (my $map = $cf::MAP{$path}) {
2186 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2193 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2187 } 2194 }
2188 2195
2189 $MAP_PREFETCH{$path} |= $load; 2196 $MAP_PREFETCH{$path} |= $load;
2190 2197
2191 $MAP_PREFETCHER ||= cf::async { 2198 $MAP_PREFETCHER ||= cf::async {
2228 cf::async { 2235 cf::async {
2229 $Coro::current->{desc} = "map player save"; 2236 $Coro::current->{desc} = "map player save";
2230 $_->contr->save for $self->players; 2237 $_->contr->save for $self->players;
2231 }; 2238 };
2232 2239
2240 cf::get_slot 0.02;
2241
2233 if ($uniq) { 2242 if ($uniq) {
2234 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2243 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2235 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2244 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2236 } else { 2245 } else {
2237 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2246 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2245 $self->save; 2254 $self->save;
2246 2255
2247 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2256 my $lock = cf::lock_acquire "map_data:$self->{path}";
2248 2257
2249 return if $self->players; 2258 return if $self->players;
2250 return if $self->in_memory != cf::MAP_IN_MEMORY; 2259 return if $self->in_memory != cf::MAP_ACTIVE;
2251 return if $self->{deny_save}; 2260 return if $self->{deny_save};
2252 2261
2253 $self->in_memory (cf::MAP_SWAPPED); 2262 $self->in_memory (cf::MAP_SWAPPED);
2254 2263
2255 $self->deactivate; 2264 $self->deactivate;
2280 2289
2281 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2290 my $lock = cf::lock_acquire "map_data:$self->{path}";
2282 2291
2283 return if $self->players; 2292 return if $self->players;
2284 2293
2285 warn "resetting map ", $self->path; 2294 warn "resetting map ", $self->path, "\n";
2286 2295
2287 $self->in_memory (cf::MAP_SWAPPED); 2296 $self->in_memory (cf::MAP_SWAPPED);
2288 2297
2289 # need to save uniques path 2298 # need to save uniques path
2290 unless ($self->{deny_save}) { 2299 unless ($self->{deny_save}) {
2373 2382
2374sub unique_maps() { 2383sub unique_maps() {
2375 [ 2384 [
2376 map { 2385 map {
2377 utf8::decode $_; 2386 utf8::decode $_;
2378 /\.map$/ 2387 s/\.map$//; # TODO future compatibility hack
2388 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2389 ? ()
2379 ? normalise $_ 2390 : normalise $_
2380 : ()
2381 } @{ aio_readdir $UNIQUEDIR or [] } 2391 } @{ aio_readdir $UNIQUEDIR or [] }
2382 ] 2392 ]
2383} 2393}
2384 2394
2395=item cf::map::static_maps
2396
2397Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2398file in the shared directory excluding F</styles> and F</editor>). May
2399block.
2400
2401=cut
2402
2403sub static_maps() {
2404 my @dirs = "";
2405 my @maps;
2406
2407 while (@dirs) {
2408 my $dir = shift @dirs;
2409
2410 next if $dir eq "/styles" || $dir eq "/editor";
2411
2412 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2413 or return;
2414
2415 for (@$files) {
2416 s/\.map$// or next;
2417 utf8::decode $_;
2418 push @maps, "$dir/$_";
2419 }
2420
2421 push @dirs, map "$dir/$_", @$dirs;
2422 }
2423
2424 \@maps
2425}
2426
2385=back 2427=back
2386 2428
2387=head3 cf::object 2429=head3 cf::object
2388 2430
2389=cut 2431=cut
2392 2434
2393=over 4 2435=over 4
2394 2436
2395=item $ob->inv_recursive 2437=item $ob->inv_recursive
2396 2438
2397Returns the inventory of the object _and_ their inventories, recursively. 2439Returns the inventory of the object I<and> their inventories, recursively,
2440but I<not> the object itself.
2398 2441
2399=cut 2442=cut
2400 2443
2401sub inv_recursive_; 2444sub inv_recursive_;
2402sub inv_recursive_ { 2445sub inv_recursive_ {
2407 inv_recursive_ inv $_[0] 2450 inv_recursive_ inv $_[0]
2408} 2451}
2409 2452
2410=item $ref = $ob->ref 2453=item $ref = $ob->ref
2411 2454
2412creates and returns a persistent reference to an objetc that can be stored as a string. 2455Creates and returns a persistent reference to an object that can be stored as a string.
2413 2456
2414=item $ob = cf::object::deref ($refstring) 2457=item $ob = cf::object::deref ($refstring)
2415 2458
2416returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2459returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2417even if the object actually exists. May block. 2460even if the object actually exists. May block.
2449can be C<undef>. Does the right thing when the player is currently in a 2492can be C<undef>. Does the right thing when the player is currently in a
2450dialogue with the given NPC character. 2493dialogue with the given NPC character.
2451 2494
2452=cut 2495=cut
2453 2496
2497our $SAY_CHANNEL = {
2498 id => "say",
2499 title => "Map",
2500 reply => "say ",
2501 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2502};
2503
2504our $CHAT_CHANNEL = {
2505 id => "chat",
2506 title => "Chat",
2507 reply => "chat ",
2508 tooltip => "Player chat and shouts, global to the server.",
2509};
2510
2454# rough implementation of a future "reply" method that works 2511# rough implementation of a future "reply" method that works
2455# with dialog boxes. 2512# with dialog boxes.
2456#TODO: the first argument must go, split into a $npc->reply_to ( method 2513#TODO: the first argument must go, split into a $npc->reply_to ( method
2457sub cf::object::player::reply($$$;$) { 2514sub cf::object::player::reply($$$;$) {
2458 my ($self, $npc, $msg, $flags) = @_; 2515 my ($self, $npc, $msg, $flags) = @_;
2469 my $dialog = $pl->{npc_dialog}; 2526 my $dialog = $pl->{npc_dialog};
2470 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2527 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2471 2528
2472 } else { 2529 } else {
2473 $msg = $npc->name . " says: $msg" if $npc; 2530 $msg = $npc->name . " says: $msg" if $npc;
2474 $self->message ($msg, $flags); 2531 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2475 } 2532 }
2476 } 2533 }
2477} 2534}
2478 2535
2479=item $object->send_msg ($channel, $msg, $color, [extra...]) 2536=item $object->send_msg ($channel, $msg, $color, [extra...])
2504 2561
2505=item $player_object->enter_link 2562=item $player_object->enter_link
2506 2563
2507Freezes the player and moves him/her to a special map (C<{link}>). 2564Freezes the player and moves him/her to a special map (C<{link}>).
2508 2565
2509The player should be reasonably safe there for short amounts of time. You 2566The player should be reasonably safe there for short amounts of time (e.g.
2510I<MUST> call C<leave_link> as soon as possible, though. 2567for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2568though, as the palyer cannot control the character while it is on the link
2569map.
2511 2570
2512Will never block. 2571Will never block.
2513 2572
2514=item $player_object->leave_link ($map, $x, $y) 2573=item $player_object->leave_link ($map, $x, $y)
2515 2574
2567 ($x, $y) = (-1, -1) 2626 ($x, $y) = (-1, -1)
2568 unless (defined $x) && (defined $y); 2627 unless (defined $x) && (defined $y);
2569 2628
2570 # use -1 or undef as default coordinates, not 0, 0 2629 # use -1 or undef as default coordinates, not 0, 0
2571 ($x, $y) = ($map->enter_x, $map->enter_y) 2630 ($x, $y) = ($map->enter_x, $map->enter_y)
2572 if $x <=0 && $y <= 0; 2631 if $x <= 0 && $y <= 0;
2573 2632
2574 $map->load; 2633 $map->load;
2575 $map->load_neighbours; 2634 $map->load_neighbours;
2576 2635
2577 return unless $self->contr->active; 2636 return unless $self->contr->active;
2578 $self->activate_recursive;
2579 2637
2580 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2638 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2581 $self->enter_map ($map, $x, $y); 2639 $self->enter_map ($map, $x, $y);
2640
2641 # only activate afterwards, to support waiting in hooks
2642 $self->activate_recursive;
2582} 2643}
2583 2644
2584=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2645=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2585 2646
2586Moves the player to the given map-path and coordinates by first freezing 2647Moves the player to the given map-path and coordinates by first freezing
2587her, loading and preparing them map, calling the provided $check callback 2648her, loading and preparing them map, calling the provided $check callback
2588that has to return the map if sucecssful, and then unfreezes the player on 2649that has to return the map if sucecssful, and then unfreezes the player on
2589the new (success) or old (failed) map position. In either case, $done will 2650the new (success) or old (failed) map position. In either case, $done will
2590be called at the end of this process. 2651be called at the end of this process.
2652
2653Note that $check will be called with a potentially non-loaded map, so if
2654it needs a loaded map it has to call C<< ->load >>.
2591 2655
2592=cut 2656=cut
2593 2657
2594our $GOTOGEN; 2658our $GOTOGEN;
2595 2659
2674} 2738}
2675 2739
2676sub prepare_random_map { 2740sub prepare_random_map {
2677 my ($exit) = @_; 2741 my ($exit) = @_;
2678 2742
2679 my $guard = cf::lock_acquire "exit_prepare:$exit";
2680
2681 # all this does is basically replace the /! path by 2743 # all this does is basically replace the /! path by
2682 # a new random map path (?random/...) with a seed 2744 # a new random map path (?random/...) with a seed
2683 # that depends on the exit object 2745 # that depends on the exit object
2684 2746
2685 my $rmp = parse_random_map_params $exit->msg; 2747 my $rmp = parse_random_map_params $exit->msg;
2687 if ($exit->map) { 2749 if ($exit->map) {
2688 $rmp->{region} = $exit->region->name; 2750 $rmp->{region} = $exit->region->name;
2689 $rmp->{origin_map} = $exit->map->path; 2751 $rmp->{origin_map} = $exit->map->path;
2690 $rmp->{origin_x} = $exit->x; 2752 $rmp->{origin_x} = $exit->x;
2691 $rmp->{origin_y} = $exit->y; 2753 $rmp->{origin_y} = $exit->y;
2754
2755 $exit->map->touch;
2692 } 2756 }
2693 2757
2694 $rmp->{random_seed} ||= $exit->random_seed; 2758 $rmp->{random_seed} ||= $exit->random_seed;
2695 2759
2696 my $data = cf::encode_json $rmp; 2760 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2697 my $md5 = Digest::MD5::md5_hex $data; 2761 my $md5 = Digest::MD5::md5_hex $data;
2698 my $meta = "$RANDOMDIR/$md5.meta"; 2762 my $meta = "$RANDOMDIR/$md5.meta";
2699 2763
2700 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2764 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2701 aio_write $fh, 0, (length $data), $data, 0; 2765 aio_write $fh, 0, (length $data), $data, 0;
2702 undef $fh; 2766 undef $fh;
2703 aio_rename "$meta~", $meta; 2767 aio_rename "$meta~", $meta;
2704 2768
2769 my $slaying = "?random/$md5";
2770
2771 if ($exit->valid) {
2705 $exit->slaying ("?random/$md5"); 2772 $exit->slaying ("?random/$md5");
2706 $exit->msg (undef); 2773 $exit->msg (undef);
2774 }
2707 } 2775 }
2708} 2776}
2709 2777
2710sub cf::object::player::enter_exit { 2778sub cf::object::player::enter_exit {
2711 my ($self, $exit) = @_; 2779 my ($self, $exit) = @_;
2712 2780
2713 return unless $self->type == cf::PLAYER; 2781 return unless $self->type == cf::PLAYER;
2714 2782
2715 if ($exit->slaying eq "/!") {
2716 #TODO: this should de-fi-ni-te-ly not be a sync-job
2717 # the problem is that $exit might not survive long enough
2718 # so it needs to be done right now, right here
2719 cf::sync_job { prepare_random_map $exit };
2720 }
2721
2722 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2723 my $hp = $exit->stats->hp;
2724 my $sp = $exit->stats->sp;
2725
2726 $self->enter_link; 2783 $self->enter_link;
2727 2784
2728 # if exit is damned, update players death & WoR home-position
2729 $self->contr->savebed ($slaying, $hp, $sp)
2730 if $exit->flag (FLAG_DAMNED);
2731
2732 (async { 2785 (async {
2733 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2786 $Coro::current->{desc} = "enter_exit";
2734 2787
2735 $self->deactivate_recursive; # just to be sure
2736 unless (eval { 2788 unless (eval {
2789 $self->deactivate_recursive; # just to be sure
2790
2791 # random map handling
2792 {
2793 my $guard = cf::lock_acquire "exit_prepare:$exit";
2794
2795 prepare_random_map $exit
2796 if $exit->slaying eq "/!";
2797 }
2798
2799 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2800 my $x = $exit->stats->hp;
2801 my $y = $exit->stats->sp;
2802
2737 $self->goto ($slaying, $hp, $sp); 2803 $self->goto ($map, $x, $y);
2738 2804
2805 # if exit is damned, update players death & WoR home-position
2806 $self->contr->savebed ($map, $x, $y)
2807 if $exit->flag (cf::FLAG_DAMNED);
2808
2739 1; 2809 1
2740 }) { 2810 }) {
2741 $self->message ("Something went wrong deep within the crossfire server. " 2811 $self->message ("Something went wrong deep within the deliantra server. "
2742 . "I'll try to bring you back to the map you were before. " 2812 . "I'll try to bring you back to the map you were before. "
2743 . "Please report this to the dungeon master!", 2813 . "Please report this to the dungeon master!",
2744 cf::NDI_UNIQUE | cf::NDI_RED); 2814 cf::NDI_UNIQUE | cf::NDI_RED);
2745 2815
2746 warn "ERROR in enter_exit: $@"; 2816 warn "ERROR in enter_exit: $@";
2763sub cf::client::send_drawinfo { 2833sub cf::client::send_drawinfo {
2764 my ($self, $text, $flags) = @_; 2834 my ($self, $text, $flags) = @_;
2765 2835
2766 utf8::encode $text; 2836 utf8::encode $text;
2767 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2837 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2838}
2839
2840=item $client->send_big_packet ($pkt)
2841
2842Like C<send_packet>, but tries to compress large packets, and fragments
2843them as required.
2844
2845=cut
2846
2847our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2848
2849sub cf::client::send_big_packet {
2850 my ($self, $pkt) = @_;
2851
2852 # try lzf for large packets
2853 $pkt = "lzf " . Compress::LZF::compress $pkt
2854 if 1024 <= length $pkt and $self->{can_lzf};
2855
2856 # split very large packets
2857 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2858 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2859 $pkt = "frag";
2860 }
2861
2862 $self->send_packet ($pkt);
2768} 2863}
2769 2864
2770=item $client->send_msg ($channel, $msg, $color, [extra...]) 2865=item $client->send_msg ($channel, $msg, $color, [extra...])
2771 2866
2772Send a drawinfo or msg packet to the client, formatting the msg for the 2867Send a drawinfo or msg packet to the client, formatting the msg for the
2776 2871
2777=cut 2872=cut
2778 2873
2779# non-persistent channels (usually the info channel) 2874# non-persistent channels (usually the info channel)
2780our %CHANNEL = ( 2875our %CHANNEL = (
2876 "c/motd" => {
2877 id => "infobox",
2878 title => "MOTD",
2879 reply => undef,
2880 tooltip => "The message of the day",
2881 },
2781 "c/identify" => { 2882 "c/identify" => {
2782 id => "infobox", 2883 id => "infobox",
2783 title => "Identify", 2884 title => "Identify",
2784 reply => undef, 2885 reply => undef,
2785 tooltip => "Items recently identified", 2886 tooltip => "Items recently identified",
2787 "c/examine" => { 2888 "c/examine" => {
2788 id => "infobox", 2889 id => "infobox",
2789 title => "Examine", 2890 title => "Examine",
2790 reply => undef, 2891 reply => undef,
2791 tooltip => "Signs and other items you examined", 2892 tooltip => "Signs and other items you examined",
2893 },
2894 "c/shopinfo" => {
2895 id => "infobox",
2896 title => "Shop Info",
2897 reply => undef,
2898 tooltip => "What your bargaining skill tells you about the shop",
2792 }, 2899 },
2793 "c/book" => { 2900 "c/book" => {
2794 id => "infobox", 2901 id => "infobox",
2795 title => "Book", 2902 title => "Book",
2796 reply => undef, 2903 reply => undef,
2812 id => "infobox", 2919 id => "infobox",
2813 title => "Body Parts", 2920 title => "Body Parts",
2814 reply => undef, 2921 reply => undef,
2815 tooltip => "Shows which body parts you posess and are available", 2922 tooltip => "Shows which body parts you posess and are available",
2816 }, 2923 },
2924 "c/statistics" => {
2925 id => "infobox",
2926 title => "Statistics",
2927 reply => undef,
2928 tooltip => "Shows your primary statistics",
2929 },
2930 "c/skills" => {
2931 id => "infobox",
2932 title => "Skills",
2933 reply => undef,
2934 tooltip => "Shows your experience per skill and item power",
2935 },
2936 "c/shopitems" => {
2937 id => "infobox",
2938 title => "Shop Items",
2939 reply => undef,
2940 tooltip => "Shows the items currently for sale in this shop",
2941 },
2942 "c/resistances" => {
2943 id => "infobox",
2944 title => "Resistances",
2945 reply => undef,
2946 tooltip => "Shows your resistances",
2947 },
2948 "c/pets" => {
2949 id => "infobox",
2950 title => "Pets",
2951 reply => undef,
2952 tooltip => "Shows information abotu your pets/a specific pet",
2953 },
2954 "c/perceiveself" => {
2955 id => "infobox",
2956 title => "Perceive Self",
2957 reply => undef,
2958 tooltip => "You gained detailed knowledge about yourself",
2959 },
2817 "c/uptime" => { 2960 "c/uptime" => {
2818 id => "infobox", 2961 id => "infobox",
2819 title => "Uptime", 2962 title => "Uptime",
2820 reply => undef, 2963 reply => undef,
2821 tooltip => "How long the server has been running since last restart", 2964 tooltip => "How long the server has been running since last restart",
2824 id => "infobox", 2967 id => "infobox",
2825 title => "Map Info", 2968 title => "Map Info",
2826 reply => undef, 2969 reply => undef,
2827 tooltip => "Information related to the maps", 2970 tooltip => "Information related to the maps",
2828 }, 2971 },
2972 "c/party" => {
2973 id => "party",
2974 title => "Party",
2975 reply => "gsay ",
2976 tooltip => "Messages and chat related to your party",
2977 },
2978 "c/death" => {
2979 id => "death",
2980 title => "Death",
2981 reply => undef,
2982 tooltip => "Reason for and more info about your most recent death",
2983 },
2984 "c/say" => $SAY_CHANNEL,
2985 "c/chat" => $CHAT_CHANNEL,
2829); 2986);
2830 2987
2831sub cf::client::send_msg { 2988sub cf::client::send_msg {
2832 my ($self, $channel, $msg, $color, @extra) = @_; 2989 my ($self, $channel, $msg, $color, @extra) = @_;
2833 2990
2834 $msg = $self->pl->expand_cfpod ($msg); 2991 $msg = $self->pl->expand_cfpod ($msg)
2992 unless $color & cf::NDI_VERBATIM;
2835 2993
2836 $color &= cf::NDI_CLIENT_MASK; # just in case... 2994 $color &= cf::NDI_CLIENT_MASK; # just in case...
2837 2995
2838 # check predefined channels, for the benefit of C 2996 # check predefined channels, for the benefit of C
2839 if ($CHANNEL{$channel}) { 2997 if ($CHANNEL{$channel}) {
2840 $channel = $CHANNEL{$channel}; 2998 $channel = $CHANNEL{$channel};
2841 2999
2842 $self->ext_msg (channel_info => $channel) 3000 $self->ext_msg (channel_info => $channel);
2843 if $self->can_msg;
2844
2845 $channel = $channel->{id}; 3001 $channel = $channel->{id};
2846 3002
2847 } elsif (ref $channel) { 3003 } elsif (ref $channel) {
2848 # send meta info to client, if not yet sent 3004 # send meta info to client, if not yet sent
2849 unless (exists $self->{channel}{$channel->{id}}) { 3005 unless (exists $self->{channel}{$channel->{id}}) {
2850 $self->{channel}{$channel->{id}} = $channel; 3006 $self->{channel}{$channel->{id}} = $channel;
2851 $self->ext_msg (channel_info => $channel) 3007 $self->ext_msg (channel_info => $channel);
2852 if $self->can_msg;
2853 } 3008 }
2854 3009
2855 $channel = $channel->{id}; 3010 $channel = $channel->{id};
2856 } 3011 }
2857 3012
2858 return unless @extra || length $msg; 3013 return unless @extra || length $msg;
2859 3014
2860 if ($self->can_msg) {
2861 # default colour, mask it out 3015 # default colour, mask it out
2862 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3016 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2863 if $color & cf::NDI_DEF; 3017 if $color & cf::NDI_DEF;
2864 3018
2865 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3019 my $pkt = "msg "
3020 . $self->{json_coder}->encode (
2866 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3021 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2867 } else { 3022 );
2868 if ($color >= 0) {
2869 # replace some tags by gcfclient-compatible ones
2870 for ($msg) {
2871 1 while
2872 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2873 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2874 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2875 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2876 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2877 }
2878 3023
2879 $color &= cf::NDI_COLOR_MASK; 3024 $self->send_big_packet ($pkt);
2880
2881 utf8::encode $msg;
2882
2883 if (0 && $msg =~ /\[/) {
2884 # COMMAND/INFO
2885 $self->send_packet ("drawextinfo $color 10 8 $msg")
2886 } else {
2887 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2888 $self->send_packet ("drawinfo $color $msg")
2889 }
2890 }
2891 }
2892} 3025}
2893 3026
2894=item $client->ext_msg ($type, @msg) 3027=item $client->ext_msg ($type, @msg)
2895 3028
2896Sends an ext event to the client. 3029Sends an ext event to the client.
2899 3032
2900sub cf::client::ext_msg($$@) { 3033sub cf::client::ext_msg($$@) {
2901 my ($self, $type, @msg) = @_; 3034 my ($self, $type, @msg) = @_;
2902 3035
2903 if ($self->extcmd == 2) { 3036 if ($self->extcmd == 2) {
2904 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3037 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2905 } elsif ($self->extcmd == 1) { # TODO: remove 3038 } elsif ($self->extcmd == 1) { # TODO: remove
2906 push @msg, msgtype => "event_$type"; 3039 push @msg, msgtype => "event_$type";
2907 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3040 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2908 } 3041 }
2909} 3042}
2910 3043
2911=item $client->ext_reply ($msgid, @msg) 3044=item $client->ext_reply ($msgid, @msg)
2912 3045
2916 3049
2917sub cf::client::ext_reply($$@) { 3050sub cf::client::ext_reply($$@) {
2918 my ($self, $id, @msg) = @_; 3051 my ($self, $id, @msg) = @_;
2919 3052
2920 if ($self->extcmd == 2) { 3053 if ($self->extcmd == 2) {
2921 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3054 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2922 } elsif ($self->extcmd == 1) { 3055 } elsif ($self->extcmd == 1) {
2923 #TODO: version 1, remove 3056 #TODO: version 1, remove
2924 unshift @msg, msgtype => "reply", msgid => $id; 3057 unshift @msg, msgtype => "reply", msgid => $id;
2925 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3058 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2926 } 3059 }
2927} 3060}
2928 3061
2929=item $success = $client->query ($flags, "text", \&cb) 3062=item $success = $client->query ($flags, "text", \&cb)
2930 3063
3031 3164
3032 $coro 3165 $coro
3033} 3166}
3034 3167
3035cf::client->attach ( 3168cf::client->attach (
3036 on_destroy => sub { 3169 on_client_destroy => sub {
3037 my ($ns) = @_; 3170 my ($ns) = @_;
3038 3171
3039 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3172 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3040 }, 3173 },
3041); 3174);
3057our $safe_hole = new Safe::Hole; 3190our $safe_hole = new Safe::Hole;
3058 3191
3059$SIG{FPE} = 'IGNORE'; 3192$SIG{FPE} = 'IGNORE';
3060 3193
3061$safe->permit_only (Opcode::opset qw( 3194$safe->permit_only (Opcode::opset qw(
3062 :base_core :base_mem :base_orig :base_math 3195 :base_core :base_mem :base_orig :base_math :base_loop
3063 grepstart grepwhile mapstart mapwhile 3196 grepstart grepwhile mapstart mapwhile
3064 sort time 3197 sort time
3065)); 3198));
3066 3199
3067# here we export the classes and methods available to script code 3200# here we export the classes and methods available to script code
3070 3203
3071The following functions and methods are available within a safe environment: 3204The following functions and methods are available within a safe environment:
3072 3205
3073 cf::object 3206 cf::object
3074 contr pay_amount pay_player map x y force_find force_add destroy 3207 contr pay_amount pay_player map x y force_find force_add destroy
3075 insert remove name archname title slaying race decrease_ob_nr 3208 insert remove name archname title slaying race decrease split
3209 value
3076 3210
3077 cf::object::player 3211 cf::object::player
3078 player 3212 player
3079 3213
3080 cf::player 3214 cf::player
3085 3219
3086=cut 3220=cut
3087 3221
3088for ( 3222for (
3089 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3223 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3090 insert remove inv name archname title slaying race 3224 insert remove inv nrof name archname title slaying race
3091 decrease_ob_nr destroy)], 3225 decrease split destroy change_exp value msg lore send_msg)],
3092 ["cf::object::player" => qw(player)], 3226 ["cf::object::player" => qw(player)],
3093 ["cf::player" => qw(peaceful)], 3227 ["cf::player" => qw(peaceful send_msg)],
3094 ["cf::map" => qw(trigger)], 3228 ["cf::map" => qw(trigger)],
3095) { 3229) {
3096 no strict 'refs'; 3230 no strict 'refs';
3097 my ($pkg, @funs) = @$_; 3231 my ($pkg, @funs) = @$_;
3098 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3232 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3116 3250
3117 my $qcode = $code; 3251 my $qcode = $code;
3118 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3252 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3119 $qcode =~ s/\n/\\n/g; 3253 $qcode =~ s/\n/\\n/g;
3120 3254
3255 %vars = (_dummy => 0) unless %vars;
3256
3257 my @res;
3121 local $_; 3258 local $_;
3122 local @safe::cf::_safe_eval_args = values %vars;
3123 3259
3124 my $eval = 3260 my $eval =
3125 "do {\n" 3261 "do {\n"
3126 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3262 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3127 . "#line 0 \"{$qcode}\"\n" 3263 . "#line 0 \"{$qcode}\"\n"
3128 . $code 3264 . $code
3129 . "\n}" 3265 . "\n}"
3130 ; 3266 ;
3131 3267
3268 if ($CFG{safe_eval}) {
3132 sub_generation_inc; 3269 sub_generation_inc;
3270 local @safe::cf::_safe_eval_args = values %vars;
3133 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3271 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3134 sub_generation_inc; 3272 sub_generation_inc;
3273 } else {
3274 local @cf::_safe_eval_args = values %vars;
3275 @res = wantarray ? eval eval : scalar eval $eval;
3276 }
3135 3277
3136 if ($@) { 3278 if ($@) {
3137 warn "$@"; 3279 warn "$@";
3138 warn "while executing safe code '$code'\n"; 3280 warn "while executing safe code '$code'\n";
3139 warn "with arguments " . (join " ", %vars) . "\n"; 3281 warn "with arguments " . (join " ", %vars) . "\n";
3158=cut 3300=cut
3159 3301
3160sub register_script_function { 3302sub register_script_function {
3161 my ($fun, $cb) = @_; 3303 my ($fun, $cb) = @_;
3162 3304
3163 no strict 'refs'; 3305 $fun = "safe::$fun" if $CFG{safe_eval};
3164 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3306 *$fun = $safe_hole->wrap ($cb);
3165} 3307}
3166 3308
3167=back 3309=back
3168 3310
3169=cut 3311=cut
3190 3332
3191 $facedata->{version} == 2 3333 $facedata->{version} == 2
3192 or cf::cleanup "$path: version mismatch, cannot proceed."; 3334 or cf::cleanup "$path: version mismatch, cannot proceed.";
3193 3335
3194 # patch in the exptable 3336 # patch in the exptable
3337 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3195 $facedata->{resource}{"res/exp_table"} = { 3338 $facedata->{resource}{"res/exp_table"} = {
3196 type => FT_RSRC, 3339 type => FT_RSRC,
3197 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3340 data => $exp_table,
3341 hash => (Digest::MD5::md5 $exp_table),
3198 }; 3342 };
3199 cf::cede_to_tick; 3343 cf::cede_to_tick;
3200 3344
3201 { 3345 {
3202 my $faces = $facedata->{faceinfo}; 3346 my $faces = $facedata->{faceinfo};
3204 while (my ($face, $info) = each %$faces) { 3348 while (my ($face, $info) = each %$faces) {
3205 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3349 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3206 3350
3207 cf::face::set_visibility $idx, $info->{visibility}; 3351 cf::face::set_visibility $idx, $info->{visibility};
3208 cf::face::set_magicmap $idx, $info->{magicmap}; 3352 cf::face::set_magicmap $idx, $info->{magicmap};
3209 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3353 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3210 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3354 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3211 3355
3212 cf::cede_to_tick; 3356 cf::cede_to_tick;
3213 } 3357 }
3214 3358
3215 while (my ($face, $info) = each %$faces) { 3359 while (my ($face, $info) = each %$faces) {
3239 3383
3240 cf::anim::invalidate_all; # d'oh 3384 cf::anim::invalidate_all; # d'oh
3241 } 3385 }
3242 3386
3243 { 3387 {
3244 # TODO: for gcfclient pleasure, we should give resources
3245 # that gcfclient doesn't grok a >10000 face index.
3246 my $res = $facedata->{resource}; 3388 my $res = $facedata->{resource};
3247 3389
3248 while (my ($name, $info) = each %$res) { 3390 while (my ($name, $info) = each %$res) {
3249 if (defined $info->{type}) { 3391 if (defined $info->{type}) {
3250 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3392 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3251 my $data;
3252 3393
3253 if ($info->{type} & 1) { 3394 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3254 # prepend meta info
3255
3256 my $meta = $enc->encode ({
3257 name => $name,
3258 %{ $info->{meta} || {} },
3259 });
3260
3261 $data = pack "(w/a*)*", $meta, $info->{data};
3262 } else {
3263 $data = $info->{data};
3264 }
3265
3266 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3267 cf::face::set_type $idx, $info->{type}; 3395 cf::face::set_type $idx, $info->{type};
3268 } else { 3396 } else {
3269 $RESOURCE{$name} = $info; 3397 $RESOURCE{$name} = $info;
3270 } 3398 }
3271 3399
3304 while (my ($k, $v) = each %$want) { 3432 while (my ($k, $v) = each %$want) {
3305 $ns->fx_want ($k, $v); 3433 $ns->fx_want ($k, $v);
3306 } 3434 }
3307}; 3435};
3308 3436
3437sub load_resource_file($) {
3438 my $guard = lock_acquire "load_resource_file";
3439
3440 my $status = load_resource_file_ $_[0];
3441 get_slot 0.1, 100;
3442 cf::arch::commit_load;
3443
3444 $status
3445}
3446
3309sub reload_regions { 3447sub reload_regions {
3310 # HACK to clear player env face cache, we need some signal framework 3448 # HACK to clear player env face cache, we need some signal framework
3311 # for this (global event?) 3449 # for this (global event?)
3312 %ext::player_env::MUSIC_FACE_CACHE = (); 3450 %ext::player_env::MUSIC_FACE_CACHE = ();
3313 3451
3326} 3464}
3327 3465
3328sub reload_archetypes { 3466sub reload_archetypes {
3329 load_resource_file "$DATADIR/archetypes" 3467 load_resource_file "$DATADIR/archetypes"
3330 or die "unable to load archetypes\n"; 3468 or die "unable to load archetypes\n";
3331 #d# NEED to laod twice to resolve forward references
3332 # this really needs to be done in an extra post-pass
3333 # (which needs to be synchronous, so solve it differently)
3334 load_resource_file "$DATADIR/archetypes"
3335 or die "unable to load archetypes\n";
3336} 3469}
3337 3470
3338sub reload_treasures { 3471sub reload_treasures {
3339 load_resource_file "$DATADIR/treasures" 3472 load_resource_file "$DATADIR/treasures"
3340 or die "unable to load treasurelists\n"; 3473 or die "unable to load treasurelists\n";
3341} 3474}
3342 3475
3343sub reload_resources { 3476sub reload_resources {
3344 warn "reloading resource files...\n"; 3477 warn "reloading resource files...\n";
3345 3478
3479 reload_facedata;
3480 reload_archetypes;
3346 reload_regions; 3481 reload_regions;
3347 reload_facedata;
3348 #reload_archetypes;#d#
3349 reload_archetypes;
3350 reload_treasures; 3482 reload_treasures;
3351 3483
3352 warn "finished reloading resource files\n"; 3484 warn "finished reloading resource files\n";
3353} 3485}
3354 3486
3355sub init {
3356 reload_resources;
3357}
3358
3359sub reload_config { 3487sub reload_config {
3488 warn "reloading config file...\n";
3489
3360 open my $fh, "<:utf8", "$CONFDIR/config" 3490 open my $fh, "<:utf8", "$CONFDIR/config"
3361 or return; 3491 or return;
3362 3492
3363 local $/; 3493 local $/;
3364 *CFG = YAML::Load <$fh>; 3494 *CFG = YAML::XS::Load scalar <$fh>;
3365 3495
3366 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3496 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3367 3497
3368 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3498 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3369 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3499 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3373 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3503 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3374 and die "WARNING: m(un)lockall failed: $!\n"; 3504 and die "WARNING: m(un)lockall failed: $!\n";
3375 }; 3505 };
3376 warn $@ if $@; 3506 warn $@ if $@;
3377 } 3507 }
3508
3509 warn "finished reloading resource files\n";
3510}
3511
3512sub pidfile() {
3513 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3514 or die "$PIDFILE: $!";
3515 flock $fh, &Fcntl::LOCK_EX
3516 or die "$PIDFILE: flock: $!";
3517 $fh
3518}
3519
3520# make sure only one server instance is running at any one time
3521sub atomic {
3522 my $fh = pidfile;
3523
3524 my $pid = <$fh>;
3525 kill 9, $pid if $pid > 0;
3526
3527 seek $fh, 0, 0;
3528 print $fh $$;
3529}
3530
3531sub main_loop {
3532 warn "EV::loop starting\n";
3533 if (1) {
3534 EV::loop;
3535 }
3536 warn "EV::loop returned\n";
3537 goto &main_loop unless $REALLY_UNLOOP;
3378} 3538}
3379 3539
3380sub main { 3540sub main {
3541 cf::init_globals; # initialise logging
3542
3543 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3544 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3545 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3546 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3547
3548 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3549
3381 # we must not ever block the main coroutine 3550 # we must not ever block the main coroutine
3382 local $Coro::idle = sub { 3551 local $Coro::idle = sub {
3383 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3552 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3384 (async { 3553 (async {
3385 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3554 $Coro::current->{desc} = "IDLE BUG HANDLER";
3386 EV::loop EV::LOOP_ONESHOT; 3555 EV::loop EV::LOOP_ONESHOT;
3387 })->prio (Coro::PRIO_MAX); 3556 })->prio (Coro::PRIO_MAX);
3388 }; 3557 };
3389 3558
3390 reload_config;
3391 db_init;
3392 load_extensions;
3393
3394 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3395 evthread_start IO::AIO::poll_fileno; 3559 evthread_start IO::AIO::poll_fileno;
3396 EV::loop; 3560
3561 cf::sync_job {
3562 cf::init_experience;
3563 cf::init_anim;
3564 cf::init_attackmess;
3565 cf::init_dynamic;
3566
3567 cf::load_settings;
3568 cf::load_materials;
3569
3570 reload_resources;
3571 reload_config;
3572 db_init;
3573
3574 cf::init_uuid;
3575 cf::init_signals;
3576 cf::init_skills;
3577
3578 cf::init_beforeplay;
3579
3580 atomic;
3581
3582 load_extensions;
3583
3584 utime time, time, $RUNTIMEFILE;
3585
3586 # no (long-running) fork's whatsoever before this point(!)
3587 use POSIX ();
3588 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3589
3590 (pop @POST_INIT)->(0) while @POST_INIT;
3591 };
3592
3593 main_loop;
3397} 3594}
3398 3595
3399############################################################################# 3596#############################################################################
3400# initialisation and cleanup 3597# initialisation and cleanup
3401 3598
3402# install some emergency cleanup handlers 3599# install some emergency cleanup handlers
3403BEGIN { 3600BEGIN {
3404 our %SIGWATCHER = (); 3601 our %SIGWATCHER = ();
3405 for my $signal (qw(INT HUP TERM)) { 3602 for my $signal (qw(INT HUP TERM)) {
3406 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3603 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3407 cf::cleanup "SIG$signal"; 3604 cf::cleanup "SIG$signal";
3408 }; 3605 };
3409 } 3606 }
3410} 3607}
3411 3608
3412sub write_runtime_sync { 3609sub write_runtime_sync {
3413 my $runtime = "$LOCALDIR/runtime"; 3610 my $t0 = AE::time;
3414 3611
3415 # first touch the runtime file to show we are still running: 3612 # first touch the runtime file to show we are still running:
3416 # the fsync below can take a very very long time. 3613 # the fsync below can take a very very long time.
3417 3614
3418 IO::AIO::aio_utime $runtime, undef, undef; 3615 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3419 3616
3420 my $guard = cf::lock_acquire "write_runtime"; 3617 my $guard = cf::lock_acquire "write_runtime";
3421 3618
3422 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3619 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3423 or return; 3620 or return;
3424 3621
3425 my $value = $cf::RUNTIME + 90 + 10; 3622 my $value = $cf::RUNTIME + 90 + 10;
3426 # 10 is the runtime save interval, for a monotonic clock 3623 # 10 is the runtime save interval, for a monotonic clock
3427 # 60 allows for the watchdog to kill the server. 3624 # 60 allows for the watchdog to kill the server.
3437 aio_utime $fh, undef, undef; 3634 aio_utime $fh, undef, undef;
3438 3635
3439 close $fh 3636 close $fh
3440 or return; 3637 or return;
3441 3638
3442 aio_rename "$runtime~", $runtime 3639 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3443 and return; 3640 and return;
3444 3641
3445 warn "runtime file written.\n"; 3642 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3446 3643
3447 1 3644 1
3448} 3645}
3449 3646
3450our $uuid_lock; 3647our $uuid_lock;
3459 my $uuid = "$LOCALDIR/uuid"; 3656 my $uuid = "$LOCALDIR/uuid";
3460 3657
3461 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3658 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3462 or return; 3659 or return;
3463 3660
3464 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3661 my $value = uuid_seq uuid_cur;
3662
3663 unless ($value) {
3664 warn "cowardly refusing to write zero uuid value!\n";
3665 return;
3666 }
3667
3668 my $value = uuid_str $value + $uuid_skip;
3465 $uuid_skip = 0; 3669 $uuid_skip = 0;
3466 3670
3467 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3671 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3468 and return; 3672 and return;
3469 3673
3491} 3695}
3492 3696
3493sub emergency_save() { 3697sub emergency_save() {
3494 my $freeze_guard = cf::freeze_mainloop; 3698 my $freeze_guard = cf::freeze_mainloop;
3495 3699
3496 warn "enter emergency perl save\n"; 3700 warn "emergency_perl_save: enter\n";
3497 3701
3498 cf::sync_job { 3702 cf::sync_job {
3703 # this is a trade-off: we want to be very quick here, so
3704 # save all maps without fsync, and later call a global sync
3705 # (which in turn might be very very slow)
3706 local $USE_FSYNC = 0;
3707
3499 # use a peculiar iteration method to avoid tripping on perl 3708 # use a peculiar iteration method to avoid tripping on perl
3500 # refcount bugs in for. also avoids problems with players 3709 # refcount bugs in for. also avoids problems with players
3501 # and maps saved/destroyed asynchronously. 3710 # and maps saved/destroyed asynchronously.
3502 warn "begin emergency player save\n"; 3711 warn "emergency_perl_save: begin player save\n";
3503 for my $login (keys %cf::PLAYER) { 3712 for my $login (keys %cf::PLAYER) {
3504 my $pl = $cf::PLAYER{$login} or next; 3713 my $pl = $cf::PLAYER{$login} or next;
3505 $pl->valid or next; 3714 $pl->valid or next;
3506 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3715 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3507 $pl->save; 3716 $pl->save;
3508 } 3717 }
3509 warn "end emergency player save\n"; 3718 warn "emergency_perl_save: end player save\n";
3510 3719
3511 warn "begin emergency map save\n"; 3720 warn "emergency_perl_save: begin map save\n";
3512 for my $path (keys %cf::MAP) { 3721 for my $path (keys %cf::MAP) {
3513 my $map = $cf::MAP{$path} or next; 3722 my $map = $cf::MAP{$path} or next;
3514 $map->valid or next; 3723 $map->valid or next;
3515 $map->save; 3724 $map->save;
3516 } 3725 }
3517 warn "end emergency map save\n"; 3726 warn "emergency_perl_save: end map save\n";
3518 3727
3519 warn "begin emergency database checkpoint\n"; 3728 warn "emergency_perl_save: begin database checkpoint\n";
3520 BDB::db_env_txn_checkpoint $DB_ENV; 3729 BDB::db_env_txn_checkpoint $DB_ENV;
3521 warn "end emergency database checkpoint\n"; 3730 warn "emergency_perl_save: end database checkpoint\n";
3522 3731
3523 warn "begin write uuid\n"; 3732 warn "emergency_perl_save: begin write uuid\n";
3524 write_uuid_sync 1; 3733 write_uuid_sync 1;
3525 warn "end write uuid\n"; 3734 warn "emergency_perl_save: end write uuid\n";
3526 }; 3735 };
3527 3736
3737 warn "emergency_perl_save: starting sync()\n";
3738 IO::AIO::aio_sync sub {
3739 warn "emergency_perl_save: finished sync()\n";
3740 };
3741
3528 warn "leave emergency perl save\n"; 3742 warn "emergency_perl_save: leave\n";
3529} 3743}
3530 3744
3531sub post_cleanup { 3745sub post_cleanup {
3532 my ($make_core) = @_; 3746 my ($make_core) = @_;
3533 3747
3534 warn Carp::longmess "post_cleanup backtrace" 3748 warn Carp::longmess "post_cleanup backtrace"
3535 if $make_core; 3749 if $make_core;
3750
3751 my $fh = pidfile;
3752 unlink $PIDFILE if <$fh> == $$;
3753}
3754
3755# a safer delete_package, copied from Symbol
3756sub clear_package($) {
3757 my $pkg = shift;
3758
3759 # expand to full symbol table name if needed
3760 unless ($pkg =~ /^main::.*::$/) {
3761 $pkg = "main$pkg" if $pkg =~ /^::/;
3762 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3763 $pkg .= '::' unless $pkg =~ /::$/;
3764 }
3765
3766 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3767 my $stem_symtab = *{$stem}{HASH};
3768
3769 defined $stem_symtab and exists $stem_symtab->{$leaf}
3770 or return;
3771
3772 # clear all symbols
3773 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3774 for my $name (keys %$leaf_symtab) {
3775 _gv_clear *{"$pkg$name"};
3776# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3777 }
3778 warn "cleared package $pkg\n";#d#
3536} 3779}
3537 3780
3538sub do_reload_perl() { 3781sub do_reload_perl() {
3539 # can/must only be called in main 3782 # can/must only be called in main
3540 if ($Coro::current != $Coro::main) { 3783 if ($Coro::current != $Coro::main) {
3541 warn "can only reload from main coroutine"; 3784 warn "can only reload from main coroutine";
3542 return; 3785 return;
3543 } 3786 }
3544 3787
3788 return if $RELOAD++;
3789
3790 my $t1 = AE::time;
3791
3792 while ($RELOAD) {
3545 warn "reloading..."; 3793 warn "reloading...";
3546 3794
3547 warn "entering sync_job"; 3795 warn "entering sync_job";
3548 3796
3549 cf::sync_job { 3797 cf::sync_job {
3550 cf::write_runtime_sync; # external watchdog should not bark 3798 cf::write_runtime_sync; # external watchdog should not bark
3551 cf::emergency_save; 3799 cf::emergency_save;
3552 cf::write_runtime_sync; # external watchdog should not bark 3800 cf::write_runtime_sync; # external watchdog should not bark
3553 3801
3554 warn "syncing database to disk"; 3802 warn "syncing database to disk";
3555 BDB::db_env_txn_checkpoint $DB_ENV; 3803 BDB::db_env_txn_checkpoint $DB_ENV;
3556 3804
3557 # if anything goes wrong in here, we should simply crash as we already saved 3805 # if anything goes wrong in here, we should simply crash as we already saved
3558 3806
3559 warn "flushing outstanding aio requests"; 3807 warn "flushing outstanding aio requests";
3560 for (;;) {
3561 BDB::flush;
3562 IO::AIO::flush;
3563 Coro::cede_notself;
3564 last unless IO::AIO::nreqs || BDB::nreqs; 3808 while (IO::AIO::nreqs || BDB::nreqs) {
3565 warn "iterate..."; 3809 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3566 }
3567
3568 ++$RELOAD;
3569
3570 warn "cancelling all extension coros";
3571 $_->cancel for values %EXT_CORO;
3572 %EXT_CORO = ();
3573
3574 warn "removing commands";
3575 %COMMAND = ();
3576
3577 warn "removing ext/exti commands";
3578 %EXTCMD = ();
3579 %EXTICMD = ();
3580
3581 warn "unloading/nuking all extensions";
3582 for my $pkg (@EXTS) {
3583 warn "... unloading $pkg";
3584
3585 if (my $cb = $pkg->can ("unload")) {
3586 eval {
3587 $cb->($pkg);
3588 1
3589 } or warn "$pkg unloaded, but with errors: $@";
3590 } 3810 }
3591 3811
3592 warn "... nuking $pkg"; 3812 warn "cancelling all extension coros";
3593 Symbol::delete_package $pkg; 3813 $_->cancel for values %EXT_CORO;
3594 } 3814 %EXT_CORO = ();
3595 3815
3596 warn "unloading all perl modules loaded from $LIBDIR"; 3816 warn "removing commands";
3597 while (my ($k, $v) = each %INC) { 3817 %COMMAND = ();
3598 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3599 3818
3819 warn "removing ext/exti commands";
3820 %EXTCMD = ();
3821 %EXTICMD = ();
3822
3823 warn "unloading/nuking all extensions";
3824 for my $pkg (@EXTS) {
3600 warn "... unloading $k"; 3825 warn "... unloading $pkg";
3601 delete $INC{$k};
3602 3826
3603 $k =~ s/\.pm$//;
3604 $k =~ s/\//::/g;
3605
3606 if (my $cb = $k->can ("unload_module")) { 3827 if (my $cb = $pkg->can ("unload")) {
3828 eval {
3607 $cb->(); 3829 $cb->($pkg);
3830 1
3831 } or warn "$pkg unloaded, but with errors: $@";
3832 }
3833
3834 warn "... clearing $pkg";
3835 clear_package $pkg;
3608 } 3836 }
3609 3837
3610 Symbol::delete_package $k; 3838 warn "unloading all perl modules loaded from $LIBDIR";
3839 while (my ($k, $v) = each %INC) {
3840 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3841
3842 warn "... unloading $k";
3843 delete $INC{$k};
3844
3845 $k =~ s/\.pm$//;
3846 $k =~ s/\//::/g;
3847
3848 if (my $cb = $k->can ("unload_module")) {
3849 $cb->();
3850 }
3851
3852 clear_package $k;
3611 } 3853 }
3612 3854
3613 warn "getting rid of safe::, as good as possible"; 3855 warn "getting rid of safe::, as good as possible";
3614 Symbol::delete_package "safe::$_" 3856 clear_package "safe::$_"
3615 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3857 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3616 3858
3617 warn "unloading cf.pm \"a bit\""; 3859 warn "unloading cf.pm \"a bit\"";
3618 delete $INC{"cf.pm"}; 3860 delete $INC{"cf.pm"};
3619 delete $INC{"cf/pod.pm"}; 3861 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3620 3862
3621 # don't, removes xs symbols, too, 3863 # don't, removes xs symbols, too,
3622 # and global variables created in xs 3864 # and global variables created in xs
3623 #Symbol::delete_package __PACKAGE__; 3865 #clear_package __PACKAGE__;
3624 3866
3625 warn "unload completed, starting to reload now"; 3867 warn "unload completed, starting to reload now";
3626 3868
3627 warn "reloading cf.pm"; 3869 warn "reloading cf.pm";
3628 require cf; 3870 require cf;
3629 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3871 cf::_connect_to_perl_1;
3630 3872
3631 warn "loading config and database again"; 3873 warn "loading config and database again";
3632 cf::reload_config; 3874 cf::reload_config;
3633 3875
3634 warn "loading extensions"; 3876 warn "loading extensions";
3635 cf::load_extensions; 3877 cf::load_extensions;
3636 3878
3879 if ($REATTACH_ON_RELOAD) {
3637 warn "reattaching attachments to objects/players"; 3880 warn "reattaching attachments to objects/players";
3638 _global_reattach; # objects, sockets 3881 _global_reattach; # objects, sockets
3639 warn "reattaching attachments to maps"; 3882 warn "reattaching attachments to maps";
3640 reattach $_ for values %MAP; 3883 reattach $_ for values %MAP;
3641 warn "reattaching attachments to players"; 3884 warn "reattaching attachments to players";
3642 reattach $_ for values %PLAYER; 3885 reattach $_ for values %PLAYER;
3886 }
3643 3887
3888 warn "running post_init jobs";
3889 (pop @POST_INIT)->(1) while @POST_INIT;
3890
3644 warn "leaving sync_job"; 3891 warn "leaving sync_job";
3645 3892
3646 1 3893 1
3647 } or do { 3894 } or do {
3648 warn $@; 3895 warn $@;
3649 cf::cleanup "error while reloading, exiting."; 3896 cf::cleanup "error while reloading, exiting.";
3650 }; 3897 };
3651 3898
3652 warn "reloaded"; 3899 warn "reloaded";
3900 --$RELOAD;
3901 }
3902
3903 $t1 = AE::time - $t1;
3904 warn "reload completed in ${t1}s\n";
3653}; 3905};
3654 3906
3655our $RELOAD_WATCHER; # used only during reload 3907our $RELOAD_WATCHER; # used only during reload
3656 3908
3657sub reload_perl() { 3909sub reload_perl() {
3658 # doing reload synchronously and two reloads happen back-to-back, 3910 # doing reload synchronously and two reloads happen back-to-back,
3659 # coro crashes during coro_state_free->destroy here. 3911 # coro crashes during coro_state_free->destroy here.
3660 3912
3913 $RELOAD_WATCHER ||= cf::async {
3914 Coro::AIO::aio_wait cache_extensions;
3915
3661 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3916 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3662 do_reload_perl; 3917 do_reload_perl;
3663 undef $RELOAD_WATCHER; 3918 undef $RELOAD_WATCHER;
3919 };
3664 }; 3920 };
3665} 3921}
3666 3922
3667register_command "reload" => sub { 3923register_command "reload" => sub {
3668 my ($who, $arg) = @_; 3924 my ($who, $arg) = @_;
3682 3938
3683our @WAIT_FOR_TICK; 3939our @WAIT_FOR_TICK;
3684our @WAIT_FOR_TICK_BEGIN; 3940our @WAIT_FOR_TICK_BEGIN;
3685 3941
3686sub wait_for_tick { 3942sub wait_for_tick {
3687 return if tick_inhibit;
3688 return if $Coro::current == $Coro::main; 3943 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3689 3944
3690 my $signal = new Coro::Signal; 3945 my $signal = new Coro::Signal;
3691 push @WAIT_FOR_TICK, $signal; 3946 push @WAIT_FOR_TICK, $signal;
3692 $signal->wait; 3947 $signal->wait;
3693} 3948}
3694 3949
3695sub wait_for_tick_begin { 3950sub wait_for_tick_begin {
3696 return if tick_inhibit;
3697 return if $Coro::current == $Coro::main; 3951 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3698 3952
3699 my $signal = new Coro::Signal; 3953 my $signal = new Coro::Signal;
3700 push @WAIT_FOR_TICK_BEGIN, $signal; 3954 push @WAIT_FOR_TICK_BEGIN, $signal;
3701 $signal->wait; 3955 $signal->wait;
3702} 3956}
3707 unless ++$bug_warning > 10; 3961 unless ++$bug_warning > 10;
3708 return; 3962 return;
3709 } 3963 }
3710 3964
3711 cf::server_tick; # one server iteration 3965 cf::server_tick; # one server iteration
3966
3967 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3712 3968
3713 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3969 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3714 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3970 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3715 Coro::async_pool { 3971 Coro::async_pool {
3716 $Coro::current->{desc} = "runtime saver"; 3972 $Coro::current->{desc} = "runtime saver";
3739} 3995}
3740 3996
3741{ 3997{
3742 # configure BDB 3998 # configure BDB
3743 3999
3744 BDB::min_parallel 8; 4000 BDB::min_parallel 16;
3745 BDB::max_poll_reqs $TICK * 0.1; 4001 BDB::max_poll_reqs $TICK * 0.1;
3746 $Coro::BDB::WATCHER->priority (1); 4002 $AnyEvent::BDB::WATCHER->priority (1);
3747 4003
3748 unless ($DB_ENV) { 4004 unless ($DB_ENV) {
3749 $DB_ENV = BDB::db_env_create; 4005 $DB_ENV = BDB::db_env_create;
3750 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4006 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3751 | BDB::LOG_AUTOREMOVE, 1); 4007 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4008 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3752 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4009 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3753 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4010 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3754 4011
3755 cf::sync_job { 4012 cf::sync_job {
3756 eval { 4013 eval {
3782{ 4039{
3783 # configure IO::AIO 4040 # configure IO::AIO
3784 4041
3785 IO::AIO::min_parallel 8; 4042 IO::AIO::min_parallel 8;
3786 IO::AIO::max_poll_time $TICK * 0.1; 4043 IO::AIO::max_poll_time $TICK * 0.1;
3787 $Coro::AIO::WATCHER->priority (1); 4044 undef $AnyEvent::AIO::WATCHER;
3788} 4045}
3789 4046
3790my $_log_backtrace; 4047my $_log_backtrace;
3791 4048
3792sub _log_backtrace { 4049sub _log_backtrace {
3795 $msg =~ s/\n//; 4052 $msg =~ s/\n//;
3796 4053
3797 # limit the # of concurrent backtraces 4054 # limit the # of concurrent backtraces
3798 if ($_log_backtrace < 2) { 4055 if ($_log_backtrace < 2) {
3799 ++$_log_backtrace; 4056 ++$_log_backtrace;
4057 my $perl_bt = Carp::longmess $msg;
3800 async { 4058 async {
3801 $Coro::current->{desc} = "abt $msg"; 4059 $Coro::current->{desc} = "abt $msg";
3802 4060
3803 my @bt = fork_call { 4061 my @bt = fork_call {
3804 @addr = map { sprintf "%x", $_ } @addr; 4062 @addr = map { sprintf "%x", $_ } @addr;
3815 } 4073 }
3816 4074
3817 @funcs 4075 @funcs
3818 }; 4076 };
3819 4077
3820 LOG llevInfo, "[ABT] $msg\n"; 4078 LOG llevInfo, "[ABT] $perl_bt\n";
4079 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3821 LOG llevInfo, "[ABT] $_\n" for @bt; 4080 LOG llevInfo, "[ABT] $_\n" for @bt;
3822 --$_log_backtrace; 4081 --$_log_backtrace;
3823 }; 4082 };
3824 } else { 4083 } else {
3825 LOG llevInfo, "[ABT] $msg\n"; 4084 LOG llevInfo, "[ABT] $msg\n";
3826 LOG llevInfo, "[ABT] [suppressed]\n"; 4085 LOG llevInfo, "[ABT] [suppressed]\n";
3827 } 4086 }
3828} 4087}
3829 4088
3830# load additional modules 4089# load additional modules
3831use cf::pod; 4090require "cf/$_.pm" for @EXTRA_MODULES;
4091cf::_connect_to_perl_2;
3832 4092
3833END { cf::emergency_save } 4093END { cf::emergency_save }
3834 4094
38351 40951
3836 4096

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines