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.444 by root, Mon Sep 8 11:27:25 2008 UTC vs.
Revision 1.558 by root, Tue Oct 5 22:35:30 2010 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
18# 19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use 5.10.0; 25use common::sense;
25use utf8;
26use strict "vars", "subs";
27 26
28use Symbol; 27use Symbol;
29use List::Util; 28use List::Util;
30use Socket; 29use Socket;
31use EV; 30use EV;
32use Opcode; 31use Opcode;
33use Safe; 32use Safe;
34use Safe::Hole; 33use Safe::Hole;
35use Storable (); 34use Storable ();
35use Carp ();
36 36
37use Guard ();
37use Coro (); 38use Coro ();
38use Coro::State; 39use Coro::State;
39use Coro::Handle; 40use Coro::Handle;
40use Coro::EV; 41use Coro::EV;
41use Coro::AnyEvent; 42use Coro::AnyEvent;
42use Coro::Timer; 43use Coro::Timer;
43use Coro::Signal; 44use Coro::Signal;
44use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
45use Coro::AnyEvent; 47use Coro::AnyEvent;
46use Coro::AIO; 48use Coro::AIO;
47use Coro::BDB 1.6; 49use Coro::BDB 1.6;
48use Coro::Storable; 50use Coro::Storable;
49use Coro::Util (); 51use Coro::Util ();
50 52
51use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
52use BDB (); 54use BDB ();
53use Data::Dumper; 55use Data::Dumper;
54use Digest::MD5;
55use Fcntl; 56use Fcntl;
56use YAML (); 57use YAML::XS ();
57use IO::AIO (); 58use IO::AIO ();
58use Time::HiRes; 59use Time::HiRes;
59use Compress::LZF; 60use Compress::LZF;
60use Digest::MD5 (); 61use Digest::MD5 ();
61 62
… …
63 64
64# configure various modules to our taste 65# configure various modules to our taste
65# 66#
66$Storable::canonical = 1; # reduce rsync transfers 67$Storable::canonical = 1; # reduce rsync transfers
67Coro::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";
68Compress::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
69 75
70$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" };
71 78
72sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
73 82
74our %COMMAND = (); 83our %COMMAND = ();
75our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
76 85
77our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
78our %EXTCMD = (); 87our %EXTCMD = ();
79our %EXTICMD = (); 88our %EXTICMD = ();
80our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
81our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
82 91
83our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
84our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
85 96
86our $CONFDIR = confdir; 97our $CONFDIR = confdir;
87our $DATADIR = datadir; 98our $DATADIR = datadir;
88our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
89our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
90our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
91our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
92our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
93our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
94our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
95our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
96our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110
97our %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;
98 118
99our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
100our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
101our $NEXT_TICK; 121our $NEXT_TICK;
102our $USE_FSYNC = 1; # use fsync to write maps - default off 122our $USE_FSYNC = 1; # use fsync to write maps - default on
103 123
104our $BDB_DEADLOCK_WATCHER; 124our $BDB_DEADLOCK_WATCHER;
105our $BDB_CHECKPOINT_WATCHER; 125our $BDB_CHECKPOINT_WATCHER;
106our $BDB_TRICKLE_WATCHER; 126our $BDB_TRICKLE_WATCHER;
107our $DB_ENV; 127our $DB_ENV;
108 128
129our @EXTRA_MODULES = qw(pod match mapscript incloader);
130
109our %CFG; 131our %CFG;
110 132
111our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
112our $RUNTIME; 134our $RUNTIME;
113our $NOW; 135our $NOW;
… …
122our $LOAD; # a number between 0 (idle) and 1 (too many objects) 144our $LOAD; # a number between 0 (idle) and 1 (too many objects)
123our $LOADAVG; # same thing, but with alpha-smoothing 145our $LOADAVG; # same thing, but with alpha-smoothing
124our $JITTER; # average jitter 146our $JITTER; # average jitter
125our $TICK_START; # for load detecting purposes 147our $TICK_START; # for load detecting purposes
126 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
127binmode STDOUT; 154binmode STDOUT;
128binmode STDERR; 155binmode STDERR;
129 156
130# read virtual server time, if available 157# read virtual server time, if available
131unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 158unless ($RUNTIME || !-e $RUNTIMEFILE) {
132 open my $fh, "<", "$LOCALDIR/runtime" 159 open my $fh, "<", $RUNTIMEFILE
133 or die "unable to read runtime file: $!"; 160 or die "unable to read $RUNTIMEFILE file: $!";
134 $RUNTIME = <$fh> + 0.; 161 $RUNTIME = <$fh> + 0.;
135} 162}
163
164eval "sub TICK() { $TICK } 1" or die;
136 165
137mkdir $_ 166mkdir $_
138 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 167 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
139 168
140our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
141 170
142sub 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::"} };
143 187
144############################################################################# 188#############################################################################
145 189
146=head2 GLOBAL VARIABLES 190=head2 GLOBAL VARIABLES
147 191
… …
189from wherever your confdir points to. 233from wherever your confdir points to.
190 234
191=item cf::wait_for_tick, cf::wait_for_tick_begin 235=item cf::wait_for_tick, cf::wait_for_tick_begin
192 236
193These 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
194returns 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
195per 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.
196 240
241=cut
242
243sub wait_for_tick();
244sub wait_for_tick_begin();
245
197=item @cf::INVOKE_RESULTS 246=item @cf::INVOKE_RESULTS
198 247
199This array contains the results of the last C<invoke ()> call. When 248This array contains the results of the last C<invoke ()> call. When
200C<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
201that call. 250that call.
202 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
203=back 258=back
204 259
205=cut 260=cut
206 261
207BEGIN { 262sub error(@) { LOG llevError, join "", @_ }
208 *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 {
209 my $msg = join "", @_; 269 my $msg = join "", @_;
210 270
211 $msg .= "\n" 271 $msg .= "\n"
212 unless $msg =~ /\n$/; 272 unless $msg =~ /\n$/;
213 273
214 $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;
215 275
216 LOG llevError, $msg; 276 LOG llevWarn, $msg;
217 }; 277};
218}
219 278
220$Coro::State::DIEHOOK = sub { 279$Coro::State::DIEHOOK = sub {
221 return unless $^S eq 0; # "eq", not "==" 280 return unless $^S eq 0; # "eq", not "=="
222 281
223 if ($Coro::current == $Coro::main) {#d# 282 error Carp::longmess $_[0];
283
284 if (in_main) {#d#
224 warn "DIEHOOK called in main context, Coro bug?\n";#d# 285 error "DIEHOOK called in main context, Coro bug?\n";#d#
225 return;#d# 286 return;#d#
226 }#d# 287 }#d#
227 288
228 # kill coroutine otherwise 289 # kill coroutine otherwise
229 warn Carp::longmess $_[0];
230 Coro::terminate 290 Coro::terminate
231}; 291};
232
233$SIG{__DIE__} = sub { }; #d#?
234 292
235@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 293@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
236@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 294@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
237@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 295@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
238@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 296@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
252)) { 310)) {
253 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 311 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
254} 312}
255 313
256$EV::DIED = sub { 314$EV::DIED = sub {
257 warn "error in event callback: @_"; 315 Carp::cluck "error in event callback: @_";
258}; 316};
259 317
260############################################################################# 318#############################################################################
261 319
262=head2 UTILITY FUNCTIONS 320=head2 UTILITY FUNCTIONS
… …
299our $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
300 358
301sub encode_json($) { $json_coder->encode ($_[0]) } 359sub encode_json($) { $json_coder->encode ($_[0]) }
302sub decode_json($) { $json_coder->decode ($_[0]) } 360sub decode_json($) { $json_coder->decode ($_[0]) }
303 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
304=item cf::lock_wait $string 405=item cf::lock_wait $string
305 406
306Wait until the given lock is available. See cf::lock_acquire. 407Wait until the given lock is available. See cf::lock_acquire.
307 408
308=item my $lock = cf::lock_acquire $string 409=item my $lock = cf::lock_acquire $string
309 410
310Wait 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
311a 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,
312for example when the coroutine gets canceled), the lock is automatically 413for example when the coroutine gets canceled), the lock is automatically
313returned. 414returned.
314 415
315Locks 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
316deadlocked coro. 417deadlocked coro.
… …
322 423
323Return 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.
324 425
325=cut 426=cut
326 427
327our %LOCK; 428our $LOCKS = new Coro::SemaphoreSet;
328our %LOCKER;#d#
329 429
330sub lock_wait($) { 430sub lock_wait($) {
331 my ($key) = @_; 431 $LOCKS->wait ($_[0]);
332
333 if ($LOCKER{$key} == $Coro::current) {#d#
334 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
335 return;#d#
336 }#d#
337
338 # wait for lock, if any
339 while ($LOCK{$key}) {
340 push @{ $LOCK{$key} }, $Coro::current;
341 Coro::schedule;
342 }
343} 432}
344 433
345sub lock_acquire($) { 434sub lock_acquire($) {
346 my ($key) = @_; 435 $LOCKS->guard ($_[0])
347
348 # wait, to be sure we are not locked
349 lock_wait $key;
350
351 $LOCK{$key} = [];
352 $LOCKER{$key} = $Coro::current;#d#
353
354 Coro::guard {
355 delete $LOCKER{$key};#d#
356 # wake up all waiters, to be on the safe side
357 $_->ready for @{ delete $LOCK{$key} };
358 }
359} 436}
360 437
361sub lock_active($) { 438sub lock_active($) {
362 my ($key) = @_; 439 $LOCKS->count ($_[0]) < 1
363
364 ! ! $LOCK{$key}
365} 440}
366 441
367sub freeze_mainloop { 442sub freeze_mainloop {
368 tick_inhibit_inc; 443 tick_inhibit_inc;
369 444
370 Coro::guard \&tick_inhibit_dec; 445 &Guard::guard (\&tick_inhibit_dec);
371} 446}
372 447
373=item cf::periodic $interval, $cb 448=item cf::periodic $interval, $cb
374 449
375Like 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
376get spread over timer. 451get spread over time.
377 452
378=cut 453=cut
379 454
380sub periodic($$) { 455sub periodic($$) {
381 my ($interval, $cb) = @_; 456 my ($interval, $cb) = @_;
… …
398 473
399=cut 474=cut
400 475
401our @SLOT_QUEUE; 476our @SLOT_QUEUE;
402our $SLOT_QUEUE; 477our $SLOT_QUEUE;
478our $SLOT_DECAY = 0.9;
403 479
404$SLOT_QUEUE->cancel if $SLOT_QUEUE; 480$SLOT_QUEUE->cancel if $SLOT_QUEUE;
405$SLOT_QUEUE = Coro::async { 481$SLOT_QUEUE = Coro::async {
406 $Coro::current->desc ("timeslot manager"); 482 $Coro::current->desc ("timeslot manager");
407 483
408 my $signal = new Coro::Signal; 484 my $signal = new Coro::Signal;
485 my $busy;
409 486
410 while () { 487 while () {
411 next_job: 488 next_job:
489
412 my $avail = cf::till_tick; 490 my $avail = cf::till_tick;
413 if ($avail > 0.01) { 491
414 for (0 .. $#SLOT_QUEUE) { 492 for (0 .. $#SLOT_QUEUE) {
415 if ($SLOT_QUEUE[$_][0] < $avail) { 493 if ($SLOT_QUEUE[$_][0] <= $avail) {
494 $busy = 0;
416 my $job = splice @SLOT_QUEUE, $_, 1, (); 495 my $job = splice @SLOT_QUEUE, $_, 1, ();
417 $job->[2]->send; 496 $job->[2]->send;
418 Coro::cede; 497 Coro::cede;
419 goto next_job; 498 goto next_job;
420 } 499 } else {
500 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
421 } 501 }
422 } 502 }
423 503
424 if (@SLOT_QUEUE) { 504 if (@SLOT_QUEUE) {
425 # 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
426 push @cf::WAIT_FOR_TICK, $signal; 506 push @cf::WAIT_FOR_TICK, $signal;
427 $signal->wait; 507 $signal->wait;
428 } else { 508 } else {
509 $busy = 0;
429 Coro::schedule; 510 Coro::schedule;
430 } 511 }
431 } 512 }
432}; 513};
433 514
434sub get_slot($;$$) { 515sub get_slot($;$$) {
435 return if tick_inhibit || $Coro::current == $Coro::main; 516 return if tick_inhibit || $Coro::current == $Coro::main;
436 517
437 my ($time, $pri, $name) = @_; 518 my ($time, $pri, $name) = @_;
438 519
439 $time = $TICK * .6 if $time > $TICK * .6; 520 $time = clamp $time, 0.01, $TICK * .6;
521
440 my $sig = new Coro::Signal; 522 my $sig = new Coro::Signal;
441 523
442 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 524 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
443 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 525 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
444 $SLOT_QUEUE->ready; 526 $SLOT_QUEUE->ready;
… …
470=cut 552=cut
471 553
472sub sync_job(&) { 554sub sync_job(&) {
473 my ($job) = @_; 555 my ($job) = @_;
474 556
475 if ($Coro::current == $Coro::main) { 557 if (in_main) {
476 my $time = EV::time; 558 my $time = AE::time;
477 559
478 # this is the main coro, too bad, we have to block 560 # this is the main coro, too bad, we have to block
479 # till the operation succeeds, freezing the server :/ 561 # till the operation succeeds, freezing the server :/
480 562
481 LOG llevError, Carp::longmess "sync job";#d# 563 #LOG llevError, Carp::longmess "sync job";#d#
482 564
483 my $freeze_guard = freeze_mainloop; 565 my $freeze_guard = freeze_mainloop;
484 566
485 my $busy = 1; 567 my $busy = 1;
486 my @res; 568 my @res;
487 569
488 (async { 570 (async {
489 $Coro::current->desc ("sync job coro"); 571 $Coro::current->desc ("sync job coro");
490 @res = eval { $job->() }; 572 @res = eval { $job->() };
491 warn $@ if $@; 573 error $@ if $@;
492 undef $busy; 574 undef $busy;
493 })->prio (Coro::PRIO_MAX); 575 })->prio (Coro::PRIO_MAX);
494 576
495 while ($busy) { 577 while ($busy) {
496 if (Coro::nready) { 578 if (Coro::nready) {
… …
498 } else { 580 } else {
499 EV::loop EV::LOOP_ONESHOT; 581 EV::loop EV::LOOP_ONESHOT;
500 } 582 }
501 } 583 }
502 584
503 my $time = EV::time - $time; 585 my $time = AE::time - $time;
504 586
505 $TICK_START += $time; # do not account sync jobs to server load 587 $TICK_START += $time; # do not account sync jobs to server load
506 588
507 wantarray ? @res : $res[0] 589 wantarray ? @res : $res[0]
508 } else { 590 } else {
… …
530 $EXT_CORO{$coro+0} = $coro; 612 $EXT_CORO{$coro+0} = $coro;
531 613
532 $coro 614 $coro
533} 615}
534 616
535=item fork_call { }, $args 617=item fork_call { }, @args
536 618
537Executes the given code block with the given arguments in a seperate 619Executes the given code block with the given arguments in a seperate
538process, returning the results. Everything must be serialisable with 620process, returning the results. Everything must be serialisable with
539Coro::Storable. May, of course, block. Note that the executed sub may 621Coro::Storable. May, of course, block. Note that the executed sub may
540never block itself or use any form of event handling. 622never block itself or use any form of event handling.
541 623
542=cut 624=cut
543 625
626sub post_fork {
627 reset_signals;
628}
629
544sub fork_call(&@) { 630sub fork_call(&@) {
545 my ($cb, @args) = @_; 631 my ($cb, @args) = @_;
546 632
547 # 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,
548 # otherwise perl prematurely frees the stuff :/ 634 # otherwise perl prematurely frees the stuff :/
549 # TODO: investigate and fix (likely this will be rather laborious) 635 # TODO: investigate and fix (likely this will be rather laborious)
550 636
551 my @res = Coro::Util::fork_eval { 637 my @res = Coro::Util::fork_eval {
552 reset_signals; 638 cf::post_fork;
553 &$cb 639 &$cb
554 }, @args; 640 } @args;
555 641
556 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 )
557} 654}
558 655
559=item $coin = coin_from_name $name 656=item $coin = coin_from_name $name
560 657
561=cut 658=cut
… …
598within each server. 695within each server.
599 696
600=cut 697=cut
601 698
602sub db_table($) { 699sub db_table($) {
700 cf::error "db_get called from main context"
701 if $Coro::current == $Coro::main;
702
603 my ($name) = @_; 703 my ($name) = @_;
604 my $db = BDB::db_create $DB_ENV; 704 my $db = BDB::db_create $DB_ENV;
605 705
606 eval { 706 eval {
607 $db->set_flags (BDB::CHKSUM); 707 $db->set_flags (BDB::CHKSUM);
… …
617} 717}
618 718
619our $DB; 719our $DB;
620 720
621sub db_init { 721sub db_init {
622 cf::sync_job {
623 $DB ||= db_table "db"; 722 $DB ||= db_table "db";
624 };
625} 723}
626 724
627sub db_get($$) { 725sub db_get($$) {
628 my $key = "$_[0]/$_[1]"; 726 my $key = "$_[0]/$_[1]";
629 727
630 cf::sync_job { 728 cf::error "db_get called from main context"
729 if $Coro::current == $Coro::main;
730
631 BDB::db_get $DB, undef, $key, my $data; 731 BDB::db_get $DB, undef, $key, my $data;
632 732
633 $! ? () 733 $! ? ()
634 : $data 734 : $data
635 }
636} 735}
637 736
638sub db_put($$$) { 737sub db_put($$$) {
639 BDB::dbreq_pri 4; 738 BDB::dbreq_pri 4;
640 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 739 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
696 795
697 my $t1 = Time::HiRes::time; 796 my $t1 = Time::HiRes::time;
698 my $data = $process->(\@data); 797 my $data = $process->(\@data);
699 my $t2 = Time::HiRes::time; 798 my $t2 = Time::HiRes::time;
700 799
701 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 800 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
702 801
703 db_put cache => "$id/data", $data; 802 db_put cache => "$id/data", $data;
704 db_put cache => "$id/md5" , $md5; 803 db_put cache => "$id/md5" , $md5;
705 db_put cache => "$id/meta", $meta; 804 db_put cache => "$id/meta", $meta;
706 805
… …
716 815
717=cut 816=cut
718 817
719sub datalog($@) { 818sub datalog($@) {
720 my ($type, %kv) = @_; 819 my ($type, %kv) = @_;
721 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 820 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
722} 821}
723 822
724=back 823=back
725 824
726=cut 825=cut
727 826
728############################################################################# 827#############################################################################
729 828
730=head2 ATTACHABLE OBJECTS 829=head2 ATTACHABLE OBJECTS
731 830
732Many 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
733attach callbacks/event handlers (a collection of which is called an "attachment") 832attach callbacks/event handlers (a collection of which is called an "attachment")
734to it. All such attachable objects support the following methods. 833to it. All such attachable objects support the following methods.
735 834
736In 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>
737C<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
… …
787=item cf::CLASS::attachment $name, ... 886=item cf::CLASS::attachment $name, ...
788 887
789Register an attachment by C<$name> through which attachable objects of the 888Register an attachment by C<$name> through which attachable objects of the
790given CLASS can refer to this attachment. 889given CLASS can refer to this attachment.
791 890
792Some classes such as crossfire maps and objects can specify attachments 891Some classes such as deliantra maps and objects can specify attachments
793that 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.
794 893
795These calls expect any number of the following handler/hook descriptions: 894These calls expect any number of the following handler/hook descriptions:
796 895
797=over 4 896=over 4
… …
921 1020
922 } elsif (exists $cb_id{$type}) { 1021 } elsif (exists $cb_id{$type}) {
923 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1022 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
924 1023
925 } elsif (ref $type) { 1024 } elsif (ref $type) {
926 warn "attaching objects not supported, ignoring.\n"; 1025 error "attaching objects not supported, ignoring.\n";
927 1026
928 } else { 1027 } else {
929 shift @arg; 1028 shift @arg;
930 warn "attach argument '$type' not supported, ignoring.\n"; 1029 error "attach argument '$type' not supported, ignoring.\n";
931 } 1030 }
932 } 1031 }
933} 1032}
934 1033
935sub _object_attach { 1034sub _object_attach {
… …
945 _attach $registry, $klass, @attach; 1044 _attach $registry, $klass, @attach;
946 } 1045 }
947 1046
948 $obj->{$name} = \%arg; 1047 $obj->{$name} = \%arg;
949 } else { 1048 } else {
950 warn "object uses attachment '$name' which is not available, postponing.\n"; 1049 info "object uses attachment '$name' which is not available, postponing.\n";
951 } 1050 }
952 1051
953 $obj->{_attachment}{$name} = undef; 1052 $obj->{_attachment}{$name} = undef;
954} 1053}
955 1054
… …
1014 1113
1015 for (@$callbacks) { 1114 for (@$callbacks) {
1016 eval { &{$_->[1]} }; 1115 eval { &{$_->[1]} };
1017 1116
1018 if ($@) { 1117 if ($@) {
1019 warn "$@";
1020 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1118 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1021 override; 1119 override;
1022 } 1120 }
1023 1121
1024 return 1 if $override; 1122 return 1 if $override;
1025 } 1123 }
… …
1104 for (@$attach) { 1202 for (@$attach) {
1105 my ($klass, @attach) = @$_; 1203 my ($klass, @attach) = @$_;
1106 _attach $registry, $klass, @attach; 1204 _attach $registry, $klass, @attach;
1107 } 1205 }
1108 } else { 1206 } else {
1109 warn "object uses attachment '$name' that is not available, postponing.\n"; 1207 info "object uses attachment '$name' that is not available, postponing.\n";
1110 } 1208 }
1111 } 1209 }
1112} 1210}
1113 1211
1114cf::attachable->attach ( 1212cf::attachable->attach (
… …
1141 my ($filename, $rdata, $objs) = @_; 1239 my ($filename, $rdata, $objs) = @_;
1142 1240
1143 sync_job { 1241 sync_job {
1144 if (length $$rdata) { 1242 if (length $$rdata) {
1145 utf8::decode (my $decname = $filename); 1243 utf8::decode (my $decname = $filename);
1146 warn sprintf "saving %s (%d,%d)\n", 1244 trace sprintf "saving %s (%d,%d)\n",
1147 $decname, length $$rdata, scalar @$objs; 1245 $decname, length $$rdata, scalar @$objs
1246 if $VERBOSE_IO;
1148 1247
1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1248 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1150 aio_chmod $fh, SAVE_MODE; 1249 aio_chmod $fh, SAVE_MODE;
1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1250 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1152 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 }
1153 aio_close $fh; 1255 aio_close $fh;
1154 1256
1155 if (@$objs) { 1257 if (@$objs) {
1156 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) {
1157 aio_chmod $fh, SAVE_MODE; 1259 aio_chmod $fh, SAVE_MODE;
1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1260 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1159 aio_write $fh, 0, (length $data), $data, 0; 1261 aio_write $fh, 0, (length $data), $data, 0;
1160 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 }
1161 aio_close $fh; 1266 aio_close $fh;
1162 aio_rename "$filename.pst~", "$filename.pst"; 1267 aio_rename "$filename.pst~", "$filename.pst";
1163 } 1268 }
1164 } else { 1269 } else {
1165 aio_unlink "$filename.pst"; 1270 aio_unlink "$filename.pst";
1166 } 1271 }
1167 1272
1168 aio_rename "$filename~", $filename; 1273 aio_rename "$filename~", $filename;
1274
1275 $filename =~ s%/[^/]+$%%;
1276 aio_pathsync $filename if $cf::USE_FSYNC;
1169 } else { 1277 } else {
1170 warn "FATAL: $filename~: $!\n"; 1278 error "unable to save objects: $filename~: $!\n";
1171 } 1279 }
1172 } else { 1280 } else {
1173 aio_unlink $filename; 1281 aio_unlink $filename;
1174 aio_unlink "$filename.pst"; 1282 aio_unlink "$filename.pst";
1175 } 1283 }
… …
1199 my $st = eval { Coro::Storable::thaw $av }; 1307 my $st = eval { Coro::Storable::thaw $av };
1200 $av = $st->{objs}; 1308 $av = $st->{objs};
1201 } 1309 }
1202 1310
1203 utf8::decode (my $decname = $filename); 1311 utf8::decode (my $decname = $filename);
1204 warn sprintf "loading %s (%d,%d)\n", 1312 trace sprintf "loading %s (%d,%d)\n",
1205 $decname, length $data, scalar @{$av || []}; 1313 $decname, length $data, scalar @{$av || []}
1314 if $VERBOSE_IO;
1206 1315
1207 ($data, $av) 1316 ($data, $av)
1208} 1317}
1209 1318
1210=head2 COMMAND CALLBACKS 1319=head2 COMMAND CALLBACKS
… …
1266 my ($name, $cb) = @_; 1375 my ($name, $cb) = @_;
1267 1376
1268 $EXTICMD{$name} = $cb; 1377 $EXTICMD{$name} = $cb;
1269} 1378}
1270 1379
1380use File::Glob ();
1381
1271cf::player->attach ( 1382cf::player->attach (
1272 on_command => sub { 1383 on_unknown_command => sub {
1273 my ($pl, $name, $params) = @_; 1384 my ($pl, $name, $params) = @_;
1274 1385
1275 my $cb = $COMMAND{$name} 1386 my $cb = $COMMAND{$name}
1276 or return; 1387 or return;
1277 1388
… …
1300 1411
1301 $pl->ext_reply ($reply, @reply) 1412 $pl->ext_reply ($reply, @reply)
1302 if $reply; 1413 if $reply;
1303 1414
1304 } else { 1415 } else {
1305 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1416 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1306 } 1417 }
1307 1418
1308 cf::override; 1419 cf::override;
1309 }, 1420 },
1310); 1421);
1311 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
1312sub load_extensions { 1436sub load_extensions {
1437 info "loading extensions...";
1438
1313 cf::sync_job { 1439 cf::sync_job {
1314 my %todo; 1440 my %todo;
1315 1441
1316 for my $path (<$LIBDIR/*.ext>) { 1442 for my $path (<$LIBDIR/*.ext>) {
1317 next unless -r $path; 1443 next unless -r $path;
… …
1335 1461
1336 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1462 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1337 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1463 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1338 1464
1339 $ext{source} = 1465 $ext{source} =
1340 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1466 "package $pkg; use common::sense;\n"
1341 . "#line 1 \"$path\"\n{\n" 1467 . "#line 1 \"$path\"\n{\n"
1342 . $source 1468 . $source
1343 . "\n};\n1"; 1469 . "\n};\n1";
1344 1470
1345 $todo{$base} = \%ext; 1471 $todo{$base} = \%ext;
1346 } 1472 }
1347 1473
1474 my $pass = 0;
1348 my %done; 1475 my %done;
1349 while (%todo) { 1476 while (%todo) {
1350 my $progress; 1477 my $progress;
1351 1478
1479 ++$pass;
1480
1481 ext:
1352 while (my ($k, $v) = each %todo) { 1482 while (my ($k, $v) = each %todo) {
1353 for (split /,\s*/, $v->{meta}{depends}) { 1483 for (split /,\s*/, $v->{meta}{depends}) {
1354 goto skip 1484 next ext
1355 unless exists $done{$_}; 1485 unless exists $done{$_};
1356 } 1486 }
1357 1487
1358 warn "... loading '$k' into '$v->{pkg}'\n"; 1488 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1359 1489
1360 unless (eval $v->{source}) { 1490 my $active = eval $v->{source};
1491
1492 if (length $@) {
1361 my $msg = $@ ? "$v->{path}: $@\n" 1493 error "$v->{path}: $@\n";
1362 : "$v->{base}: extension inactive.\n";
1363 1494
1364 if (exists $v->{meta}{mandatory}) {
1365 warn $msg;
1366 cf::cleanup "mandatory extension failed to load, exiting."; 1495 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1367 } 1496 if exists $v->{meta}{mandatory};
1368 1497
1369 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;
1370 } 1507 }
1371
1372 $done{$k} = delete $todo{$k};
1373 push @EXTS, $v->{pkg};
1374 $progress = 1;
1375 } 1508 }
1376 1509
1377 skip: 1510 unless ($progress) {
1378 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1511 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1379 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 }
1380 } 1518 }
1381 }; 1519 };
1382} 1520}
1383 1521
1384############################################################################# 1522#############################################################################
1385 1523
1386=back 1524=back
1387 1525
1388=head2 CORE EXTENSIONS 1526=head2 CORE EXTENSIONS
1389 1527
1390Functions and methods that extend core crossfire objects. 1528Functions and methods that extend core deliantra objects.
1391 1529
1392=cut 1530=cut
1393 1531
1394package cf::player; 1532package cf::player;
1395 1533
… …
1438 1576
1439sub exists($) { 1577sub exists($) {
1440 my ($login) = @_; 1578 my ($login) = @_;
1441 1579
1442 $cf::PLAYER{$login} 1580 $cf::PLAYER{$login}
1443 or cf::sync_job { !aio_stat path $login } 1581 or !aio_stat path $login
1444} 1582}
1445 1583
1446sub find($) { 1584sub find($) {
1447 return $cf::PLAYER{$_[0]} || do { 1585 return $cf::PLAYER{$_[0]} || do {
1448 my $login = $_[0]; 1586 my $login = $_[0];
… …
1468 $cf::PLAYER{$login} = $pl 1606 $cf::PLAYER{$login} = $pl
1469 } 1607 }
1470 } 1608 }
1471} 1609}
1472 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
1473sub save($) { 1624sub save($) {
1474 my ($pl) = @_; 1625 my ($pl) = @_;
1475 1626
1476 return if $pl->{deny_save}; 1627 return if $pl->{deny_save};
1477 1628
… …
1482 1633
1483 aio_mkdir playerdir $pl, 0770; 1634 aio_mkdir playerdir $pl, 0770;
1484 $pl->{last_save} = $cf::RUNTIME; 1635 $pl->{last_save} = $cf::RUNTIME;
1485 1636
1486 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];
1487 1641
1488 $pl->save_pl ($path); 1642 $pl->save_pl ($path);
1489 cf::cede_to_tick; 1643 cf::cede_to_tick;
1490} 1644}
1491 1645
… …
1525 my $name = $pl->ob->name; 1679 my $name = $pl->ob->name;
1526 1680
1527 $pl->{deny_save} = 1; 1681 $pl->{deny_save} = 1;
1528 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1682 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1529 1683
1530 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1684 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1531 $pl->deactivate; 1685 $pl->deactivate;
1686
1532 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1687 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1533 $pl->ob->check_score;
1534 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1688 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1689 ext::highscore::check ($pl->ob);
1690
1535 $pl->ns->destroy if $pl->ns; 1691 $pl->ns->destroy if $pl->ns;
1536 1692
1537 my $path = playerdir $pl; 1693 my $path = playerdir $pl;
1538 my $temp = "$path~$cf::RUNTIME~deleting~"; 1694 my $temp = "$path~$cf::RUNTIME~deleting~";
1539 aio_rename $path, $temp; 1695 aio_rename $path, $temp;
… …
1593 \@logins 1749 \@logins
1594} 1750}
1595 1751
1596=item $player->maps 1752=item $player->maps
1597 1753
1754=item cf::player::maps $login
1755
1598Returns an arrayref of map paths that are private for this 1756Returns an arrayref of map paths that are private for this
1599player. May block. 1757player. May block.
1600 1758
1601=cut 1759=cut
1602 1760
… …
1619 } 1777 }
1620 1778
1621 \@paths 1779 \@paths
1622} 1780}
1623 1781
1624=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1782=item $protocol_xml = $player->expand_cfpod ($cfpod)
1625 1783
1626Expand crossfire pod fragments into protocol xml. 1784Expand deliantra pod fragments into protocol xml.
1627 1785
1628=item $player->ext_reply ($msgid, @msg) 1786=item $player->ext_reply ($msgid, @msg)
1629 1787
1630Sends an ext reply to the player. 1788Sends an ext reply to the player.
1631 1789
… …
1663 1821
1664=cut 1822=cut
1665 1823
1666sub find_by_path($) { 1824sub find_by_path($) {
1667 my ($path) = @_; 1825 my ($path) = @_;
1826
1827 $path =~ s/^~[^\/]*//; # skip ~login
1668 1828
1669 my ($match, $specificity); 1829 my ($match, $specificity);
1670 1830
1671 for my $region (list) { 1831 for my $region (list) {
1672 if ($region->{match} && $path =~ $region->{match}) { 1832 if ($region->{match} && $path =~ $region->{match}) {
… …
1701sub generate_random_map { 1861sub generate_random_map {
1702 my ($self, $rmp) = @_; 1862 my ($self, $rmp) = @_;
1703 1863
1704 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
1705 1865
1706 # mit "rum" bekleckern, nicht
1707 $self->_create_random_map ( 1866 $self->_create_random_map ($rmp);
1708 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1709 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1710 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1711 $rmp->{exit_on_final_map},
1712 $rmp->{xsize}, $rmp->{ysize},
1713 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1714 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1715 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1716 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1717 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1718 (cf::region::find $rmp->{region}), $rmp->{custom}
1719 )
1720} 1867}
1721 1868
1722=item cf::map->register ($regex, $prio) 1869=item cf::map->register ($regex, $prio)
1723 1870
1724Register a handler for the map path matching the given regex at the 1871Register a handler for the map path matching the given regex at the
… …
1729 1876
1730sub register { 1877sub register {
1731 my (undef, $regex, $prio) = @_; 1878 my (undef, $regex, $prio) = @_;
1732 my $pkg = caller; 1879 my $pkg = caller;
1733 1880
1734 no strict;
1735 push @{"$pkg\::ISA"}, __PACKAGE__; 1881 push @{"$pkg\::ISA"}, __PACKAGE__;
1736 1882
1737 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1883 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1738} 1884}
1739 1885
1740# also paths starting with '/' 1886# also paths starting with '/'
1741$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1887$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1742 1888
1743sub thawer_merge { 1889sub thawer_merge {
1744 my ($self, $merge) = @_; 1890 my ($self, $merge) = @_;
1745 1891
1746 # we have to keep some variables in memory intact 1892 # we have to keep some variables in memory intact
… …
1751} 1897}
1752 1898
1753sub normalise { 1899sub normalise {
1754 my ($path, $base) = @_; 1900 my ($path, $base) = @_;
1755 1901
1756 $path = "$path"; # make sure its a string 1902 $path = "$path"; # make sure it's a string
1757 1903
1758 $path =~ s/\.map$//; 1904 $path =~ s/\.map$//;
1759 1905
1760 # map plan: 1906 # map plan:
1761 # 1907 #
… …
1776 $base =~ s{[^/]+/?$}{}; 1922 $base =~ s{[^/]+/?$}{};
1777 $path = "$base/$path"; 1923 $path = "$base/$path";
1778 } 1924 }
1779 1925
1780 for ($path) { 1926 for ($path) {
1781 redo if s{//}{/};
1782 redo if s{/\.?/}{/}; 1927 redo if s{/\.?/}{/};
1783 redo if s{/[^/]+/\.\./}{/}; 1928 redo if s{/[^/]+/\.\./}{/};
1784 } 1929 }
1785 1930
1786 $path 1931 $path
… …
1800 $self->init; # pass $1 etc. 1945 $self->init; # pass $1 etc.
1801 return $self; 1946 return $self;
1802 } 1947 }
1803 } 1948 }
1804 1949
1805 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1950 Carp::cluck "unable to resolve path '$path' (base '$base')";
1806 () 1951 ()
1807} 1952}
1808 1953
1809sub init { 1954sub init {
1810 my ($self) = @_; 1955 my ($self) = @_;
… …
1842sub uniq_path { 1987sub uniq_path {
1843 my ($self) = @_; 1988 my ($self) = @_;
1844 1989
1845 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1990 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1846 "$UNIQUEDIR/$path" 1991 "$UNIQUEDIR/$path"
1847}
1848
1849# and all this just because we cannot iterate over
1850# all maps in C++...
1851sub change_all_map_light {
1852 my ($change) = @_;
1853
1854 $_->change_map_light ($change)
1855 for grep $_->outdoor, values %cf::MAP;
1856} 1992}
1857 1993
1858sub decay_objects { 1994sub decay_objects {
1859 my ($self) = @_; 1995 my ($self) = @_;
1860 1996
… …
1942 2078
1943sub find; 2079sub find;
1944sub find { 2080sub find {
1945 my ($path, $origin) = @_; 2081 my ($path, $origin) = @_;
1946 2082
2083 cf::cede_to_tick;
2084
1947 $path = normalise $path, $origin && $origin->path; 2085 $path = normalise $path, $origin && $origin->path;
1948 2086
1949 cf::lock_wait "map_data:$path";#d#remove 2087 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1950 cf::lock_wait "map_find:$path"; 2088 my $guard2 = cf::lock_acquire "map_find:$path";
1951 2089
1952 $cf::MAP{$path} || do { 2090 $cf::MAP{$path} || do {
1953 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1954 my $guard2 = cf::lock_acquire "map_find:$path";
1955
1956 my $map = new_from_path cf::map $path 2091 my $map = new_from_path cf::map $path
1957 or return; 2092 or return;
1958 2093
1959 $map->{last_save} = $cf::RUNTIME; 2094 $map->{last_save} = $cf::RUNTIME;
1960 2095
… …
1972 2107
1973 $cf::MAP{$path} = $map 2108 $cf::MAP{$path} = $map
1974 } 2109 }
1975} 2110}
1976 2111
1977sub pre_load { } 2112sub pre_load { }
1978sub post_load { } 2113#sub post_load { } # XS
1979 2114
1980sub load { 2115sub load {
1981 my ($self) = @_; 2116 my ($self) = @_;
1982 2117
1983 local $self->{deny_reset} = 1; # loading can take a long time 2118 local $self->{deny_reset} = 1; # loading can take a long time
… …
2028 unless ($self->{deny_activate}) { 2163 unless ($self->{deny_activate}) {
2029 $self->decay_objects; 2164 $self->decay_objects;
2030 $self->fix_auto_apply; 2165 $self->fix_auto_apply;
2031 $self->update_buttons; 2166 $self->update_buttons;
2032 cf::cede_to_tick; 2167 cf::cede_to_tick;
2033 $self->set_darkness_map;
2034 cf::cede_to_tick;
2035 $self->activate; 2168 $self->activate;
2036 } 2169 }
2037 2170
2038 $self->{last_save} = $cf::RUNTIME; 2171 $self->{last_save} = $cf::RUNTIME;
2039 $self->last_access ($cf::RUNTIME); 2172 $self->last_access ($cf::RUNTIME);
2040 2173
2041 $self->in_memory (cf::MAP_ACTIVE); 2174 $self->in_memory (cf::MAP_ACTIVE);
2042 } 2175 }
2043 2176
2044 $self->post_load; 2177 $self->post_load;
2045}
2046 2178
2179 1
2180}
2181
2182# customize the map for a given player, i.e.
2183# return the _real_ map. used by e.g. per-player
2184# maps to change the path to ~playername/mappath
2047sub customise_for { 2185sub customise_for {
2048 my ($self, $ob) = @_; 2186 my ($self, $ob) = @_;
2049 2187
2050 return find "~" . $ob->name . "/" . $self->{path} 2188 return find "~" . $ob->name . "/" . $self->{path}
2051 if $self->per_player; 2189 if $self->per_player;
… …
2067 or next; 2205 or next;
2068 $neigh = find $neigh, $map 2206 $neigh = find $neigh, $map
2069 or next; 2207 or next;
2070 $neigh->load; 2208 $neigh->load;
2071 2209
2210 # now find the diagonal neighbours
2072 push @neigh, 2211 push @neigh,
2073 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2212 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2074 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2213 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2075 } 2214 }
2076 2215
… …
2083} 2222}
2084 2223
2085sub find_sync { 2224sub find_sync {
2086 my ($path, $origin) = @_; 2225 my ($path, $origin) = @_;
2087 2226
2088 cf::sync_job { find $path, $origin } 2227 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2228 if $Coro::current == $Coro::main;
2229
2230 find $path, $origin
2089} 2231}
2090 2232
2091sub do_load_sync { 2233sub do_load_sync {
2092 my ($map) = @_; 2234 my ($map) = @_;
2093 2235
2094 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2236 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2095 if $Coro::current == $Coro::main; 2237 if $Coro::current == $Coro::main;
2096 2238
2097 cf::sync_job { $map->load }; 2239 $map->load;
2098} 2240}
2099 2241
2100our %MAP_PREFETCH; 2242our %MAP_PREFETCH;
2101our $MAP_PREFETCHER = undef; 2243our $MAP_PREFETCHER = undef;
2102 2244
… …
2128 $MAP_PREFETCHER->prio (6); 2270 $MAP_PREFETCHER->prio (6);
2129 2271
2130 () 2272 ()
2131} 2273}
2132 2274
2275# common code, used by both ->save and ->swapout
2133sub save { 2276sub _save {
2134 my ($self) = @_; 2277 my ($self) = @_;
2135
2136 my $lock = cf::lock_acquire "map_data:$self->{path}";
2137 2278
2138 $self->{last_save} = $cf::RUNTIME; 2279 $self->{last_save} = $cf::RUNTIME;
2139 2280
2140 return unless $self->dirty; 2281 return unless $self->dirty;
2141 2282
… …
2161 } else { 2302 } else {
2162 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2303 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2163 } 2304 }
2164} 2305}
2165 2306
2307sub save {
2308 my ($self) = @_;
2309
2310 my $lock = cf::lock_acquire "map_data:$self->{path}";
2311
2312 $self->_save;
2313}
2314
2166sub swap_out { 2315sub swap_out {
2167 my ($self) = @_; 2316 my ($self) = @_;
2168 2317
2169 # save first because save cedes
2170 $self->save;
2171
2172 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2318 my $lock = cf::lock_acquire "map_data:$self->{path}";
2173 2319
2174 return if $self->players;
2175 return if $self->in_memory != cf::MAP_ACTIVE; 2320 return if $self->in_memory != cf::MAP_ACTIVE;
2176 return if $self->{deny_save}; 2321 return if $self->{deny_save};
2322 return if $self->players;
2177 2323
2324 # first deactivate the map and "unlink" it from the core
2325 $self->deactivate;
2326 $_->clear_links_to ($self) for values %cf::MAP;
2178 $self->in_memory (cf::MAP_SWAPPED); 2327 $self->in_memory (cf::MAP_SWAPPED);
2328
2329 # then atomically save
2330 $self->_save;
2331
2332 # then free the map
2333 $self->clear;
2334}
2335
2336sub reset_at {
2337 my ($self) = @_;
2338
2339 # TODO: safety, remove and allow resettable per-player maps
2340 return 1e99 if $self->{deny_reset};
2341
2342 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2343 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2344
2345 $time + $to
2346}
2347
2348sub should_reset {
2349 my ($self) = @_;
2350
2351 $self->reset_at <= $cf::RUNTIME
2352}
2353
2354sub reset {
2355 my ($self) = @_;
2356
2357 my $lock = cf::lock_acquire "map_data:$self->{path}";
2358
2359 return if $self->players;
2360
2361 cf::trace "resetting map ", $self->path, "\n";
2362
2363 $self->in_memory (cf::MAP_SWAPPED);
2364
2365 # need to save uniques path
2366 unless ($self->{deny_save}) {
2367 my $uniq = $self->uniq_path; utf8::encode $uniq;
2368
2369 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2370 if $uniq;
2371 }
2372
2373 delete $cf::MAP{$self->path};
2179 2374
2180 $self->deactivate; 2375 $self->deactivate;
2181 $_->clear_links_to ($self) for values %cf::MAP; 2376 $_->clear_links_to ($self) for values %cf::MAP;
2182 $self->clear; 2377 $self->clear;
2183}
2184
2185sub reset_at {
2186 my ($self) = @_;
2187
2188 # TODO: safety, remove and allow resettable per-player maps
2189 return 1e99 if $self->{deny_reset};
2190
2191 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2192 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2193
2194 $time + $to
2195}
2196
2197sub should_reset {
2198 my ($self) = @_;
2199
2200 $self->reset_at <= $cf::RUNTIME
2201}
2202
2203sub reset {
2204 my ($self) = @_;
2205
2206 my $lock = cf::lock_acquire "map_data:$self->{path}";
2207
2208 return if $self->players;
2209
2210 warn "resetting map ", $self->path;
2211
2212 $self->in_memory (cf::MAP_SWAPPED);
2213
2214 # need to save uniques path
2215 unless ($self->{deny_save}) {
2216 my $uniq = $self->uniq_path; utf8::encode $uniq;
2217
2218 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2219 if $uniq;
2220 }
2221
2222 delete $cf::MAP{$self->path};
2223
2224 $self->deactivate;
2225 $_->clear_links_to ($self) for values %cf::MAP;
2226 $self->clear;
2227 2378
2228 $self->unlink_save; 2379 $self->unlink_save;
2229 $self->destroy; 2380 $self->destroy;
2230} 2381}
2231 2382
… …
2239 2390
2240 delete $cf::MAP{$self->path}; 2391 delete $cf::MAP{$self->path};
2241 2392
2242 $self->unlink_save; 2393 $self->unlink_save;
2243 2394
2244 bless $self, "cf::map"; 2395 bless $self, "cf::map::wrap";
2245 delete $self->{deny_reset}; 2396 delete $self->{deny_reset};
2246 $self->{deny_save} = 1; 2397 $self->{deny_save} = 1;
2247 $self->reset_timeout (1); 2398 $self->reset_timeout (1);
2248 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2399 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2249 2400
… …
2306 : normalise $_ 2457 : normalise $_
2307 } @{ aio_readdir $UNIQUEDIR or [] } 2458 } @{ aio_readdir $UNIQUEDIR or [] }
2308 ] 2459 ]
2309} 2460}
2310 2461
2462=item cf::map::static_maps
2463
2464Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2465file in the shared directory excluding F</styles> and F</editor>). May
2466block.
2467
2468=cut
2469
2470sub static_maps() {
2471 my @dirs = "";
2472 my @maps;
2473
2474 while (@dirs) {
2475 my $dir = shift @dirs;
2476
2477 next if $dir eq "/styles" || $dir eq "/editor";
2478
2479 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2480 or return;
2481
2482 for (@$files) {
2483 s/\.map$// or next;
2484 utf8::decode $_;
2485 push @maps, "$dir/$_";
2486 }
2487
2488 push @dirs, map "$dir/$_", @$dirs;
2489 }
2490
2491 \@maps
2492}
2493
2311=back 2494=back
2312 2495
2313=head3 cf::object 2496=head3 cf::object
2314 2497
2315=cut 2498=cut
… …
2380 2563
2381our $SAY_CHANNEL = { 2564our $SAY_CHANNEL = {
2382 id => "say", 2565 id => "say",
2383 title => "Map", 2566 title => "Map",
2384 reply => "say ", 2567 reply => "say ",
2385 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2568 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2386}; 2569};
2387 2570
2388our $CHAT_CHANNEL = { 2571our $CHAT_CHANNEL = {
2389 id => "chat", 2572 id => "chat",
2390 title => "Chat", 2573 title => "Chat",
… …
2445 2628
2446=item $player_object->enter_link 2629=item $player_object->enter_link
2447 2630
2448Freezes the player and moves him/her to a special map (C<{link}>). 2631Freezes the player and moves him/her to a special map (C<{link}>).
2449 2632
2450The player should be reasonably safe there for short amounts of time. You 2633The player should be reasonably safe there for short amounts of time (e.g.
2451I<MUST> call C<leave_link> as soon as possible, though. 2634for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2635though, as the player cannot control the character while it is on the link
2636map.
2452 2637
2453Will never block. 2638Will never block.
2454 2639
2455=item $player_object->leave_link ($map, $x, $y) 2640=item $player_object->leave_link ($map, $x, $y)
2456 2641
… …
2476sub cf::object::player::enter_link { 2661sub cf::object::player::enter_link {
2477 my ($self) = @_; 2662 my ($self) = @_;
2478 2663
2479 $self->deactivate_recursive; 2664 $self->deactivate_recursive;
2480 2665
2666 ++$self->{_link_recursion};
2667
2481 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2668 return if UNIVERSAL::isa $self->map, "ext::map_link";
2482 2669
2483 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2670 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2484 if $self->map && $self->map->{path} ne "{link}"; 2671 if $self->map && $self->map->{path} ne "{link}";
2485 2672
2486 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2673 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2487} 2674}
2488 2675
2489sub cf::object::player::leave_link { 2676sub cf::object::player::leave_link {
2490 my ($self, $map, $x, $y) = @_; 2677 my ($self, $map, $x, $y) = @_;
2491 2678
… …
2508 ($x, $y) = (-1, -1) 2695 ($x, $y) = (-1, -1)
2509 unless (defined $x) && (defined $y); 2696 unless (defined $x) && (defined $y);
2510 2697
2511 # use -1 or undef as default coordinates, not 0, 0 2698 # use -1 or undef as default coordinates, not 0, 0
2512 ($x, $y) = ($map->enter_x, $map->enter_y) 2699 ($x, $y) = ($map->enter_x, $map->enter_y)
2513 if $x <=0 && $y <= 0; 2700 if $x <= 0 && $y <= 0;
2514 2701
2515 $map->load; 2702 $map->load;
2516 $map->load_neighbours; 2703 $map->load_neighbours;
2517 2704
2518 return unless $self->contr->active; 2705 return unless $self->contr->active;
2519 $self->activate_recursive;
2520 2706
2521 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2707 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2522 $self->enter_map ($map, $x, $y); 2708 if ($self->enter_map ($map, $x, $y)) {
2523} 2709 # entering was successful
2710 delete $self->{_link_recursion};
2711 # only activate afterwards, to support waiting in hooks
2712 $self->activate_recursive;
2713 }
2524 2714
2715}
2716
2525=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2717=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2526 2718
2527Moves the player to the given map-path and coordinates by first freezing 2719Moves the player to the given map-path and coordinates by first freezing
2528her, loading and preparing them map, calling the provided $check callback 2720her, loading and preparing them map, calling the provided $check callback
2529that has to return the map if sucecssful, and then unfreezes the player on 2721that has to return the map if sucecssful, and then unfreezes the player on
2530the new (success) or old (failed) map position. In either case, $done will 2722the new (success) or old (failed) map position. In either case, $done will
… …
2537 2729
2538our $GOTOGEN; 2730our $GOTOGEN;
2539 2731
2540sub cf::object::player::goto { 2732sub cf::object::player::goto {
2541 my ($self, $path, $x, $y, $check, $done) = @_; 2733 my ($self, $path, $x, $y, $check, $done) = @_;
2734
2735 if ($self->{_link_recursion} >= $MAX_LINKS) {
2736 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2737 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2738 ($path, $x, $y) = @$EMERGENCY_POSITION;
2739 }
2542 2740
2543 # do generation counting so two concurrent goto's will be executed in-order 2741 # do generation counting so two concurrent goto's will be executed in-order
2544 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2742 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2545 2743
2546 $self->enter_link; 2744 $self->enter_link;
… …
2570 my $map = eval { 2768 my $map = eval {
2571 my $map = defined $path ? cf::map::find $path : undef; 2769 my $map = defined $path ? cf::map::find $path : undef;
2572 2770
2573 if ($map) { 2771 if ($map) {
2574 $map = $map->customise_for ($self); 2772 $map = $map->customise_for ($self);
2575 $map = $check->($map) if $check && $map; 2773 $map = $check->($map, $x, $y, $self) if $check && $map;
2576 } else { 2774 } else {
2577 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2775 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2578 } 2776 }
2579 2777
2580 $map 2778 $map
… …
2588 if ($gen == $self->{_goto_generation}) { 2786 if ($gen == $self->{_goto_generation}) {
2589 delete $self->{_goto_generation}; 2787 delete $self->{_goto_generation};
2590 $self->leave_link ($map, $x, $y); 2788 $self->leave_link ($map, $x, $y);
2591 } 2789 }
2592 2790
2593 $done->() if $done; 2791 $done->($self) if $done;
2594 })->prio (1); 2792 })->prio (1);
2595} 2793}
2596 2794
2597=item $player_object->enter_exit ($exit_object) 2795=item $player_object->enter_exit ($exit_object)
2598 2796
… …
2686 $self->contr->savebed ($map, $x, $y) 2884 $self->contr->savebed ($map, $x, $y)
2687 if $exit->flag (cf::FLAG_DAMNED); 2885 if $exit->flag (cf::FLAG_DAMNED);
2688 2886
2689 1 2887 1
2690 }) { 2888 }) {
2691 $self->message ("Something went wrong deep within the crossfire server. " 2889 $self->message ("Something went wrong deep within the deliantra server. "
2692 . "I'll try to bring you back to the map you were before. " 2890 . "I'll try to bring you back to the map you were before. "
2693 . "Please report this to the dungeon master!", 2891 . "Please report this to the dungeon master!",
2694 cf::NDI_UNIQUE | cf::NDI_RED); 2892 cf::NDI_UNIQUE | cf::NDI_RED);
2695 2893
2696 warn "ERROR in enter_exit: $@"; 2894 error "ERROR in enter_exit: $@";
2697 $self->leave_link; 2895 $self->leave_link;
2698 } 2896 }
2699 })->prio (1); 2897 })->prio (1);
2700} 2898}
2701 2899
… …
2713sub cf::client::send_drawinfo { 2911sub cf::client::send_drawinfo {
2714 my ($self, $text, $flags) = @_; 2912 my ($self, $text, $flags) = @_;
2715 2913
2716 utf8::encode $text; 2914 utf8::encode $text;
2717 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2915 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2916}
2917
2918=item $client->send_big_packet ($pkt)
2919
2920Like C<send_packet>, but tries to compress large packets, and fragments
2921them as required.
2922
2923=cut
2924
2925our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2926
2927sub cf::client::send_big_packet {
2928 my ($self, $pkt) = @_;
2929
2930 # try lzf for large packets
2931 $pkt = "lzf " . Compress::LZF::compress $pkt
2932 if 1024 <= length $pkt and $self->{can_lzf};
2933
2934 # split very large packets
2935 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2936 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2937 $pkt = "frag";
2938 }
2939
2940 $self->send_packet ($pkt);
2718} 2941}
2719 2942
2720=item $client->send_msg ($channel, $msg, $color, [extra...]) 2943=item $client->send_msg ($channel, $msg, $color, [extra...])
2721 2944
2722Send a drawinfo or msg packet to the client, formatting the msg for the 2945Send a drawinfo or msg packet to the client, formatting the msg for the
… …
2726 2949
2727=cut 2950=cut
2728 2951
2729# non-persistent channels (usually the info channel) 2952# non-persistent channels (usually the info channel)
2730our %CHANNEL = ( 2953our %CHANNEL = (
2954 "c/motd" => {
2955 id => "infobox",
2956 title => "MOTD",
2957 reply => undef,
2958 tooltip => "The message of the day",
2959 },
2731 "c/identify" => { 2960 "c/identify" => {
2732 id => "infobox", 2961 id => "infobox",
2733 title => "Identify", 2962 title => "Identify",
2734 reply => undef, 2963 reply => undef,
2735 tooltip => "Items recently identified", 2964 tooltip => "Items recently identified",
… …
2737 "c/examine" => { 2966 "c/examine" => {
2738 id => "infobox", 2967 id => "infobox",
2739 title => "Examine", 2968 title => "Examine",
2740 reply => undef, 2969 reply => undef,
2741 tooltip => "Signs and other items you examined", 2970 tooltip => "Signs and other items you examined",
2971 },
2972 "c/shopinfo" => {
2973 id => "infobox",
2974 title => "Shop Info",
2975 reply => undef,
2976 tooltip => "What your bargaining skill tells you about the shop",
2742 }, 2977 },
2743 "c/book" => { 2978 "c/book" => {
2744 id => "infobox", 2979 id => "infobox",
2745 title => "Book", 2980 title => "Book",
2746 reply => undef, 2981 reply => undef,
… …
2762 id => "infobox", 2997 id => "infobox",
2763 title => "Body Parts", 2998 title => "Body Parts",
2764 reply => undef, 2999 reply => undef,
2765 tooltip => "Shows which body parts you posess and are available", 3000 tooltip => "Shows which body parts you posess and are available",
2766 }, 3001 },
3002 "c/statistics" => {
3003 id => "infobox",
3004 title => "Statistics",
3005 reply => undef,
3006 tooltip => "Shows your primary statistics",
3007 },
3008 "c/skills" => {
3009 id => "infobox",
3010 title => "Skills",
3011 reply => undef,
3012 tooltip => "Shows your experience per skill and item power",
3013 },
3014 "c/shopitems" => {
3015 id => "infobox",
3016 title => "Shop Items",
3017 reply => undef,
3018 tooltip => "Shows the items currently for sale in this shop",
3019 },
3020 "c/resistances" => {
3021 id => "infobox",
3022 title => "Resistances",
3023 reply => undef,
3024 tooltip => "Shows your resistances",
3025 },
3026 "c/pets" => {
3027 id => "infobox",
3028 title => "Pets",
3029 reply => undef,
3030 tooltip => "Shows information abotu your pets/a specific pet",
3031 },
3032 "c/perceiveself" => {
3033 id => "infobox",
3034 title => "Perceive Self",
3035 reply => undef,
3036 tooltip => "You gained detailed knowledge about yourself",
3037 },
2767 "c/uptime" => { 3038 "c/uptime" => {
2768 id => "infobox", 3039 id => "infobox",
2769 title => "Uptime", 3040 title => "Uptime",
2770 reply => undef, 3041 reply => undef,
2771 tooltip => "How long the server has been running since last restart", 3042 tooltip => "How long the server has been running since last restart",
… …
2780 id => "party", 3051 id => "party",
2781 title => "Party", 3052 title => "Party",
2782 reply => "gsay ", 3053 reply => "gsay ",
2783 tooltip => "Messages and chat related to your party", 3054 tooltip => "Messages and chat related to your party",
2784 }, 3055 },
3056 "c/death" => {
3057 id => "death",
3058 title => "Death",
3059 reply => undef,
3060 tooltip => "Reason for and more info about your most recent death",
3061 },
3062 "c/say" => $SAY_CHANNEL,
3063 "c/chat" => $CHAT_CHANNEL,
2785); 3064);
2786 3065
2787sub cf::client::send_msg { 3066sub cf::client::send_msg {
2788 my ($self, $channel, $msg, $color, @extra) = @_; 3067 my ($self, $channel, $msg, $color, @extra) = @_;
2789 3068
2790 $msg = $self->pl->expand_cfpod ($msg); 3069 $msg = $self->pl->expand_cfpod ($msg)
3070 unless $color & cf::NDI_VERBATIM;
2791 3071
2792 $color &= cf::NDI_CLIENT_MASK; # just in case... 3072 $color &= cf::NDI_CLIENT_MASK; # just in case...
2793 3073
2794 # check predefined channels, for the benefit of C 3074 # check predefined channels, for the benefit of C
2795 if ($CHANNEL{$channel}) { 3075 if ($CHANNEL{$channel}) {
2796 $channel = $CHANNEL{$channel}; 3076 $channel = $CHANNEL{$channel};
2797 3077
2798 $self->ext_msg (channel_info => $channel) 3078 $self->ext_msg (channel_info => $channel);
2799 if $self->can_msg;
2800
2801 $channel = $channel->{id}; 3079 $channel = $channel->{id};
2802 3080
2803 } elsif (ref $channel) { 3081 } elsif (ref $channel) {
2804 # send meta info to client, if not yet sent 3082 # send meta info to client, if not yet sent
2805 unless (exists $self->{channel}{$channel->{id}}) { 3083 unless (exists $self->{channel}{$channel->{id}}) {
2806 $self->{channel}{$channel->{id}} = $channel; 3084 $self->{channel}{$channel->{id}} = $channel;
2807 $self->ext_msg (channel_info => $channel) 3085 $self->ext_msg (channel_info => $channel);
2808 if $self->can_msg;
2809 } 3086 }
2810 3087
2811 $channel = $channel->{id}; 3088 $channel = $channel->{id};
2812 } 3089 }
2813 3090
2814 return unless @extra || length $msg; 3091 return unless @extra || length $msg;
2815 3092
2816 if ($self->can_msg) {
2817 # default colour, mask it out 3093 # default colour, mask it out
2818 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3094 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2819 if $color & cf::NDI_DEF; 3095 if $color & cf::NDI_DEF;
2820 3096
2821 my $pkt = "msg " 3097 my $pkt = "msg "
2822 . $self->{json_coder}->encode ( 3098 . $self->{json_coder}->encode (
2823 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3099 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2824 ); 3100 );
2825 3101
2826 # try lzf for large packets
2827 $pkt = "lzf " . Compress::LZF::compress $pkt
2828 if 1024 <= length $pkt and $self->{can_lzf};
2829
2830 # split very large packets
2831 if (8192 < length $pkt and $self->{can_lzf}) {
2832 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2833 $pkt = "frag";
2834 }
2835
2836 $self->send_packet ($pkt); 3102 $self->send_big_packet ($pkt);
2837 } else {
2838 if ($color >= 0) {
2839 # replace some tags by gcfclient-compatible ones
2840 for ($msg) {
2841 1 while
2842 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2843 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2844 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2845 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2846 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2847 }
2848
2849 $color &= cf::NDI_COLOR_MASK;
2850
2851 utf8::encode $msg;
2852
2853 if (0 && $msg =~ /\[/) {
2854 # COMMAND/INFO
2855 $self->send_packet ("drawextinfo $color 10 8 $msg")
2856 } else {
2857 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2858 $self->send_packet ("drawinfo $color $msg")
2859 }
2860 }
2861 }
2862} 3103}
2863 3104
2864=item $client->ext_msg ($type, @msg) 3105=item $client->ext_msg ($type, @msg)
2865 3106
2866Sends an ext event to the client. 3107Sends an ext event to the client.
… …
2869 3110
2870sub cf::client::ext_msg($$@) { 3111sub cf::client::ext_msg($$@) {
2871 my ($self, $type, @msg) = @_; 3112 my ($self, $type, @msg) = @_;
2872 3113
2873 if ($self->extcmd == 2) { 3114 if ($self->extcmd == 2) {
2874 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3115 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2875 } elsif ($self->extcmd == 1) { # TODO: remove 3116 } elsif ($self->extcmd == 1) { # TODO: remove
2876 push @msg, msgtype => "event_$type"; 3117 push @msg, msgtype => "event_$type";
2877 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3118 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2878 } 3119 }
2879} 3120}
2880 3121
2881=item $client->ext_reply ($msgid, @msg) 3122=item $client->ext_reply ($msgid, @msg)
2882 3123
… …
2886 3127
2887sub cf::client::ext_reply($$@) { 3128sub cf::client::ext_reply($$@) {
2888 my ($self, $id, @msg) = @_; 3129 my ($self, $id, @msg) = @_;
2889 3130
2890 if ($self->extcmd == 2) { 3131 if ($self->extcmd == 2) {
2891 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3132 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2892 } elsif ($self->extcmd == 1) { 3133 } elsif ($self->extcmd == 1) {
2893 #TODO: version 1, remove 3134 #TODO: version 1, remove
2894 unshift @msg, msgtype => "reply", msgid => $id; 3135 unshift @msg, msgtype => "reply", msgid => $id;
2895 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3136 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2896 } 3137 }
2897} 3138}
2898 3139
2899=item $success = $client->query ($flags, "text", \&cb) 3140=item $success = $client->query ($flags, "text", \&cb)
2900 3141
… …
2971 3212
2972 $ns->ext_reply ($reply, @reply) 3213 $ns->ext_reply ($reply, @reply)
2973 if $reply; 3214 if $reply;
2974 3215
2975 } else { 3216 } else {
2976 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3217 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2977 } 3218 }
2978 3219
2979 cf::override; 3220 cf::override;
2980 }, 3221 },
2981); 3222);
… …
3001 3242
3002 $coro 3243 $coro
3003} 3244}
3004 3245
3005cf::client->attach ( 3246cf::client->attach (
3006 on_destroy => sub { 3247 on_client_destroy => sub {
3007 my ($ns) = @_; 3248 my ($ns) = @_;
3008 3249
3009 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3250 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3010 }, 3251 },
3011); 3252);
… …
3027our $safe_hole = new Safe::Hole; 3268our $safe_hole = new Safe::Hole;
3028 3269
3029$SIG{FPE} = 'IGNORE'; 3270$SIG{FPE} = 'IGNORE';
3030 3271
3031$safe->permit_only (Opcode::opset qw( 3272$safe->permit_only (Opcode::opset qw(
3032 :base_core :base_mem :base_orig :base_math 3273 :base_core :base_mem :base_orig :base_math :base_loop
3033 grepstart grepwhile mapstart mapwhile 3274 grepstart grepwhile mapstart mapwhile
3034 sort time 3275 sort time
3035)); 3276));
3036 3277
3037# here we export the classes and methods available to script code 3278# here we export the classes and methods available to script code
… …
3041The following functions and methods are available within a safe environment: 3282The following functions and methods are available within a safe environment:
3042 3283
3043 cf::object 3284 cf::object
3044 contr pay_amount pay_player map x y force_find force_add destroy 3285 contr pay_amount pay_player map x y force_find force_add destroy
3045 insert remove name archname title slaying race decrease split 3286 insert remove name archname title slaying race decrease split
3287 value
3046 3288
3047 cf::object::player 3289 cf::object::player
3048 player 3290 player
3049 3291
3050 cf::player 3292 cf::player
… …
3056=cut 3298=cut
3057 3299
3058for ( 3300for (
3059 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3301 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3060 insert remove inv nrof name archname title slaying race 3302 insert remove inv nrof name archname title slaying race
3061 decrease split destroy change_exp)], 3303 decrease split destroy change_exp value msg lore send_msg)],
3062 ["cf::object::player" => qw(player)], 3304 ["cf::object::player" => qw(player)],
3063 ["cf::player" => qw(peaceful)], 3305 ["cf::player" => qw(peaceful send_msg)],
3064 ["cf::map" => qw(trigger)], 3306 ["cf::map" => qw(trigger)],
3065) { 3307) {
3066 no strict 'refs';
3067 my ($pkg, @funs) = @$_; 3308 my ($pkg, @funs) = @$_;
3068 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3309 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3069 for @funs; 3310 for @funs;
3070} 3311}
3071 3312
… …
3086 3327
3087 my $qcode = $code; 3328 my $qcode = $code;
3088 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3329 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3089 $qcode =~ s/\n/\\n/g; 3330 $qcode =~ s/\n/\\n/g;
3090 3331
3332 %vars = (_dummy => 0) unless %vars;
3333
3334 my @res;
3091 local $_; 3335 local $_;
3092 local @safe::cf::_safe_eval_args = values %vars;
3093 3336
3094 my $eval = 3337 my $eval =
3095 "do {\n" 3338 "do {\n"
3096 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3339 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3097 . "#line 0 \"{$qcode}\"\n" 3340 . "#line 0 \"{$qcode}\"\n"
3098 . $code 3341 . $code
3099 . "\n}" 3342 . "\n}"
3100 ; 3343 ;
3101 3344
3345 if ($CFG{safe_eval}) {
3102 sub_generation_inc; 3346 sub_generation_inc;
3347 local @safe::cf::_safe_eval_args = values %vars;
3103 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3348 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3104 sub_generation_inc; 3349 sub_generation_inc;
3350 } else {
3351 local @cf::_safe_eval_args = values %vars;
3352 @res = wantarray ? eval eval : scalar eval $eval;
3353 }
3105 3354
3106 if ($@) { 3355 if ($@) {
3107 warn "$@"; 3356 warn "$@",
3108 warn "while executing safe code '$code'\n"; 3357 "while executing safe code '$code'\n",
3109 warn "with arguments " . (join " ", %vars) . "\n"; 3358 "with arguments " . (join " ", %vars) . "\n";
3110 } 3359 }
3111 3360
3112 wantarray ? @res : $res[0] 3361 wantarray ? @res : $res[0]
3113} 3362}
3114 3363
… …
3128=cut 3377=cut
3129 3378
3130sub register_script_function { 3379sub register_script_function {
3131 my ($fun, $cb) = @_; 3380 my ($fun, $cb) = @_;
3132 3381
3133 no strict 'refs'; 3382 $fun = "safe::$fun" if $CFG{safe_eval};
3134 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3383 *$fun = $safe_hole->wrap ($cb);
3135} 3384}
3136 3385
3137=back 3386=back
3138 3387
3139=cut 3388=cut
… …
3148 # for this (global event?) 3397 # for this (global event?)
3149 %ext::player_env::MUSIC_FACE_CACHE = (); 3398 %ext::player_env::MUSIC_FACE_CACHE = ();
3150 3399
3151 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3400 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3152 3401
3153 warn "loading facedata from $path\n"; 3402 trace "loading facedata from $path\n";
3154 3403
3155 my $facedata;
3156 0 < aio_load $path, $facedata 3404 0 < aio_load $path, my $facedata
3157 or die "$path: $!"; 3405 or die "$path: $!";
3158 3406
3159 $facedata = Coro::Storable::thaw $facedata; 3407 $facedata = Coro::Storable::thaw $facedata;
3160 3408
3161 $facedata->{version} == 2 3409 $facedata->{version} == 2
3162 or cf::cleanup "$path: version mismatch, cannot proceed."; 3410 or cf::cleanup "$path: version mismatch, cannot proceed.";
3163 3411
3164 # patch in the exptable 3412 # patch in the exptable
3413 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3165 $facedata->{resource}{"res/exp_table"} = { 3414 $facedata->{resource}{"res/exp_table"} = {
3166 type => FT_RSRC, 3415 type => FT_RSRC,
3167 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3416 data => $exp_table,
3417 hash => (Digest::MD5::md5 $exp_table),
3168 }; 3418 };
3169 cf::cede_to_tick; 3419 cf::cede_to_tick;
3170 3420
3171 { 3421 {
3172 my $faces = $facedata->{faceinfo}; 3422 my $faces = $facedata->{faceinfo};
… …
3174 while (my ($face, $info) = each %$faces) { 3424 while (my ($face, $info) = each %$faces) {
3175 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3425 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3176 3426
3177 cf::face::set_visibility $idx, $info->{visibility}; 3427 cf::face::set_visibility $idx, $info->{visibility};
3178 cf::face::set_magicmap $idx, $info->{magicmap}; 3428 cf::face::set_magicmap $idx, $info->{magicmap};
3179 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3429 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3180 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3430 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3431 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3181 3432
3182 cf::cede_to_tick; 3433 cf::cede_to_tick;
3183 } 3434 }
3184 3435
3185 while (my ($face, $info) = each %$faces) { 3436 while (my ($face, $info) = each %$faces) {
… …
3190 3441
3191 if (my $smooth = cf::face::find $info->{smooth}) { 3442 if (my $smooth = cf::face::find $info->{smooth}) {
3192 cf::face::set_smooth $idx, $smooth; 3443 cf::face::set_smooth $idx, $smooth;
3193 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3444 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3194 } else { 3445 } else {
3195 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3446 error "smooth face '$info->{smooth}' not found for face '$face'";
3196 } 3447 }
3197 3448
3198 cf::cede_to_tick; 3449 cf::cede_to_tick;
3199 } 3450 }
3200 } 3451 }
… …
3209 3460
3210 cf::anim::invalidate_all; # d'oh 3461 cf::anim::invalidate_all; # d'oh
3211 } 3462 }
3212 3463
3213 { 3464 {
3214 # TODO: for gcfclient pleasure, we should give resources
3215 # that gcfclient doesn't grok a >10000 face index.
3216 my $res = $facedata->{resource}; 3465 my $res = $facedata->{resource};
3217 3466
3218 while (my ($name, $info) = each %$res) { 3467 while (my ($name, $info) = each %$res) {
3219 if (defined $info->{type}) { 3468 if (defined $info->{type}) {
3220 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3469 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3221 my $data;
3222 3470
3223 if ($info->{type} & 1) { 3471 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3224 # prepend meta info
3225
3226 my $meta = $enc->encode ({
3227 name => $name,
3228 %{ $info->{meta} || {} },
3229 });
3230
3231 $data = pack "(w/a*)*", $meta, $info->{data};
3232 } else {
3233 $data = $info->{data};
3234 }
3235
3236 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3237 cf::face::set_type $idx, $info->{type}; 3472 cf::face::set_type $idx, $info->{type};
3238 } else { 3473 } else {
3239 $RESOURCE{$name} = $info; 3474 $RESOURCE{$name} = $info; # unused
3240 } 3475 }
3241 3476
3242 cf::cede_to_tick; 3477 cf::cede_to_tick;
3243 } 3478 }
3244 } 3479 }
3245 3480
3246 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3481 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3247 3482
3248 1 3483 1
3249} 3484}
3250
3251cf::global->attach (on_resource_update => sub {
3252 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3253 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3254
3255 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3256 my $sound = $soundconf->{compat}[$_]
3257 or next;
3258
3259 my $face = cf::face::find "sound/$sound->[1]";
3260 cf::sound::set $sound->[0] => $face;
3261 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3262 }
3263
3264 while (my ($k, $v) = each %{$soundconf->{event}}) {
3265 my $face = cf::face::find "sound/$v";
3266 cf::sound::set $k => $face;
3267 }
3268 }
3269});
3270 3485
3271register_exticmd fx_want => sub { 3486register_exticmd fx_want => sub {
3272 my ($ns, $want) = @_; 3487 my ($ns, $want) = @_;
3273 3488
3274 while (my ($k, $v) = each %$want) { 3489 while (my ($k, $v) = each %$want) {
… …
3313sub reload_treasures { 3528sub reload_treasures {
3314 load_resource_file "$DATADIR/treasures" 3529 load_resource_file "$DATADIR/treasures"
3315 or die "unable to load treasurelists\n"; 3530 or die "unable to load treasurelists\n";
3316} 3531}
3317 3532
3533sub reload_sound {
3534 trace "loading sound config from $DATADIR/sound\n";
3535
3536 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3537 or die "$DATADIR/sound $!";
3538
3539 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3540
3541 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3542 my $sound = $soundconf->{compat}[$_]
3543 or next;
3544
3545 my $face = cf::face::find "sound/$sound->[1]";
3546 cf::sound::set $sound->[0] => $face;
3547 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3548 }
3549
3550 while (my ($k, $v) = each %{$soundconf->{event}}) {
3551 my $face = cf::face::find "sound/$v";
3552 cf::sound::set $k => $face;
3553 }
3554}
3555
3318sub reload_resources { 3556sub reload_resources {
3319 warn "reloading resource files...\n"; 3557 trace "reloading resource files...\n";
3320 3558
3559 reload_exp_table;
3560 reload_materials;
3321 reload_facedata; 3561 reload_facedata;
3562 reload_sound;
3322 reload_archetypes; 3563 reload_archetypes;
3323 reload_regions; 3564 reload_regions;
3324 reload_treasures; 3565 reload_treasures;
3325 3566
3326 warn "finished reloading resource files\n"; 3567 trace "finished reloading resource files\n";
3327}
3328
3329sub init {
3330 my $guard = freeze_mainloop;
3331
3332 evthread_start IO::AIO::poll_fileno;
3333
3334 reload_resources;
3335} 3568}
3336 3569
3337sub reload_config { 3570sub reload_config {
3338 open my $fh, "<:utf8", "$CONFDIR/config" 3571 trace "reloading config file...\n";
3339 or return;
3340 3572
3341 local $/; 3573 0 < aio_load "$CONFDIR/config", my $config
3342 *CFG = YAML::Load <$fh>; 3574 or die "$CONFDIR/config: $!";
3343 3575
3576 utf8::decode $config;
3577 *CFG = yaml_load $config;
3578
3344 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3579 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3345 3580
3346 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3581 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3347 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3582 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3348 3583
3349 if (exists $CFG{mlockall}) { 3584 if (exists $CFG{mlockall}) {
… …
3353 }; 3588 };
3354 warn $@ if $@; 3589 warn $@ if $@;
3355 } 3590 }
3356} 3591}
3357 3592
3593sub pidfile() {
3594 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3595 or die "$PIDFILE: $!";
3596 flock $fh, &Fcntl::LOCK_EX
3597 or die "$PIDFILE: flock: $!";
3598 $fh
3599}
3600
3601# make sure only one server instance is running at any one time
3602sub atomic {
3603 my $fh = pidfile;
3604
3605 my $pid = <$fh>;
3606 kill 9, $pid if $pid > 0;
3607
3608 seek $fh, 0, 0;
3609 print $fh $$;
3610}
3611
3612sub main_loop {
3613 trace "EV::loop starting\n";
3614 if (1) {
3615 EV::loop;
3616 }
3617 trace "EV::loop returned\n";
3618 goto &main_loop unless $REALLY_UNLOOP;
3619}
3620
3358sub main { 3621sub main {
3622 cf::init_globals; # initialise logging
3623
3624 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3625 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3626 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3627 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3628
3629 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3630
3359 # we must not ever block the main coroutine 3631 # we must not ever block the main coroutine
3360 local $Coro::idle = sub { 3632 local $Coro::idle = sub {
3361 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3633 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3362 (async { 3634 (async {
3363 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3635 $Coro::current->{desc} = "IDLE BUG HANDLER";
3364 EV::loop EV::LOOP_ONESHOT; 3636 EV::loop EV::LOOP_ONESHOT;
3365 })->prio (Coro::PRIO_MAX); 3637 })->prio (Coro::PRIO_MAX);
3366 }; 3638 };
3367 3639
3368 { 3640 evthread_start IO::AIO::poll_fileno;
3369 my $guard = freeze_mainloop; 3641
3642 cf::sync_job {
3643 cf::incloader::init ();
3644
3645 cf::init_anim;
3646 cf::init_attackmess;
3647 cf::init_dynamic;
3648
3649 cf::load_settings;
3650
3651 reload_resources;
3370 reload_config; 3652 reload_config;
3371 db_init; 3653 db_init;
3654
3655 cf::init_uuid;
3656 cf::init_signals;
3657 cf::init_skills;
3658
3659 cf::init_beforeplay;
3660
3661 atomic;
3662
3372 load_extensions; 3663 load_extensions;
3373 3664
3374 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3665 utime time, time, $RUNTIMEFILE;
3666
3667 # no (long-running) fork's whatsoever before this point(!)
3668 use POSIX ();
3669 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3670
3671 cf::_post_init 0;
3375 } 3672 };
3376 3673
3377 EV::loop; 3674 cf::object::thawer::errors_are_fatal 0;
3675 info "parse errors in files are no longer fatal from this point on.\n";
3676
3677 my $free_main; $free_main = EV::idle sub {
3678 undef $free_main;
3679 undef &main; # free gobs of memory :)
3680 };
3681
3682 goto &main_loop;
3378} 3683}
3379 3684
3380############################################################################# 3685#############################################################################
3381# initialisation and cleanup 3686# initialisation and cleanup
3382 3687
3383# install some emergency cleanup handlers 3688# install some emergency cleanup handlers
3384BEGIN { 3689BEGIN {
3385 our %SIGWATCHER = (); 3690 our %SIGWATCHER = ();
3386 for my $signal (qw(INT HUP TERM)) { 3691 for my $signal (qw(INT HUP TERM)) {
3387 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3692 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3388 cf::cleanup "SIG$signal"; 3693 cf::cleanup "SIG$signal";
3389 }; 3694 };
3390 } 3695 }
3391} 3696}
3392 3697
3393sub write_runtime_sync { 3698sub write_runtime_sync {
3394 my $runtime = "$LOCALDIR/runtime"; 3699 my $t0 = AE::time;
3395 3700
3396 # first touch the runtime file to show we are still running: 3701 # first touch the runtime file to show we are still running:
3397 # the fsync below can take a very very long time. 3702 # the fsync below can take a very very long time.
3398 3703
3399 IO::AIO::aio_utime $runtime, undef, undef; 3704 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3400 3705
3401 my $guard = cf::lock_acquire "write_runtime"; 3706 my $guard = cf::lock_acquire "write_runtime";
3402 3707
3403 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3708 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3404 or return; 3709 or return;
3405 3710
3406 my $value = $cf::RUNTIME + 90 + 10; 3711 my $value = $cf::RUNTIME + 90 + 10;
3407 # 10 is the runtime save interval, for a monotonic clock 3712 # 10 is the runtime save interval, for a monotonic clock
3408 # 60 allows for the watchdog to kill the server. 3713 # 60 allows for the watchdog to kill the server.
… …
3418 aio_utime $fh, undef, undef; 3723 aio_utime $fh, undef, undef;
3419 3724
3420 close $fh 3725 close $fh
3421 or return; 3726 or return;
3422 3727
3423 aio_rename "$runtime~", $runtime 3728 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3424 and return; 3729 and return;
3425 3730
3426 warn "runtime file written.\n"; 3731 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3427 3732
3428 1 3733 1
3429} 3734}
3430 3735
3431our $uuid_lock; 3736our $uuid_lock;
… …
3440 my $uuid = "$LOCALDIR/uuid"; 3745 my $uuid = "$LOCALDIR/uuid";
3441 3746
3442 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3747 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3443 or return; 3748 or return;
3444 3749
3445 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3750 my $value = uuid_seq uuid_cur;
3751
3752 unless ($value) {
3753 info "cowardly refusing to write zero uuid value!\n";
3754 return;
3755 }
3756
3757 my $value = uuid_str $value + $uuid_skip;
3446 $uuid_skip = 0; 3758 $uuid_skip = 0;
3447 3759
3448 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3760 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3449 and return; 3761 and return;
3450 3762
… …
3456 or return; 3768 or return;
3457 3769
3458 aio_rename "$uuid~", $uuid 3770 aio_rename "$uuid~", $uuid
3459 and return; 3771 and return;
3460 3772
3461 warn "uuid file written ($value).\n"; 3773 trace "uuid file written ($value).\n";
3462 3774
3463 1 3775 1
3464 3776
3465} 3777}
3466 3778
… …
3472} 3784}
3473 3785
3474sub emergency_save() { 3786sub emergency_save() {
3475 my $freeze_guard = cf::freeze_mainloop; 3787 my $freeze_guard = cf::freeze_mainloop;
3476 3788
3477 warn "enter emergency perl save\n"; 3789 info "emergency_perl_save: enter\n";
3790
3791 # this is a trade-off: we want to be very quick here, so
3792 # save all maps without fsync, and later call a global sync
3793 # (which in turn might be very very slow)
3794 local $USE_FSYNC = 0;
3478 3795
3479 cf::sync_job { 3796 cf::sync_job {
3797 cf::write_runtime_sync; # external watchdog should not bark
3798
3480 # use a peculiar iteration method to avoid tripping on perl 3799 # use a peculiar iteration method to avoid tripping on perl
3481 # refcount bugs in for. also avoids problems with players 3800 # refcount bugs in for. also avoids problems with players
3482 # and maps saved/destroyed asynchronously. 3801 # and maps saved/destroyed asynchronously.
3483 warn "begin emergency player save\n"; 3802 info "emergency_perl_save: begin player save\n";
3484 for my $login (keys %cf::PLAYER) { 3803 for my $login (keys %cf::PLAYER) {
3485 my $pl = $cf::PLAYER{$login} or next; 3804 my $pl = $cf::PLAYER{$login} or next;
3486 $pl->valid or next; 3805 $pl->valid or next;
3487 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3806 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3488 $pl->save; 3807 $pl->save;
3489 } 3808 }
3490 warn "end emergency player save\n"; 3809 info "emergency_perl_save: end player save\n";
3491 3810
3492 warn "begin emergency map save\n"; 3811 cf::write_runtime_sync; # external watchdog should not bark
3812
3813 info "emergency_perl_save: begin map save\n";
3493 for my $path (keys %cf::MAP) { 3814 for my $path (keys %cf::MAP) {
3494 my $map = $cf::MAP{$path} or next; 3815 my $map = $cf::MAP{$path} or next;
3495 $map->valid or next; 3816 $map->valid or next;
3496 $map->save; 3817 $map->save;
3497 } 3818 }
3498 warn "end emergency map save\n"; 3819 info "emergency_perl_save: end map save\n";
3499 3820
3500 warn "begin emergency database checkpoint\n"; 3821 cf::write_runtime_sync; # external watchdog should not bark
3822
3823 info "emergency_perl_save: begin database checkpoint\n";
3501 BDB::db_env_txn_checkpoint $DB_ENV; 3824 BDB::db_env_txn_checkpoint $DB_ENV;
3502 warn "end emergency database checkpoint\n"; 3825 info "emergency_perl_save: end database checkpoint\n";
3503 3826
3504 warn "begin write uuid\n"; 3827 info "emergency_perl_save: begin write uuid\n";
3505 write_uuid_sync 1; 3828 write_uuid_sync 1;
3506 warn "end write uuid\n"; 3829 info "emergency_perl_save: end write uuid\n";
3830
3831 cf::write_runtime_sync; # external watchdog should not bark
3832
3833 trace "emergency_perl_save: syncing database to disk";
3834 BDB::db_env_txn_checkpoint $DB_ENV;
3835
3836 info "emergency_perl_save: starting sync\n";
3837 IO::AIO::aio_sync sub {
3838 info "emergency_perl_save: finished sync\n";
3839 };
3840
3841 cf::write_runtime_sync; # external watchdog should not bark
3842
3843 trace "emergency_perl_save: flushing outstanding aio requests";
3844 while (IO::AIO::nreqs || BDB::nreqs) {
3845 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3846 }
3847
3848 cf::write_runtime_sync; # external watchdog should not bark
3507 }; 3849 };
3508 3850
3509 warn "leave emergency perl save\n"; 3851 info "emergency_perl_save: leave\n";
3510} 3852}
3511 3853
3512sub post_cleanup { 3854sub post_cleanup {
3513 my ($make_core) = @_; 3855 my ($make_core) = @_;
3514 3856
3857 IO::AIO::flush;
3858
3515 warn Carp::longmess "post_cleanup backtrace" 3859 error Carp::longmess "post_cleanup backtrace"
3516 if $make_core; 3860 if $make_core;
3861
3862 my $fh = pidfile;
3863 unlink $PIDFILE if <$fh> == $$;
3517} 3864}
3518 3865
3519# a safer delete_package, copied from Symbol 3866# a safer delete_package, copied from Symbol
3520sub clear_package($) { 3867sub clear_package($) {
3521 my $pkg = shift; 3868 my $pkg = shift;
… …
3537 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3884 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3538 for my $name (keys %$leaf_symtab) { 3885 for my $name (keys %$leaf_symtab) {
3539 _gv_clear *{"$pkg$name"}; 3886 _gv_clear *{"$pkg$name"};
3540# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3887# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3541 } 3888 }
3542 warn "cleared package #$pkg\n";#d#
3543} 3889}
3544
3545our $RELOAD; # how many times to reload
3546 3890
3547sub do_reload_perl() { 3891sub do_reload_perl() {
3548 # can/must only be called in main 3892 # can/must only be called in main
3549 if ($Coro::current != $Coro::main) { 3893 unless (in_main) {
3550 warn "can only reload from main coroutine"; 3894 error "can only reload from main coroutine";
3551 return; 3895 return;
3552 } 3896 }
3553 3897
3554 return if $RELOAD++; 3898 return if $RELOAD++;
3555 3899
3900 my $t1 = AE::time;
3901
3556 while ($RELOAD) { 3902 while ($RELOAD) {
3557 warn "reloading..."; 3903 cf::get_slot 0.1, -1, "reload_perl";
3904 info "perl_reload: reloading...";
3558 3905
3559 warn "entering sync_job"; 3906 trace "perl_reload: entering sync_job";
3560 3907
3561 cf::sync_job { 3908 cf::sync_job {
3562 cf::write_runtime_sync; # external watchdog should not bark
3563 cf::emergency_save; 3909 #cf::emergency_save;
3564 cf::write_runtime_sync; # external watchdog should not bark
3565 3910
3566 warn "syncing database to disk";
3567 BDB::db_env_txn_checkpoint $DB_ENV;
3568
3569 # if anything goes wrong in here, we should simply crash as we already saved
3570
3571 warn "flushing outstanding aio requests";
3572 while (IO::AIO::nreqs || BDB::nreqs) {
3573 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3574 }
3575
3576 warn "cancelling all extension coros"; 3911 trace "perl_reload: cancelling all extension coros";
3577 $_->cancel for values %EXT_CORO; 3912 $_->cancel for values %EXT_CORO;
3578 %EXT_CORO = (); 3913 %EXT_CORO = ();
3579 3914
3580 warn "removing commands"; 3915 trace "perl_reload: removing commands";
3581 %COMMAND = (); 3916 %COMMAND = ();
3582 3917
3583 warn "removing ext/exti commands"; 3918 trace "perl_reload: removing ext/exti commands";
3584 %EXTCMD = (); 3919 %EXTCMD = ();
3585 %EXTICMD = (); 3920 %EXTICMD = ();
3586 3921
3587 warn "unloading/nuking all extensions"; 3922 trace "perl_reload: unloading/nuking all extensions";
3588 for my $pkg (@EXTS) { 3923 for my $pkg (@EXTS) {
3589 warn "... unloading $pkg"; 3924 trace "... unloading $pkg";
3590 3925
3591 if (my $cb = $pkg->can ("unload")) { 3926 if (my $cb = $pkg->can ("unload")) {
3592 eval { 3927 eval {
3593 $cb->($pkg); 3928 $cb->($pkg);
3594 1 3929 1
3595 } or warn "$pkg unloaded, but with errors: $@"; 3930 } or error "$pkg unloaded, but with errors: $@";
3596 } 3931 }
3597 3932
3598 warn "... clearing $pkg"; 3933 trace "... clearing $pkg";
3599 clear_package $pkg; 3934 clear_package $pkg;
3600 } 3935 }
3601 3936
3602 warn "unloading all perl modules loaded from $LIBDIR"; 3937 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3603 while (my ($k, $v) = each %INC) { 3938 while (my ($k, $v) = each %INC) {
3604 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3939 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3605 3940
3606 warn "... unloading $k"; 3941 trace "... unloading $k";
3607 delete $INC{$k}; 3942 delete $INC{$k};
3608 3943
3609 $k =~ s/\.pm$//; 3944 $k =~ s/\.pm$//;
3610 $k =~ s/\//::/g; 3945 $k =~ s/\//::/g;
3611 3946
… …
3614 } 3949 }
3615 3950
3616 clear_package $k; 3951 clear_package $k;
3617 } 3952 }
3618 3953
3619 warn "getting rid of safe::, as good as possible"; 3954 trace "perl_reload: getting rid of safe::, as good as possible";
3620 clear_package "safe::$_" 3955 clear_package "safe::$_"
3621 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3956 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3622 3957
3623 warn "unloading cf.pm \"a bit\""; 3958 trace "perl_reload: unloading cf.pm \"a bit\"";
3624 delete $INC{"cf.pm"}; 3959 delete $INC{"cf.pm"};
3625 delete $INC{"cf/pod.pm"}; 3960 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3626 3961
3627 # don't, removes xs symbols, too, 3962 # don't, removes xs symbols, too,
3628 # and global variables created in xs 3963 # and global variables created in xs
3629 #clear_package __PACKAGE__; 3964 #clear_package __PACKAGE__;
3630 3965
3631 warn "unload completed, starting to reload now"; 3966 info "perl_reload: unload completed, starting to reload now";
3632 3967
3633 warn "reloading cf.pm"; 3968 trace "perl_reload: reloading cf.pm";
3634 require cf; 3969 require cf;
3635 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3970 cf::_connect_to_perl_1;
3636 3971
3637 warn "loading config and database again"; 3972 trace "perl_reload: loading config and database again";
3638 cf::reload_config; 3973 cf::reload_config;
3639 3974
3640 warn "loading extensions"; 3975 trace "perl_reload: loading extensions";
3641 cf::load_extensions; 3976 cf::load_extensions;
3642 3977
3978 if ($REATTACH_ON_RELOAD) {
3643 warn "reattaching attachments to objects/players"; 3979 trace "perl_reload: reattaching attachments to objects/players";
3644 _global_reattach; # objects, sockets 3980 _global_reattach; # objects, sockets
3645 warn "reattaching attachments to maps"; 3981 trace "perl_reload: reattaching attachments to maps";
3646 reattach $_ for values %MAP; 3982 reattach $_ for values %MAP;
3647 warn "reattaching attachments to players"; 3983 trace "perl_reload: reattaching attachments to players";
3648 reattach $_ for values %PLAYER; 3984 reattach $_ for values %PLAYER;
3985 }
3649 3986
3650 warn "leaving sync_job"; 3987 cf::_post_init 1;
3988
3989 trace "perl_reload: leaving sync_job";
3651 3990
3652 1 3991 1
3653 } or do { 3992 } or do {
3654 warn $@; 3993 error $@;
3655 cf::cleanup "error while reloading, exiting."; 3994 cf::cleanup "perl_reload: error, exiting.";
3656 }; 3995 };
3657 3996
3658 warn "reloaded";
3659 --$RELOAD; 3997 --$RELOAD;
3660 } 3998 }
3999
4000 $t1 = AE::time - $t1;
4001 info "perl_reload: completed in ${t1}s\n";
3661}; 4002};
3662 4003
3663our $RELOAD_WATCHER; # used only during reload 4004our $RELOAD_WATCHER; # used only during reload
3664 4005
3665sub reload_perl() { 4006sub reload_perl() {
3666 # doing reload synchronously and two reloads happen back-to-back, 4007 # doing reload synchronously and two reloads happen back-to-back,
3667 # coro crashes during coro_state_free->destroy here. 4008 # coro crashes during coro_state_free->destroy here.
3668 4009
4010 $RELOAD_WATCHER ||= cf::async {
4011 Coro::AIO::aio_wait cache_extensions;
4012
3669 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4013 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3670 do_reload_perl; 4014 do_reload_perl;
3671 undef $RELOAD_WATCHER; 4015 undef $RELOAD_WATCHER;
4016 };
3672 }; 4017 };
3673} 4018}
3674 4019
3675register_command "reload" => sub { 4020register_command "reload" => sub {
3676 my ($who, $arg) = @_; 4021 my ($who, $arg) = @_;
… …
3682 reload_perl; 4027 reload_perl;
3683 }; 4028 };
3684 } 4029 }
3685}; 4030};
3686 4031
3687unshift @INC, $LIBDIR; 4032#############################################################################
3688 4033
3689my $bug_warning = 0; 4034my $bug_warning = 0;
3690 4035
3691our @WAIT_FOR_TICK; 4036our @WAIT_FOR_TICK;
3692our @WAIT_FOR_TICK_BEGIN; 4037our @WAIT_FOR_TICK_BEGIN;
3693 4038
3694sub wait_for_tick { 4039sub wait_for_tick() {
3695 return if tick_inhibit || $Coro::current == $Coro::main; 4040 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3696 4041
3697 my $signal = new Coro::Signal; 4042 my $signal = new Coro::Signal;
3698 push @WAIT_FOR_TICK, $signal; 4043 push @WAIT_FOR_TICK, $signal;
3699 $signal->wait; 4044 $signal->wait;
3700} 4045}
3701 4046
3702sub wait_for_tick_begin { 4047sub wait_for_tick_begin() {
3703 return if tick_inhibit || $Coro::current == $Coro::main; 4048 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3704 4049
3705 my $signal = new Coro::Signal; 4050 my $signal = new Coro::Signal;
3706 push @WAIT_FOR_TICK_BEGIN, $signal; 4051 push @WAIT_FOR_TICK_BEGIN, $signal;
3707 $signal->wait; 4052 $signal->wait;
3708} 4053}
… …
3714 return; 4059 return;
3715 } 4060 }
3716 4061
3717 cf::server_tick; # one server iteration 4062 cf::server_tick; # one server iteration
3718 4063
4064 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4065
3719 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4066 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3720 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4067 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3721 Coro::async_pool { 4068 Coro::async_pool {
3722 $Coro::current->{desc} = "runtime saver"; 4069 $Coro::current->{desc} = "runtime saver";
3723 write_runtime_sync 4070 write_runtime_sync
3724 or warn "ERROR: unable to write runtime file: $!"; 4071 or error "ERROR: unable to write runtime file: $!";
3725 }; 4072 };
3726 } 4073 }
3727 4074
3728 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4075 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3729 $sig->send; 4076 $sig->send;
… …
3737 4084
3738 if (0) { 4085 if (0) {
3739 if ($NEXT_TICK) { 4086 if ($NEXT_TICK) {
3740 my $jitter = $TICK_START - $NEXT_TICK; 4087 my $jitter = $TICK_START - $NEXT_TICK;
3741 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4088 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3742 warn "jitter $JITTER\n";#d# 4089 debug "jitter $JITTER\n";#d#
3743 } 4090 }
3744 } 4091 }
3745} 4092}
3746 4093
3747{ 4094{
3748 # configure BDB 4095 # configure BDB
3749 4096
3750 BDB::min_parallel 8; 4097 BDB::min_parallel 16;
3751 BDB::max_poll_reqs $TICK * 0.1; 4098 BDB::max_poll_reqs $TICK * 0.1;
3752 $AnyEvent::BDB::WATCHER->priority (1); 4099 $AnyEvent::BDB::WATCHER->priority (1);
3753 4100
3754 unless ($DB_ENV) { 4101 unless ($DB_ENV) {
3755 $DB_ENV = BDB::db_env_create; 4102 $DB_ENV = BDB::db_env_create;
… …
3792 IO::AIO::min_parallel 8; 4139 IO::AIO::min_parallel 8;
3793 IO::AIO::max_poll_time $TICK * 0.1; 4140 IO::AIO::max_poll_time $TICK * 0.1;
3794 undef $AnyEvent::AIO::WATCHER; 4141 undef $AnyEvent::AIO::WATCHER;
3795} 4142}
3796 4143
3797my $_log_backtrace; 4144our $_log_backtrace;
4145our $_log_backtrace_last;
3798 4146
3799sub _log_backtrace { 4147sub _log_backtrace {
3800 my ($msg, @addr) = @_; 4148 my ($msg, @addr) = @_;
3801 4149
3802 $msg =~ s/\n//; 4150 $msg =~ s/\n$//;
3803 4151
4152 if ($_log_backtrace_last eq $msg) {
4153 LOG llevInfo, "[ABT] $msg\n";
4154 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3804 # limit the # of concurrent backtraces 4155 # limit the # of concurrent backtraces
3805 if ($_log_backtrace < 2) { 4156 } elsif ($_log_backtrace < 2) {
4157 $_log_backtrace_last = $msg;
3806 ++$_log_backtrace; 4158 ++$_log_backtrace;
4159 my $perl_bt = Carp::longmess $msg;
3807 async { 4160 async {
3808 $Coro::current->{desc} = "abt $msg"; 4161 $Coro::current->{desc} = "abt $msg";
3809 4162
3810 my @bt = fork_call { 4163 my @bt = fork_call {
3811 @addr = map { sprintf "%x", $_ } @addr; 4164 @addr = map { sprintf "%x", $_ } @addr;
… …
3822 } 4175 }
3823 4176
3824 @funcs 4177 @funcs
3825 }; 4178 };
3826 4179
3827 LOG llevInfo, "[ABT] $msg\n"; 4180 LOG llevInfo, "[ABT] $perl_bt\n";
4181 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3828 LOG llevInfo, "[ABT] $_\n" for @bt; 4182 LOG llevInfo, "[ABT] $_\n" for @bt;
3829 --$_log_backtrace; 4183 --$_log_backtrace;
3830 }; 4184 };
3831 } else { 4185 } else {
3832 LOG llevInfo, "[ABT] $msg\n"; 4186 LOG llevInfo, "[ABT] $msg\n";
3833 LOG llevInfo, "[ABT] [suppressed]\n"; 4187 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3834 } 4188 }
3835} 4189}
3836 4190
3837# load additional modules 4191# load additional modules
3838use cf::pod; 4192require "cf/$_.pm" for @EXTRA_MODULES;
4193cf::_connect_to_perl_2;
3839 4194
3840END { cf::emergency_save } 4195END { cf::emergency_save }
3841 4196
38421 41971
3843 4198

Diff Legend

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