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.422 by root, Tue Apr 15 20:46:55 2008 UTC vs.
Revision 1.558 by root, Tue Oct 5 22:35:30 2010 UTC

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

Diff Legend

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