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.425 by root, Mon Apr 21 06:35:26 2008 UTC vs.
Revision 1.552 by root, Mon May 17 21:12:59 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 || $Coro::current == $Coro::main; 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}) {
… …
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 1866 # mit "rum" bekleckern, nicht
1788 $self->_create_random_map ( 1867 $self->_create_random_map (
1789 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1868 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1790 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1869 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1791 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1870 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1792 $rmp->{exit_on_final_map}, 1871 $rmp->{exit_on_final_map},
1793 $rmp->{xsize}, $rmp->{ysize}, 1872 $rmp->{xsize}, $rmp->{ysize},
1794 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1873 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1795 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1874 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
1810 1889
1811sub register { 1890sub register {
1812 my (undef, $regex, $prio) = @_; 1891 my (undef, $regex, $prio) = @_;
1813 my $pkg = caller; 1892 my $pkg = caller;
1814 1893
1815 no strict;
1816 push @{"$pkg\::ISA"}, __PACKAGE__; 1894 push @{"$pkg\::ISA"}, __PACKAGE__;
1817 1895
1818 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1896 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1819} 1897}
1820 1898
1821# also paths starting with '/' 1899# also paths starting with '/'
1822$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1900$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1823 1901
1824sub thawer_merge { 1902sub thawer_merge {
1825 my ($self, $merge) = @_; 1903 my ($self, $merge) = @_;
1826 1904
1827 # we have to keep some variables in memory intact 1905 # we have to keep some variables in memory intact
… …
1832} 1910}
1833 1911
1834sub normalise { 1912sub normalise {
1835 my ($path, $base) = @_; 1913 my ($path, $base) = @_;
1836 1914
1837 $path = "$path"; # make sure its a string 1915 $path = "$path"; # make sure it's a string
1838 1916
1839 $path =~ s/\.map$//; 1917 $path =~ s/\.map$//;
1840 1918
1841 # map plan: 1919 # map plan:
1842 # 1920 #
… …
1857 $base =~ s{[^/]+/?$}{}; 1935 $base =~ s{[^/]+/?$}{};
1858 $path = "$base/$path"; 1936 $path = "$base/$path";
1859 } 1937 }
1860 1938
1861 for ($path) { 1939 for ($path) {
1862 redo if s{//}{/};
1863 redo if s{/\.?/}{/}; 1940 redo if s{/\.?/}{/};
1864 redo if s{/[^/]+/\.\./}{/}; 1941 redo if s{/[^/]+/\.\./}{/};
1865 } 1942 }
1866 1943
1867 $path 1944 $path
… …
1881 $self->init; # pass $1 etc. 1958 $self->init; # pass $1 etc.
1882 return $self; 1959 return $self;
1883 } 1960 }
1884 } 1961 }
1885 1962
1886 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1963 Carp::cluck "unable to resolve path '$path' (base '$base')";
1887 () 1964 ()
1888} 1965}
1889 1966
1890sub init { 1967sub init {
1891 my ($self) = @_; 1968 my ($self) = @_;
… …
1923sub uniq_path { 2000sub uniq_path {
1924 my ($self) = @_; 2001 my ($self) = @_;
1925 2002
1926 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 2003 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1927 "$UNIQUEDIR/$path" 2004 "$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} 2005}
1938 2006
1939sub decay_objects { 2007sub decay_objects {
1940 my ($self) = @_; 2008 my ($self) = @_;
1941 2009
… …
2023 2091
2024sub find; 2092sub find;
2025sub find { 2093sub find {
2026 my ($path, $origin) = @_; 2094 my ($path, $origin) = @_;
2027 2095
2096 cf::cede_to_tick;
2097
2028 $path = normalise $path, $origin && $origin->path; 2098 $path = normalise $path, $origin && $origin->path;
2029 2099
2030 cf::lock_wait "map_data:$path";#d#remove 2100 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2031 cf::lock_wait "map_find:$path"; 2101 my $guard2 = cf::lock_acquire "map_find:$path";
2032 2102
2033 $cf::MAP{$path} || do { 2103 $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 2104 my $map = new_from_path cf::map $path
2038 or return; 2105 or return;
2039 2106
2040 $map->{last_save} = $cf::RUNTIME; 2107 $map->{last_save} = $cf::RUNTIME;
2041 2108
… …
2043 or return; 2110 or return;
2044 2111
2045 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2112 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2046 # doing this can freeze the server in a sync job, obviously 2113 # doing this can freeze the server in a sync job, obviously
2047 #$cf::WAIT_FOR_TICK->wait; 2114 #$cf::WAIT_FOR_TICK->wait;
2115 undef $guard2;
2048 undef $guard1; 2116 undef $guard1;
2049 undef $guard2;
2050 $map->reset; 2117 $map->reset;
2051 return find $path; 2118 return find $path;
2052 } 2119 }
2053 2120
2054 $cf::MAP{$path} = $map 2121 $cf::MAP{$path} = $map
2055 } 2122 }
2056} 2123}
2057 2124
2058sub pre_load { } 2125sub pre_load { }
2059sub post_load { } 2126#sub post_load { } # XS
2060 2127
2061sub load { 2128sub load {
2062 my ($self) = @_; 2129 my ($self) = @_;
2063 2130
2064 local $self->{deny_reset} = 1; # loading can take a long time 2131 local $self->{deny_reset} = 1; # loading can take a long time
… …
2081 my $f = new_from_file cf::object::thawer $self->{load_path}; 2148 my $f = new_from_file cf::object::thawer $self->{load_path};
2082 $f->skip_block; 2149 $f->skip_block;
2083 $self->_load_objects ($f) 2150 $self->_load_objects ($f)
2084 or return; 2151 or return;
2085 2152
2086 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2153 $self->post_load_original
2087 if delete $self->{load_original}; 2154 if delete $self->{load_original};
2088 2155
2089 if (my $uniq = $self->uniq_path) { 2156 if (my $uniq = $self->uniq_path) {
2090 utf8::encode $uniq; 2157 utf8::encode $uniq;
2091 unless (aio_stat $uniq) { 2158 unless (aio_stat $uniq) {
… …
2109 unless ($self->{deny_activate}) { 2176 unless ($self->{deny_activate}) {
2110 $self->decay_objects; 2177 $self->decay_objects;
2111 $self->fix_auto_apply; 2178 $self->fix_auto_apply;
2112 $self->update_buttons; 2179 $self->update_buttons;
2113 cf::cede_to_tick; 2180 cf::cede_to_tick;
2114 $self->set_darkness_map;
2115 cf::cede_to_tick;
2116 $self->activate; 2181 $self->activate;
2117 } 2182 }
2118 2183
2119 $self->{last_save} = $cf::RUNTIME; 2184 $self->{last_save} = $cf::RUNTIME;
2120 $self->last_access ($cf::RUNTIME); 2185 $self->last_access ($cf::RUNTIME);
… …
2123 } 2188 }
2124 2189
2125 $self->post_load; 2190 $self->post_load;
2126} 2191}
2127 2192
2193# customize the map for a given player, i.e.
2194# return the _real_ map. used by e.g. per-player
2195# maps to change the path to ~playername/mappath
2128sub customise_for { 2196sub customise_for {
2129 my ($self, $ob) = @_; 2197 my ($self, $ob) = @_;
2130 2198
2131 return find "~" . $ob->name . "/" . $self->{path} 2199 return find "~" . $ob->name . "/" . $self->{path}
2132 if $self->per_player; 2200 if $self->per_player;
… …
2148 or next; 2216 or next;
2149 $neigh = find $neigh, $map 2217 $neigh = find $neigh, $map
2150 or next; 2218 or next;
2151 $neigh->load; 2219 $neigh->load;
2152 2220
2221 # now find the diagonal neighbours
2153 push @neigh, 2222 push @neigh,
2154 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2223 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2155 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2224 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2156 } 2225 }
2157 2226
… …
2164} 2233}
2165 2234
2166sub find_sync { 2235sub find_sync {
2167 my ($path, $origin) = @_; 2236 my ($path, $origin) = @_;
2168 2237
2169 cf::sync_job { find $path, $origin } 2238 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2239 if $Coro::current == $Coro::main;
2240
2241 find $path, $origin
2170} 2242}
2171 2243
2172sub do_load_sync { 2244sub do_load_sync {
2173 my ($map) = @_; 2245 my ($map) = @_;
2174 2246
2175 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2247 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2176 if $Coro::current == $Coro::main; 2248 if $Coro::current == $Coro::main;
2177 2249
2178 cf::sync_job { $map->load }; 2250 $map->load;
2179} 2251}
2180 2252
2181our %MAP_PREFETCH; 2253our %MAP_PREFETCH;
2182our $MAP_PREFETCHER = undef; 2254our $MAP_PREFETCHER = undef;
2183 2255
… …
2209 $MAP_PREFETCHER->prio (6); 2281 $MAP_PREFETCHER->prio (6);
2210 2282
2211 () 2283 ()
2212} 2284}
2213 2285
2286# common code, used by both ->save and ->swapout
2214sub save { 2287sub _save {
2215 my ($self) = @_; 2288 my ($self) = @_;
2216
2217 my $lock = cf::lock_acquire "map_data:$self->{path}";
2218 2289
2219 $self->{last_save} = $cf::RUNTIME; 2290 $self->{last_save} = $cf::RUNTIME;
2220 2291
2221 return unless $self->dirty; 2292 return unless $self->dirty;
2222 2293
… …
2242 } else { 2313 } else {
2243 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2314 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2244 } 2315 }
2245} 2316}
2246 2317
2318sub save {
2319 my ($self) = @_;
2320
2321 my $lock = cf::lock_acquire "map_data:$self->{path}";
2322
2323 $self->_save;
2324}
2325
2247sub swap_out { 2326sub swap_out {
2248 my ($self) = @_; 2327 my ($self) = @_;
2249 2328
2250 # save first because save cedes
2251 $self->save;
2252
2253 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2329 my $lock = cf::lock_acquire "map_data:$self->{path}";
2254 2330
2255 return if $self->players;
2256 return if $self->in_memory != cf::MAP_ACTIVE; 2331 return if $self->in_memory != cf::MAP_ACTIVE;
2257 return if $self->{deny_save}; 2332 return if $self->{deny_save};
2333 return if $self->players;
2258 2334
2335 # first deactivate the map and "unlink" it from the core
2336 $self->deactivate;
2337 $_->clear_links_to ($self) for values %cf::MAP;
2259 $self->in_memory (cf::MAP_SWAPPED); 2338 $self->in_memory (cf::MAP_SWAPPED);
2339
2340 # then atomically save
2341 $self->_save;
2342
2343 # then free the map
2344 $self->clear;
2345}
2346
2347sub reset_at {
2348 my ($self) = @_;
2349
2350 # TODO: safety, remove and allow resettable per-player maps
2351 return 1e99 if $self->{deny_reset};
2352
2353 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2354 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2355
2356 $time + $to
2357}
2358
2359sub should_reset {
2360 my ($self) = @_;
2361
2362 $self->reset_at <= $cf::RUNTIME
2363}
2364
2365sub reset {
2366 my ($self) = @_;
2367
2368 my $lock = cf::lock_acquire "map_data:$self->{path}";
2369
2370 return if $self->players;
2371
2372 cf::trace "resetting map ", $self->path, "\n";
2373
2374 $self->in_memory (cf::MAP_SWAPPED);
2375
2376 # need to save uniques path
2377 unless ($self->{deny_save}) {
2378 my $uniq = $self->uniq_path; utf8::encode $uniq;
2379
2380 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2381 if $uniq;
2382 }
2383
2384 delete $cf::MAP{$self->path};
2260 2385
2261 $self->deactivate; 2386 $self->deactivate;
2262 $_->clear_links_to ($self) for values %cf::MAP; 2387 $_->clear_links_to ($self) for values %cf::MAP;
2263 $self->clear; 2388 $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 2389
2309 $self->unlink_save; 2390 $self->unlink_save;
2310 $self->destroy; 2391 $self->destroy;
2311} 2392}
2312 2393
… …
2320 2401
2321 delete $cf::MAP{$self->path}; 2402 delete $cf::MAP{$self->path};
2322 2403
2323 $self->unlink_save; 2404 $self->unlink_save;
2324 2405
2325 bless $self, "cf::map"; 2406 bless $self, "cf::map::wrap";
2326 delete $self->{deny_reset}; 2407 delete $self->{deny_reset};
2327 $self->{deny_save} = 1; 2408 $self->{deny_save} = 1;
2328 $self->reset_timeout (1); 2409 $self->reset_timeout (1);
2329 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2410 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2330 2411
… …
2387 : normalise $_ 2468 : normalise $_
2388 } @{ aio_readdir $UNIQUEDIR or [] } 2469 } @{ aio_readdir $UNIQUEDIR or [] }
2389 ] 2470 ]
2390} 2471}
2391 2472
2473=item cf::map::static_maps
2474
2475Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2476file in the shared directory excluding F</styles> and F</editor>). May
2477block.
2478
2479=cut
2480
2481sub static_maps() {
2482 my @dirs = "";
2483 my @maps;
2484
2485 while (@dirs) {
2486 my $dir = shift @dirs;
2487
2488 next if $dir eq "/styles" || $dir eq "/editor";
2489
2490 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2491 or return;
2492
2493 for (@$files) {
2494 s/\.map$// or next;
2495 utf8::decode $_;
2496 push @maps, "$dir/$_";
2497 }
2498
2499 push @dirs, map "$dir/$_", @$dirs;
2500 }
2501
2502 \@maps
2503}
2504
2392=back 2505=back
2393 2506
2394=head3 cf::object 2507=head3 cf::object
2395 2508
2396=cut 2509=cut
… …
2457can be C<undef>. Does the right thing when the player is currently in a 2570can be C<undef>. Does the right thing when the player is currently in a
2458dialogue with the given NPC character. 2571dialogue with the given NPC character.
2459 2572
2460=cut 2573=cut
2461 2574
2575our $SAY_CHANNEL = {
2576 id => "say",
2577 title => "Map",
2578 reply => "say ",
2579 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2580};
2581
2582our $CHAT_CHANNEL = {
2583 id => "chat",
2584 title => "Chat",
2585 reply => "chat ",
2586 tooltip => "Player chat and shouts, global to the server.",
2587};
2588
2462# rough implementation of a future "reply" method that works 2589# rough implementation of a future "reply" method that works
2463# with dialog boxes. 2590# with dialog boxes.
2464#TODO: the first argument must go, split into a $npc->reply_to ( method 2591#TODO: the first argument must go, split into a $npc->reply_to ( method
2465sub cf::object::player::reply($$$;$) { 2592sub cf::object::player::reply($$$;$) {
2466 my ($self, $npc, $msg, $flags) = @_; 2593 my ($self, $npc, $msg, $flags) = @_;
… …
2477 my $dialog = $pl->{npc_dialog}; 2604 my $dialog = $pl->{npc_dialog};
2478 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2605 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2479 2606
2480 } else { 2607 } else {
2481 $msg = $npc->name . " says: $msg" if $npc; 2608 $msg = $npc->name . " says: $msg" if $npc;
2482 $self->message ($msg, $flags); 2609 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2483 } 2610 }
2484 } 2611 }
2485} 2612}
2486 2613
2487=item $object->send_msg ($channel, $msg, $color, [extra...]) 2614=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2512 2639
2513=item $player_object->enter_link 2640=item $player_object->enter_link
2514 2641
2515Freezes the player and moves him/her to a special map (C<{link}>). 2642Freezes the player and moves him/her to a special map (C<{link}>).
2516 2643
2517The player should be reasonably safe there for short amounts of time. You 2644The player should be reasonably safe there for short amounts of time (e.g.
2518I<MUST> call C<leave_link> as soon as possible, though. 2645for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2646though, as the player cannot control the character while it is on the link
2647map.
2519 2648
2520Will never block. 2649Will never block.
2521 2650
2522=item $player_object->leave_link ($map, $x, $y) 2651=item $player_object->leave_link ($map, $x, $y)
2523 2652
… …
2543sub cf::object::player::enter_link { 2672sub cf::object::player::enter_link {
2544 my ($self) = @_; 2673 my ($self) = @_;
2545 2674
2546 $self->deactivate_recursive; 2675 $self->deactivate_recursive;
2547 2676
2677 ++$self->{_link_recursion};
2678
2548 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2679 return if UNIVERSAL::isa $self->map, "ext::map_link";
2549 2680
2550 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2681 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2551 if $self->map && $self->map->{path} ne "{link}"; 2682 if $self->map && $self->map->{path} ne "{link}";
2552 2683
2553 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2684 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2554} 2685}
2555 2686
2556sub cf::object::player::leave_link { 2687sub cf::object::player::leave_link {
2557 my ($self, $map, $x, $y) = @_; 2688 my ($self, $map, $x, $y) = @_;
2558 2689
… …
2575 ($x, $y) = (-1, -1) 2706 ($x, $y) = (-1, -1)
2576 unless (defined $x) && (defined $y); 2707 unless (defined $x) && (defined $y);
2577 2708
2578 # use -1 or undef as default coordinates, not 0, 0 2709 # use -1 or undef as default coordinates, not 0, 0
2579 ($x, $y) = ($map->enter_x, $map->enter_y) 2710 ($x, $y) = ($map->enter_x, $map->enter_y)
2580 if $x <=0 && $y <= 0; 2711 if $x <= 0 && $y <= 0;
2581 2712
2582 $map->load; 2713 $map->load;
2583 $map->load_neighbours; 2714 $map->load_neighbours;
2584 2715
2585 return unless $self->contr->active; 2716 return unless $self->contr->active;
2586 $self->activate_recursive;
2587 2717
2588 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2718 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2589 $self->enter_map ($map, $x, $y); 2719 if ($self->enter_map ($map, $x, $y)) {
2590} 2720 # entering was successful
2721 delete $self->{_link_recursion};
2722 # only activate afterwards, to support waiting in hooks
2723 $self->activate_recursive;
2724 }
2591 2725
2726}
2727
2592=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2728=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2593 2729
2594Moves the player to the given map-path and coordinates by first freezing 2730Moves the player to the given map-path and coordinates by first freezing
2595her, loading and preparing them map, calling the provided $check callback 2731her, loading and preparing them map, calling the provided $check callback
2596that has to return the map if sucecssful, and then unfreezes the player on 2732that 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 2733the new (success) or old (failed) map position. In either case, $done will
2598be called at the end of this process. 2734be called at the end of this process.
2599 2735
2736Note that $check will be called with a potentially non-loaded map, so if
2737it needs a loaded map it has to call C<< ->load >>.
2738
2600=cut 2739=cut
2601 2740
2602our $GOTOGEN; 2741our $GOTOGEN;
2603 2742
2604sub cf::object::player::goto { 2743sub cf::object::player::goto {
2605 my ($self, $path, $x, $y, $check, $done) = @_; 2744 my ($self, $path, $x, $y, $check, $done) = @_;
2745
2746 if ($self->{_link_recursion} >= $MAX_LINKS) {
2747 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2748 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2749 ($path, $x, $y) = @$EMERGENCY_POSITION;
2750 }
2606 2751
2607 # do generation counting so two concurrent goto's will be executed in-order 2752 # do generation counting so two concurrent goto's will be executed in-order
2608 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2753 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2609 2754
2610 $self->enter_link; 2755 $self->enter_link;
… …
2634 my $map = eval { 2779 my $map = eval {
2635 my $map = defined $path ? cf::map::find $path : undef; 2780 my $map = defined $path ? cf::map::find $path : undef;
2636 2781
2637 if ($map) { 2782 if ($map) {
2638 $map = $map->customise_for ($self); 2783 $map = $map->customise_for ($self);
2639 $map = $check->($map) if $check && $map; 2784 $map = $check->($map, $x, $y, $self) if $check && $map;
2640 } else { 2785 } else {
2641 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2786 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2642 } 2787 }
2643 2788
2644 $map 2789 $map
… …
2652 if ($gen == $self->{_goto_generation}) { 2797 if ($gen == $self->{_goto_generation}) {
2653 delete $self->{_goto_generation}; 2798 delete $self->{_goto_generation};
2654 $self->leave_link ($map, $x, $y); 2799 $self->leave_link ($map, $x, $y);
2655 } 2800 }
2656 2801
2657 $done->() if $done; 2802 $done->($self) if $done;
2658 })->prio (1); 2803 })->prio (1);
2659} 2804}
2660 2805
2661=item $player_object->enter_exit ($exit_object) 2806=item $player_object->enter_exit ($exit_object)
2662 2807
… …
2682} 2827}
2683 2828
2684sub prepare_random_map { 2829sub prepare_random_map {
2685 my ($exit) = @_; 2830 my ($exit) = @_;
2686 2831
2687 my $guard = cf::lock_acquire "exit_prepare:$exit";
2688
2689 # all this does is basically replace the /! path by 2832 # all this does is basically replace the /! path by
2690 # a new random map path (?random/...) with a seed 2833 # a new random map path (?random/...) with a seed
2691 # that depends on the exit object 2834 # that depends on the exit object
2692 2835
2693 my $rmp = parse_random_map_params $exit->msg; 2836 my $rmp = parse_random_map_params $exit->msg;
… …
2695 if ($exit->map) { 2838 if ($exit->map) {
2696 $rmp->{region} = $exit->region->name; 2839 $rmp->{region} = $exit->region->name;
2697 $rmp->{origin_map} = $exit->map->path; 2840 $rmp->{origin_map} = $exit->map->path;
2698 $rmp->{origin_x} = $exit->x; 2841 $rmp->{origin_x} = $exit->x;
2699 $rmp->{origin_y} = $exit->y; 2842 $rmp->{origin_y} = $exit->y;
2843
2844 $exit->map->touch;
2700 } 2845 }
2701 2846
2702 $rmp->{random_seed} ||= $exit->random_seed; 2847 $rmp->{random_seed} ||= $exit->random_seed;
2703 2848
2704 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp); 2849 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
… …
2708 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2853 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2709 aio_write $fh, 0, (length $data), $data, 0; 2854 aio_write $fh, 0, (length $data), $data, 0;
2710 undef $fh; 2855 undef $fh;
2711 aio_rename "$meta~", $meta; 2856 aio_rename "$meta~", $meta;
2712 2857
2858 my $slaying = "?random/$md5";
2859
2860 if ($exit->valid) {
2713 $exit->slaying ("?random/$md5"); 2861 $exit->slaying ("?random/$md5");
2714 $exit->msg (undef); 2862 $exit->msg (undef);
2863 }
2715 } 2864 }
2716} 2865}
2717 2866
2718sub cf::object::player::enter_exit { 2867sub cf::object::player::enter_exit {
2719 my ($self, $exit) = @_; 2868 my ($self, $exit) = @_;
2720 2869
2721 return unless $self->type == cf::PLAYER; 2870 return unless $self->type == cf::PLAYER;
2722 2871
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; 2872 $self->enter_link;
2735 2873
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 { 2874 (async {
2741 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2875 $Coro::current->{desc} = "enter_exit";
2742 2876
2743 $self->deactivate_recursive; # just to be sure
2744 unless (eval { 2877 unless (eval {
2878 $self->deactivate_recursive; # just to be sure
2879
2880 # random map handling
2881 {
2882 my $guard = cf::lock_acquire "exit_prepare:$exit";
2883
2884 prepare_random_map $exit
2885 if $exit->slaying eq "/!";
2886 }
2887
2888 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2889 my $x = $exit->stats->hp;
2890 my $y = $exit->stats->sp;
2891
2745 $self->goto ($slaying, $hp, $sp); 2892 $self->goto ($map, $x, $y);
2746 2893
2894 # if exit is damned, update players death & WoR home-position
2895 $self->contr->savebed ($map, $x, $y)
2896 if $exit->flag (cf::FLAG_DAMNED);
2897
2747 1; 2898 1
2748 }) { 2899 }) {
2749 $self->message ("Something went wrong deep within the crossfire server. " 2900 $self->message ("Something went wrong deep within the deliantra server. "
2750 . "I'll try to bring you back to the map you were before. " 2901 . "I'll try to bring you back to the map you were before. "
2751 . "Please report this to the dungeon master!", 2902 . "Please report this to the dungeon master!",
2752 cf::NDI_UNIQUE | cf::NDI_RED); 2903 cf::NDI_UNIQUE | cf::NDI_RED);
2753 2904
2754 warn "ERROR in enter_exit: $@"; 2905 error "ERROR in enter_exit: $@";
2755 $self->leave_link; 2906 $self->leave_link;
2756 } 2907 }
2757 })->prio (1); 2908 })->prio (1);
2758} 2909}
2759 2910
… …
2771sub cf::client::send_drawinfo { 2922sub cf::client::send_drawinfo {
2772 my ($self, $text, $flags) = @_; 2923 my ($self, $text, $flags) = @_;
2773 2924
2774 utf8::encode $text; 2925 utf8::encode $text;
2775 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2926 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2927}
2928
2929=item $client->send_big_packet ($pkt)
2930
2931Like C<send_packet>, but tries to compress large packets, and fragments
2932them as required.
2933
2934=cut
2935
2936our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2937
2938sub cf::client::send_big_packet {
2939 my ($self, $pkt) = @_;
2940
2941 # try lzf for large packets
2942 $pkt = "lzf " . Compress::LZF::compress $pkt
2943 if 1024 <= length $pkt and $self->{can_lzf};
2944
2945 # split very large packets
2946 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2947 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2948 $pkt = "frag";
2949 }
2950
2951 $self->send_packet ($pkt);
2776} 2952}
2777 2953
2778=item $client->send_msg ($channel, $msg, $color, [extra...]) 2954=item $client->send_msg ($channel, $msg, $color, [extra...])
2779 2955
2780Send a drawinfo or msg packet to the client, formatting the msg for the 2956Send a drawinfo or msg packet to the client, formatting the msg for the
… …
2784 2960
2785=cut 2961=cut
2786 2962
2787# non-persistent channels (usually the info channel) 2963# non-persistent channels (usually the info channel)
2788our %CHANNEL = ( 2964our %CHANNEL = (
2965 "c/motd" => {
2966 id => "infobox",
2967 title => "MOTD",
2968 reply => undef,
2969 tooltip => "The message of the day",
2970 },
2789 "c/identify" => { 2971 "c/identify" => {
2790 id => "infobox", 2972 id => "infobox",
2791 title => "Identify", 2973 title => "Identify",
2792 reply => undef, 2974 reply => undef,
2793 tooltip => "Items recently identified", 2975 tooltip => "Items recently identified",
… …
2795 "c/examine" => { 2977 "c/examine" => {
2796 id => "infobox", 2978 id => "infobox",
2797 title => "Examine", 2979 title => "Examine",
2798 reply => undef, 2980 reply => undef,
2799 tooltip => "Signs and other items you examined", 2981 tooltip => "Signs and other items you examined",
2982 },
2983 "c/shopinfo" => {
2984 id => "infobox",
2985 title => "Shop Info",
2986 reply => undef,
2987 tooltip => "What your bargaining skill tells you about the shop",
2800 }, 2988 },
2801 "c/book" => { 2989 "c/book" => {
2802 id => "infobox", 2990 id => "infobox",
2803 title => "Book", 2991 title => "Book",
2804 reply => undef, 2992 reply => undef,
… …
2820 id => "infobox", 3008 id => "infobox",
2821 title => "Body Parts", 3009 title => "Body Parts",
2822 reply => undef, 3010 reply => undef,
2823 tooltip => "Shows which body parts you posess and are available", 3011 tooltip => "Shows which body parts you posess and are available",
2824 }, 3012 },
3013 "c/statistics" => {
3014 id => "infobox",
3015 title => "Statistics",
3016 reply => undef,
3017 tooltip => "Shows your primary statistics",
3018 },
3019 "c/skills" => {
3020 id => "infobox",
3021 title => "Skills",
3022 reply => undef,
3023 tooltip => "Shows your experience per skill and item power",
3024 },
3025 "c/shopitems" => {
3026 id => "infobox",
3027 title => "Shop Items",
3028 reply => undef,
3029 tooltip => "Shows the items currently for sale in this shop",
3030 },
3031 "c/resistances" => {
3032 id => "infobox",
3033 title => "Resistances",
3034 reply => undef,
3035 tooltip => "Shows your resistances",
3036 },
3037 "c/pets" => {
3038 id => "infobox",
3039 title => "Pets",
3040 reply => undef,
3041 tooltip => "Shows information abotu your pets/a specific pet",
3042 },
3043 "c/perceiveself" => {
3044 id => "infobox",
3045 title => "Perceive Self",
3046 reply => undef,
3047 tooltip => "You gained detailed knowledge about yourself",
3048 },
2825 "c/uptime" => { 3049 "c/uptime" => {
2826 id => "infobox", 3050 id => "infobox",
2827 title => "Uptime", 3051 title => "Uptime",
2828 reply => undef, 3052 reply => undef,
2829 tooltip => "How long the server has been running since last restart", 3053 tooltip => "How long the server has been running since last restart",
… …
2832 id => "infobox", 3056 id => "infobox",
2833 title => "Map Info", 3057 title => "Map Info",
2834 reply => undef, 3058 reply => undef,
2835 tooltip => "Information related to the maps", 3059 tooltip => "Information related to the maps",
2836 }, 3060 },
3061 "c/party" => {
3062 id => "party",
3063 title => "Party",
3064 reply => "gsay ",
3065 tooltip => "Messages and chat related to your party",
3066 },
3067 "c/death" => {
3068 id => "death",
3069 title => "Death",
3070 reply => undef,
3071 tooltip => "Reason for and more info about your most recent death",
3072 },
3073 "c/say" => $SAY_CHANNEL,
3074 "c/chat" => $CHAT_CHANNEL,
2837); 3075);
2838 3076
2839sub cf::client::send_msg { 3077sub cf::client::send_msg {
2840 my ($self, $channel, $msg, $color, @extra) = @_; 3078 my ($self, $channel, $msg, $color, @extra) = @_;
2841 3079
2842 $msg = $self->pl->expand_cfpod ($msg); 3080 $msg = $self->pl->expand_cfpod ($msg)
3081 unless $color & cf::NDI_VERBATIM;
2843 3082
2844 $color &= cf::NDI_CLIENT_MASK; # just in case... 3083 $color &= cf::NDI_CLIENT_MASK; # just in case...
2845 3084
2846 # check predefined channels, for the benefit of C 3085 # check predefined channels, for the benefit of C
2847 if ($CHANNEL{$channel}) { 3086 if ($CHANNEL{$channel}) {
2848 $channel = $CHANNEL{$channel}; 3087 $channel = $CHANNEL{$channel};
2849 3088
2850 $self->ext_msg (channel_info => $channel) 3089 $self->ext_msg (channel_info => $channel);
2851 if $self->can_msg;
2852
2853 $channel = $channel->{id}; 3090 $channel = $channel->{id};
2854 3091
2855 } elsif (ref $channel) { 3092 } elsif (ref $channel) {
2856 # send meta info to client, if not yet sent 3093 # send meta info to client, if not yet sent
2857 unless (exists $self->{channel}{$channel->{id}}) { 3094 unless (exists $self->{channel}{$channel->{id}}) {
2858 $self->{channel}{$channel->{id}} = $channel; 3095 $self->{channel}{$channel->{id}} = $channel;
2859 $self->ext_msg (channel_info => $channel) 3096 $self->ext_msg (channel_info => $channel);
2860 if $self->can_msg;
2861 } 3097 }
2862 3098
2863 $channel = $channel->{id}; 3099 $channel = $channel->{id};
2864 } 3100 }
2865 3101
2866 return unless @extra || length $msg; 3102 return unless @extra || length $msg;
2867 3103
2868 if ($self->can_msg) {
2869 # default colour, mask it out 3104 # default colour, mask it out
2870 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3105 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2871 if $color & cf::NDI_DEF; 3106 if $color & cf::NDI_DEF;
2872 3107
2873 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3108 my $pkt = "msg "
3109 . $self->{json_coder}->encode (
2874 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3110 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2875 } else { 3111 );
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 3112
2887 $color &= cf::NDI_COLOR_MASK; 3113 $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} 3114}
2901 3115
2902=item $client->ext_msg ($type, @msg) 3116=item $client->ext_msg ($type, @msg)
2903 3117
2904Sends an ext event to the client. 3118Sends an ext event to the client.
… …
2907 3121
2908sub cf::client::ext_msg($$@) { 3122sub cf::client::ext_msg($$@) {
2909 my ($self, $type, @msg) = @_; 3123 my ($self, $type, @msg) = @_;
2910 3124
2911 if ($self->extcmd == 2) { 3125 if ($self->extcmd == 2) {
2912 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3126 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2913 } elsif ($self->extcmd == 1) { # TODO: remove 3127 } elsif ($self->extcmd == 1) { # TODO: remove
2914 push @msg, msgtype => "event_$type"; 3128 push @msg, msgtype => "event_$type";
2915 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3129 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2916 } 3130 }
2917} 3131}
2918 3132
2919=item $client->ext_reply ($msgid, @msg) 3133=item $client->ext_reply ($msgid, @msg)
2920 3134
… …
2924 3138
2925sub cf::client::ext_reply($$@) { 3139sub cf::client::ext_reply($$@) {
2926 my ($self, $id, @msg) = @_; 3140 my ($self, $id, @msg) = @_;
2927 3141
2928 if ($self->extcmd == 2) { 3142 if ($self->extcmd == 2) {
2929 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3143 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2930 } elsif ($self->extcmd == 1) { 3144 } elsif ($self->extcmd == 1) {
2931 #TODO: version 1, remove 3145 #TODO: version 1, remove
2932 unshift @msg, msgtype => "reply", msgid => $id; 3146 unshift @msg, msgtype => "reply", msgid => $id;
2933 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3147 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2934 } 3148 }
2935} 3149}
2936 3150
2937=item $success = $client->query ($flags, "text", \&cb) 3151=item $success = $client->query ($flags, "text", \&cb)
2938 3152
… …
3009 3223
3010 $ns->ext_reply ($reply, @reply) 3224 $ns->ext_reply ($reply, @reply)
3011 if $reply; 3225 if $reply;
3012 3226
3013 } else { 3227 } else {
3014 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3228 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3015 } 3229 }
3016 3230
3017 cf::override; 3231 cf::override;
3018 }, 3232 },
3019); 3233);
… …
3039 3253
3040 $coro 3254 $coro
3041} 3255}
3042 3256
3043cf::client->attach ( 3257cf::client->attach (
3044 on_destroy => sub { 3258 on_client_destroy => sub {
3045 my ($ns) = @_; 3259 my ($ns) = @_;
3046 3260
3047 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3261 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3048 }, 3262 },
3049); 3263);
… …
3065our $safe_hole = new Safe::Hole; 3279our $safe_hole = new Safe::Hole;
3066 3280
3067$SIG{FPE} = 'IGNORE'; 3281$SIG{FPE} = 'IGNORE';
3068 3282
3069$safe->permit_only (Opcode::opset qw( 3283$safe->permit_only (Opcode::opset qw(
3070 :base_core :base_mem :base_orig :base_math 3284 :base_core :base_mem :base_orig :base_math :base_loop
3071 grepstart grepwhile mapstart mapwhile 3285 grepstart grepwhile mapstart mapwhile
3072 sort time 3286 sort time
3073)); 3287));
3074 3288
3075# here we export the classes and methods available to script code 3289# here we export the classes and methods available to script code
… …
3079The following functions and methods are available within a safe environment: 3293The following functions and methods are available within a safe environment:
3080 3294
3081 cf::object 3295 cf::object
3082 contr pay_amount pay_player map x y force_find force_add destroy 3296 contr pay_amount pay_player map x y force_find force_add destroy
3083 insert remove name archname title slaying race decrease split 3297 insert remove name archname title slaying race decrease split
3298 value
3084 3299
3085 cf::object::player 3300 cf::object::player
3086 player 3301 player
3087 3302
3088 cf::player 3303 cf::player
… …
3093 3308
3094=cut 3309=cut
3095 3310
3096for ( 3311for (
3097 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3312 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3098 insert remove inv name archname title slaying race 3313 insert remove inv nrof name archname title slaying race
3099 decrease split destroy)], 3314 decrease split destroy change_exp value msg lore send_msg)],
3100 ["cf::object::player" => qw(player)], 3315 ["cf::object::player" => qw(player)],
3101 ["cf::player" => qw(peaceful)], 3316 ["cf::player" => qw(peaceful send_msg)],
3102 ["cf::map" => qw(trigger)], 3317 ["cf::map" => qw(trigger)],
3103) { 3318) {
3104 no strict 'refs';
3105 my ($pkg, @funs) = @$_; 3319 my ($pkg, @funs) = @$_;
3106 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3320 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3107 for @funs; 3321 for @funs;
3108} 3322}
3109 3323
… …
3124 3338
3125 my $qcode = $code; 3339 my $qcode = $code;
3126 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3340 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3127 $qcode =~ s/\n/\\n/g; 3341 $qcode =~ s/\n/\\n/g;
3128 3342
3343 %vars = (_dummy => 0) unless %vars;
3344
3345 my @res;
3129 local $_; 3346 local $_;
3130 local @safe::cf::_safe_eval_args = values %vars;
3131 3347
3132 my $eval = 3348 my $eval =
3133 "do {\n" 3349 "do {\n"
3134 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3350 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3135 . "#line 0 \"{$qcode}\"\n" 3351 . "#line 0 \"{$qcode}\"\n"
3136 . $code 3352 . $code
3137 . "\n}" 3353 . "\n}"
3138 ; 3354 ;
3139 3355
3356 if ($CFG{safe_eval}) {
3140 sub_generation_inc; 3357 sub_generation_inc;
3358 local @safe::cf::_safe_eval_args = values %vars;
3141 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3359 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3142 sub_generation_inc; 3360 sub_generation_inc;
3361 } else {
3362 local @cf::_safe_eval_args = values %vars;
3363 @res = wantarray ? eval eval : scalar eval $eval;
3364 }
3143 3365
3144 if ($@) { 3366 if ($@) {
3145 warn "$@"; 3367 warn "$@",
3146 warn "while executing safe code '$code'\n"; 3368 "while executing safe code '$code'\n",
3147 warn "with arguments " . (join " ", %vars) . "\n"; 3369 "with arguments " . (join " ", %vars) . "\n";
3148 } 3370 }
3149 3371
3150 wantarray ? @res : $res[0] 3372 wantarray ? @res : $res[0]
3151} 3373}
3152 3374
… …
3166=cut 3388=cut
3167 3389
3168sub register_script_function { 3390sub register_script_function {
3169 my ($fun, $cb) = @_; 3391 my ($fun, $cb) = @_;
3170 3392
3171 no strict 'refs'; 3393 $fun = "safe::$fun" if $CFG{safe_eval};
3172 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3394 *$fun = $safe_hole->wrap ($cb);
3173} 3395}
3174 3396
3175=back 3397=back
3176 3398
3177=cut 3399=cut
… …
3186 # for this (global event?) 3408 # for this (global event?)
3187 %ext::player_env::MUSIC_FACE_CACHE = (); 3409 %ext::player_env::MUSIC_FACE_CACHE = ();
3188 3410
3189 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3411 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3190 3412
3191 warn "loading facedata from $path\n"; 3413 trace "loading facedata from $path\n";
3192 3414
3193 my $facedata;
3194 0 < aio_load $path, $facedata 3415 0 < aio_load $path, my $facedata
3195 or die "$path: $!"; 3416 or die "$path: $!";
3196 3417
3197 $facedata = Coro::Storable::thaw $facedata; 3418 $facedata = Coro::Storable::thaw $facedata;
3198 3419
3199 $facedata->{version} == 2 3420 $facedata->{version} == 2
3200 or cf::cleanup "$path: version mismatch, cannot proceed."; 3421 or cf::cleanup "$path: version mismatch, cannot proceed.";
3201 3422
3202 # patch in the exptable 3423 # patch in the exptable
3424 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3203 $facedata->{resource}{"res/exp_table"} = { 3425 $facedata->{resource}{"res/exp_table"} = {
3204 type => FT_RSRC, 3426 type => FT_RSRC,
3205 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3427 data => $exp_table,
3428 hash => (Digest::MD5::md5 $exp_table),
3206 }; 3429 };
3207 cf::cede_to_tick; 3430 cf::cede_to_tick;
3208 3431
3209 { 3432 {
3210 my $faces = $facedata->{faceinfo}; 3433 my $faces = $facedata->{faceinfo};
… …
3212 while (my ($face, $info) = each %$faces) { 3435 while (my ($face, $info) = each %$faces) {
3213 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3436 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3214 3437
3215 cf::face::set_visibility $idx, $info->{visibility}; 3438 cf::face::set_visibility $idx, $info->{visibility};
3216 cf::face::set_magicmap $idx, $info->{magicmap}; 3439 cf::face::set_magicmap $idx, $info->{magicmap};
3217 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3440 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3218 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3441 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3219 3442
3220 cf::cede_to_tick; 3443 cf::cede_to_tick;
3221 } 3444 }
3222 3445
3223 while (my ($face, $info) = each %$faces) { 3446 while (my ($face, $info) = each %$faces) {
… …
3228 3451
3229 if (my $smooth = cf::face::find $info->{smooth}) { 3452 if (my $smooth = cf::face::find $info->{smooth}) {
3230 cf::face::set_smooth $idx, $smooth; 3453 cf::face::set_smooth $idx, $smooth;
3231 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3454 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3232 } else { 3455 } else {
3233 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3456 error "smooth face '$info->{smooth}' not found for face '$face'";
3234 } 3457 }
3235 3458
3236 cf::cede_to_tick; 3459 cf::cede_to_tick;
3237 } 3460 }
3238 } 3461 }
… …
3247 3470
3248 cf::anim::invalidate_all; # d'oh 3471 cf::anim::invalidate_all; # d'oh
3249 } 3472 }
3250 3473
3251 { 3474 {
3252 # TODO: for gcfclient pleasure, we should give resources
3253 # that gcfclient doesn't grok a >10000 face index.
3254 my $res = $facedata->{resource}; 3475 my $res = $facedata->{resource};
3255 3476
3256 while (my ($name, $info) = each %$res) { 3477 while (my ($name, $info) = each %$res) {
3257 if (defined $info->{type}) { 3478 if (defined $info->{type}) {
3258 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3479 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3259 my $data;
3260 3480
3261 if ($info->{type} & 1) { 3481 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}; 3482 cf::face::set_type $idx, $info->{type};
3276 } else { 3483 } else {
3277 $RESOURCE{$name} = $info; 3484 $RESOURCE{$name} = $info; # unused
3278 } 3485 }
3279 3486
3280 cf::cede_to_tick; 3487 cf::cede_to_tick;
3281 } 3488 }
3282 } 3489 }
3283 3490
3284 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3491 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3285 3492
3286 1 3493 1
3287} 3494}
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 3495
3309register_exticmd fx_want => sub { 3496register_exticmd fx_want => sub {
3310 my ($ns, $want) = @_; 3497 my ($ns, $want) = @_;
3311 3498
3312 while (my ($k, $v) = each %$want) { 3499 while (my ($k, $v) = each %$want) {
… …
3351sub reload_treasures { 3538sub reload_treasures {
3352 load_resource_file "$DATADIR/treasures" 3539 load_resource_file "$DATADIR/treasures"
3353 or die "unable to load treasurelists\n"; 3540 or die "unable to load treasurelists\n";
3354} 3541}
3355 3542
3543sub reload_sound {
3544 trace "loading sound config from $DATADIR/sound\n";
3545
3546 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3547 or die "$DATADIR/sound $!";
3548
3549 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3550
3551 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3552 my $sound = $soundconf->{compat}[$_]
3553 or next;
3554
3555 my $face = cf::face::find "sound/$sound->[1]";
3556 cf::sound::set $sound->[0] => $face;
3557 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3558 }
3559
3560 while (my ($k, $v) = each %{$soundconf->{event}}) {
3561 my $face = cf::face::find "sound/$v";
3562 cf::sound::set $k => $face;
3563 }
3564}
3565
3356sub reload_resources { 3566sub reload_resources {
3357 warn "reloading resource files...\n"; 3567 trace "reloading resource files...\n";
3358 3568
3569 reload_exp_table;
3570 reload_materials;
3359 reload_facedata; 3571 reload_facedata;
3572 reload_sound;
3360 reload_archetypes; 3573 reload_archetypes;
3361 reload_regions; 3574 reload_regions;
3362 reload_treasures; 3575 reload_treasures;
3363 3576
3364 warn "finished reloading resource files\n"; 3577 trace "finished reloading resource files\n";
3365}
3366
3367sub init {
3368 my $guard = freeze_mainloop;
3369
3370 reload_resources;
3371} 3578}
3372 3579
3373sub reload_config { 3580sub reload_config {
3374 open my $fh, "<:utf8", "$CONFDIR/config" 3581 trace "reloading config file...\n";
3375 or return;
3376 3582
3377 local $/; 3583 0 < aio_load "$CONFDIR/config", my $config
3378 *CFG = YAML::Load <$fh>; 3584 or die "$CONFDIR/config: $!";
3379 3585
3586 utf8::decode $config;
3587 *CFG = yaml_load $config;
3588
3380 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3589 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3381 3590
3382 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3591 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3383 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3592 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3384 3593
3385 if (exists $CFG{mlockall}) { 3594 if (exists $CFG{mlockall}) {
… …
3389 }; 3598 };
3390 warn $@ if $@; 3599 warn $@ if $@;
3391 } 3600 }
3392} 3601}
3393 3602
3603sub pidfile() {
3604 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3605 or die "$PIDFILE: $!";
3606 flock $fh, &Fcntl::LOCK_EX
3607 or die "$PIDFILE: flock: $!";
3608 $fh
3609}
3610
3611# make sure only one server instance is running at any one time
3612sub atomic {
3613 my $fh = pidfile;
3614
3615 my $pid = <$fh>;
3616 kill 9, $pid if $pid > 0;
3617
3618 seek $fh, 0, 0;
3619 print $fh $$;
3620}
3621
3622sub main_loop {
3623 trace "EV::loop starting\n";
3624 if (1) {
3625 EV::loop;
3626 }
3627 trace "EV::loop returned\n";
3628 goto &main_loop unless $REALLY_UNLOOP;
3629}
3630
3394sub main { 3631sub main {
3632 cf::init_globals; # initialise logging
3633
3634 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3635 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3636 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3637 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3638
3639 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3640
3395 # we must not ever block the main coroutine 3641 # we must not ever block the main coroutine
3396 local $Coro::idle = sub { 3642 local $Coro::idle = sub {
3397 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3643 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3398 (async { 3644 (async {
3399 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3645 $Coro::current->{desc} = "IDLE BUG HANDLER";
3400 EV::loop EV::LOOP_ONESHOT; 3646 EV::loop EV::LOOP_ONESHOT;
3401 })->prio (Coro::PRIO_MAX); 3647 })->prio (Coro::PRIO_MAX);
3402 }; 3648 };
3403 3649
3404 { 3650 evthread_start IO::AIO::poll_fileno;
3405 my $guard = freeze_mainloop; 3651
3652 cf::sync_job {
3653 cf::incloader::init ();
3654
3655 cf::init_anim;
3656 cf::init_attackmess;
3657 cf::init_dynamic;
3658
3659 cf::load_settings;
3660
3661 reload_resources;
3406 reload_config; 3662 reload_config;
3407 db_init; 3663 db_init;
3664
3665 cf::init_uuid;
3666 cf::init_signals;
3667 cf::init_skills;
3668
3669 cf::init_beforeplay;
3670
3671 atomic;
3672
3408 load_extensions; 3673 load_extensions;
3409 3674
3410 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3675 utime time, time, $RUNTIMEFILE;
3411 evthread_start IO::AIO::poll_fileno; 3676
3677 # no (long-running) fork's whatsoever before this point(!)
3678 use POSIX ();
3679 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3680
3681 cf::_post_init 0;
3412 } 3682 };
3413 3683
3414 EV::loop; 3684 cf::object::thawer::errors_are_fatal 0;
3685 info "parse errors in files are no longer fatal from this point on.\n";
3686
3687 my $free_main; $free_main = EV::idle sub {
3688 undef $free_main;
3689 undef &main; # free gobs of memory :)
3690 };
3691
3692 goto &main_loop;
3415} 3693}
3416 3694
3417############################################################################# 3695#############################################################################
3418# initialisation and cleanup 3696# initialisation and cleanup
3419 3697
3420# install some emergency cleanup handlers 3698# install some emergency cleanup handlers
3421BEGIN { 3699BEGIN {
3422 our %SIGWATCHER = (); 3700 our %SIGWATCHER = ();
3423 for my $signal (qw(INT HUP TERM)) { 3701 for my $signal (qw(INT HUP TERM)) {
3424 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3702 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3425 cf::cleanup "SIG$signal"; 3703 cf::cleanup "SIG$signal";
3426 }; 3704 };
3427 } 3705 }
3428} 3706}
3429 3707
3430sub write_runtime_sync { 3708sub write_runtime_sync {
3431 my $runtime = "$LOCALDIR/runtime"; 3709 my $t0 = AE::time;
3432 3710
3433 # first touch the runtime file to show we are still running: 3711 # first touch the runtime file to show we are still running:
3434 # the fsync below can take a very very long time. 3712 # the fsync below can take a very very long time.
3435 3713
3436 IO::AIO::aio_utime $runtime, undef, undef; 3714 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3437 3715
3438 my $guard = cf::lock_acquire "write_runtime"; 3716 my $guard = cf::lock_acquire "write_runtime";
3439 3717
3440 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3718 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3441 or return; 3719 or return;
3442 3720
3443 my $value = $cf::RUNTIME + 90 + 10; 3721 my $value = $cf::RUNTIME + 90 + 10;
3444 # 10 is the runtime save interval, for a monotonic clock 3722 # 10 is the runtime save interval, for a monotonic clock
3445 # 60 allows for the watchdog to kill the server. 3723 # 60 allows for the watchdog to kill the server.
… …
3455 aio_utime $fh, undef, undef; 3733 aio_utime $fh, undef, undef;
3456 3734
3457 close $fh 3735 close $fh
3458 or return; 3736 or return;
3459 3737
3460 aio_rename "$runtime~", $runtime 3738 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3461 and return; 3739 and return;
3462 3740
3463 warn "runtime file written.\n"; 3741 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3464 3742
3465 1 3743 1
3466} 3744}
3467 3745
3468our $uuid_lock; 3746our $uuid_lock;
… …
3477 my $uuid = "$LOCALDIR/uuid"; 3755 my $uuid = "$LOCALDIR/uuid";
3478 3756
3479 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3757 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3480 or return; 3758 or return;
3481 3759
3482 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3760 my $value = uuid_seq uuid_cur;
3761
3762 unless ($value) {
3763 info "cowardly refusing to write zero uuid value!\n";
3764 return;
3765 }
3766
3767 my $value = uuid_str $value + $uuid_skip;
3483 $uuid_skip = 0; 3768 $uuid_skip = 0;
3484 3769
3485 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3770 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3486 and return; 3771 and return;
3487 3772
… …
3493 or return; 3778 or return;
3494 3779
3495 aio_rename "$uuid~", $uuid 3780 aio_rename "$uuid~", $uuid
3496 and return; 3781 and return;
3497 3782
3498 warn "uuid file written ($value).\n"; 3783 trace "uuid file written ($value).\n";
3499 3784
3500 1 3785 1
3501 3786
3502} 3787}
3503 3788
… …
3509} 3794}
3510 3795
3511sub emergency_save() { 3796sub emergency_save() {
3512 my $freeze_guard = cf::freeze_mainloop; 3797 my $freeze_guard = cf::freeze_mainloop;
3513 3798
3514 warn "enter emergency perl save\n"; 3799 info "emergency_perl_save: enter\n";
3800
3801 # this is a trade-off: we want to be very quick here, so
3802 # save all maps without fsync, and later call a global sync
3803 # (which in turn might be very very slow)
3804 local $USE_FSYNC = 0;
3515 3805
3516 cf::sync_job { 3806 cf::sync_job {
3807 cf::write_runtime_sync; # external watchdog should not bark
3808
3517 # use a peculiar iteration method to avoid tripping on perl 3809 # use a peculiar iteration method to avoid tripping on perl
3518 # refcount bugs in for. also avoids problems with players 3810 # refcount bugs in for. also avoids problems with players
3519 # and maps saved/destroyed asynchronously. 3811 # and maps saved/destroyed asynchronously.
3520 warn "begin emergency player save\n"; 3812 info "emergency_perl_save: begin player save\n";
3521 for my $login (keys %cf::PLAYER) { 3813 for my $login (keys %cf::PLAYER) {
3522 my $pl = $cf::PLAYER{$login} or next; 3814 my $pl = $cf::PLAYER{$login} or next;
3523 $pl->valid or next; 3815 $pl->valid or next;
3524 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3816 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3525 $pl->save; 3817 $pl->save;
3526 } 3818 }
3527 warn "end emergency player save\n"; 3819 info "emergency_perl_save: end player save\n";
3528 3820
3529 warn "begin emergency map save\n"; 3821 cf::write_runtime_sync; # external watchdog should not bark
3822
3823 info "emergency_perl_save: begin map save\n";
3530 for my $path (keys %cf::MAP) { 3824 for my $path (keys %cf::MAP) {
3531 my $map = $cf::MAP{$path} or next; 3825 my $map = $cf::MAP{$path} or next;
3532 $map->valid or next; 3826 $map->valid or next;
3533 $map->save; 3827 $map->save;
3534 } 3828 }
3535 warn "end emergency map save\n"; 3829 info "emergency_perl_save: end map save\n";
3536 3830
3537 warn "begin emergency database checkpoint\n"; 3831 cf::write_runtime_sync; # external watchdog should not bark
3832
3833 info "emergency_perl_save: begin database checkpoint\n";
3538 BDB::db_env_txn_checkpoint $DB_ENV; 3834 BDB::db_env_txn_checkpoint $DB_ENV;
3539 warn "end emergency database checkpoint\n"; 3835 info "emergency_perl_save: end database checkpoint\n";
3540 3836
3541 warn "begin write uuid\n"; 3837 info "emergency_perl_save: begin write uuid\n";
3542 write_uuid_sync 1; 3838 write_uuid_sync 1;
3543 warn "end write uuid\n"; 3839 info "emergency_perl_save: end write uuid\n";
3840
3841 cf::write_runtime_sync; # external watchdog should not bark
3842
3843 trace "emergency_perl_save: syncing database to disk";
3844 BDB::db_env_txn_checkpoint $DB_ENV;
3845
3846 info "emergency_perl_save: starting sync\n";
3847 IO::AIO::aio_sync sub {
3848 info "emergency_perl_save: finished sync\n";
3849 };
3850
3851 cf::write_runtime_sync; # external watchdog should not bark
3852
3853 trace "emergency_perl_save: flushing outstanding aio requests";
3854 while (IO::AIO::nreqs || BDB::nreqs) {
3855 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3856 }
3857
3858 cf::write_runtime_sync; # external watchdog should not bark
3544 }; 3859 };
3545 3860
3546 warn "leave emergency perl save\n"; 3861 info "emergency_perl_save: leave\n";
3547} 3862}
3548 3863
3549sub post_cleanup { 3864sub post_cleanup {
3550 my ($make_core) = @_; 3865 my ($make_core) = @_;
3551 3866
3867 IO::AIO::flush;
3868
3552 warn Carp::longmess "post_cleanup backtrace" 3869 error Carp::longmess "post_cleanup backtrace"
3553 if $make_core; 3870 if $make_core;
3871
3872 my $fh = pidfile;
3873 unlink $PIDFILE if <$fh> == $$;
3874}
3875
3876# a safer delete_package, copied from Symbol
3877sub clear_package($) {
3878 my $pkg = shift;
3879
3880 # expand to full symbol table name if needed
3881 unless ($pkg =~ /^main::.*::$/) {
3882 $pkg = "main$pkg" if $pkg =~ /^::/;
3883 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3884 $pkg .= '::' unless $pkg =~ /::$/;
3885 }
3886
3887 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3888 my $stem_symtab = *{$stem}{HASH};
3889
3890 defined $stem_symtab and exists $stem_symtab->{$leaf}
3891 or return;
3892
3893 # clear all symbols
3894 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3895 for my $name (keys %$leaf_symtab) {
3896 _gv_clear *{"$pkg$name"};
3897# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3898 }
3554} 3899}
3555 3900
3556sub do_reload_perl() { 3901sub do_reload_perl() {
3557 # can/must only be called in main 3902 # can/must only be called in main
3558 if ($Coro::current != $Coro::main) { 3903 unless (in_main) {
3559 warn "can only reload from main coroutine"; 3904 error "can only reload from main coroutine";
3560 return; 3905 return;
3561 } 3906 }
3562 3907
3563 warn "reloading..."; 3908 return if $RELOAD++;
3564 3909
3565 warn "entering sync_job"; 3910 my $t1 = AE::time;
3566 3911
3912 while ($RELOAD) {
3913 cf::get_slot 0.1, -1, "reload_perl";
3914 info "perl_reload: reloading...";
3915
3916 trace "perl_reload: entering sync_job";
3917
3567 cf::sync_job { 3918 cf::sync_job {
3568 cf::write_runtime_sync; # external watchdog should not bark
3569 cf::emergency_save; 3919 #cf::emergency_save;
3570 cf::write_runtime_sync; # external watchdog should not bark
3571 3920
3572 warn "syncing database to disk";
3573 BDB::db_env_txn_checkpoint $DB_ENV;
3574
3575 # if anything goes wrong in here, we should simply crash as we already saved
3576
3577 warn "flushing outstanding aio requests";
3578 for (;;) {
3579 BDB::flush;
3580 IO::AIO::flush;
3581 Coro::cede_notself;
3582 last unless IO::AIO::nreqs || BDB::nreqs;
3583 warn "iterate...";
3584 }
3585
3586 ++$RELOAD;
3587
3588 warn "cancelling all extension coros"; 3921 trace "perl_reload: cancelling all extension coros";
3589 $_->cancel for values %EXT_CORO; 3922 $_->cancel for values %EXT_CORO;
3590 %EXT_CORO = (); 3923 %EXT_CORO = ();
3591 3924
3592 warn "removing commands"; 3925 trace "perl_reload: removing commands";
3593 %COMMAND = (); 3926 %COMMAND = ();
3594 3927
3595 warn "removing ext/exti commands"; 3928 trace "perl_reload: removing ext/exti commands";
3596 %EXTCMD = (); 3929 %EXTCMD = ();
3597 %EXTICMD = (); 3930 %EXTICMD = ();
3598 3931
3599 warn "unloading/nuking all extensions"; 3932 trace "perl_reload: unloading/nuking all extensions";
3600 for my $pkg (@EXTS) { 3933 for my $pkg (@EXTS) {
3601 warn "... unloading $pkg"; 3934 trace "... unloading $pkg";
3602 3935
3603 if (my $cb = $pkg->can ("unload")) { 3936 if (my $cb = $pkg->can ("unload")) {
3604 eval { 3937 eval {
3605 $cb->($pkg); 3938 $cb->($pkg);
3606 1 3939 1
3607 } or warn "$pkg unloaded, but with errors: $@"; 3940 } or error "$pkg unloaded, but with errors: $@";
3941 }
3942
3943 trace "... clearing $pkg";
3944 clear_package $pkg;
3608 } 3945 }
3609 3946
3610 warn "... nuking $pkg";
3611 Symbol::delete_package $pkg;
3612 }
3613
3614 warn "unloading all perl modules loaded from $LIBDIR"; 3947 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3615 while (my ($k, $v) = each %INC) { 3948 while (my ($k, $v) = each %INC) {
3616 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3949 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3617 3950
3618 warn "... unloading $k"; 3951 trace "... unloading $k";
3619 delete $INC{$k}; 3952 delete $INC{$k};
3620 3953
3621 $k =~ s/\.pm$//; 3954 $k =~ s/\.pm$//;
3622 $k =~ s/\//::/g; 3955 $k =~ s/\//::/g;
3623 3956
3624 if (my $cb = $k->can ("unload_module")) { 3957 if (my $cb = $k->can ("unload_module")) {
3625 $cb->(); 3958 $cb->();
3959 }
3960
3961 clear_package $k;
3626 } 3962 }
3627 3963
3628 Symbol::delete_package $k;
3629 }
3630
3631 warn "getting rid of safe::, as good as possible"; 3964 trace "perl_reload: getting rid of safe::, as good as possible";
3632 Symbol::delete_package "safe::$_" 3965 clear_package "safe::$_"
3633 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3966 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3634 3967
3635 warn "unloading cf.pm \"a bit\""; 3968 trace "perl_reload: unloading cf.pm \"a bit\"";
3636 delete $INC{"cf.pm"}; 3969 delete $INC{"cf.pm"};
3637 delete $INC{"cf/pod.pm"}; 3970 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3638 3971
3639 # don't, removes xs symbols, too, 3972 # don't, removes xs symbols, too,
3640 # and global variables created in xs 3973 # and global variables created in xs
3641 #Symbol::delete_package __PACKAGE__; 3974 #clear_package __PACKAGE__;
3642 3975
3643 warn "unload completed, starting to reload now"; 3976 info "perl_reload: unload completed, starting to reload now";
3644 3977
3645 warn "reloading cf.pm"; 3978 trace "perl_reload: reloading cf.pm";
3646 require cf; 3979 require cf;
3647 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3980 cf::_connect_to_perl_1;
3648 3981
3649 warn "loading config and database again"; 3982 trace "perl_reload: loading config and database again";
3650 cf::reload_config; 3983 cf::reload_config;
3651 3984
3652 warn "loading extensions"; 3985 trace "perl_reload: loading extensions";
3653 cf::load_extensions; 3986 cf::load_extensions;
3654 3987
3988 if ($REATTACH_ON_RELOAD) {
3655 warn "reattaching attachments to objects/players"; 3989 trace "perl_reload: reattaching attachments to objects/players";
3656 _global_reattach; # objects, sockets 3990 _global_reattach; # objects, sockets
3657 warn "reattaching attachments to maps"; 3991 trace "perl_reload: reattaching attachments to maps";
3658 reattach $_ for values %MAP; 3992 reattach $_ for values %MAP;
3659 warn "reattaching attachments to players"; 3993 trace "perl_reload: reattaching attachments to players";
3660 reattach $_ for values %PLAYER; 3994 reattach $_ for values %PLAYER;
3995 }
3661 3996
3662 warn "leaving sync_job"; 3997 cf::_post_init 1;
3663 3998
3999 trace "perl_reload: leaving sync_job";
4000
3664 1 4001 1
3665 } or do { 4002 } or do {
3666 warn $@; 4003 error $@;
3667 cf::cleanup "error while reloading, exiting."; 4004 cf::cleanup "perl_reload: error, exiting.";
4005 };
4006
4007 --$RELOAD;
3668 }; 4008 }
3669 4009
3670 warn "reloaded"; 4010 $t1 = AE::time - $t1;
4011 info "perl_reload: completed in ${t1}s\n";
3671}; 4012};
3672 4013
3673our $RELOAD_WATCHER; # used only during reload 4014our $RELOAD_WATCHER; # used only during reload
3674 4015
3675sub reload_perl() { 4016sub reload_perl() {
3676 # doing reload synchronously and two reloads happen back-to-back, 4017 # doing reload synchronously and two reloads happen back-to-back,
3677 # coro crashes during coro_state_free->destroy here. 4018 # coro crashes during coro_state_free->destroy here.
3678 4019
4020 $RELOAD_WATCHER ||= cf::async {
4021 Coro::AIO::aio_wait cache_extensions;
4022
3679 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4023 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3680 do_reload_perl; 4024 do_reload_perl;
3681 undef $RELOAD_WATCHER; 4025 undef $RELOAD_WATCHER;
4026 };
3682 }; 4027 };
3683} 4028}
3684 4029
3685register_command "reload" => sub { 4030register_command "reload" => sub {
3686 my ($who, $arg) = @_; 4031 my ($who, $arg) = @_;
… …
3692 reload_perl; 4037 reload_perl;
3693 }; 4038 };
3694 } 4039 }
3695}; 4040};
3696 4041
3697unshift @INC, $LIBDIR; 4042#############################################################################
3698 4043
3699my $bug_warning = 0; 4044my $bug_warning = 0;
3700 4045
3701our @WAIT_FOR_TICK; 4046our @WAIT_FOR_TICK;
3702our @WAIT_FOR_TICK_BEGIN; 4047our @WAIT_FOR_TICK_BEGIN;
3703 4048
3704sub wait_for_tick { 4049sub wait_for_tick() {
3705 return if tick_inhibit || $Coro::current == $Coro::main; 4050 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3706 4051
3707 my $signal = new Coro::Signal; 4052 my $signal = new Coro::Signal;
3708 push @WAIT_FOR_TICK, $signal; 4053 push @WAIT_FOR_TICK, $signal;
3709 $signal->wait; 4054 $signal->wait;
3710} 4055}
3711 4056
3712sub wait_for_tick_begin { 4057sub wait_for_tick_begin() {
3713 return if tick_inhibit || $Coro::current == $Coro::main; 4058 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3714 4059
3715 my $signal = new Coro::Signal; 4060 my $signal = new Coro::Signal;
3716 push @WAIT_FOR_TICK_BEGIN, $signal; 4061 push @WAIT_FOR_TICK_BEGIN, $signal;
3717 $signal->wait; 4062 $signal->wait;
3718} 4063}
… …
3724 return; 4069 return;
3725 } 4070 }
3726 4071
3727 cf::server_tick; # one server iteration 4072 cf::server_tick; # one server iteration
3728 4073
4074 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4075
3729 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4076 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3730 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4077 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3731 Coro::async_pool { 4078 Coro::async_pool {
3732 $Coro::current->{desc} = "runtime saver"; 4079 $Coro::current->{desc} = "runtime saver";
3733 write_runtime_sync 4080 write_runtime_sync
3734 or warn "ERROR: unable to write runtime file: $!"; 4081 or error "ERROR: unable to write runtime file: $!";
3735 }; 4082 };
3736 } 4083 }
3737 4084
3738 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4085 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3739 $sig->send; 4086 $sig->send;
… …
3747 4094
3748 if (0) { 4095 if (0) {
3749 if ($NEXT_TICK) { 4096 if ($NEXT_TICK) {
3750 my $jitter = $TICK_START - $NEXT_TICK; 4097 my $jitter = $TICK_START - $NEXT_TICK;
3751 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4098 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3752 warn "jitter $JITTER\n";#d# 4099 debug "jitter $JITTER\n";#d#
3753 } 4100 }
3754 } 4101 }
3755} 4102}
3756 4103
3757{ 4104{
3758 # configure BDB 4105 # configure BDB
3759 4106
3760 BDB::min_parallel 8; 4107 BDB::min_parallel 16;
3761 BDB::max_poll_reqs $TICK * 0.1; 4108 BDB::max_poll_reqs $TICK * 0.1;
3762 $Coro::BDB::WATCHER->priority (1); 4109 $AnyEvent::BDB::WATCHER->priority (1);
3763 4110
3764 unless ($DB_ENV) { 4111 unless ($DB_ENV) {
3765 $DB_ENV = BDB::db_env_create; 4112 $DB_ENV = BDB::db_env_create;
3766 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4113 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3767 | BDB::LOG_AUTOREMOVE, 1); 4114 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4115 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3768 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4116 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3769 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4117 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3770 4118
3771 cf::sync_job { 4119 cf::sync_job {
3772 eval { 4120 eval {
… …
3798{ 4146{
3799 # configure IO::AIO 4147 # configure IO::AIO
3800 4148
3801 IO::AIO::min_parallel 8; 4149 IO::AIO::min_parallel 8;
3802 IO::AIO::max_poll_time $TICK * 0.1; 4150 IO::AIO::max_poll_time $TICK * 0.1;
3803 $Coro::AIO::WATCHER->priority (1); 4151 undef $AnyEvent::AIO::WATCHER;
3804} 4152}
3805 4153
3806my $_log_backtrace; 4154our $_log_backtrace;
4155our $_log_backtrace_last;
3807 4156
3808sub _log_backtrace { 4157sub _log_backtrace {
3809 my ($msg, @addr) = @_; 4158 my ($msg, @addr) = @_;
3810 4159
3811 $msg =~ s/\n//; 4160 $msg =~ s/\n$//;
3812 4161
4162 if ($_log_backtrace_last eq $msg) {
4163 LOG llevInfo, "[ABT] $msg\n";
4164 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3813 # limit the # of concurrent backtraces 4165 # limit the # of concurrent backtraces
3814 if ($_log_backtrace < 2) { 4166 } elsif ($_log_backtrace < 2) {
4167 $_log_backtrace_last = $msg;
3815 ++$_log_backtrace; 4168 ++$_log_backtrace;
4169 my $perl_bt = Carp::longmess $msg;
3816 async { 4170 async {
3817 $Coro::current->{desc} = "abt $msg"; 4171 $Coro::current->{desc} = "abt $msg";
3818 4172
3819 my @bt = fork_call { 4173 my @bt = fork_call {
3820 @addr = map { sprintf "%x", $_ } @addr; 4174 @addr = map { sprintf "%x", $_ } @addr;
… …
3831 } 4185 }
3832 4186
3833 @funcs 4187 @funcs
3834 }; 4188 };
3835 4189
3836 LOG llevInfo, "[ABT] $msg\n"; 4190 LOG llevInfo, "[ABT] $perl_bt\n";
4191 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3837 LOG llevInfo, "[ABT] $_\n" for @bt; 4192 LOG llevInfo, "[ABT] $_\n" for @bt;
3838 --$_log_backtrace; 4193 --$_log_backtrace;
3839 }; 4194 };
3840 } else { 4195 } else {
3841 LOG llevInfo, "[ABT] $msg\n"; 4196 LOG llevInfo, "[ABT] $msg\n";
3842 LOG llevInfo, "[ABT] [suppressed]\n"; 4197 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3843 } 4198 }
3844} 4199}
3845 4200
3846# load additional modules 4201# load additional modules
3847use cf::pod; 4202require "cf/$_.pm" for @EXTRA_MODULES;
4203cf::_connect_to_perl_2;
3848 4204
3849END { cf::emergency_save } 4205END { cf::emergency_save }
3850 4206
38511 42071
3852 4208

Diff Legend

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