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.423 by root, Sun Apr 20 00:44:13 2008 UTC vs.
Revision 1.559 by root, Sat Feb 26 12:50:27 2011 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
18# 19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use utf8; 25use common::sense;
25use strict;
26 26
27use Symbol; 27use Symbol;
28use List::Util; 28use List::Util;
29use Socket; 29use Socket;
30use EV 3.2; 30use EV;
31use Opcode; 31use Opcode;
32use Safe; 32use Safe;
33use Safe::Hole; 33use Safe::Hole;
34use Storable (); 34use Storable ();
35use Carp ();
35 36
37use Guard ();
36use Coro 4.50 (); 38use Coro ();
37use Coro::State; 39use Coro::State;
38use Coro::Handle; 40use Coro::Handle;
39use Coro::EV; 41use Coro::EV;
42use Coro::AnyEvent;
40use Coro::Timer; 43use Coro::Timer;
41use Coro::Signal; 44use Coro::Signal;
42use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
47use Coro::AnyEvent;
43use Coro::AIO; 48use Coro::AIO;
44use Coro::BDB; 49use Coro::BDB 1.6;
45use Coro::Storable; 50use Coro::Storable;
46use Coro::Util (); 51use Coro::Util ();
47 52
48use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
49use BDB (); 54use BDB ();
50use Data::Dumper; 55use Data::Dumper;
51use Digest::MD5;
52use Fcntl; 56use Fcntl;
53use YAML (); 57use YAML::XS ();
54use IO::AIO 2.51 (); 58use IO::AIO ();
55use Time::HiRes; 59use Time::HiRes;
56use Compress::LZF; 60use Compress::LZF;
57use Digest::MD5 (); 61use Digest::MD5 ();
62
63AnyEvent::detect;
58 64
59# configure various modules to our taste 65# configure various modules to our taste
60# 66#
61$Storable::canonical = 1; # reduce rsync transfers 67$Storable::canonical = 1; # reduce rsync transfers
62Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 68Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
69
70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
71
72# make sure c-lzf reinitialises itself
73Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
63Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 74Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
64 75
65$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 76# strictly for debugging
77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
66 78
67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
68 82
69our %COMMAND = (); 83our %COMMAND = ();
70our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
71 85
72our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
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;
98
82our $DATADIR = datadir; 99our $DATADIR = datadir;
83our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
84our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
85our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
86our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
87our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
89our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
90our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
91our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
110our $PIDFILE = "$LOCALDIR/pid";
111our $RUNTIMEFILE = "$LOCALDIR/runtime";
112
92our %RESOURCE; 113our %RESOURCE; # unused
114
115our $OUTPUT_RATE_MIN = 3000;
116our $OUTPUT_RATE_MAX = 1000000;
117
118our $MAX_LINKS = 32; # how many chained exits to follow
119our $VERBOSE_IO = 1;
93 120
94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
95our $AIO_POLL_WATCHER;
96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
97our $NEXT_TICK; 123our $NEXT_TICK;
98our $USE_FSYNC = 1; # use fsync to write maps - default off 124our $USE_FSYNC = 1; # use fsync to write maps - default on
99 125
100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER; 126our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER; 127our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER; 128our $BDB_TRICKLE_WATCHER;
104our $DB_ENV; 129our $DB_ENV;
105 130
131our @EXTRA_MODULES = qw(pod match mapscript incloader);
132
106our %CFG; 133our %CFG;
107 134
108our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
109our $RUNTIME; 136our $RUNTIME;
110our $NOW; 137our $NOW;
… …
119our $LOAD; # a number between 0 (idle) and 1 (too many objects) 146our $LOAD; # a number between 0 (idle) and 1 (too many objects)
120our $LOADAVG; # same thing, but with alpha-smoothing 147our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter 148our $JITTER; # average jitter
122our $TICK_START; # for load detecting purposes 149our $TICK_START; # for load detecting purposes
123 150
151our @POST_INIT;
152
153our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
154our $REALLY_UNLOOP; # never set to true, please :)
155
124binmode STDOUT; 156binmode STDOUT;
125binmode STDERR; 157binmode STDERR;
126 158
127# read virtual server time, if available 159# read virtual server time, if available
128unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 160unless ($RUNTIME || !-e $RUNTIMEFILE) {
129 open my $fh, "<", "$LOCALDIR/runtime" 161 open my $fh, "<", $RUNTIMEFILE
130 or die "unable to read runtime file: $!"; 162 or die "unable to read $RUNTIMEFILE file: $!";
131 $RUNTIME = <$fh> + 0.; 163 $RUNTIME = <$fh> + 0.;
132} 164}
165
166eval "sub TICK() { $TICK } 1" or die;
133 167
134mkdir $_ 168mkdir $_
135 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 169 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
136 170
137our $EMERGENCY_POSITION; 171our $EMERGENCY_POSITION;
138 172
139sub cf::map::normalise; 173sub cf::map::normalise;
174
175sub in_main() {
176 $Coro::current == $Coro::main
177}
178
179#############################################################################
180
181%REFLECT = ();
182for (@REFLECT) {
183 my $reflect = JSON::XS::decode_json $_;
184 $REFLECT{$reflect->{class}} = $reflect;
185}
186
187# this is decidedly evil
188$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
140 189
141############################################################################# 190#############################################################################
142 191
143=head2 GLOBAL VARIABLES 192=head2 GLOBAL VARIABLES
144 193
… …
186from wherever your confdir points to. 235from wherever your confdir points to.
187 236
188=item cf::wait_for_tick, cf::wait_for_tick_begin 237=item cf::wait_for_tick, cf::wait_for_tick_begin
189 238
190These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 239These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
191returns directly I<after> the tick processing (and consequently, can only wake one process 240returns directly I<after> the tick processing (and consequently, can only wake one thread
192per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 241per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
193 242
243=cut
244
245sub wait_for_tick();
246sub wait_for_tick_begin();
247
194=item @cf::INVOKE_RESULTS 248=item @cf::INVOKE_RESULTS
195 249
196This array contains the results of the last C<invoke ()> call. When 250This 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 251C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
198that call. 252that call.
199 253
254=item %cf::REFLECT
255
256Contains, for each (C++) class name, a hash reference with information
257about object members (methods, scalars, arrays and flags) and other
258metadata, which is useful for introspection.
259
200=back 260=back
201 261
202=cut 262=cut
203 263
204BEGIN { 264sub error(@) { LOG llevError, join "", @_ }
205 *CORE::GLOBAL::warn = sub { 265sub warn (@) { LOG llevWarn , join "", @_ }
266sub info (@) { LOG llevInfo , join "", @_ }
267sub debug(@) { LOG llevDebug, join "", @_ }
268sub trace(@) { LOG llevTrace, join "", @_ }
269
270$Coro::State::WARNHOOK = sub {
206 my $msg = join "", @_; 271 my $msg = join "", @_;
207 272
208 $msg .= "\n" 273 $msg .= "\n"
209 unless $msg =~ /\n$/; 274 unless $msg =~ /\n$/;
210 275
211 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 276 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
212 277
213 LOG llevError, $msg; 278 LOG llevWarn, $msg;
214 }; 279};
215}
216 280
217$Coro::State::DIEHOOK = sub { 281$Coro::State::DIEHOOK = sub {
218 return unless $^S eq 0; # "eq", not "==" 282 return unless $^S eq 0; # "eq", not "=="
219 283
220 if ($Coro::current == $Coro::main) {#d# 284 error Carp::longmess $_[0];
285
286 if (in_main) {#d#
221 warn "DIEHOOK called in main context, Coro bug?\n";#d# 287 error "DIEHOOK called in main context, Coro bug?\n";#d#
222 return;#d# 288 return;#d#
223 }#d# 289 }#d#
224 290
225 # kill coroutine otherwise 291 # kill coroutine otherwise
226 warn Carp::longmess $_[0];
227 Coro::terminate 292 Coro::terminate
228}; 293};
229
230$SIG{__DIE__} = sub { }; #d#?
231 294
232@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 295@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
233@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 296@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
234@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 297@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
235@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 298@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
242for my $pkg (qw( 305for my $pkg (qw(
243 cf::global cf::attachable 306 cf::global cf::attachable
244 cf::object cf::object::player 307 cf::object cf::object::player
245 cf::client cf::player 308 cf::client cf::player
246 cf::arch cf::living 309 cf::arch cf::living
310 cf::map cf::mapspace
247 cf::map cf::party cf::region 311 cf::party cf::region
248)) { 312)) {
249 no strict 'refs';
250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 313 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
251} 314}
252 315
253$EV::DIED = sub { 316$EV::DIED = sub {
254 warn "error in event callback: @_"; 317 Carp::cluck "error in event callback: @_";
255}; 318};
256 319
257############################################################################# 320#############################################################################
258 321
259=head2 UTILITY FUNCTIONS 322=head2 UTILITY FUNCTIONS
… …
296our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 359our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
297 360
298sub encode_json($) { $json_coder->encode ($_[0]) } 361sub encode_json($) { $json_coder->encode ($_[0]) }
299sub decode_json($) { $json_coder->decode ($_[0]) } 362sub decode_json($) { $json_coder->decode ($_[0]) }
300 363
364=item $ref = cf::yaml_load $scalar
365
366Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
367
368=cut
369
370sub fork_call(&@);
371
372sub yaml_load($) {
373 fork_call { YAML::XS::Load $_[0] } @_
374}
375
376=item cf::post_init { BLOCK }
377
378Execute the given codeblock, I<after> all extensions have been (re-)loaded,
379but I<before> the server starts ticking again.
380
381The codeblock will have a single boolean argument to indicate whether this
382is a reload or not.
383
384=cut
385
386sub post_init(&) {
387 push @POST_INIT, shift;
388}
389
390sub _post_init {
391 trace "running post_init jobs";
392
393 # run them in parallel...
394
395 my @join;
396
397 while () {
398 push @join, map &Coro::async ($_, 0), @POST_INIT;
399 @POST_INIT = ();
400
401 @join or last;
402
403 (pop @join)->join;
404 }
405}
406
301=item cf::lock_wait $string 407=item cf::lock_wait $string
302 408
303Wait until the given lock is available. See cf::lock_acquire. 409Wait until the given lock is available. See cf::lock_acquire.
304 410
305=item my $lock = cf::lock_acquire $string 411=item my $lock = cf::lock_acquire $string
306 412
307Wait until the given lock is available and then acquires it and returns 413Wait 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, 414a L<Guard> object. If the guard object gets destroyed (goes out of scope,
309for example when the coroutine gets canceled), the lock is automatically 415for example when the coroutine gets canceled), the lock is automatically
310returned. 416returned.
311 417
312Locks are *not* recursive, locking from the same coro twice results in a 418Locks are *not* recursive, locking from the same coro twice results in a
313deadlocked coro. 419deadlocked coro.
… …
319 425
320Return true if the lock is currently active, i.e. somebody has locked it. 426Return true if the lock is currently active, i.e. somebody has locked it.
321 427
322=cut 428=cut
323 429
324our %LOCK; 430our $LOCKS = new Coro::SemaphoreSet;
325our %LOCKER;#d#
326 431
327sub lock_wait($) { 432sub lock_wait($) {
328 my ($key) = @_; 433 $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} 434}
341 435
342sub lock_acquire($) { 436sub lock_acquire($) {
343 my ($key) = @_; 437 $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} 438}
357 439
358sub lock_active($) { 440sub lock_active($) {
359 my ($key) = @_; 441 $LOCKS->count ($_[0]) < 1
360
361 ! ! $LOCK{$key}
362} 442}
363 443
364sub freeze_mainloop { 444sub freeze_mainloop {
365 tick_inhibit_inc; 445 tick_inhibit_inc;
366 446
367 Coro::guard \&tick_inhibit_dec; 447 &Guard::guard (\&tick_inhibit_dec);
368} 448}
369 449
370=item cf::periodic $interval, $cb 450=item cf::periodic $interval, $cb
371 451
372Like EV::periodic, but randomly selects a starting point so that the actions 452Like EV::periodic, but randomly selects a starting point so that the actions
373get spread over timer. 453get spread over time.
374 454
375=cut 455=cut
376 456
377sub periodic($$) { 457sub periodic($$) {
378 my ($interval, $cb) = @_; 458 my ($interval, $cb) = @_;
… …
395 475
396=cut 476=cut
397 477
398our @SLOT_QUEUE; 478our @SLOT_QUEUE;
399our $SLOT_QUEUE; 479our $SLOT_QUEUE;
480our $SLOT_DECAY = 0.9;
400 481
401$SLOT_QUEUE->cancel if $SLOT_QUEUE; 482$SLOT_QUEUE->cancel if $SLOT_QUEUE;
402$SLOT_QUEUE = Coro::async { 483$SLOT_QUEUE = Coro::async {
403 $Coro::current->desc ("timeslot manager"); 484 $Coro::current->desc ("timeslot manager");
404 485
405 my $signal = new Coro::Signal; 486 my $signal = new Coro::Signal;
487 my $busy;
406 488
407 while () { 489 while () {
408 next_job: 490 next_job:
491
409 my $avail = cf::till_tick; 492 my $avail = cf::till_tick;
410 if ($avail > 0.01) { 493
411 for (0 .. $#SLOT_QUEUE) { 494 for (0 .. $#SLOT_QUEUE) {
412 if ($SLOT_QUEUE[$_][0] < $avail) { 495 if ($SLOT_QUEUE[$_][0] <= $avail) {
496 $busy = 0;
413 my $job = splice @SLOT_QUEUE, $_, 1, (); 497 my $job = splice @SLOT_QUEUE, $_, 1, ();
414 $job->[2]->send; 498 $job->[2]->send;
415 Coro::cede; 499 Coro::cede;
416 goto next_job; 500 goto next_job;
417 } 501 } else {
502 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
418 } 503 }
419 } 504 }
420 505
421 if (@SLOT_QUEUE) { 506 if (@SLOT_QUEUE) {
422 # we do not use wait_for_tick() as it returns immediately when tick is inactive 507 # we do not use wait_for_tick() as it returns immediately when tick is inactive
423 push @cf::WAIT_FOR_TICK, $signal; 508 push @cf::WAIT_FOR_TICK, $signal;
424 $signal->wait; 509 $signal->wait;
425 } else { 510 } else {
511 $busy = 0;
426 Coro::schedule; 512 Coro::schedule;
427 } 513 }
428 } 514 }
429}; 515};
430 516
431sub get_slot($;$$) { 517sub get_slot($;$$) {
432 return if tick_inhibit || $Coro::current == $Coro::main; 518 return if tick_inhibit || $Coro::current == $Coro::main;
433 519
434 my ($time, $pri, $name) = @_; 520 my ($time, $pri, $name) = @_;
435 521
436 $time = $TICK * .6 if $time > $TICK * .6; 522 $time = clamp $time, 0.01, $TICK * .6;
523
437 my $sig = new Coro::Signal; 524 my $sig = new Coro::Signal;
438 525
439 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 526 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
440 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 527 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
441 $SLOT_QUEUE->ready; 528 $SLOT_QUEUE->ready;
… …
467=cut 554=cut
468 555
469sub sync_job(&) { 556sub sync_job(&) {
470 my ($job) = @_; 557 my ($job) = @_;
471 558
472 if ($Coro::current == $Coro::main) { 559 if (in_main) {
473 my $time = EV::time; 560 my $time = AE::time;
474 561
475 # this is the main coro, too bad, we have to block 562 # this is the main coro, too bad, we have to block
476 # till the operation succeeds, freezing the server :/ 563 # till the operation succeeds, freezing the server :/
477 564
478 LOG llevError, Carp::longmess "sync job";#d# 565 #LOG llevError, Carp::longmess "sync job";#d#
479 566
480 my $freeze_guard = freeze_mainloop; 567 my $freeze_guard = freeze_mainloop;
481 568
482 my $busy = 1; 569 my $busy = 1;
483 my @res; 570 my @res;
484 571
485 (async { 572 (async {
486 $Coro::current->desc ("sync job coro"); 573 $Coro::current->desc ("sync job coro");
487 @res = eval { $job->() }; 574 @res = eval { $job->() };
488 warn $@ if $@; 575 error $@ if $@;
489 undef $busy; 576 undef $busy;
490 })->prio (Coro::PRIO_MAX); 577 })->prio (Coro::PRIO_MAX);
491 578
492 while ($busy) { 579 while ($busy) {
493 if (Coro::nready) { 580 if (Coro::nready) {
… …
495 } else { 582 } else {
496 EV::loop EV::LOOP_ONESHOT; 583 EV::loop EV::LOOP_ONESHOT;
497 } 584 }
498 } 585 }
499 586
500 my $time = EV::time - $time; 587 my $time = AE::time - $time;
501 588
502 $TICK_START += $time; # do not account sync jobs to server load 589 $TICK_START += $time; # do not account sync jobs to server load
503 590
504 wantarray ? @res : $res[0] 591 wantarray ? @res : $res[0]
505 } else { 592 } else {
… …
527 $EXT_CORO{$coro+0} = $coro; 614 $EXT_CORO{$coro+0} = $coro;
528 615
529 $coro 616 $coro
530} 617}
531 618
532=item fork_call { }, $args 619=item fork_call { }, @args
533 620
534Executes the given code block with the given arguments in a seperate 621Executes the given code block with the given arguments in a seperate
535process, returning the results. Everything must be serialisable with 622process, returning the results. Everything must be serialisable with
536Coro::Storable. May, of course, block. Note that the executed sub may 623Coro::Storable. May, of course, block. Note that the executed sub may
537never block itself or use any form of event handling. 624never block itself or use any form of event handling.
538 625
539=cut 626=cut
540 627
628sub post_fork {
629 reset_signals;
630}
631
541sub fork_call(&@) { 632sub fork_call(&@) {
542 my ($cb, @args) = @_; 633 my ($cb, @args) = @_;
543 634
544 # we seemingly have to make a local copy of the whole thing, 635 # we seemingly have to make a local copy of the whole thing,
545 # otherwise perl prematurely frees the stuff :/ 636 # otherwise perl prematurely frees the stuff :/
546 # TODO: investigate and fix (likely this will be rather laborious) 637 # TODO: investigate and fix (likely this will be rather laborious)
547 638
548 my @res = Coro::Util::fork_eval { 639 my @res = Coro::Util::fork_eval {
549 reset_signals; 640 cf::post_fork;
550 &$cb 641 &$cb
551 }, @args; 642 } @args;
552 643
553 wantarray ? @res : $res[-1] 644 wantarray ? @res : $res[-1]
645}
646
647sub objinfo {
648 (
649 "counter value" => cf::object::object_count,
650 "objects created" => cf::object::create_count,
651 "objects destroyed" => cf::object::destroy_count,
652 "freelist size" => cf::object::free_count,
653 "allocated objects" => cf::object::objects_size,
654 "active objects" => cf::object::actives_size,
655 )
554} 656}
555 657
556=item $coin = coin_from_name $name 658=item $coin = coin_from_name $name
557 659
558=cut 660=cut
… …
595within each server. 697within each server.
596 698
597=cut 699=cut
598 700
599sub db_table($) { 701sub db_table($) {
702 cf::error "db_get called from main context"
703 if $Coro::current == $Coro::main;
704
600 my ($name) = @_; 705 my ($name) = @_;
601 my $db = BDB::db_create $DB_ENV; 706 my $db = BDB::db_create $DB_ENV;
602 707
603 eval { 708 eval {
604 $db->set_flags (BDB::CHKSUM); 709 $db->set_flags (BDB::CHKSUM);
… …
614} 719}
615 720
616our $DB; 721our $DB;
617 722
618sub db_init { 723sub db_init {
619 cf::sync_job {
620 $DB ||= db_table "db"; 724 $DB ||= db_table "db";
621 };
622} 725}
623 726
624sub db_get($$) { 727sub db_get($$) {
625 my $key = "$_[0]/$_[1]"; 728 my $key = "$_[0]/$_[1]";
626 729
627 cf::sync_job { 730 cf::error "db_get called from main context"
731 if $Coro::current == $Coro::main;
732
628 BDB::db_get $DB, undef, $key, my $data; 733 BDB::db_get $DB, undef, $key, my $data;
629 734
630 $! ? () 735 $! ? ()
631 : $data 736 : $data
632 }
633} 737}
634 738
635sub db_put($$$) { 739sub db_put($$$) {
636 BDB::dbreq_pri 4; 740 BDB::dbreq_pri 4;
637 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 741 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
693 797
694 my $t1 = Time::HiRes::time; 798 my $t1 = Time::HiRes::time;
695 my $data = $process->(\@data); 799 my $data = $process->(\@data);
696 my $t2 = Time::HiRes::time; 800 my $t2 = Time::HiRes::time;
697 801
698 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 802 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
699 803
700 db_put cache => "$id/data", $data; 804 db_put cache => "$id/data", $data;
701 db_put cache => "$id/md5" , $md5; 805 db_put cache => "$id/md5" , $md5;
702 db_put cache => "$id/meta", $meta; 806 db_put cache => "$id/meta", $meta;
703 807
… …
713 817
714=cut 818=cut
715 819
716sub datalog($@) { 820sub datalog($@) {
717 my ($type, %kv) = @_; 821 my ($type, %kv) = @_;
718 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 822 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
719} 823}
720 824
721=back 825=back
722 826
723=cut 827=cut
724 828
725############################################################################# 829#############################################################################
726 830
727=head2 ATTACHABLE OBJECTS 831=head2 ATTACHABLE OBJECTS
728 832
729Many objects in crossfire are so-called attachable objects. That means you can 833Many objects in deliantra are so-called attachable objects. That means you can
730attach callbacks/event handlers (a collection of which is called an "attachment") 834attach callbacks/event handlers (a collection of which is called an "attachment")
731to it. All such attachable objects support the following methods. 835to it. All such attachable objects support the following methods.
732 836
733In the following description, CLASS can be any of C<global>, C<object> 837In the following description, CLASS can be any of C<global>, C<object>
734C<player>, C<client> or C<map> (i.e. the attachable objects in 838C<player>, C<client> or C<map> (i.e. the attachable objects in
… …
784=item cf::CLASS::attachment $name, ... 888=item cf::CLASS::attachment $name, ...
785 889
786Register an attachment by C<$name> through which attachable objects of the 890Register an attachment by C<$name> through which attachable objects of the
787given CLASS can refer to this attachment. 891given CLASS can refer to this attachment.
788 892
789Some classes such as crossfire maps and objects can specify attachments 893Some classes such as deliantra maps and objects can specify attachments
790that are attached at load/instantiate time, thus the need for a name. 894that are attached at load/instantiate time, thus the need for a name.
791 895
792These calls expect any number of the following handler/hook descriptions: 896These calls expect any number of the following handler/hook descriptions:
793 897
794=over 4 898=over 4
… …
918 1022
919 } elsif (exists $cb_id{$type}) { 1023 } elsif (exists $cb_id{$type}) {
920 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1024 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
921 1025
922 } elsif (ref $type) { 1026 } elsif (ref $type) {
923 warn "attaching objects not supported, ignoring.\n"; 1027 error "attaching objects not supported, ignoring.\n";
924 1028
925 } else { 1029 } else {
926 shift @arg; 1030 shift @arg;
927 warn "attach argument '$type' not supported, ignoring.\n"; 1031 error "attach argument '$type' not supported, ignoring.\n";
928 } 1032 }
929 } 1033 }
930} 1034}
931 1035
932sub _object_attach { 1036sub _object_attach {
… …
942 _attach $registry, $klass, @attach; 1046 _attach $registry, $klass, @attach;
943 } 1047 }
944 1048
945 $obj->{$name} = \%arg; 1049 $obj->{$name} = \%arg;
946 } else { 1050 } else {
947 warn "object uses attachment '$name' which is not available, postponing.\n"; 1051 info "object uses attachment '$name' which is not available, postponing.\n";
948 } 1052 }
949 1053
950 $obj->{_attachment}{$name} = undef; 1054 $obj->{_attachment}{$name} = undef;
951} 1055}
952 1056
… …
1011 1115
1012 for (@$callbacks) { 1116 for (@$callbacks) {
1013 eval { &{$_->[1]} }; 1117 eval { &{$_->[1]} };
1014 1118
1015 if ($@) { 1119 if ($@) {
1016 warn "$@";
1017 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1120 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1018 override; 1121 override;
1019 } 1122 }
1020 1123
1021 return 1 if $override; 1124 return 1 if $override;
1022 } 1125 }
… …
1085 1188
1086sub reattach { 1189sub reattach {
1087 # basically do the same as instantiate, without calling instantiate 1190 # basically do the same as instantiate, without calling instantiate
1088 my ($obj) = @_; 1191 my ($obj) = @_;
1089 1192
1193 # no longer needed after getting rid of delete_package?
1090 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1194 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1091 1195
1092 my $registry = $obj->registry; 1196 my $registry = $obj->registry;
1093 1197
1094 @$registry = (); 1198 @$registry = ();
1095 1199
… …
1100 for (@$attach) { 1204 for (@$attach) {
1101 my ($klass, @attach) = @$_; 1205 my ($klass, @attach) = @$_;
1102 _attach $registry, $klass, @attach; 1206 _attach $registry, $klass, @attach;
1103 } 1207 }
1104 } else { 1208 } else {
1105 warn "object uses attachment '$name' that is not available, postponing.\n"; 1209 info "object uses attachment '$name' that is not available, postponing.\n";
1106 } 1210 }
1107 } 1211 }
1108} 1212}
1109 1213
1110cf::attachable->attach ( 1214cf::attachable->attach (
… …
1137 my ($filename, $rdata, $objs) = @_; 1241 my ($filename, $rdata, $objs) = @_;
1138 1242
1139 sync_job { 1243 sync_job {
1140 if (length $$rdata) { 1244 if (length $$rdata) {
1141 utf8::decode (my $decname = $filename); 1245 utf8::decode (my $decname = $filename);
1142 warn sprintf "saving %s (%d,%d)\n", 1246 trace sprintf "saving %s (%d,%d)\n",
1143 $decname, length $$rdata, scalar @$objs; 1247 $decname, length $$rdata, scalar @$objs
1248 if $VERBOSE_IO;
1144 1249
1145 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1250 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1146 chmod SAVE_MODE, $fh; 1251 aio_chmod $fh, SAVE_MODE;
1147 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1252 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1148 aio_fsync $fh if $cf::USE_FSYNC; 1253 if ($cf::USE_FSYNC) {
1254 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;
1255 aio_fsync $fh;
1256 }
1149 close $fh; 1257 aio_close $fh;
1150 1258
1151 if (@$objs) { 1259 if (@$objs) {
1152 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1260 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1153 chmod SAVE_MODE, $fh; 1261 aio_chmod $fh, SAVE_MODE;
1154 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1262 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1155 aio_write $fh, 0, (length $data), $data, 0; 1263 aio_write $fh, 0, (length $data), $data, 0;
1156 aio_fsync $fh if $cf::USE_FSYNC; 1264 if ($cf::USE_FSYNC) {
1265 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;
1266 aio_fsync $fh;
1267 }
1157 close $fh; 1268 aio_close $fh;
1158 aio_rename "$filename.pst~", "$filename.pst"; 1269 aio_rename "$filename.pst~", "$filename.pst";
1159 } 1270 }
1160 } else { 1271 } else {
1161 aio_unlink "$filename.pst"; 1272 aio_unlink "$filename.pst";
1162 } 1273 }
1163 1274
1164 aio_rename "$filename~", $filename; 1275 aio_rename "$filename~", $filename;
1276
1277 $filename =~ s%/[^/]+$%%;
1278 aio_pathsync $filename if $cf::USE_FSYNC;
1165 } else { 1279 } else {
1166 warn "FATAL: $filename~: $!\n"; 1280 error "unable to save objects: $filename~: $!\n";
1167 } 1281 }
1168 } else { 1282 } else {
1169 aio_unlink $filename; 1283 aio_unlink $filename;
1170 aio_unlink "$filename.pst"; 1284 aio_unlink "$filename.pst";
1171 } 1285 }
… …
1195 my $st = eval { Coro::Storable::thaw $av }; 1309 my $st = eval { Coro::Storable::thaw $av };
1196 $av = $st->{objs}; 1310 $av = $st->{objs};
1197 } 1311 }
1198 1312
1199 utf8::decode (my $decname = $filename); 1313 utf8::decode (my $decname = $filename);
1200 warn sprintf "loading %s (%d,%d)\n", 1314 trace sprintf "loading %s (%d,%d)\n",
1201 $decname, length $data, scalar @{$av || []}; 1315 $decname, length $data, scalar @{$av || []}
1316 if $VERBOSE_IO;
1202 1317
1203 ($data, $av) 1318 ($data, $av)
1204} 1319}
1205 1320
1206=head2 COMMAND CALLBACKS 1321=head2 COMMAND CALLBACKS
… …
1262 my ($name, $cb) = @_; 1377 my ($name, $cb) = @_;
1263 1378
1264 $EXTICMD{$name} = $cb; 1379 $EXTICMD{$name} = $cb;
1265} 1380}
1266 1381
1382use File::Glob ();
1383
1267cf::player->attach ( 1384cf::player->attach (
1268 on_command => sub { 1385 on_unknown_command => sub {
1269 my ($pl, $name, $params) = @_; 1386 my ($pl, $name, $params) = @_;
1270 1387
1271 my $cb = $COMMAND{$name} 1388 my $cb = $COMMAND{$name}
1272 or return; 1389 or return;
1273 1390
… …
1296 1413
1297 $pl->ext_reply ($reply, @reply) 1414 $pl->ext_reply ($reply, @reply)
1298 if $reply; 1415 if $reply;
1299 1416
1300 } else { 1417 } else {
1301 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1418 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1302 } 1419 }
1303 1420
1304 cf::override; 1421 cf::override;
1305 }, 1422 },
1306); 1423);
1307 1424
1425# "readahead" all extensions
1426sub cache_extensions {
1427 my $grp = IO::AIO::aio_group;
1428
1429 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1430 for (grep /\.ext$/, @{$_[0]}) {
1431 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1432 }
1433 };
1434
1435 $grp
1436}
1437
1308sub load_extensions { 1438sub load_extensions {
1439 info "loading extensions...";
1440
1309 cf::sync_job { 1441 cf::sync_job {
1310 my %todo; 1442 my %todo;
1311 1443
1312 for my $path (<$LIBDIR/*.ext>) { 1444 for my $path (<$LIBDIR/*.ext>) {
1313 next unless -r $path; 1445 next unless -r $path;
… …
1331 1463
1332 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1464 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1333 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1465 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1334 1466
1335 $ext{source} = 1467 $ext{source} =
1336 "package $pkg; use strict; use utf8;\n" 1468 "package $pkg; use common::sense;\n"
1337 . "#line 1 \"$path\"\n{\n" 1469 . "#line 1 \"$path\"\n{\n"
1338 . $source 1470 . $source
1339 . "\n};\n1"; 1471 . "\n};\n1";
1340 1472
1341 $todo{$base} = \%ext; 1473 $todo{$base} = \%ext;
1342 } 1474 }
1343 1475
1476 my $pass = 0;
1344 my %done; 1477 my %done;
1345 while (%todo) { 1478 while (%todo) {
1346 my $progress; 1479 my $progress;
1347 1480
1481 ++$pass;
1482
1483 ext:
1348 while (my ($k, $v) = each %todo) { 1484 while (my ($k, $v) = each %todo) {
1349 for (split /,\s*/, $v->{meta}{depends}) { 1485 for (split /,\s*/, $v->{meta}{depends}) {
1350 goto skip 1486 next ext
1351 unless exists $done{$_}; 1487 unless exists $done{$_};
1352 } 1488 }
1353 1489
1354 warn "... loading '$k' into '$v->{pkg}'\n"; 1490 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1355 1491
1356 unless (eval $v->{source}) { 1492 my $active = eval $v->{source};
1493
1494 if (length $@) {
1357 my $msg = $@ ? "$v->{path}: $@\n" 1495 error "$v->{path}: $@\n";
1358 : "$v->{base}: extension inactive.\n";
1359 1496
1360 if (exists $v->{meta}{mandatory}) {
1361 warn $msg;
1362 cf::cleanup "mandatory extension failed to load, exiting."; 1497 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1363 } 1498 if exists $v->{meta}{mandatory};
1364 1499
1365 warn $msg; 1500 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1501 delete $todo{$k};
1502 } else {
1503 $done{$k} = delete $todo{$k};
1504 push @EXTS, $v->{pkg};
1505 $progress = 1;
1506
1507 info "$v->{base}: extension inactive.\n"
1508 unless $active;
1366 } 1509 }
1367
1368 $done{$k} = delete $todo{$k};
1369 push @EXTS, $v->{pkg};
1370 $progress = 1;
1371 } 1510 }
1372 1511
1373 skip: 1512 unless ($progress) {
1374 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1513 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1375 unless $progress; 1514
1515 while (my ($k, $v) = each %todo) {
1516 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1517 if exists $v->{meta}{mandatory};
1518 }
1519 }
1376 } 1520 }
1377 }; 1521 };
1378} 1522}
1379 1523
1380############################################################################# 1524#############################################################################
1381 1525
1382=back 1526=back
1383 1527
1384=head2 CORE EXTENSIONS 1528=head2 CORE EXTENSIONS
1385 1529
1386Functions and methods that extend core crossfire objects. 1530Functions and methods that extend core deliantra objects.
1387 1531
1388=cut 1532=cut
1389 1533
1390package cf::player; 1534package cf::player;
1391 1535
… …
1434 1578
1435sub exists($) { 1579sub exists($) {
1436 my ($login) = @_; 1580 my ($login) = @_;
1437 1581
1438 $cf::PLAYER{$login} 1582 $cf::PLAYER{$login}
1439 or cf::sync_job { !aio_stat path $login } 1583 or !aio_stat path $login
1440} 1584}
1441 1585
1442sub find($) { 1586sub find($) {
1443 return $cf::PLAYER{$_[0]} || do { 1587 return $cf::PLAYER{$_[0]} || do {
1444 my $login = $_[0]; 1588 my $login = $_[0];
… …
1456 my $f = new_from_file cf::object::thawer path $login 1600 my $f = new_from_file cf::object::thawer path $login
1457 or return; 1601 or return;
1458 1602
1459 my $pl = cf::player::load_pl $f 1603 my $pl = cf::player::load_pl $f
1460 or return; 1604 or return;
1605
1461 local $cf::PLAYER_LOADING{$login} = $pl; 1606 local $cf::PLAYER_LOADING{$login} = $pl;
1462 $f->resolve_delayed_derefs; 1607 $f->resolve_delayed_derefs;
1463 $cf::PLAYER{$login} = $pl 1608 $cf::PLAYER{$login} = $pl
1464 } 1609 }
1465 } 1610 }
1466} 1611}
1467 1612
1613cf::player->attach (
1614 on_load => sub {
1615 my ($pl, $path) = @_;
1616
1617 # restore slots saved in save, below
1618 my $slots = delete $pl->{_slots};
1619
1620 $pl->ob->current_weapon ($slots->[0]);
1621 $pl->combat_ob ($slots->[1]);
1622 $pl->ranged_ob ($slots->[2]);
1623 },
1624);
1625
1468sub save($) { 1626sub save($) {
1469 my ($pl) = @_; 1627 my ($pl) = @_;
1470 1628
1471 return if $pl->{deny_save}; 1629 return if $pl->{deny_save};
1472 1630
… …
1477 1635
1478 aio_mkdir playerdir $pl, 0770; 1636 aio_mkdir playerdir $pl, 0770;
1479 $pl->{last_save} = $cf::RUNTIME; 1637 $pl->{last_save} = $cf::RUNTIME;
1480 1638
1481 cf::get_slot 0.01; 1639 cf::get_slot 0.01;
1640
1641 # save slots, to be restored later
1642 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1482 1643
1483 $pl->save_pl ($path); 1644 $pl->save_pl ($path);
1484 cf::cede_to_tick; 1645 cf::cede_to_tick;
1485} 1646}
1486 1647
… …
1518 my ($pl) = @_; 1679 my ($pl) = @_;
1519 1680
1520 my $name = $pl->ob->name; 1681 my $name = $pl->ob->name;
1521 1682
1522 $pl->{deny_save} = 1; 1683 $pl->{deny_save} = 1;
1523 $pl->password ("*"); # this should lock out the player until we nuked the dir 1684 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1524 1685
1525 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1686 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1526 $pl->deactivate; 1687 $pl->deactivate;
1688
1689 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1527 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1690 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1691 ext::highscore::check ($pl->ob);
1692
1528 $pl->ns->destroy if $pl->ns; 1693 $pl->ns->destroy if $pl->ns;
1529 1694
1530 my $path = playerdir $pl; 1695 my $path = playerdir $pl;
1531 my $temp = "$path~$cf::RUNTIME~deleting~"; 1696 my $temp = "$path~$cf::RUNTIME~deleting~";
1532 aio_rename $path, $temp; 1697 aio_rename $path, $temp;
… …
1570 1735
1571 for my $login (@$dirs) { 1736 for my $login (@$dirs) {
1572 my $path = path $login; 1737 my $path = path $login;
1573 1738
1574 # a .pst is a dead give-away for a valid player 1739 # a .pst is a dead give-away for a valid player
1575 unless (-e "$path.pst") { 1740 # if no pst file found, open and chekc for blocked users
1741 if (aio_stat "$path.pst") {
1576 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1742 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1577 aio_read $fh, 0, 512, my $buf, 0 or next; 1743 aio_read $fh, 0, 512, my $buf, 0 or next;
1578 $buf !~ /^password -------------$/m or next; # official not-valid tag 1744 $buf !~ /^password -------------$/m or next; # official not-valid tag
1579 } 1745 }
1580 1746
… …
1584 1750
1585 \@logins 1751 \@logins
1586} 1752}
1587 1753
1588=item $player->maps 1754=item $player->maps
1755
1756=item cf::player::maps $login
1589 1757
1590Returns an arrayref of map paths that are private for this 1758Returns an arrayref of map paths that are private for this
1591player. May block. 1759player. May block.
1592 1760
1593=cut 1761=cut
… …
1611 } 1779 }
1612 1780
1613 \@paths 1781 \@paths
1614} 1782}
1615 1783
1616=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1784=item $protocol_xml = $player->expand_cfpod ($cfpod)
1617 1785
1618Expand crossfire pod fragments into protocol xml. 1786Expand deliantra pod fragments into protocol xml.
1619
1620=cut
1621
1622use re 'eval';
1623
1624my $group;
1625my $interior; $interior = qr{
1626 # match a pod interior sequence sans C<< >>
1627 (?:
1628 \ (.*?)\ (?{ $group = $^N })
1629 | < (??{$interior}) >
1630 )
1631}x;
1632
1633sub expand_cfpod {
1634 my ($self, $pod) = @_;
1635
1636 my $xml;
1637
1638 while () {
1639 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1640 $group = $1;
1641
1642 $group =~ s/&/&amp;/g;
1643 $group =~ s/</&lt;/g;
1644
1645 $xml .= $group;
1646 } elsif ($pod =~ m%\G
1647 ([BCGHITU])
1648 <
1649 (?:
1650 ([^<>]*) (?{ $group = $^N })
1651 | < $interior >
1652 )
1653 >
1654 %gcsx
1655 ) {
1656 my ($code, $data) = ($1, $group);
1657
1658 if ($code eq "B") {
1659 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1660 } elsif ($code eq "I") {
1661 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1662 } elsif ($code eq "U") {
1663 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1664 } elsif ($code eq "C") {
1665 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1666 } elsif ($code eq "T") {
1667 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1668 } elsif ($code eq "G") {
1669 my ($male, $female) = split /\|/, $data;
1670 $data = $self->gender ? $female : $male;
1671 $xml .= expand_cfpod ($self, $data);
1672 } elsif ($code eq "H") {
1673 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1674 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1675 "")
1676 [$self->{hintmode}];
1677 } else {
1678 $xml .= "error processing '$code($data)' directive";
1679 }
1680 } else {
1681 if ($pod =~ /\G(.+)/) {
1682 warn "parse error while expanding $pod (at $1)";
1683 }
1684 last;
1685 }
1686 }
1687
1688 for ($xml) {
1689 # create single paragraphs (very hackish)
1690 s/(?<=\S)\n(?=\w)/ /g;
1691
1692 # compress some whitespace
1693 s/\s+\n/\n/g; # ws line-ends
1694 s/\n\n+/\n/g; # double lines
1695 s/^\n+//; # beginning lines
1696 s/\n+$//; # ending lines
1697 }
1698
1699 $xml
1700}
1701
1702no re 'eval';
1703
1704sub hintmode {
1705 $_[0]{hintmode} = $_[1] if @_ > 1;
1706 $_[0]{hintmode}
1707}
1708 1787
1709=item $player->ext_reply ($msgid, @msg) 1788=item $player->ext_reply ($msgid, @msg)
1710 1789
1711Sends an ext reply to the player. 1790Sends an ext reply to the player.
1712 1791
… …
1744 1823
1745=cut 1824=cut
1746 1825
1747sub find_by_path($) { 1826sub find_by_path($) {
1748 my ($path) = @_; 1827 my ($path) = @_;
1828
1829 $path =~ s/^~[^\/]*//; # skip ~login
1749 1830
1750 my ($match, $specificity); 1831 my ($match, $specificity);
1751 1832
1752 for my $region (list) { 1833 for my $region (list) {
1753 if ($region->{match} && $path =~ $region->{match}) { 1834 if ($region->{match} && $path =~ $region->{match}) {
… …
1782sub generate_random_map { 1863sub generate_random_map {
1783 my ($self, $rmp) = @_; 1864 my ($self, $rmp) = @_;
1784 1865
1785 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1866 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1786 1867
1787 # mit "rum" bekleckern, nicht
1788 $self->_create_random_map ( 1868 $self->_create_random_map ($rmp);
1789 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1790 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1791 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1792 $rmp->{exit_on_final_map},
1793 $rmp->{xsize}, $rmp->{ysize},
1794 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1795 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1796 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1797 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1798 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1799 (cf::region::find $rmp->{region}), $rmp->{custom}
1800 )
1801} 1869}
1802 1870
1803=item cf::map->register ($regex, $prio) 1871=item cf::map->register ($regex, $prio)
1804 1872
1805Register a handler for the map path matching the given regex at the 1873Register a handler for the map path matching the given regex at the
… …
1810 1878
1811sub register { 1879sub register {
1812 my (undef, $regex, $prio) = @_; 1880 my (undef, $regex, $prio) = @_;
1813 my $pkg = caller; 1881 my $pkg = caller;
1814 1882
1815 no strict;
1816 push @{"$pkg\::ISA"}, __PACKAGE__; 1883 push @{"$pkg\::ISA"}, __PACKAGE__;
1817 1884
1818 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1885 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1819} 1886}
1820 1887
1821# also paths starting with '/' 1888# also paths starting with '/'
1822$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1889$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1823 1890
1824sub thawer_merge { 1891sub thawer_merge {
1825 my ($self, $merge) = @_; 1892 my ($self, $merge) = @_;
1826 1893
1827 # we have to keep some variables in memory intact 1894 # we have to keep some variables in memory intact
… …
1832} 1899}
1833 1900
1834sub normalise { 1901sub normalise {
1835 my ($path, $base) = @_; 1902 my ($path, $base) = @_;
1836 1903
1837 $path = "$path"; # make sure its a string 1904 $path = "$path"; # make sure it's a string
1838 1905
1839 $path =~ s/\.map$//; 1906 $path =~ s/\.map$//;
1840 1907
1841 # map plan: 1908 # map plan:
1842 # 1909 #
… …
1857 $base =~ s{[^/]+/?$}{}; 1924 $base =~ s{[^/]+/?$}{};
1858 $path = "$base/$path"; 1925 $path = "$base/$path";
1859 } 1926 }
1860 1927
1861 for ($path) { 1928 for ($path) {
1862 redo if s{//}{/};
1863 redo if s{/\.?/}{/}; 1929 redo if s{/\.?/}{/};
1864 redo if s{/[^/]+/\.\./}{/}; 1930 redo if s{/[^/]+/\.\./}{/};
1865 } 1931 }
1866 1932
1867 $path 1933 $path
… …
1881 $self->init; # pass $1 etc. 1947 $self->init; # pass $1 etc.
1882 return $self; 1948 return $self;
1883 } 1949 }
1884 } 1950 }
1885 1951
1886 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1952 Carp::cluck "unable to resolve path '$path' (base '$base')";
1887 () 1953 ()
1888} 1954}
1889 1955
1890sub init { 1956sub init {
1891 my ($self) = @_; 1957 my ($self) = @_;
… …
1923sub uniq_path { 1989sub uniq_path {
1924 my ($self) = @_; 1990 my ($self) = @_;
1925 1991
1926 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1992 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1927 "$UNIQUEDIR/$path" 1993 "$UNIQUEDIR/$path"
1928}
1929
1930# and all this just because we cannot iterate over
1931# all maps in C++...
1932sub change_all_map_light {
1933 my ($change) = @_;
1934
1935 $_->change_map_light ($change)
1936 for grep $_->outdoor, values %cf::MAP;
1937} 1994}
1938 1995
1939sub decay_objects { 1996sub decay_objects {
1940 my ($self) = @_; 1997 my ($self) = @_;
1941 1998
… …
2023 2080
2024sub find; 2081sub find;
2025sub find { 2082sub find {
2026 my ($path, $origin) = @_; 2083 my ($path, $origin) = @_;
2027 2084
2085 cf::cede_to_tick;
2086
2028 $path = normalise $path, $origin && $origin->path; 2087 $path = normalise $path, $origin && $origin->path;
2029 2088
2030 cf::lock_wait "map_data:$path";#d#remove 2089 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2031 cf::lock_wait "map_find:$path"; 2090 my $guard2 = cf::lock_acquire "map_find:$path";
2032 2091
2033 $cf::MAP{$path} || do { 2092 $cf::MAP{$path} || do {
2034 my $guard1 = cf::lock_acquire "map_find:$path";
2035 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2036
2037 my $map = new_from_path cf::map $path 2093 my $map = new_from_path cf::map $path
2038 or return; 2094 or return;
2039 2095
2040 $map->{last_save} = $cf::RUNTIME; 2096 $map->{last_save} = $cf::RUNTIME;
2041 2097
… …
2043 or return; 2099 or return;
2044 2100
2045 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2101 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2046 # doing this can freeze the server in a sync job, obviously 2102 # doing this can freeze the server in a sync job, obviously
2047 #$cf::WAIT_FOR_TICK->wait; 2103 #$cf::WAIT_FOR_TICK->wait;
2104 undef $guard2;
2048 undef $guard1; 2105 undef $guard1;
2049 undef $guard2;
2050 $map->reset; 2106 $map->reset;
2051 return find $path; 2107 return find $path;
2052 } 2108 }
2053 2109
2054 $cf::MAP{$path} = $map 2110 $cf::MAP{$path} = $map
2055 } 2111 }
2056} 2112}
2057 2113
2058sub pre_load { } 2114sub pre_load { }
2059sub post_load { } 2115#sub post_load { } # XS
2060 2116
2061sub load { 2117sub load {
2062 my ($self) = @_; 2118 my ($self) = @_;
2063 2119
2064 local $self->{deny_reset} = 1; # loading can take a long time 2120 local $self->{deny_reset} = 1; # loading can take a long time
… …
2081 my $f = new_from_file cf::object::thawer $self->{load_path}; 2137 my $f = new_from_file cf::object::thawer $self->{load_path};
2082 $f->skip_block; 2138 $f->skip_block;
2083 $self->_load_objects ($f) 2139 $self->_load_objects ($f)
2084 or return; 2140 or return;
2085 2141
2086 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2142 $self->post_load_original
2087 if delete $self->{load_original}; 2143 if delete $self->{load_original};
2088 2144
2089 if (my $uniq = $self->uniq_path) { 2145 if (my $uniq = $self->uniq_path) {
2090 utf8::encode $uniq; 2146 utf8::encode $uniq;
2091 unless (aio_stat $uniq) { 2147 unless (aio_stat $uniq) {
… …
2109 unless ($self->{deny_activate}) { 2165 unless ($self->{deny_activate}) {
2110 $self->decay_objects; 2166 $self->decay_objects;
2111 $self->fix_auto_apply; 2167 $self->fix_auto_apply;
2112 $self->update_buttons; 2168 $self->update_buttons;
2113 cf::cede_to_tick; 2169 cf::cede_to_tick;
2114 $self->set_darkness_map;
2115 cf::cede_to_tick;
2116 $self->activate; 2170 $self->activate;
2117 } 2171 }
2118 2172
2119 $self->{last_save} = $cf::RUNTIME; 2173 $self->{last_save} = $cf::RUNTIME;
2120 $self->last_access ($cf::RUNTIME); 2174 $self->last_access ($cf::RUNTIME);
2121 2175
2122 $self->in_memory (cf::MAP_ACTIVE); 2176 $self->in_memory (cf::MAP_ACTIVE);
2123 } 2177 }
2124 2178
2125 $self->post_load; 2179 $self->post_load;
2126}
2127 2180
2181 1
2182}
2183
2184# customize the map for a given player, i.e.
2185# return the _real_ map. used by e.g. per-player
2186# maps to change the path to ~playername/mappath
2128sub customise_for { 2187sub customise_for {
2129 my ($self, $ob) = @_; 2188 my ($self, $ob) = @_;
2130 2189
2131 return find "~" . $ob->name . "/" . $self->{path} 2190 return find "~" . $ob->name . "/" . $self->{path}
2132 if $self->per_player; 2191 if $self->per_player;
… …
2148 or next; 2207 or next;
2149 $neigh = find $neigh, $map 2208 $neigh = find $neigh, $map
2150 or next; 2209 or next;
2151 $neigh->load; 2210 $neigh->load;
2152 2211
2212 # now find the diagonal neighbours
2153 push @neigh, 2213 push @neigh,
2154 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2214 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2155 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2215 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2156 } 2216 }
2157 2217
… …
2164} 2224}
2165 2225
2166sub find_sync { 2226sub find_sync {
2167 my ($path, $origin) = @_; 2227 my ($path, $origin) = @_;
2168 2228
2169 cf::sync_job { find $path, $origin } 2229 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2230 if $Coro::current == $Coro::main;
2231
2232 find $path, $origin
2170} 2233}
2171 2234
2172sub do_load_sync { 2235sub do_load_sync {
2173 my ($map) = @_; 2236 my ($map) = @_;
2174 2237
2175 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2238 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2176 if $Coro::current == $Coro::main; 2239 if $Coro::current == $Coro::main;
2177 2240
2178 cf::sync_job { $map->load }; 2241 $map->load;
2179} 2242}
2180 2243
2181our %MAP_PREFETCH; 2244our %MAP_PREFETCH;
2182our $MAP_PREFETCHER = undef; 2245our $MAP_PREFETCHER = undef;
2183 2246
… …
2209 $MAP_PREFETCHER->prio (6); 2272 $MAP_PREFETCHER->prio (6);
2210 2273
2211 () 2274 ()
2212} 2275}
2213 2276
2277# common code, used by both ->save and ->swapout
2214sub save { 2278sub _save {
2215 my ($self) = @_; 2279 my ($self) = @_;
2216
2217 my $lock = cf::lock_acquire "map_data:$self->{path}";
2218 2280
2219 $self->{last_save} = $cf::RUNTIME; 2281 $self->{last_save} = $cf::RUNTIME;
2220 2282
2221 return unless $self->dirty; 2283 return unless $self->dirty;
2222 2284
… …
2242 } else { 2304 } else {
2243 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2305 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2244 } 2306 }
2245} 2307}
2246 2308
2309sub save {
2310 my ($self) = @_;
2311
2312 my $lock = cf::lock_acquire "map_data:$self->{path}";
2313
2314 $self->_save;
2315}
2316
2247sub swap_out { 2317sub swap_out {
2248 my ($self) = @_; 2318 my ($self) = @_;
2249 2319
2250 # save first because save cedes
2251 $self->save;
2252
2253 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2320 my $lock = cf::lock_acquire "map_data:$self->{path}";
2254 2321
2255 return if $self->players;
2256 return if $self->in_memory != cf::MAP_ACTIVE; 2322 return if $self->in_memory != cf::MAP_ACTIVE;
2257 return if $self->{deny_save}; 2323 return if $self->{deny_save};
2324 return if $self->players;
2258 2325
2326 # first deactivate the map and "unlink" it from the core
2327 $self->deactivate;
2328 $_->clear_links_to ($self) for values %cf::MAP;
2259 $self->in_memory (cf::MAP_SWAPPED); 2329 $self->in_memory (cf::MAP_SWAPPED);
2330
2331 # then atomically save
2332 $self->_save;
2333
2334 # then free the map
2335 $self->clear;
2336}
2337
2338sub reset_at {
2339 my ($self) = @_;
2340
2341 # TODO: safety, remove and allow resettable per-player maps
2342 return 1e99 if $self->{deny_reset};
2343
2344 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2345 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2346
2347 $time + $to
2348}
2349
2350sub should_reset {
2351 my ($self) = @_;
2352
2353 $self->reset_at <= $cf::RUNTIME
2354}
2355
2356sub reset {
2357 my ($self) = @_;
2358
2359 my $lock = cf::lock_acquire "map_data:$self->{path}";
2360
2361 return if $self->players;
2362
2363 cf::trace "resetting map ", $self->path, "\n";
2364
2365 $self->in_memory (cf::MAP_SWAPPED);
2366
2367 # need to save uniques path
2368 unless ($self->{deny_save}) {
2369 my $uniq = $self->uniq_path; utf8::encode $uniq;
2370
2371 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2372 if $uniq;
2373 }
2374
2375 delete $cf::MAP{$self->path};
2260 2376
2261 $self->deactivate; 2377 $self->deactivate;
2262 $_->clear_links_to ($self) for values %cf::MAP; 2378 $_->clear_links_to ($self) for values %cf::MAP;
2263 $self->clear; 2379 $self->clear;
2264}
2265
2266sub reset_at {
2267 my ($self) = @_;
2268
2269 # TODO: safety, remove and allow resettable per-player maps
2270 return 1e99 if $self->{deny_reset};
2271
2272 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2273 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2274
2275 $time + $to
2276}
2277
2278sub should_reset {
2279 my ($self) = @_;
2280
2281 $self->reset_at <= $cf::RUNTIME
2282}
2283
2284sub reset {
2285 my ($self) = @_;
2286
2287 my $lock = cf::lock_acquire "map_data:$self->{path}";
2288
2289 return if $self->players;
2290
2291 warn "resetting map ", $self->path;
2292
2293 $self->in_memory (cf::MAP_SWAPPED);
2294
2295 # need to save uniques path
2296 unless ($self->{deny_save}) {
2297 my $uniq = $self->uniq_path; utf8::encode $uniq;
2298
2299 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2300 if $uniq;
2301 }
2302
2303 delete $cf::MAP{$self->path};
2304
2305 $self->deactivate;
2306 $_->clear_links_to ($self) for values %cf::MAP;
2307 $self->clear;
2308 2380
2309 $self->unlink_save; 2381 $self->unlink_save;
2310 $self->destroy; 2382 $self->destroy;
2311} 2383}
2312 2384
… …
2320 2392
2321 delete $cf::MAP{$self->path}; 2393 delete $cf::MAP{$self->path};
2322 2394
2323 $self->unlink_save; 2395 $self->unlink_save;
2324 2396
2325 bless $self, "cf::map"; 2397 bless $self, "cf::map::wrap";
2326 delete $self->{deny_reset}; 2398 delete $self->{deny_reset};
2327 $self->{deny_save} = 1; 2399 $self->{deny_save} = 1;
2328 $self->reset_timeout (1); 2400 $self->reset_timeout (1);
2329 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2401 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2330 2402
… …
2387 : normalise $_ 2459 : normalise $_
2388 } @{ aio_readdir $UNIQUEDIR or [] } 2460 } @{ aio_readdir $UNIQUEDIR or [] }
2389 ] 2461 ]
2390} 2462}
2391 2463
2464=item cf::map::static_maps
2465
2466Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2467file in the shared directory excluding F</styles> and F</editor>). May
2468block.
2469
2470=cut
2471
2472sub static_maps() {
2473 my @dirs = "";
2474 my @maps;
2475
2476 while (@dirs) {
2477 my $dir = shift @dirs;
2478
2479 next if $dir eq "/styles" || $dir eq "/editor";
2480
2481 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2482 or return;
2483
2484 for (@$files) {
2485 s/\.map$// or next;
2486 utf8::decode $_;
2487 push @maps, "$dir/$_";
2488 }
2489
2490 push @dirs, map "$dir/$_", @$dirs;
2491 }
2492
2493 \@maps
2494}
2495
2392=back 2496=back
2393 2497
2394=head3 cf::object 2498=head3 cf::object
2395 2499
2396=cut 2500=cut
… …
2457can be C<undef>. Does the right thing when the player is currently in a 2561can be C<undef>. Does the right thing when the player is currently in a
2458dialogue with the given NPC character. 2562dialogue with the given NPC character.
2459 2563
2460=cut 2564=cut
2461 2565
2566our $SAY_CHANNEL = {
2567 id => "say",
2568 title => "Map",
2569 reply => "say ",
2570 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2571};
2572
2573our $CHAT_CHANNEL = {
2574 id => "chat",
2575 title => "Chat",
2576 reply => "chat ",
2577 tooltip => "Player chat and shouts, global to the server.",
2578};
2579
2462# rough implementation of a future "reply" method that works 2580# rough implementation of a future "reply" method that works
2463# with dialog boxes. 2581# with dialog boxes.
2464#TODO: the first argument must go, split into a $npc->reply_to ( method 2582#TODO: the first argument must go, split into a $npc->reply_to ( method
2465sub cf::object::player::reply($$$;$) { 2583sub cf::object::player::reply($$$;$) {
2466 my ($self, $npc, $msg, $flags) = @_; 2584 my ($self, $npc, $msg, $flags) = @_;
… …
2477 my $dialog = $pl->{npc_dialog}; 2595 my $dialog = $pl->{npc_dialog};
2478 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2596 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2479 2597
2480 } else { 2598 } else {
2481 $msg = $npc->name . " says: $msg" if $npc; 2599 $msg = $npc->name . " says: $msg" if $npc;
2482 $self->message ($msg, $flags); 2600 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2483 } 2601 }
2484 } 2602 }
2485} 2603}
2486 2604
2487=item $object->send_msg ($channel, $msg, $color, [extra...]) 2605=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2512 2630
2513=item $player_object->enter_link 2631=item $player_object->enter_link
2514 2632
2515Freezes the player and moves him/her to a special map (C<{link}>). 2633Freezes the player and moves him/her to a special map (C<{link}>).
2516 2634
2517The player should be reasonably safe there for short amounts of time. You 2635The player should be reasonably safe there for short amounts of time (e.g.
2518I<MUST> call C<leave_link> as soon as possible, though. 2636for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2637though, as the player cannot control the character while it is on the link
2638map.
2519 2639
2520Will never block. 2640Will never block.
2521 2641
2522=item $player_object->leave_link ($map, $x, $y) 2642=item $player_object->leave_link ($map, $x, $y)
2523 2643
… …
2543sub cf::object::player::enter_link { 2663sub cf::object::player::enter_link {
2544 my ($self) = @_; 2664 my ($self) = @_;
2545 2665
2546 $self->deactivate_recursive; 2666 $self->deactivate_recursive;
2547 2667
2668 ++$self->{_link_recursion};
2669
2548 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2670 return if UNIVERSAL::isa $self->map, "ext::map_link";
2549 2671
2550 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2672 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2551 if $self->map && $self->map->{path} ne "{link}"; 2673 if $self->map && $self->map->{path} ne "{link}";
2552 2674
2553 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2675 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2554} 2676}
2555 2677
2556sub cf::object::player::leave_link { 2678sub cf::object::player::leave_link {
2557 my ($self, $map, $x, $y) = @_; 2679 my ($self, $map, $x, $y) = @_;
2558 2680
… …
2575 ($x, $y) = (-1, -1) 2697 ($x, $y) = (-1, -1)
2576 unless (defined $x) && (defined $y); 2698 unless (defined $x) && (defined $y);
2577 2699
2578 # use -1 or undef as default coordinates, not 0, 0 2700 # use -1 or undef as default coordinates, not 0, 0
2579 ($x, $y) = ($map->enter_x, $map->enter_y) 2701 ($x, $y) = ($map->enter_x, $map->enter_y)
2580 if $x <=0 && $y <= 0; 2702 if $x <= 0 && $y <= 0;
2581 2703
2582 $map->load; 2704 $map->load;
2583 $map->load_neighbours; 2705 $map->load_neighbours;
2584 2706
2585 return unless $self->contr->active; 2707 return unless $self->contr->active;
2586 $self->activate_recursive;
2587 2708
2588 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2709 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2589 $self->enter_map ($map, $x, $y); 2710 if ($self->enter_map ($map, $x, $y)) {
2590} 2711 # entering was successful
2712 delete $self->{_link_recursion};
2713 # only activate afterwards, to support waiting in hooks
2714 $self->activate_recursive;
2715 }
2591 2716
2717}
2718
2592=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2719=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2593 2720
2594Moves the player to the given map-path and coordinates by first freezing 2721Moves the player to the given map-path and coordinates by first freezing
2595her, loading and preparing them map, calling the provided $check callback 2722her, loading and preparing them map, calling the provided $check callback
2596that has to return the map if sucecssful, and then unfreezes the player on 2723that has to return the map if sucecssful, and then unfreezes the player on
2597the new (success) or old (failed) map position. In either case, $done will 2724the new (success) or old (failed) map position. In either case, $done will
2598be called at the end of this process. 2725be called at the end of this process.
2599 2726
2727Note that $check will be called with a potentially non-loaded map, so if
2728it needs a loaded map it has to call C<< ->load >>.
2729
2600=cut 2730=cut
2601 2731
2602our $GOTOGEN; 2732our $GOTOGEN;
2603 2733
2604sub cf::object::player::goto { 2734sub cf::object::player::goto {
2605 my ($self, $path, $x, $y, $check, $done) = @_; 2735 my ($self, $path, $x, $y, $check, $done) = @_;
2736
2737 if ($self->{_link_recursion} >= $MAX_LINKS) {
2738 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2739 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2740 ($path, $x, $y) = @$EMERGENCY_POSITION;
2741 }
2606 2742
2607 # do generation counting so two concurrent goto's will be executed in-order 2743 # do generation counting so two concurrent goto's will be executed in-order
2608 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2744 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2609 2745
2610 $self->enter_link; 2746 $self->enter_link;
… …
2634 my $map = eval { 2770 my $map = eval {
2635 my $map = defined $path ? cf::map::find $path : undef; 2771 my $map = defined $path ? cf::map::find $path : undef;
2636 2772
2637 if ($map) { 2773 if ($map) {
2638 $map = $map->customise_for ($self); 2774 $map = $map->customise_for ($self);
2639 $map = $check->($map) if $check && $map; 2775 $map = $check->($map, $x, $y, $self) if $check && $map;
2640 } else { 2776 } else {
2641 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2777 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2642 } 2778 }
2643 2779
2644 $map 2780 $map
… …
2652 if ($gen == $self->{_goto_generation}) { 2788 if ($gen == $self->{_goto_generation}) {
2653 delete $self->{_goto_generation}; 2789 delete $self->{_goto_generation};
2654 $self->leave_link ($map, $x, $y); 2790 $self->leave_link ($map, $x, $y);
2655 } 2791 }
2656 2792
2657 $done->() if $done; 2793 $done->($self) if $done;
2658 })->prio (1); 2794 })->prio (1);
2659} 2795}
2660 2796
2661=item $player_object->enter_exit ($exit_object) 2797=item $player_object->enter_exit ($exit_object)
2662 2798
… …
2682} 2818}
2683 2819
2684sub prepare_random_map { 2820sub prepare_random_map {
2685 my ($exit) = @_; 2821 my ($exit) = @_;
2686 2822
2687 my $guard = cf::lock_acquire "exit_prepare:$exit";
2688
2689 # all this does is basically replace the /! path by 2823 # all this does is basically replace the /! path by
2690 # a new random map path (?random/...) with a seed 2824 # a new random map path (?random/...) with a seed
2691 # that depends on the exit object 2825 # that depends on the exit object
2692 2826
2693 my $rmp = parse_random_map_params $exit->msg; 2827 my $rmp = parse_random_map_params $exit->msg;
… …
2695 if ($exit->map) { 2829 if ($exit->map) {
2696 $rmp->{region} = $exit->region->name; 2830 $rmp->{region} = $exit->region->name;
2697 $rmp->{origin_map} = $exit->map->path; 2831 $rmp->{origin_map} = $exit->map->path;
2698 $rmp->{origin_x} = $exit->x; 2832 $rmp->{origin_x} = $exit->x;
2699 $rmp->{origin_y} = $exit->y; 2833 $rmp->{origin_y} = $exit->y;
2834
2835 $exit->map->touch;
2700 } 2836 }
2701 2837
2702 $rmp->{random_seed} ||= $exit->random_seed; 2838 $rmp->{random_seed} ||= $exit->random_seed;
2703 2839
2704 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp); 2840 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
… …
2708 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2844 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2709 aio_write $fh, 0, (length $data), $data, 0; 2845 aio_write $fh, 0, (length $data), $data, 0;
2710 undef $fh; 2846 undef $fh;
2711 aio_rename "$meta~", $meta; 2847 aio_rename "$meta~", $meta;
2712 2848
2849 my $slaying = "?random/$md5";
2850
2851 if ($exit->valid) {
2713 $exit->slaying ("?random/$md5"); 2852 $exit->slaying ("?random/$md5");
2714 $exit->msg (undef); 2853 $exit->msg (undef);
2854 }
2715 } 2855 }
2716} 2856}
2717 2857
2718sub cf::object::player::enter_exit { 2858sub cf::object::player::enter_exit {
2719 my ($self, $exit) = @_; 2859 my ($self, $exit) = @_;
2720 2860
2721 return unless $self->type == cf::PLAYER; 2861 return unless $self->type == cf::PLAYER;
2722 2862
2723 if ($exit->slaying eq "/!") {
2724 #TODO: this should de-fi-ni-te-ly not be a sync-job
2725 # the problem is that $exit might not survive long enough
2726 # so it needs to be done right now, right here
2727 cf::sync_job { prepare_random_map $exit };
2728 }
2729
2730 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2731 my $hp = $exit->stats->hp;
2732 my $sp = $exit->stats->sp;
2733
2734 $self->enter_link; 2863 $self->enter_link;
2735 2864
2736 # if exit is damned, update players death & WoR home-position
2737 $self->contr->savebed ($slaying, $hp, $sp)
2738 if $exit->flag (FLAG_DAMNED);
2739
2740 (async { 2865 (async {
2741 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2866 $Coro::current->{desc} = "enter_exit";
2742 2867
2743 $self->deactivate_recursive; # just to be sure
2744 unless (eval { 2868 unless (eval {
2869 $self->deactivate_recursive; # just to be sure
2870
2871 # random map handling
2872 {
2873 my $guard = cf::lock_acquire "exit_prepare:$exit";
2874
2875 prepare_random_map $exit
2876 if $exit->slaying eq "/!";
2877 }
2878
2879 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2880 my $x = $exit->stats->hp;
2881 my $y = $exit->stats->sp;
2882
2745 $self->goto ($slaying, $hp, $sp); 2883 $self->goto ($map, $x, $y);
2746 2884
2885 # if exit is damned, update players death & WoR home-position
2886 $self->contr->savebed ($map, $x, $y)
2887 if $exit->flag (cf::FLAG_DAMNED);
2888
2747 1; 2889 1
2748 }) { 2890 }) {
2749 $self->message ("Something went wrong deep within the crossfire server. " 2891 $self->message ("Something went wrong deep within the deliantra server. "
2750 . "I'll try to bring you back to the map you were before. " 2892 . "I'll try to bring you back to the map you were before. "
2751 . "Please report this to the dungeon master!", 2893 . "Please report this to the dungeon master!",
2752 cf::NDI_UNIQUE | cf::NDI_RED); 2894 cf::NDI_UNIQUE | cf::NDI_RED);
2753 2895
2754 warn "ERROR in enter_exit: $@"; 2896 error "ERROR in enter_exit: $@";
2755 $self->leave_link; 2897 $self->leave_link;
2756 } 2898 }
2757 })->prio (1); 2899 })->prio (1);
2758} 2900}
2759 2901
… …
2771sub cf::client::send_drawinfo { 2913sub cf::client::send_drawinfo {
2772 my ($self, $text, $flags) = @_; 2914 my ($self, $text, $flags) = @_;
2773 2915
2774 utf8::encode $text; 2916 utf8::encode $text;
2775 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2917 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2918}
2919
2920=item $client->send_big_packet ($pkt)
2921
2922Like C<send_packet>, but tries to compress large packets, and fragments
2923them as required.
2924
2925=cut
2926
2927our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2928
2929sub cf::client::send_big_packet {
2930 my ($self, $pkt) = @_;
2931
2932 # try lzf for large packets
2933 $pkt = "lzf " . Compress::LZF::compress $pkt
2934 if 1024 <= length $pkt and $self->{can_lzf};
2935
2936 # split very large packets
2937 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2938 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2939 $pkt = "frag";
2940 }
2941
2942 $self->send_packet ($pkt);
2776} 2943}
2777 2944
2778=item $client->send_msg ($channel, $msg, $color, [extra...]) 2945=item $client->send_msg ($channel, $msg, $color, [extra...])
2779 2946
2780Send a drawinfo or msg packet to the client, formatting the msg for the 2947Send a drawinfo or msg packet to the client, formatting the msg for the
… …
2784 2951
2785=cut 2952=cut
2786 2953
2787# non-persistent channels (usually the info channel) 2954# non-persistent channels (usually the info channel)
2788our %CHANNEL = ( 2955our %CHANNEL = (
2956 "c/motd" => {
2957 id => "infobox",
2958 title => "MOTD",
2959 reply => undef,
2960 tooltip => "The message of the day",
2961 },
2789 "c/identify" => { 2962 "c/identify" => {
2790 id => "infobox", 2963 id => "infobox",
2791 title => "Identify", 2964 title => "Identify",
2792 reply => undef, 2965 reply => undef,
2793 tooltip => "Items recently identified", 2966 tooltip => "Items recently identified",
… …
2795 "c/examine" => { 2968 "c/examine" => {
2796 id => "infobox", 2969 id => "infobox",
2797 title => "Examine", 2970 title => "Examine",
2798 reply => undef, 2971 reply => undef,
2799 tooltip => "Signs and other items you examined", 2972 tooltip => "Signs and other items you examined",
2973 },
2974 "c/shopinfo" => {
2975 id => "infobox",
2976 title => "Shop Info",
2977 reply => undef,
2978 tooltip => "What your bargaining skill tells you about the shop",
2800 }, 2979 },
2801 "c/book" => { 2980 "c/book" => {
2802 id => "infobox", 2981 id => "infobox",
2803 title => "Book", 2982 title => "Book",
2804 reply => undef, 2983 reply => undef,
… …
2820 id => "infobox", 2999 id => "infobox",
2821 title => "Body Parts", 3000 title => "Body Parts",
2822 reply => undef, 3001 reply => undef,
2823 tooltip => "Shows which body parts you posess and are available", 3002 tooltip => "Shows which body parts you posess and are available",
2824 }, 3003 },
3004 "c/statistics" => {
3005 id => "infobox",
3006 title => "Statistics",
3007 reply => undef,
3008 tooltip => "Shows your primary statistics",
3009 },
3010 "c/skills" => {
3011 id => "infobox",
3012 title => "Skills",
3013 reply => undef,
3014 tooltip => "Shows your experience per skill and item power",
3015 },
3016 "c/shopitems" => {
3017 id => "infobox",
3018 title => "Shop Items",
3019 reply => undef,
3020 tooltip => "Shows the items currently for sale in this shop",
3021 },
3022 "c/resistances" => {
3023 id => "infobox",
3024 title => "Resistances",
3025 reply => undef,
3026 tooltip => "Shows your resistances",
3027 },
3028 "c/pets" => {
3029 id => "infobox",
3030 title => "Pets",
3031 reply => undef,
3032 tooltip => "Shows information abotu your pets/a specific pet",
3033 },
3034 "c/perceiveself" => {
3035 id => "infobox",
3036 title => "Perceive Self",
3037 reply => undef,
3038 tooltip => "You gained detailed knowledge about yourself",
3039 },
2825 "c/uptime" => { 3040 "c/uptime" => {
2826 id => "infobox", 3041 id => "infobox",
2827 title => "Uptime", 3042 title => "Uptime",
2828 reply => undef, 3043 reply => undef,
2829 tooltip => "How long the server has been running since last restart", 3044 tooltip => "How long the server has been running since last restart",
… …
2832 id => "infobox", 3047 id => "infobox",
2833 title => "Map Info", 3048 title => "Map Info",
2834 reply => undef, 3049 reply => undef,
2835 tooltip => "Information related to the maps", 3050 tooltip => "Information related to the maps",
2836 }, 3051 },
3052 "c/party" => {
3053 id => "party",
3054 title => "Party",
3055 reply => "gsay ",
3056 tooltip => "Messages and chat related to your party",
3057 },
3058 "c/death" => {
3059 id => "death",
3060 title => "Death",
3061 reply => undef,
3062 tooltip => "Reason for and more info about your most recent death",
3063 },
3064 "c/say" => $SAY_CHANNEL,
3065 "c/chat" => $CHAT_CHANNEL,
2837); 3066);
2838 3067
2839sub cf::client::send_msg { 3068sub cf::client::send_msg {
2840 my ($self, $channel, $msg, $color, @extra) = @_; 3069 my ($self, $channel, $msg, $color, @extra) = @_;
2841 3070
2842 $msg = $self->pl->expand_cfpod ($msg); 3071 $msg = $self->pl->expand_cfpod ($msg)
3072 unless $color & cf::NDI_VERBATIM;
2843 3073
2844 $color &= cf::NDI_CLIENT_MASK; # just in case... 3074 $color &= cf::NDI_CLIENT_MASK; # just in case...
2845 3075
2846 # check predefined channels, for the benefit of C 3076 # check predefined channels, for the benefit of C
2847 if ($CHANNEL{$channel}) { 3077 if ($CHANNEL{$channel}) {
2848 $channel = $CHANNEL{$channel}; 3078 $channel = $CHANNEL{$channel};
2849 3079
2850 $self->ext_msg (channel_info => $channel) 3080 $self->ext_msg (channel_info => $channel);
2851 if $self->can_msg;
2852
2853 $channel = $channel->{id}; 3081 $channel = $channel->{id};
2854 3082
2855 } elsif (ref $channel) { 3083 } elsif (ref $channel) {
2856 # send meta info to client, if not yet sent 3084 # send meta info to client, if not yet sent
2857 unless (exists $self->{channel}{$channel->{id}}) { 3085 unless (exists $self->{channel}{$channel->{id}}) {
2858 $self->{channel}{$channel->{id}} = $channel; 3086 $self->{channel}{$channel->{id}} = $channel;
2859 $self->ext_msg (channel_info => $channel) 3087 $self->ext_msg (channel_info => $channel);
2860 if $self->can_msg;
2861 } 3088 }
2862 3089
2863 $channel = $channel->{id}; 3090 $channel = $channel->{id};
2864 } 3091 }
2865 3092
2866 return unless @extra || length $msg; 3093 return unless @extra || length $msg;
2867 3094
2868 if ($self->can_msg) {
2869 # default colour, mask it out 3095 # default colour, mask it out
2870 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3096 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2871 if $color & cf::NDI_DEF; 3097 if $color & cf::NDI_DEF;
2872 3098
2873 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3099 my $pkt = "msg "
3100 . $self->{json_coder}->encode (
2874 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3101 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2875 } else { 3102 );
2876 if ($color >= 0) {
2877 # replace some tags by gcfclient-compatible ones
2878 for ($msg) {
2879 1 while
2880 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2881 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2882 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2883 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2884 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2885 }
2886 3103
2887 $color &= cf::NDI_COLOR_MASK; 3104 $self->send_big_packet ($pkt);
2888
2889 utf8::encode $msg;
2890
2891 if (0 && $msg =~ /\[/) {
2892 # COMMAND/INFO
2893 $self->send_packet ("drawextinfo $color 10 8 $msg")
2894 } else {
2895 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2896 $self->send_packet ("drawinfo $color $msg")
2897 }
2898 }
2899 }
2900} 3105}
2901 3106
2902=item $client->ext_msg ($type, @msg) 3107=item $client->ext_msg ($type, @msg)
2903 3108
2904Sends an ext event to the client. 3109Sends an ext event to the client.
… …
2907 3112
2908sub cf::client::ext_msg($$@) { 3113sub cf::client::ext_msg($$@) {
2909 my ($self, $type, @msg) = @_; 3114 my ($self, $type, @msg) = @_;
2910 3115
2911 if ($self->extcmd == 2) { 3116 if ($self->extcmd == 2) {
2912 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3117 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2913 } elsif ($self->extcmd == 1) { # TODO: remove 3118 } elsif ($self->extcmd == 1) { # TODO: remove
2914 push @msg, msgtype => "event_$type"; 3119 push @msg, msgtype => "event_$type";
2915 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3120 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2916 } 3121 }
2917} 3122}
2918 3123
2919=item $client->ext_reply ($msgid, @msg) 3124=item $client->ext_reply ($msgid, @msg)
2920 3125
… …
2924 3129
2925sub cf::client::ext_reply($$@) { 3130sub cf::client::ext_reply($$@) {
2926 my ($self, $id, @msg) = @_; 3131 my ($self, $id, @msg) = @_;
2927 3132
2928 if ($self->extcmd == 2) { 3133 if ($self->extcmd == 2) {
2929 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3134 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2930 } elsif ($self->extcmd == 1) { 3135 } elsif ($self->extcmd == 1) {
2931 #TODO: version 1, remove 3136 #TODO: version 1, remove
2932 unshift @msg, msgtype => "reply", msgid => $id; 3137 unshift @msg, msgtype => "reply", msgid => $id;
2933 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3138 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2934 } 3139 }
2935} 3140}
2936 3141
2937=item $success = $client->query ($flags, "text", \&cb) 3142=item $success = $client->query ($flags, "text", \&cb)
2938 3143
… …
3009 3214
3010 $ns->ext_reply ($reply, @reply) 3215 $ns->ext_reply ($reply, @reply)
3011 if $reply; 3216 if $reply;
3012 3217
3013 } else { 3218 } else {
3014 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3219 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3015 } 3220 }
3016 3221
3017 cf::override; 3222 cf::override;
3018 }, 3223 },
3019); 3224);
… …
3039 3244
3040 $coro 3245 $coro
3041} 3246}
3042 3247
3043cf::client->attach ( 3248cf::client->attach (
3044 on_destroy => sub { 3249 on_client_destroy => sub {
3045 my ($ns) = @_; 3250 my ($ns) = @_;
3046 3251
3047 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3252 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3048 }, 3253 },
3049); 3254);
… …
3065our $safe_hole = new Safe::Hole; 3270our $safe_hole = new Safe::Hole;
3066 3271
3067$SIG{FPE} = 'IGNORE'; 3272$SIG{FPE} = 'IGNORE';
3068 3273
3069$safe->permit_only (Opcode::opset qw( 3274$safe->permit_only (Opcode::opset qw(
3070 :base_core :base_mem :base_orig :base_math 3275 :base_core :base_mem :base_orig :base_math :base_loop
3071 grepstart grepwhile mapstart mapwhile 3276 grepstart grepwhile mapstart mapwhile
3072 sort time 3277 sort time
3073)); 3278));
3074 3279
3075# here we export the classes and methods available to script code 3280# here we export the classes and methods available to script code
… …
3078 3283
3079The following functions and methods are available within a safe environment: 3284The following functions and methods are available within a safe environment:
3080 3285
3081 cf::object 3286 cf::object
3082 contr pay_amount pay_player map x y force_find force_add destroy 3287 contr pay_amount pay_player map x y force_find force_add destroy
3083 insert remove name archname title slaying race decrease_ob_nr 3288 insert remove name archname title slaying race decrease split
3289 value
3084 3290
3085 cf::object::player 3291 cf::object::player
3086 player 3292 player
3087 3293
3088 cf::player 3294 cf::player
… …
3093 3299
3094=cut 3300=cut
3095 3301
3096for ( 3302for (
3097 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3303 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3098 insert remove inv name archname title slaying race 3304 insert remove inv nrof name archname title slaying race
3099 decrease_ob_nr destroy)], 3305 decrease split destroy change_exp value msg lore send_msg)],
3100 ["cf::object::player" => qw(player)], 3306 ["cf::object::player" => qw(player)],
3101 ["cf::player" => qw(peaceful)], 3307 ["cf::player" => qw(peaceful send_msg)],
3102 ["cf::map" => qw(trigger)], 3308 ["cf::map" => qw(trigger)],
3103) { 3309) {
3104 no strict 'refs';
3105 my ($pkg, @funs) = @$_; 3310 my ($pkg, @funs) = @$_;
3106 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3311 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3107 for @funs; 3312 for @funs;
3108} 3313}
3109 3314
… …
3124 3329
3125 my $qcode = $code; 3330 my $qcode = $code;
3126 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3331 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3127 $qcode =~ s/\n/\\n/g; 3332 $qcode =~ s/\n/\\n/g;
3128 3333
3334 %vars = (_dummy => 0) unless %vars;
3335
3336 my @res;
3129 local $_; 3337 local $_;
3130 local @safe::cf::_safe_eval_args = values %vars;
3131 3338
3132 my $eval = 3339 my $eval =
3133 "do {\n" 3340 "do {\n"
3134 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3341 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3135 . "#line 0 \"{$qcode}\"\n" 3342 . "#line 0 \"{$qcode}\"\n"
3136 . $code 3343 . $code
3137 . "\n}" 3344 . "\n}"
3138 ; 3345 ;
3139 3346
3347 if ($CFG{safe_eval}) {
3140 sub_generation_inc; 3348 sub_generation_inc;
3349 local @safe::cf::_safe_eval_args = values %vars;
3141 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3350 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3142 sub_generation_inc; 3351 sub_generation_inc;
3352 } else {
3353 local @cf::_safe_eval_args = values %vars;
3354 @res = wantarray ? eval eval : scalar eval $eval;
3355 }
3143 3356
3144 if ($@) { 3357 if ($@) {
3145 warn "$@"; 3358 warn "$@",
3146 warn "while executing safe code '$code'\n"; 3359 "while executing safe code '$code'\n",
3147 warn "with arguments " . (join " ", %vars) . "\n"; 3360 "with arguments " . (join " ", %vars) . "\n";
3148 } 3361 }
3149 3362
3150 wantarray ? @res : $res[0] 3363 wantarray ? @res : $res[0]
3151} 3364}
3152 3365
… …
3166=cut 3379=cut
3167 3380
3168sub register_script_function { 3381sub register_script_function {
3169 my ($fun, $cb) = @_; 3382 my ($fun, $cb) = @_;
3170 3383
3171 no strict 'refs'; 3384 $fun = "safe::$fun" if $CFG{safe_eval};
3172 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3385 *$fun = $safe_hole->wrap ($cb);
3173} 3386}
3174 3387
3175=back 3388=back
3176 3389
3177=cut 3390=cut
… …
3186 # for this (global event?) 3399 # for this (global event?)
3187 %ext::player_env::MUSIC_FACE_CACHE = (); 3400 %ext::player_env::MUSIC_FACE_CACHE = ();
3188 3401
3189 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3402 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3190 3403
3191 warn "loading facedata from $path\n"; 3404 trace "loading facedata from $path\n";
3192 3405
3193 my $facedata;
3194 0 < aio_load $path, $facedata 3406 0 < aio_load $path, my $facedata
3195 or die "$path: $!"; 3407 or die "$path: $!";
3196 3408
3197 $facedata = Coro::Storable::thaw $facedata; 3409 $facedata = Coro::Storable::thaw $facedata;
3198 3410
3199 $facedata->{version} == 2 3411 $facedata->{version} == 2
3200 or cf::cleanup "$path: version mismatch, cannot proceed."; 3412 or cf::cleanup "$path: version mismatch, cannot proceed.";
3201 3413
3202 # patch in the exptable 3414 # patch in the exptable
3415 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3203 $facedata->{resource}{"res/exp_table"} = { 3416 $facedata->{resource}{"res/exp_table"} = {
3204 type => FT_RSRC, 3417 type => FT_RSRC,
3205 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3418 data => $exp_table,
3419 hash => (Digest::MD5::md5 $exp_table),
3206 }; 3420 };
3207 cf::cede_to_tick; 3421 cf::cede_to_tick;
3208 3422
3209 { 3423 {
3210 my $faces = $facedata->{faceinfo}; 3424 my $faces = $facedata->{faceinfo};
… …
3212 while (my ($face, $info) = each %$faces) { 3426 while (my ($face, $info) = each %$faces) {
3213 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3427 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3214 3428
3215 cf::face::set_visibility $idx, $info->{visibility}; 3429 cf::face::set_visibility $idx, $info->{visibility};
3216 cf::face::set_magicmap $idx, $info->{magicmap}; 3430 cf::face::set_magicmap $idx, $info->{magicmap};
3217 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3431 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3218 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3432 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3433 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3219 3434
3220 cf::cede_to_tick; 3435 cf::cede_to_tick;
3221 } 3436 }
3222 3437
3223 while (my ($face, $info) = each %$faces) { 3438 while (my ($face, $info) = each %$faces) {
… …
3228 3443
3229 if (my $smooth = cf::face::find $info->{smooth}) { 3444 if (my $smooth = cf::face::find $info->{smooth}) {
3230 cf::face::set_smooth $idx, $smooth; 3445 cf::face::set_smooth $idx, $smooth;
3231 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3446 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3232 } else { 3447 } else {
3233 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3448 error "smooth face '$info->{smooth}' not found for face '$face'";
3234 } 3449 }
3235 3450
3236 cf::cede_to_tick; 3451 cf::cede_to_tick;
3237 } 3452 }
3238 } 3453 }
… …
3247 3462
3248 cf::anim::invalidate_all; # d'oh 3463 cf::anim::invalidate_all; # d'oh
3249 } 3464 }
3250 3465
3251 { 3466 {
3252 # TODO: for gcfclient pleasure, we should give resources
3253 # that gcfclient doesn't grok a >10000 face index.
3254 my $res = $facedata->{resource}; 3467 my $res = $facedata->{resource};
3255 3468
3256 while (my ($name, $info) = each %$res) { 3469 while (my ($name, $info) = each %$res) {
3257 if (defined $info->{type}) { 3470 if (defined $info->{type}) {
3258 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3471 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3259 my $data;
3260 3472
3261 if ($info->{type} & 1) { 3473 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3262 # prepend meta info
3263
3264 my $meta = $enc->encode ({
3265 name => $name,
3266 %{ $info->{meta} || {} },
3267 });
3268
3269 $data = pack "(w/a*)*", $meta, $info->{data};
3270 } else {
3271 $data = $info->{data};
3272 }
3273
3274 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3275 cf::face::set_type $idx, $info->{type}; 3474 cf::face::set_type $idx, $info->{type};
3276 } else { 3475 } else {
3277 $RESOURCE{$name} = $info; 3476 $RESOURCE{$name} = $info; # unused
3278 } 3477 }
3279 3478
3280 cf::cede_to_tick; 3479 cf::cede_to_tick;
3281 } 3480 }
3282 } 3481 }
3283 3482
3284 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3483 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3285 3484
3286 1 3485 1
3287} 3486}
3288
3289cf::global->attach (on_resource_update => sub {
3290 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3291 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3292
3293 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3294 my $sound = $soundconf->{compat}[$_]
3295 or next;
3296
3297 my $face = cf::face::find "sound/$sound->[1]";
3298 cf::sound::set $sound->[0] => $face;
3299 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3300 }
3301
3302 while (my ($k, $v) = each %{$soundconf->{event}}) {
3303 my $face = cf::face::find "sound/$v";
3304 cf::sound::set $k => $face;
3305 }
3306 }
3307});
3308 3487
3309register_exticmd fx_want => sub { 3488register_exticmd fx_want => sub {
3310 my ($ns, $want) = @_; 3489 my ($ns, $want) = @_;
3311 3490
3312 while (my ($k, $v) = each %$want) { 3491 while (my ($k, $v) = each %$want) {
3313 $ns->fx_want ($k, $v); 3492 $ns->fx_want ($k, $v);
3314 } 3493 }
3315}; 3494};
3316 3495
3317sub load_resource_file($) { 3496sub load_resource_file($) {
3497 my $guard = lock_acquire "load_resource_file";
3498
3318 my $status = load_resource_file_ $_[0]; 3499 my $status = load_resource_file_ $_[0];
3319 get_slot 0.1, 100; 3500 get_slot 0.1, 100;
3320 cf::arch::commit_load; 3501 cf::arch::commit_load;
3502
3321 $status 3503 $status
3322} 3504}
3323 3505
3324sub reload_regions { 3506sub reload_regions {
3325 # HACK to clear player env face cache, we need some signal framework 3507 # HACK to clear player env face cache, we need some signal framework
… …
3348sub reload_treasures { 3530sub reload_treasures {
3349 load_resource_file "$DATADIR/treasures" 3531 load_resource_file "$DATADIR/treasures"
3350 or die "unable to load treasurelists\n"; 3532 or die "unable to load treasurelists\n";
3351} 3533}
3352 3534
3535sub reload_sound {
3536 trace "loading sound config from $DATADIR/sound\n";
3537
3538 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3539 or die "$DATADIR/sound $!";
3540
3541 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3542
3543 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3544 my $sound = $soundconf->{compat}[$_]
3545 or next;
3546
3547 my $face = cf::face::find "sound/$sound->[1]";
3548 cf::sound::set $sound->[0] => $face;
3549 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3550 }
3551
3552 while (my ($k, $v) = each %{$soundconf->{event}}) {
3553 my $face = cf::face::find "sound/$v";
3554 cf::sound::set $k => $face;
3555 }
3556}
3557
3353sub reload_resources { 3558sub reload_resources {
3354 warn "reloading resource files...\n"; 3559 trace "reloading resource files...\n";
3355 3560
3561 reload_exp_table;
3562 reload_materials;
3356 reload_facedata; 3563 reload_facedata;
3564 reload_sound;
3357 reload_archetypes; 3565 reload_archetypes;
3358 reload_regions; 3566 reload_regions;
3359 reload_treasures; 3567 reload_treasures;
3360 3568
3361 warn "finished reloading resource files\n"; 3569 trace "finished reloading resource files\n";
3362}
3363
3364sub init {
3365 my $guard = freeze_mainloop;
3366
3367 reload_resources;
3368} 3570}
3369 3571
3370sub reload_config { 3572sub reload_config {
3371 open my $fh, "<:utf8", "$CONFDIR/config" 3573 trace "reloading config file...\n";
3372 or return;
3373 3574
3374 local $/; 3575 0 < aio_load "$CONFDIR/config", my $config
3375 *CFG = YAML::Load <$fh>; 3576 or die "$CONFDIR/config: $!";
3376 3577
3578 utf8::decode $config;
3579 *CFG = yaml_load $config;
3580
3377 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3581 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3378 3582
3379 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3583 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3380 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3584 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3381 3585
3382 if (exists $CFG{mlockall}) { 3586 if (exists $CFG{mlockall}) {
… …
3386 }; 3590 };
3387 warn $@ if $@; 3591 warn $@ if $@;
3388 } 3592 }
3389} 3593}
3390 3594
3595sub pidfile() {
3596 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3597 or die "$PIDFILE: $!";
3598 flock $fh, &Fcntl::LOCK_EX
3599 or die "$PIDFILE: flock: $!";
3600 $fh
3601}
3602
3603# make sure only one server instance is running at any one time
3604sub atomic {
3605 my $fh = pidfile;
3606
3607 my $pid = <$fh>;
3608 kill 9, $pid if $pid > 0;
3609
3610 seek $fh, 0, 0;
3611 print $fh $$;
3612}
3613
3614sub main_loop {
3615 trace "EV::loop starting\n";
3616 if (1) {
3617 EV::loop;
3618 }
3619 trace "EV::loop returned\n";
3620 goto &main_loop unless $REALLY_UNLOOP;
3621}
3622
3391sub main { 3623sub main {
3624 cf::init_globals; # initialise logging
3625
3626 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3627 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3628 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3629 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3630
3631 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3632
3392 # we must not ever block the main coroutine 3633 # we must not ever block the main coroutine
3393 local $Coro::idle = sub { 3634 local $Coro::idle = sub {
3394 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3635 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3395 (async { 3636 (async {
3396 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3637 $Coro::current->{desc} = "IDLE BUG HANDLER";
3397 EV::loop EV::LOOP_ONESHOT; 3638 EV::loop EV::LOOP_ONESHOT;
3398 })->prio (Coro::PRIO_MAX); 3639 })->prio (Coro::PRIO_MAX);
3399 }; 3640 };
3400 3641
3401 { 3642 evthread_start IO::AIO::poll_fileno;
3402 my $guard = freeze_mainloop; 3643
3644 cf::sync_job {
3645 cf::incloader::init ();
3646
3647 cf::init_anim;
3648 cf::init_attackmess;
3649 cf::init_dynamic;
3650
3651 cf::load_settings;
3652
3653 reload_resources;
3403 reload_config; 3654 reload_config;
3404 db_init; 3655 db_init;
3656
3657 cf::init_uuid;
3658 cf::init_signals;
3659 cf::init_skills;
3660
3661 cf::init_beforeplay;
3662
3663 atomic;
3664
3405 load_extensions; 3665 load_extensions;
3406 3666
3407 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3667 utime time, time, $RUNTIMEFILE;
3408 evthread_start IO::AIO::poll_fileno; 3668
3669 # no (long-running) fork's whatsoever before this point(!)
3670 use POSIX ();
3671 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3672
3673 cf::_post_init 0;
3409 } 3674 };
3410 3675
3411 EV::loop; 3676 cf::object::thawer::errors_are_fatal 0;
3677 info "parse errors in files are no longer fatal from this point on.\n";
3678
3679 my $free_main; $free_main = EV::idle sub {
3680 undef $free_main;
3681 undef &main; # free gobs of memory :)
3682 };
3683
3684 goto &main_loop;
3412} 3685}
3413 3686
3414############################################################################# 3687#############################################################################
3415# initialisation and cleanup 3688# initialisation and cleanup
3416 3689
3417# install some emergency cleanup handlers 3690# install some emergency cleanup handlers
3418BEGIN { 3691BEGIN {
3419 our %SIGWATCHER = (); 3692 our %SIGWATCHER = ();
3420 for my $signal (qw(INT HUP TERM)) { 3693 for my $signal (qw(INT HUP TERM)) {
3421 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3694 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3422 cf::cleanup "SIG$signal"; 3695 cf::cleanup "SIG$signal";
3423 }; 3696 };
3424 } 3697 }
3425} 3698}
3426 3699
3427sub write_runtime_sync { 3700sub write_runtime_sync {
3428 my $runtime = "$LOCALDIR/runtime"; 3701 my $t0 = AE::time;
3429 3702
3430 # first touch the runtime file to show we are still running: 3703 # first touch the runtime file to show we are still running:
3431 # the fsync below can take a very very long time. 3704 # the fsync below can take a very very long time.
3432 3705
3433 IO::AIO::aio_utime $runtime, undef, undef; 3706 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3434 3707
3435 my $guard = cf::lock_acquire "write_runtime"; 3708 my $guard = cf::lock_acquire "write_runtime";
3436 3709
3437 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3710 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3438 or return; 3711 or return;
3439 3712
3440 my $value = $cf::RUNTIME + 90 + 10; 3713 my $value = $cf::RUNTIME + 90 + 10;
3441 # 10 is the runtime save interval, for a monotonic clock 3714 # 10 is the runtime save interval, for a monotonic clock
3442 # 60 allows for the watchdog to kill the server. 3715 # 60 allows for the watchdog to kill the server.
… …
3452 aio_utime $fh, undef, undef; 3725 aio_utime $fh, undef, undef;
3453 3726
3454 close $fh 3727 close $fh
3455 or return; 3728 or return;
3456 3729
3457 aio_rename "$runtime~", $runtime 3730 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3458 and return; 3731 and return;
3459 3732
3460 warn "runtime file written.\n"; 3733 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3461 3734
3462 1 3735 1
3463} 3736}
3464 3737
3465our $uuid_lock; 3738our $uuid_lock;
… …
3474 my $uuid = "$LOCALDIR/uuid"; 3747 my $uuid = "$LOCALDIR/uuid";
3475 3748
3476 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3749 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3477 or return; 3750 or return;
3478 3751
3479 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3752 my $value = uuid_seq uuid_cur;
3753
3754 unless ($value) {
3755 info "cowardly refusing to write zero uuid value!\n";
3756 return;
3757 }
3758
3759 my $value = uuid_str $value + $uuid_skip;
3480 $uuid_skip = 0; 3760 $uuid_skip = 0;
3481 3761
3482 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3762 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3483 and return; 3763 and return;
3484 3764
… …
3490 or return; 3770 or return;
3491 3771
3492 aio_rename "$uuid~", $uuid 3772 aio_rename "$uuid~", $uuid
3493 and return; 3773 and return;
3494 3774
3495 warn "uuid file written ($value).\n"; 3775 trace "uuid file written ($value).\n";
3496 3776
3497 1 3777 1
3498 3778
3499} 3779}
3500 3780
… …
3506} 3786}
3507 3787
3508sub emergency_save() { 3788sub emergency_save() {
3509 my $freeze_guard = cf::freeze_mainloop; 3789 my $freeze_guard = cf::freeze_mainloop;
3510 3790
3511 warn "enter emergency perl save\n"; 3791 info "emergency_perl_save: enter\n";
3792
3793 # this is a trade-off: we want to be very quick here, so
3794 # save all maps without fsync, and later call a global sync
3795 # (which in turn might be very very slow)
3796 local $USE_FSYNC = 0;
3512 3797
3513 cf::sync_job { 3798 cf::sync_job {
3799 cf::write_runtime_sync; # external watchdog should not bark
3800
3514 # use a peculiar iteration method to avoid tripping on perl 3801 # use a peculiar iteration method to avoid tripping on perl
3515 # refcount bugs in for. also avoids problems with players 3802 # refcount bugs in for. also avoids problems with players
3516 # and maps saved/destroyed asynchronously. 3803 # and maps saved/destroyed asynchronously.
3517 warn "begin emergency player save\n"; 3804 info "emergency_perl_save: begin player save\n";
3518 for my $login (keys %cf::PLAYER) { 3805 for my $login (keys %cf::PLAYER) {
3519 my $pl = $cf::PLAYER{$login} or next; 3806 my $pl = $cf::PLAYER{$login} or next;
3520 $pl->valid or next; 3807 $pl->valid or next;
3521 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3808 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3522 $pl->save; 3809 $pl->save;
3523 } 3810 }
3524 warn "end emergency player save\n"; 3811 info "emergency_perl_save: end player save\n";
3525 3812
3526 warn "begin emergency map save\n"; 3813 cf::write_runtime_sync; # external watchdog should not bark
3814
3815 info "emergency_perl_save: begin map save\n";
3527 for my $path (keys %cf::MAP) { 3816 for my $path (keys %cf::MAP) {
3528 my $map = $cf::MAP{$path} or next; 3817 my $map = $cf::MAP{$path} or next;
3529 $map->valid or next; 3818 $map->valid or next;
3530 $map->save; 3819 $map->save;
3531 } 3820 }
3532 warn "end emergency map save\n"; 3821 info "emergency_perl_save: end map save\n";
3533 3822
3534 warn "begin emergency database checkpoint\n"; 3823 cf::write_runtime_sync; # external watchdog should not bark
3824
3825 info "emergency_perl_save: begin database checkpoint\n";
3535 BDB::db_env_txn_checkpoint $DB_ENV; 3826 BDB::db_env_txn_checkpoint $DB_ENV;
3536 warn "end emergency database checkpoint\n"; 3827 info "emergency_perl_save: end database checkpoint\n";
3537 3828
3538 warn "begin write uuid\n"; 3829 info "emergency_perl_save: begin write uuid\n";
3539 write_uuid_sync 1; 3830 write_uuid_sync 1;
3540 warn "end write uuid\n"; 3831 info "emergency_perl_save: end write uuid\n";
3832
3833 cf::write_runtime_sync; # external watchdog should not bark
3834
3835 trace "emergency_perl_save: syncing database to disk";
3836 BDB::db_env_txn_checkpoint $DB_ENV;
3837
3838 info "emergency_perl_save: starting sync\n";
3839 IO::AIO::aio_sync sub {
3840 info "emergency_perl_save: finished sync\n";
3841 };
3842
3843 cf::write_runtime_sync; # external watchdog should not bark
3844
3845 trace "emergency_perl_save: flushing outstanding aio requests";
3846 while (IO::AIO::nreqs || BDB::nreqs) {
3847 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3848 }
3849
3850 cf::write_runtime_sync; # external watchdog should not bark
3541 }; 3851 };
3542 3852
3543 warn "leave emergency perl save\n"; 3853 info "emergency_perl_save: leave\n";
3544} 3854}
3545 3855
3546sub post_cleanup { 3856sub post_cleanup {
3547 my ($make_core) = @_; 3857 my ($make_core) = @_;
3548 3858
3859 IO::AIO::flush;
3860
3549 warn Carp::longmess "post_cleanup backtrace" 3861 error Carp::longmess "post_cleanup backtrace"
3550 if $make_core; 3862 if $make_core;
3863
3864 my $fh = pidfile;
3865 unlink $PIDFILE if <$fh> == $$;
3866}
3867
3868# a safer delete_package, copied from Symbol
3869sub clear_package($) {
3870 my $pkg = shift;
3871
3872 # expand to full symbol table name if needed
3873 unless ($pkg =~ /^main::.*::$/) {
3874 $pkg = "main$pkg" if $pkg =~ /^::/;
3875 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3876 $pkg .= '::' unless $pkg =~ /::$/;
3877 }
3878
3879 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3880 my $stem_symtab = *{$stem}{HASH};
3881
3882 defined $stem_symtab and exists $stem_symtab->{$leaf}
3883 or return;
3884
3885 # clear all symbols
3886 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3887 for my $name (keys %$leaf_symtab) {
3888 _gv_clear *{"$pkg$name"};
3889# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3890 }
3551} 3891}
3552 3892
3553sub do_reload_perl() { 3893sub do_reload_perl() {
3554 # can/must only be called in main 3894 # can/must only be called in main
3555 if ($Coro::current != $Coro::main) { 3895 unless (in_main) {
3556 warn "can only reload from main coroutine"; 3896 error "can only reload from main coroutine";
3557 return; 3897 return;
3558 } 3898 }
3559 3899
3560 warn "reloading..."; 3900 return if $RELOAD++;
3561 3901
3562 warn "entering sync_job"; 3902 my $t1 = AE::time;
3563 3903
3904 while ($RELOAD) {
3905 cf::get_slot 0.1, -1, "reload_perl";
3906 info "perl_reload: reloading...";
3907
3908 trace "perl_reload: entering sync_job";
3909
3564 cf::sync_job { 3910 cf::sync_job {
3565 cf::write_runtime_sync; # external watchdog should not bark
3566 cf::emergency_save; 3911 #cf::emergency_save;
3567 cf::write_runtime_sync; # external watchdog should not bark
3568 3912
3569 warn "syncing database to disk";
3570 BDB::db_env_txn_checkpoint $DB_ENV;
3571
3572 # if anything goes wrong in here, we should simply crash as we already saved
3573
3574 warn "flushing outstanding aio requests";
3575 for (;;) {
3576 BDB::flush;
3577 IO::AIO::flush;
3578 Coro::cede_notself;
3579 last unless IO::AIO::nreqs || BDB::nreqs;
3580 warn "iterate...";
3581 }
3582
3583 ++$RELOAD;
3584
3585 warn "cancelling all extension coros"; 3913 trace "perl_reload: cancelling all extension coros";
3586 $_->cancel for values %EXT_CORO; 3914 $_->cancel for values %EXT_CORO;
3587 %EXT_CORO = (); 3915 %EXT_CORO = ();
3588 3916
3589 warn "removing commands"; 3917 trace "perl_reload: removing commands";
3590 %COMMAND = (); 3918 %COMMAND = ();
3591 3919
3592 warn "removing ext/exti commands"; 3920 trace "perl_reload: removing ext/exti commands";
3593 %EXTCMD = (); 3921 %EXTCMD = ();
3594 %EXTICMD = (); 3922 %EXTICMD = ();
3595 3923
3596 warn "unloading/nuking all extensions"; 3924 trace "perl_reload: unloading/nuking all extensions";
3597 for my $pkg (@EXTS) { 3925 for my $pkg (@EXTS) {
3598 warn "... unloading $pkg"; 3926 trace "... unloading $pkg";
3599 3927
3600 if (my $cb = $pkg->can ("unload")) { 3928 if (my $cb = $pkg->can ("unload")) {
3601 eval { 3929 eval {
3602 $cb->($pkg); 3930 $cb->($pkg);
3603 1 3931 1
3604 } or warn "$pkg unloaded, but with errors: $@"; 3932 } or error "$pkg unloaded, but with errors: $@";
3933 }
3934
3935 trace "... clearing $pkg";
3936 clear_package $pkg;
3605 } 3937 }
3606 3938
3607 warn "... nuking $pkg";
3608 Symbol::delete_package $pkg;
3609 }
3610
3611 warn "unloading all perl modules loaded from $LIBDIR"; 3939 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3612 while (my ($k, $v) = each %INC) { 3940 while (my ($k, $v) = each %INC) {
3613 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3941 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3614 3942
3615 warn "... unloading $k"; 3943 trace "... unloading $k";
3616 delete $INC{$k}; 3944 delete $INC{$k};
3617 3945
3618 $k =~ s/\.pm$//; 3946 $k =~ s/\.pm$//;
3619 $k =~ s/\//::/g; 3947 $k =~ s/\//::/g;
3620 3948
3621 if (my $cb = $k->can ("unload_module")) { 3949 if (my $cb = $k->can ("unload_module")) {
3622 $cb->(); 3950 $cb->();
3951 }
3952
3953 clear_package $k;
3623 } 3954 }
3624 3955
3625 Symbol::delete_package $k;
3626 }
3627
3628 warn "getting rid of safe::, as good as possible"; 3956 trace "perl_reload: getting rid of safe::, as good as possible";
3629 Symbol::delete_package "safe::$_" 3957 clear_package "safe::$_"
3630 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3958 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3631 3959
3632 warn "unloading cf.pm \"a bit\""; 3960 trace "perl_reload: unloading cf.pm \"a bit\"";
3633 delete $INC{"cf.pm"}; 3961 delete $INC{"cf.pm"};
3634 delete $INC{"cf/pod.pm"}; 3962 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3635 3963
3636 # don't, removes xs symbols, too, 3964 # don't, removes xs symbols, too,
3637 # and global variables created in xs 3965 # and global variables created in xs
3638 #Symbol::delete_package __PACKAGE__; 3966 #clear_package __PACKAGE__;
3639 3967
3640 warn "unload completed, starting to reload now"; 3968 info "perl_reload: unload completed, starting to reload now";
3641 3969
3642 warn "reloading cf.pm"; 3970 trace "perl_reload: reloading cf.pm";
3643 require cf; 3971 require cf;
3644 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3972 cf::_connect_to_perl_1;
3645 3973
3646 warn "loading config and database again"; 3974 trace "perl_reload: loading config and database again";
3647 cf::reload_config; 3975 cf::reload_config;
3648 3976
3649 warn "loading extensions"; 3977 trace "perl_reload: loading extensions";
3650 cf::load_extensions; 3978 cf::load_extensions;
3651 3979
3980 if ($REATTACH_ON_RELOAD) {
3652 warn "reattaching attachments to objects/players"; 3981 trace "perl_reload: reattaching attachments to objects/players";
3653 _global_reattach; # objects, sockets 3982 _global_reattach; # objects, sockets
3654 warn "reattaching attachments to maps"; 3983 trace "perl_reload: reattaching attachments to maps";
3655 reattach $_ for values %MAP; 3984 reattach $_ for values %MAP;
3656 warn "reattaching attachments to players"; 3985 trace "perl_reload: reattaching attachments to players";
3657 reattach $_ for values %PLAYER; 3986 reattach $_ for values %PLAYER;
3987 }
3658 3988
3659 warn "leaving sync_job"; 3989 cf::_post_init 1;
3660 3990
3991 trace "perl_reload: leaving sync_job";
3992
3661 1 3993 1
3662 } or do { 3994 } or do {
3663 warn $@; 3995 error $@;
3664 cf::cleanup "error while reloading, exiting."; 3996 cf::cleanup "perl_reload: error, exiting.";
3997 };
3998
3999 --$RELOAD;
3665 }; 4000 }
3666 4001
3667 warn "reloaded"; 4002 $t1 = AE::time - $t1;
4003 info "perl_reload: completed in ${t1}s\n";
3668}; 4004};
3669 4005
3670our $RELOAD_WATCHER; # used only during reload 4006our $RELOAD_WATCHER; # used only during reload
3671 4007
3672sub reload_perl() { 4008sub reload_perl() {
3673 # doing reload synchronously and two reloads happen back-to-back, 4009 # doing reload synchronously and two reloads happen back-to-back,
3674 # coro crashes during coro_state_free->destroy here. 4010 # coro crashes during coro_state_free->destroy here.
3675 4011
4012 $RELOAD_WATCHER ||= cf::async {
4013 Coro::AIO::aio_wait cache_extensions;
4014
3676 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4015 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3677 do_reload_perl; 4016 do_reload_perl;
3678 undef $RELOAD_WATCHER; 4017 undef $RELOAD_WATCHER;
4018 };
3679 }; 4019 };
3680} 4020}
3681 4021
3682register_command "reload" => sub { 4022register_command "reload" => sub {
3683 my ($who, $arg) = @_; 4023 my ($who, $arg) = @_;
… …
3689 reload_perl; 4029 reload_perl;
3690 }; 4030 };
3691 } 4031 }
3692}; 4032};
3693 4033
3694unshift @INC, $LIBDIR; 4034#############################################################################
3695 4035
3696my $bug_warning = 0; 4036my $bug_warning = 0;
3697 4037
3698our @WAIT_FOR_TICK; 4038our @WAIT_FOR_TICK;
3699our @WAIT_FOR_TICK_BEGIN; 4039our @WAIT_FOR_TICK_BEGIN;
3700 4040
3701sub wait_for_tick { 4041sub wait_for_tick() {
3702 return if tick_inhibit || $Coro::current == $Coro::main; 4042 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3703 4043
3704 my $signal = new Coro::Signal; 4044 my $signal = new Coro::Signal;
3705 push @WAIT_FOR_TICK, $signal; 4045 push @WAIT_FOR_TICK, $signal;
3706 $signal->wait; 4046 $signal->wait;
3707} 4047}
3708 4048
3709sub wait_for_tick_begin { 4049sub wait_for_tick_begin() {
3710 return if tick_inhibit || $Coro::current == $Coro::main; 4050 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3711 4051
3712 my $signal = new Coro::Signal; 4052 my $signal = new Coro::Signal;
3713 push @WAIT_FOR_TICK_BEGIN, $signal; 4053 push @WAIT_FOR_TICK_BEGIN, $signal;
3714 $signal->wait; 4054 $signal->wait;
3715} 4055}
… …
3721 return; 4061 return;
3722 } 4062 }
3723 4063
3724 cf::server_tick; # one server iteration 4064 cf::server_tick; # one server iteration
3725 4065
4066 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4067
3726 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4068 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3727 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4069 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3728 Coro::async_pool { 4070 Coro::async_pool {
3729 $Coro::current->{desc} = "runtime saver"; 4071 $Coro::current->{desc} = "runtime saver";
3730 write_runtime_sync 4072 write_runtime_sync
3731 or warn "ERROR: unable to write runtime file: $!"; 4073 or error "ERROR: unable to write runtime file: $!";
3732 }; 4074 };
3733 } 4075 }
3734 4076
3735 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4077 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3736 $sig->send; 4078 $sig->send;
… …
3744 4086
3745 if (0) { 4087 if (0) {
3746 if ($NEXT_TICK) { 4088 if ($NEXT_TICK) {
3747 my $jitter = $TICK_START - $NEXT_TICK; 4089 my $jitter = $TICK_START - $NEXT_TICK;
3748 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4090 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3749 warn "jitter $JITTER\n";#d# 4091 debug "jitter $JITTER\n";#d#
3750 } 4092 }
3751 } 4093 }
3752} 4094}
3753 4095
3754{ 4096{
3755 # configure BDB 4097 # configure BDB
3756 4098
3757 BDB::min_parallel 8; 4099 BDB::min_parallel 16;
3758 BDB::max_poll_reqs $TICK * 0.1; 4100 BDB::max_poll_reqs $TICK * 0.1;
3759 $Coro::BDB::WATCHER->priority (1); 4101 $AnyEvent::BDB::WATCHER->priority (1);
3760 4102
3761 unless ($DB_ENV) { 4103 unless ($DB_ENV) {
3762 $DB_ENV = BDB::db_env_create; 4104 $DB_ENV = BDB::db_env_create;
3763 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4105 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3764 | BDB::LOG_AUTOREMOVE, 1); 4106 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4107 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3765 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4108 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3766 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4109 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3767 4110
3768 cf::sync_job { 4111 cf::sync_job {
3769 eval { 4112 eval {
… …
3795{ 4138{
3796 # configure IO::AIO 4139 # configure IO::AIO
3797 4140
3798 IO::AIO::min_parallel 8; 4141 IO::AIO::min_parallel 8;
3799 IO::AIO::max_poll_time $TICK * 0.1; 4142 IO::AIO::max_poll_time $TICK * 0.1;
3800 $Coro::AIO::WATCHER->priority (1); 4143 undef $AnyEvent::AIO::WATCHER;
3801} 4144}
3802 4145
3803my $_log_backtrace; 4146our $_log_backtrace;
4147our $_log_backtrace_last;
3804 4148
3805sub _log_backtrace { 4149sub _log_backtrace {
3806 my ($msg, @addr) = @_; 4150 my ($msg, @addr) = @_;
3807 4151
3808 $msg =~ s/\n//; 4152 $msg =~ s/\n$//;
3809 4153
4154 if ($_log_backtrace_last eq $msg) {
4155 LOG llevInfo, "[ABT] $msg\n";
4156 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3810 # limit the # of concurrent backtraces 4157 # limit the # of concurrent backtraces
3811 if ($_log_backtrace < 2) { 4158 } elsif ($_log_backtrace < 2) {
4159 $_log_backtrace_last = $msg;
3812 ++$_log_backtrace; 4160 ++$_log_backtrace;
4161 my $perl_bt = Carp::longmess $msg;
3813 async { 4162 async {
3814 $Coro::current->{desc} = "abt $msg"; 4163 $Coro::current->{desc} = "abt $msg";
3815 4164
3816 my @bt = fork_call { 4165 my @bt = fork_call {
3817 @addr = map { sprintf "%x", $_ } @addr; 4166 @addr = map { sprintf "%x", $_ } @addr;
… …
3828 } 4177 }
3829 4178
3830 @funcs 4179 @funcs
3831 }; 4180 };
3832 4181
3833 LOG llevInfo, "[ABT] $msg\n"; 4182 LOG llevInfo, "[ABT] $perl_bt\n";
4183 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3834 LOG llevInfo, "[ABT] $_\n" for @bt; 4184 LOG llevInfo, "[ABT] $_\n" for @bt;
3835 --$_log_backtrace; 4185 --$_log_backtrace;
3836 }; 4186 };
3837 } else { 4187 } else {
3838 LOG llevInfo, "[ABT] $msg\n"; 4188 LOG llevInfo, "[ABT] $msg\n";
3839 LOG llevInfo, "[ABT] [suppressed]\n"; 4189 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3840 } 4190 }
3841} 4191}
3842 4192
3843# load additional modules 4193# load additional modules
3844use cf::pod; 4194require "cf/$_.pm" for @EXTRA_MODULES;
4195cf::_connect_to_perl_2;
3845 4196
3846END { cf::emergency_save } 4197END { cf::emergency_save }
3847 4198
38481 41991
3849 4200

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines