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.447 by root, Fri Sep 19 01:39:45 2008 UTC vs.
Revision 1.561 by root, Fri Apr 22 06:10:33 2011 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
18# 19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use 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;
98
87our $DATADIR = datadir; 99our $DATADIR = datadir;
88our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
89our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
90our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
91our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
92our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
93our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
94our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
95our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
96our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
97our $PIDFILE = "$LOCALDIR/pid"; 110our $PIDFILE = "$LOCALDIR/pid";
98our $RUNTIMEFILE = "$LOCALDIR/runtime"; 111our $RUNTIMEFILE = "$LOCALDIR/runtime";
99 112
100our %RESOURCE; 113our %RESOURCE; # unused
114
115our $OUTPUT_RATE_MIN = 3000;
116our $OUTPUT_RATE_MAX = 1000000;
117
118our $MAX_LINKS = 32; # how many chained exits to follow
119our $VERBOSE_IO = 1;
101 120
102our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
103our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
104our $NEXT_TICK; 123our $NEXT_TICK;
105our $USE_FSYNC = 1; # use fsync to write maps - default off 124our $USE_FSYNC = 1; # use fsync to write maps - default on
106 125
107our $BDB_DEADLOCK_WATCHER; 126our $BDB_DEADLOCK_WATCHER;
108our $BDB_CHECKPOINT_WATCHER; 127our $BDB_CHECKPOINT_WATCHER;
109our $BDB_TRICKLE_WATCHER; 128our $BDB_TRICKLE_WATCHER;
110our $DB_ENV; 129our $DB_ENV;
111 130
131our @EXTRA_MODULES = qw(pod match mapscript incloader);
132
112our %CFG; 133our %CFG;
113 134
114our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
115our $RUNTIME; 136our $RUNTIME;
116our $NOW; 137our $NOW;
124 145
125our $LOAD; # a number between 0 (idle) and 1 (too many objects) 146our $LOAD; # a number between 0 (idle) and 1 (too many objects)
126our $LOADAVG; # same thing, but with alpha-smoothing 147our $LOADAVG; # same thing, but with alpha-smoothing
127our $JITTER; # average jitter 148our $JITTER; # average jitter
128our $TICK_START; # for load detecting purposes 149our $TICK_START; # for load detecting purposes
150
151our @POST_INIT;
152
153our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
154our $REALLY_UNLOOP; # never set to true, please :)
129 155
130binmode STDOUT; 156binmode STDOUT;
131binmode STDERR; 157binmode STDERR;
132 158
133# read virtual server time, if available 159# read virtual server time, if available
135 open my $fh, "<", $RUNTIMEFILE 161 open my $fh, "<", $RUNTIMEFILE
136 or die "unable to read $RUNTIMEFILE file: $!"; 162 or die "unable to read $RUNTIMEFILE file: $!";
137 $RUNTIME = <$fh> + 0.; 163 $RUNTIME = <$fh> + 0.;
138} 164}
139 165
166eval "sub TICK() { $TICK } 1" or die;
167
140mkdir $_ 168mkdir $_
141 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 169 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
142 170
143our $EMERGENCY_POSITION; 171our $EMERGENCY_POSITION;
144 172
145sub cf::map::normalise; 173sub cf::map::normalise;
174
175sub in_main() {
176 $Coro::current == $Coro::main
177}
178
179#############################################################################
180
181%REFLECT = ();
182for (@REFLECT) {
183 my $reflect = JSON::XS::decode_json $_;
184 $REFLECT{$reflect->{class}} = $reflect;
185}
186
187# this is decidedly evil
188$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
146 189
147############################################################################# 190#############################################################################
148 191
149=head2 GLOBAL VARIABLES 192=head2 GLOBAL VARIABLES
150 193
192from wherever your confdir points to. 235from wherever your confdir points to.
193 236
194=item cf::wait_for_tick, cf::wait_for_tick_begin 237=item cf::wait_for_tick, cf::wait_for_tick_begin
195 238
196These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 239These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
197returns directly I<after> the tick processing (and consequently, can only wake one process 240returns directly I<after> the tick processing (and consequently, can only wake one thread
198per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 241per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
199 242
243=cut
244
245sub wait_for_tick();
246sub wait_for_tick_begin();
247
200=item @cf::INVOKE_RESULTS 248=item @cf::INVOKE_RESULTS
201 249
202This array contains the results of the last C<invoke ()> call. When 250This array contains the results of the last C<invoke ()> call. When
203C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 251C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
204that call. 252that call.
205 253
254=item %cf::REFLECT
255
256Contains, for each (C++) class name, a hash reference with information
257about object members (methods, scalars, arrays and flags) and other
258metadata, which is useful for introspection.
259
206=back 260=back
207 261
208=cut 262=cut
209 263
210BEGIN { 264sub error(@) { LOG llevError, join "", @_ }
211 *CORE::GLOBAL::warn = sub { 265sub warn (@) { LOG llevWarn , join "", @_ }
266sub info (@) { LOG llevInfo , join "", @_ }
267sub debug(@) { LOG llevDebug, join "", @_ }
268sub trace(@) { LOG llevTrace, join "", @_ }
269
270$Coro::State::WARNHOOK = sub {
212 my $msg = join "", @_; 271 my $msg = join "", @_;
213 272
214 $msg .= "\n" 273 $msg .= "\n"
215 unless $msg =~ /\n$/; 274 unless $msg =~ /\n$/;
216 275
217 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 276 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
218 277
219 LOG llevError, $msg; 278 LOG llevWarn, $msg;
220 }; 279};
221}
222 280
223$Coro::State::DIEHOOK = sub { 281$Coro::State::DIEHOOK = sub {
224 return unless $^S eq 0; # "eq", not "==" 282 return unless $^S eq 0; # "eq", not "=="
225 283
226 if ($Coro::current == $Coro::main) {#d# 284 error Carp::longmess $_[0];
285
286 if (in_main) {#d#
227 warn "DIEHOOK called in main context, Coro bug?\n";#d# 287 error "DIEHOOK called in main context, Coro bug?\n";#d#
228 return;#d# 288 return;#d#
229 }#d# 289 }#d#
230 290
231 # kill coroutine otherwise 291 # kill coroutine otherwise
232 warn Carp::longmess $_[0];
233 Coro::terminate 292 Coro::terminate
234}; 293};
235
236$SIG{__DIE__} = sub { }; #d#?
237 294
238@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 295@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
239@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 296@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
240@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 297@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
241@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 298@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
255)) { 312)) {
256 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 313 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
257} 314}
258 315
259$EV::DIED = sub { 316$EV::DIED = sub {
260 warn "error in event callback: @_"; 317 Carp::cluck "error in event callback: @_";
261}; 318};
319
320#############################################################################
321
322sub fork_call(&@);
323sub get_slot($;$$);
262 324
263############################################################################# 325#############################################################################
264 326
265=head2 UTILITY FUNCTIONS 327=head2 UTILITY FUNCTIONS
266 328
287 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 349 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
288 $d 350 $d
289 } || "[unable to dump $_[0]: '$@']"; 351 } || "[unable to dump $_[0]: '$@']";
290} 352}
291 353
354=item $scalar = load_file $path
355
356Loads the given file from path and returns its contents. Croaks on error
357and can block.
358
359=cut
360
361sub load_file($) {
362 0 <= aio_load $_[0], my $data
363 or Carp::croak "$_[0]: $!";
364
365 $data
366}
367
292=item $ref = cf::decode_json $json 368=item $ref = cf::decode_json $json
293 369
294Converts a JSON string into the corresponding perl data structure. 370Converts a JSON string into the corresponding perl data structure.
295 371
296=item $json = cf::encode_json $ref 372=item $json = cf::encode_json $ref
302our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 378our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
303 379
304sub encode_json($) { $json_coder->encode ($_[0]) } 380sub encode_json($) { $json_coder->encode ($_[0]) }
305sub decode_json($) { $json_coder->decode ($_[0]) } 381sub decode_json($) { $json_coder->decode ($_[0]) }
306 382
383=item $ref = cf::decode_storable $scalar
384
385Same as Coro::Storable::thaw, so blocks.
386
387=cut
388
389BEGIN { *decode_storable = \&Coro::Storable::thaw }
390
391=item $ref = cf::decode_yaml $scalar
392
393Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
394
395=cut
396
397sub decode_yaml($) {
398 fork_call { YAML::XS::Load $_[0] } @_
399}
400
401=item $scalar = cf::unlzf $scalar
402
403Same as Compress::LZF::compress, but takes server ticks into account, so
404blocks.
405
406=cut
407
408sub unlzf($) {
409 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
410 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
411 Compress::LZF::decompress $_[0]
412}
413
414=item cf::post_init { BLOCK }
415
416Execute the given codeblock, I<after> all extensions have been (re-)loaded,
417but I<before> the server starts ticking again.
418
419The codeblock will have a single boolean argument to indicate whether this
420is a reload or not.
421
422=cut
423
424sub post_init(&) {
425 push @POST_INIT, shift;
426}
427
428sub _post_init {
429 trace "running post_init jobs";
430
431 # run them in parallel...
432
433 my @join;
434
435 while () {
436 push @join, map &Coro::async ($_, 0), @POST_INIT;
437 @POST_INIT = ();
438
439 @join or last;
440
441 (pop @join)->join;
442 }
443}
444
307=item cf::lock_wait $string 445=item cf::lock_wait $string
308 446
309Wait until the given lock is available. See cf::lock_acquire. 447Wait until the given lock is available. See cf::lock_acquire.
310 448
311=item my $lock = cf::lock_acquire $string 449=item my $lock = cf::lock_acquire $string
312 450
313Wait until the given lock is available and then acquires it and returns 451Wait until the given lock is available and then acquires it and returns
314a Coro::guard object. If the guard object gets destroyed (goes out of scope, 452a L<Guard> object. If the guard object gets destroyed (goes out of scope,
315for example when the coroutine gets canceled), the lock is automatically 453for example when the coroutine gets canceled), the lock is automatically
316returned. 454returned.
317 455
318Locks are *not* recursive, locking from the same coro twice results in a 456Locks are *not* recursive, locking from the same coro twice results in a
319deadlocked coro. 457deadlocked coro.
325 463
326Return true if the lock is currently active, i.e. somebody has locked it. 464Return true if the lock is currently active, i.e. somebody has locked it.
327 465
328=cut 466=cut
329 467
330our %LOCK; 468our $LOCKS = new Coro::SemaphoreSet;
331our %LOCKER;#d#
332 469
333sub lock_wait($) { 470sub lock_wait($) {
334 my ($key) = @_; 471 $LOCKS->wait ($_[0]);
335
336 if ($LOCKER{$key} == $Coro::current) {#d#
337 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
338 return;#d#
339 }#d#
340
341 # wait for lock, if any
342 while ($LOCK{$key}) {
343 push @{ $LOCK{$key} }, $Coro::current;
344 Coro::schedule;
345 }
346} 472}
347 473
348sub lock_acquire($) { 474sub lock_acquire($) {
349 my ($key) = @_; 475 $LOCKS->guard ($_[0])
350
351 # wait, to be sure we are not locked
352 lock_wait $key;
353
354 $LOCK{$key} = [];
355 $LOCKER{$key} = $Coro::current;#d#
356
357 Coro::guard {
358 delete $LOCKER{$key};#d#
359 # wake up all waiters, to be on the safe side
360 $_->ready for @{ delete $LOCK{$key} };
361 }
362} 476}
363 477
364sub lock_active($) { 478sub lock_active($) {
365 my ($key) = @_; 479 $LOCKS->count ($_[0]) < 1
366
367 ! ! $LOCK{$key}
368} 480}
369 481
370sub freeze_mainloop { 482sub freeze_mainloop {
371 tick_inhibit_inc; 483 tick_inhibit_inc;
372 484
373 Coro::guard \&tick_inhibit_dec; 485 &Guard::guard (\&tick_inhibit_dec);
374} 486}
375 487
376=item cf::periodic $interval, $cb 488=item cf::periodic $interval, $cb
377 489
378Like EV::periodic, but randomly selects a starting point so that the actions 490Like EV::periodic, but randomly selects a starting point so that the actions
379get spread over timer. 491get spread over time.
380 492
381=cut 493=cut
382 494
383sub periodic($$) { 495sub periodic($$) {
384 my ($interval, $cb) = @_; 496 my ($interval, $cb) = @_;
388 EV::periodic $start, $interval, 0, $cb 500 EV::periodic $start, $interval, 0, $cb
389} 501}
390 502
391=item cf::get_slot $time[, $priority[, $name]] 503=item cf::get_slot $time[, $priority[, $name]]
392 504
393Allocate $time seconds of blocking CPU time at priority C<$priority>: 505Allocate $time seconds of blocking CPU time at priority C<$priority>
394This call blocks and returns only when you have at least C<$time> seconds 506(default: 0): This call blocks and returns only when you have at least
395of cpu time till the next tick. The slot is only valid till the next cede. 507C<$time> seconds of cpu time till the next tick. The slot is only valid
508till the next cede.
509
510Background jobs should use a priority les than zero, interactive jobs
511should use 100 or more.
396 512
397The optional C<$name> can be used to identify the job to run. It might be 513The optional C<$name> can be used to identify the job to run. It might be
398used for statistical purposes and should identify the same time-class. 514used for statistical purposes and should identify the same time-class.
399 515
400Useful for short background jobs. 516Useful for short background jobs.
401 517
402=cut 518=cut
403 519
404our @SLOT_QUEUE; 520our @SLOT_QUEUE;
405our $SLOT_QUEUE; 521our $SLOT_QUEUE;
522our $SLOT_DECAY = 0.9;
406 523
407$SLOT_QUEUE->cancel if $SLOT_QUEUE; 524$SLOT_QUEUE->cancel if $SLOT_QUEUE;
408$SLOT_QUEUE = Coro::async { 525$SLOT_QUEUE = Coro::async {
409 $Coro::current->desc ("timeslot manager"); 526 $Coro::current->desc ("timeslot manager");
410 527
411 my $signal = new Coro::Signal; 528 my $signal = new Coro::Signal;
529 my $busy;
412 530
413 while () { 531 while () {
414 next_job: 532 next_job:
533
415 my $avail = cf::till_tick; 534 my $avail = cf::till_tick;
416 if ($avail > 0.01) { 535
417 for (0 .. $#SLOT_QUEUE) { 536 for (0 .. $#SLOT_QUEUE) {
418 if ($SLOT_QUEUE[$_][0] < $avail) { 537 if ($SLOT_QUEUE[$_][0] <= $avail) {
538 $busy = 0;
419 my $job = splice @SLOT_QUEUE, $_, 1, (); 539 my $job = splice @SLOT_QUEUE, $_, 1, ();
420 $job->[2]->send; 540 $job->[2]->send;
421 Coro::cede; 541 Coro::cede;
422 goto next_job; 542 goto next_job;
423 } 543 } else {
544 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
424 } 545 }
425 } 546 }
426 547
427 if (@SLOT_QUEUE) { 548 if (@SLOT_QUEUE) {
428 # we do not use wait_for_tick() as it returns immediately when tick is inactive 549 # we do not use wait_for_tick() as it returns immediately when tick is inactive
429 push @cf::WAIT_FOR_TICK, $signal; 550 push @cf::WAIT_FOR_TICK, $signal;
430 $signal->wait; 551 $signal->wait;
431 } else { 552 } else {
553 $busy = 0;
432 Coro::schedule; 554 Coro::schedule;
433 } 555 }
434 } 556 }
435}; 557};
436 558
437sub get_slot($;$$) { 559sub get_slot($;$$) {
438 return if tick_inhibit || $Coro::current == $Coro::main; 560 return if tick_inhibit || $Coro::current == $Coro::main;
439 561
440 my ($time, $pri, $name) = @_; 562 my ($time, $pri, $name) = @_;
441 563
442 $time = $TICK * .6 if $time > $TICK * .6; 564 $time = clamp $time, 0.01, $TICK * .6;
565
443 my $sig = new Coro::Signal; 566 my $sig = new Coro::Signal;
444 567
445 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 568 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
446 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 569 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
447 $SLOT_QUEUE->ready; 570 $SLOT_QUEUE->ready;
473=cut 596=cut
474 597
475sub sync_job(&) { 598sub sync_job(&) {
476 my ($job) = @_; 599 my ($job) = @_;
477 600
478 if ($Coro::current == $Coro::main) { 601 if (in_main) {
479 my $time = EV::time; 602 my $time = AE::time;
480 603
481 # this is the main coro, too bad, we have to block 604 # this is the main coro, too bad, we have to block
482 # till the operation succeeds, freezing the server :/ 605 # till the operation succeeds, freezing the server :/
483 606
484 LOG llevError, Carp::longmess "sync job";#d# 607 #LOG llevError, Carp::longmess "sync job";#d#
485 608
486 my $freeze_guard = freeze_mainloop; 609 my $freeze_guard = freeze_mainloop;
487 610
488 my $busy = 1; 611 my $busy = 1;
489 my @res; 612 my @res;
490 613
491 (async { 614 (async {
492 $Coro::current->desc ("sync job coro"); 615 $Coro::current->desc ("sync job coro");
493 @res = eval { $job->() }; 616 @res = eval { $job->() };
494 warn $@ if $@; 617 error $@ if $@;
495 undef $busy; 618 undef $busy;
496 })->prio (Coro::PRIO_MAX); 619 })->prio (Coro::PRIO_MAX);
497 620
498 while ($busy) { 621 while ($busy) {
499 if (Coro::nready) { 622 if (Coro::nready) {
501 } else { 624 } else {
502 EV::loop EV::LOOP_ONESHOT; 625 EV::loop EV::LOOP_ONESHOT;
503 } 626 }
504 } 627 }
505 628
506 my $time = EV::time - $time; 629 my $time = AE::time - $time;
507 630
508 $TICK_START += $time; # do not account sync jobs to server load 631 $TICK_START += $time; # do not account sync jobs to server load
509 632
510 wantarray ? @res : $res[0] 633 wantarray ? @res : $res[0]
511 } else { 634 } else {
533 $EXT_CORO{$coro+0} = $coro; 656 $EXT_CORO{$coro+0} = $coro;
534 657
535 $coro 658 $coro
536} 659}
537 660
538=item fork_call { }, $args 661=item fork_call { }, @args
539 662
540Executes the given code block with the given arguments in a seperate 663Executes the given code block with the given arguments in a seperate
541process, returning the results. Everything must be serialisable with 664process, returning the results. Everything must be serialisable with
542Coro::Storable. May, of course, block. Note that the executed sub may 665Coro::Storable. May, of course, block. Note that the executed sub may
543never block itself or use any form of event handling. 666never block itself or use any form of event handling.
544 667
545=cut 668=cut
546 669
670sub post_fork {
671 reset_signals;
672}
673
547sub fork_call(&@) { 674sub fork_call(&@) {
548 my ($cb, @args) = @_; 675 my ($cb, @args) = @_;
549 676
550 # we seemingly have to make a local copy of the whole thing, 677 # we seemingly have to make a local copy of the whole thing,
551 # otherwise perl prematurely frees the stuff :/ 678 # otherwise perl prematurely frees the stuff :/
552 # TODO: investigate and fix (likely this will be rather laborious) 679 # TODO: investigate and fix (likely this will be rather laborious)
553 680
554 my @res = Coro::Util::fork_eval { 681 my @res = Coro::Util::fork_eval {
555 reset_signals; 682 cf::post_fork;
556 &$cb 683 &$cb
557 }, @args; 684 } @args;
558 685
559 wantarray ? @res : $res[-1] 686 wantarray ? @res : $res[-1]
687}
688
689sub objinfo {
690 (
691 "counter value" => cf::object::object_count,
692 "objects created" => cf::object::create_count,
693 "objects destroyed" => cf::object::destroy_count,
694 "freelist size" => cf::object::free_count,
695 "allocated objects" => cf::object::objects_size,
696 "active objects" => cf::object::actives_size,
697 )
560} 698}
561 699
562=item $coin = coin_from_name $name 700=item $coin = coin_from_name $name
563 701
564=cut 702=cut
601within each server. 739within each server.
602 740
603=cut 741=cut
604 742
605sub db_table($) { 743sub db_table($) {
744 cf::error "db_get called from main context"
745 if $Coro::current == $Coro::main;
746
606 my ($name) = @_; 747 my ($name) = @_;
607 my $db = BDB::db_create $DB_ENV; 748 my $db = BDB::db_create $DB_ENV;
608 749
609 eval { 750 eval {
610 $db->set_flags (BDB::CHKSUM); 751 $db->set_flags (BDB::CHKSUM);
620} 761}
621 762
622our $DB; 763our $DB;
623 764
624sub db_init { 765sub db_init {
625 cf::sync_job {
626 $DB ||= db_table "db"; 766 $DB ||= db_table "db";
627 };
628} 767}
629 768
630sub db_get($$) { 769sub db_get($$) {
631 my $key = "$_[0]/$_[1]"; 770 my $key = "$_[0]/$_[1]";
632 771
633 cf::sync_job { 772 cf::error "db_get called from main context"
773 if $Coro::current == $Coro::main;
774
634 BDB::db_get $DB, undef, $key, my $data; 775 BDB::db_get $DB, undef, $key, my $data;
635 776
636 $! ? () 777 $! ? ()
637 : $data 778 : $data
638 }
639} 779}
640 780
641sub db_put($$$) { 781sub db_put($$$) {
642 BDB::dbreq_pri 4; 782 BDB::dbreq_pri 4;
643 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 783 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
671 811
672 my @data; 812 my @data;
673 my $md5; 813 my $md5;
674 814
675 for (0 .. $#$src) { 815 for (0 .. $#$src) {
676 0 <= aio_load $src->[$_], $data[$_] 816 $data[$_] = load_file $src->[$_];
677 or Carp::croak "$src->[$_]: $!";
678 } 817 }
679 818
680 # if processing is expensive, check 819 # if processing is expensive, check
681 # checksum first 820 # checksum first
682 if (1) { 821 if (1) {
699 838
700 my $t1 = Time::HiRes::time; 839 my $t1 = Time::HiRes::time;
701 my $data = $process->(\@data); 840 my $data = $process->(\@data);
702 my $t2 = Time::HiRes::time; 841 my $t2 = Time::HiRes::time;
703 842
704 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 843 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
705 844
706 db_put cache => "$id/data", $data; 845 db_put cache => "$id/data", $data;
707 db_put cache => "$id/md5" , $md5; 846 db_put cache => "$id/md5" , $md5;
708 db_put cache => "$id/meta", $meta; 847 db_put cache => "$id/meta", $meta;
709 848
719 858
720=cut 859=cut
721 860
722sub datalog($@) { 861sub datalog($@) {
723 my ($type, %kv) = @_; 862 my ($type, %kv) = @_;
724 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 863 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
725} 864}
726 865
727=back 866=back
728 867
729=cut 868=cut
924 1063
925 } elsif (exists $cb_id{$type}) { 1064 } elsif (exists $cb_id{$type}) {
926 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1065 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
927 1066
928 } elsif (ref $type) { 1067 } elsif (ref $type) {
929 warn "attaching objects not supported, ignoring.\n"; 1068 error "attaching objects not supported, ignoring.\n";
930 1069
931 } else { 1070 } else {
932 shift @arg; 1071 shift @arg;
933 warn "attach argument '$type' not supported, ignoring.\n"; 1072 error "attach argument '$type' not supported, ignoring.\n";
934 } 1073 }
935 } 1074 }
936} 1075}
937 1076
938sub _object_attach { 1077sub _object_attach {
948 _attach $registry, $klass, @attach; 1087 _attach $registry, $klass, @attach;
949 } 1088 }
950 1089
951 $obj->{$name} = \%arg; 1090 $obj->{$name} = \%arg;
952 } else { 1091 } else {
953 warn "object uses attachment '$name' which is not available, postponing.\n"; 1092 info "object uses attachment '$name' which is not available, postponing.\n";
954 } 1093 }
955 1094
956 $obj->{_attachment}{$name} = undef; 1095 $obj->{_attachment}{$name} = undef;
957} 1096}
958 1097
1017 1156
1018 for (@$callbacks) { 1157 for (@$callbacks) {
1019 eval { &{$_->[1]} }; 1158 eval { &{$_->[1]} };
1020 1159
1021 if ($@) { 1160 if ($@) {
1022 warn "$@";
1023 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1161 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1024 override; 1162 override;
1025 } 1163 }
1026 1164
1027 return 1 if $override; 1165 return 1 if $override;
1028 } 1166 }
1107 for (@$attach) { 1245 for (@$attach) {
1108 my ($klass, @attach) = @$_; 1246 my ($klass, @attach) = @$_;
1109 _attach $registry, $klass, @attach; 1247 _attach $registry, $klass, @attach;
1110 } 1248 }
1111 } else { 1249 } else {
1112 warn "object uses attachment '$name' that is not available, postponing.\n"; 1250 info "object uses attachment '$name' that is not available, postponing.\n";
1113 } 1251 }
1114 } 1252 }
1115} 1253}
1116 1254
1117cf::attachable->attach ( 1255cf::attachable->attach (
1144 my ($filename, $rdata, $objs) = @_; 1282 my ($filename, $rdata, $objs) = @_;
1145 1283
1146 sync_job { 1284 sync_job {
1147 if (length $$rdata) { 1285 if (length $$rdata) {
1148 utf8::decode (my $decname = $filename); 1286 utf8::decode (my $decname = $filename);
1149 warn sprintf "saving %s (%d,%d)\n", 1287 trace sprintf "saving %s (%d,%d)\n",
1150 $decname, length $$rdata, scalar @$objs; 1288 $decname, length $$rdata, scalar @$objs
1289 if $VERBOSE_IO;
1151 1290
1152 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1291 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1153 aio_chmod $fh, SAVE_MODE; 1292 aio_chmod $fh, SAVE_MODE;
1154 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1293 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1155 aio_fsync $fh if $cf::USE_FSYNC; 1294 if ($cf::USE_FSYNC) {
1295 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;
1296 aio_fsync $fh;
1297 }
1156 aio_close $fh; 1298 aio_close $fh;
1157 1299
1158 if (@$objs) { 1300 if (@$objs) {
1159 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1301 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1160 aio_chmod $fh, SAVE_MODE; 1302 aio_chmod $fh, SAVE_MODE;
1161 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1303 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1162 aio_write $fh, 0, (length $data), $data, 0; 1304 aio_write $fh, 0, (length $data), $data, 0;
1163 aio_fsync $fh if $cf::USE_FSYNC; 1305 if ($cf::USE_FSYNC) {
1306 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;
1307 aio_fsync $fh;
1308 }
1164 aio_close $fh; 1309 aio_close $fh;
1165 aio_rename "$filename.pst~", "$filename.pst"; 1310 aio_rename "$filename.pst~", "$filename.pst";
1166 } 1311 }
1167 } else { 1312 } else {
1168 aio_unlink "$filename.pst"; 1313 aio_unlink "$filename.pst";
1169 } 1314 }
1170 1315
1171 aio_rename "$filename~", $filename; 1316 aio_rename "$filename~", $filename;
1317
1318 $filename =~ s%/[^/]+$%%;
1319 aio_pathsync $filename if $cf::USE_FSYNC;
1172 } else { 1320 } else {
1173 warn "FATAL: $filename~: $!\n"; 1321 error "unable to save objects: $filename~: $!\n";
1174 } 1322 }
1175 } else { 1323 } else {
1176 aio_unlink $filename; 1324 aio_unlink $filename;
1177 aio_unlink "$filename.pst"; 1325 aio_unlink "$filename.pst";
1178 } 1326 }
1202 my $st = eval { Coro::Storable::thaw $av }; 1350 my $st = eval { Coro::Storable::thaw $av };
1203 $av = $st->{objs}; 1351 $av = $st->{objs};
1204 } 1352 }
1205 1353
1206 utf8::decode (my $decname = $filename); 1354 utf8::decode (my $decname = $filename);
1207 warn sprintf "loading %s (%d,%d)\n", 1355 trace sprintf "loading %s (%d,%d)\n",
1208 $decname, length $data, scalar @{$av || []}; 1356 $decname, length $data, scalar @{$av || []}
1357 if $VERBOSE_IO;
1209 1358
1210 ($data, $av) 1359 ($data, $av)
1211} 1360}
1212 1361
1213=head2 COMMAND CALLBACKS 1362=head2 COMMAND CALLBACKS
1269 my ($name, $cb) = @_; 1418 my ($name, $cb) = @_;
1270 1419
1271 $EXTICMD{$name} = $cb; 1420 $EXTICMD{$name} = $cb;
1272} 1421}
1273 1422
1423use File::Glob ();
1424
1274cf::player->attach ( 1425cf::player->attach (
1275 on_command => sub { 1426 on_unknown_command => sub {
1276 my ($pl, $name, $params) = @_; 1427 my ($pl, $name, $params) = @_;
1277 1428
1278 my $cb = $COMMAND{$name} 1429 my $cb = $COMMAND{$name}
1279 or return; 1430 or return;
1280 1431
1303 1454
1304 $pl->ext_reply ($reply, @reply) 1455 $pl->ext_reply ($reply, @reply)
1305 if $reply; 1456 if $reply;
1306 1457
1307 } else { 1458 } else {
1308 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1459 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1309 } 1460 }
1310 1461
1311 cf::override; 1462 cf::override;
1312 }, 1463 },
1313); 1464);
1314 1465
1466# "readahead" all extensions
1467sub cache_extensions {
1468 my $grp = IO::AIO::aio_group;
1469
1470 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1471 for (grep /\.ext$/, @{$_[0]}) {
1472 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1473 }
1474 };
1475
1476 $grp
1477}
1478
1315sub load_extensions { 1479sub load_extensions {
1480 info "loading extensions...";
1481
1316 cf::sync_job { 1482 cf::sync_job {
1317 my %todo; 1483 my %todo;
1318 1484
1319 for my $path (<$LIBDIR/*.ext>) { 1485 for my $path (<$LIBDIR/*.ext>) {
1320 next unless -r $path; 1486 next unless -r $path;
1338 1504
1339 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1505 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1340 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1506 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1341 1507
1342 $ext{source} = 1508 $ext{source} =
1343 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1509 "package $pkg; use common::sense;\n"
1344 . "#line 1 \"$path\"\n{\n" 1510 . "#line 1 \"$path\"\n{\n"
1345 . $source 1511 . $source
1346 . "\n};\n1"; 1512 . "\n};\n1";
1347 1513
1348 $todo{$base} = \%ext; 1514 $todo{$base} = \%ext;
1349 } 1515 }
1350 1516
1517 my $pass = 0;
1351 my %done; 1518 my %done;
1352 while (%todo) { 1519 while (%todo) {
1353 my $progress; 1520 my $progress;
1354 1521
1522 ++$pass;
1523
1524 ext:
1355 while (my ($k, $v) = each %todo) { 1525 while (my ($k, $v) = each %todo) {
1356 for (split /,\s*/, $v->{meta}{depends}) { 1526 for (split /,\s*/, $v->{meta}{depends}) {
1357 goto skip 1527 next ext
1358 unless exists $done{$_}; 1528 unless exists $done{$_};
1359 } 1529 }
1360 1530
1361 warn "... loading '$k' into '$v->{pkg}'\n"; 1531 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1362 1532
1363 unless (eval $v->{source}) { 1533 my $active = eval $v->{source};
1534
1535 if (length $@) {
1364 my $msg = $@ ? "$v->{path}: $@\n" 1536 error "$v->{path}: $@\n";
1365 : "$v->{base}: extension inactive.\n";
1366 1537
1367 if (exists $v->{meta}{mandatory}) {
1368 warn $msg;
1369 cf::cleanup "mandatory extension failed to load, exiting."; 1538 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1370 } 1539 if exists $v->{meta}{mandatory};
1371 1540
1372 warn $msg; 1541 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1542 delete $todo{$k};
1543 } else {
1544 $done{$k} = delete $todo{$k};
1545 push @EXTS, $v->{pkg};
1546 $progress = 1;
1547
1548 info "$v->{base}: extension inactive.\n"
1549 unless $active;
1373 } 1550 }
1374
1375 $done{$k} = delete $todo{$k};
1376 push @EXTS, $v->{pkg};
1377 $progress = 1;
1378 } 1551 }
1379 1552
1380 skip: 1553 unless ($progress) {
1381 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1554 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1382 unless $progress; 1555
1556 while (my ($k, $v) = each %todo) {
1557 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1558 if exists $v->{meta}{mandatory};
1559 }
1560
1561 last;
1562 }
1383 } 1563 }
1384 }; 1564 };
1385} 1565}
1386 1566
1387############################################################################# 1567#############################################################################
1441 1621
1442sub exists($) { 1622sub exists($) {
1443 my ($login) = @_; 1623 my ($login) = @_;
1444 1624
1445 $cf::PLAYER{$login} 1625 $cf::PLAYER{$login}
1446 or cf::sync_job { !aio_stat path $login } 1626 or !aio_stat path $login
1447} 1627}
1448 1628
1449sub find($) { 1629sub find($) {
1450 return $cf::PLAYER{$_[0]} || do { 1630 return $cf::PLAYER{$_[0]} || do {
1451 my $login = $_[0]; 1631 my $login = $_[0];
1471 $cf::PLAYER{$login} = $pl 1651 $cf::PLAYER{$login} = $pl
1472 } 1652 }
1473 } 1653 }
1474} 1654}
1475 1655
1656cf::player->attach (
1657 on_load => sub {
1658 my ($pl, $path) = @_;
1659
1660 # restore slots saved in save, below
1661 my $slots = delete $pl->{_slots};
1662
1663 $pl->ob->current_weapon ($slots->[0]);
1664 $pl->combat_ob ($slots->[1]);
1665 $pl->ranged_ob ($slots->[2]);
1666 },
1667);
1668
1476sub save($) { 1669sub save($) {
1477 my ($pl) = @_; 1670 my ($pl) = @_;
1478 1671
1479 return if $pl->{deny_save}; 1672 return if $pl->{deny_save};
1480 1673
1485 1678
1486 aio_mkdir playerdir $pl, 0770; 1679 aio_mkdir playerdir $pl, 0770;
1487 $pl->{last_save} = $cf::RUNTIME; 1680 $pl->{last_save} = $cf::RUNTIME;
1488 1681
1489 cf::get_slot 0.01; 1682 cf::get_slot 0.01;
1683
1684 # save slots, to be restored later
1685 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1490 1686
1491 $pl->save_pl ($path); 1687 $pl->save_pl ($path);
1492 cf::cede_to_tick; 1688 cf::cede_to_tick;
1493} 1689}
1494 1690
1528 my $name = $pl->ob->name; 1724 my $name = $pl->ob->name;
1529 1725
1530 $pl->{deny_save} = 1; 1726 $pl->{deny_save} = 1;
1531 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1727 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1532 1728
1533 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1729 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1534 $pl->deactivate; 1730 $pl->deactivate;
1731
1535 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1732 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1536 $pl->ob->check_score;
1537 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1733 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1734 ext::highscore::check ($pl->ob);
1735
1538 $pl->ns->destroy if $pl->ns; 1736 $pl->ns->destroy if $pl->ns;
1539 1737
1540 my $path = playerdir $pl; 1738 my $path = playerdir $pl;
1541 my $temp = "$path~$cf::RUNTIME~deleting~"; 1739 my $temp = "$path~$cf::RUNTIME~deleting~";
1542 aio_rename $path, $temp; 1740 aio_rename $path, $temp;
1596 \@logins 1794 \@logins
1597} 1795}
1598 1796
1599=item $player->maps 1797=item $player->maps
1600 1798
1799=item cf::player::maps $login
1800
1601Returns an arrayref of map paths that are private for this 1801Returns an arrayref of map paths that are private for this
1602player. May block. 1802player. May block.
1603 1803
1604=cut 1804=cut
1605 1805
1667=cut 1867=cut
1668 1868
1669sub find_by_path($) { 1869sub find_by_path($) {
1670 my ($path) = @_; 1870 my ($path) = @_;
1671 1871
1872 $path =~ s/^~[^\/]*//; # skip ~login
1873
1672 my ($match, $specificity); 1874 my ($match, $specificity);
1673 1875
1674 for my $region (list) { 1876 for my $region (list) {
1675 if ($region->{match} && $path =~ $region->{match}) { 1877 if ($region->{match} && $path =~ $region->{match}) {
1676 ($match, $specificity) = ($region, $region->specificity) 1878 ($match, $specificity) = ($region, $region->specificity)
1704sub generate_random_map { 1906sub generate_random_map {
1705 my ($self, $rmp) = @_; 1907 my ($self, $rmp) = @_;
1706 1908
1707 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1909 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1708 1910
1709 # mit "rum" bekleckern, nicht
1710 $self->_create_random_map ( 1911 $self->_create_random_map ($rmp);
1711 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1712 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1713 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1714 $rmp->{exit_on_final_map},
1715 $rmp->{xsize}, $rmp->{ysize},
1716 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1717 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1718 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1719 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1720 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1721 (cf::region::find $rmp->{region}), $rmp->{custom}
1722 )
1723} 1912}
1724 1913
1725=item cf::map->register ($regex, $prio) 1914=item cf::map->register ($regex, $prio)
1726 1915
1727Register a handler for the map path matching the given regex at the 1916Register a handler for the map path matching the given regex at the
1732 1921
1733sub register { 1922sub register {
1734 my (undef, $regex, $prio) = @_; 1923 my (undef, $regex, $prio) = @_;
1735 my $pkg = caller; 1924 my $pkg = caller;
1736 1925
1737 no strict;
1738 push @{"$pkg\::ISA"}, __PACKAGE__; 1926 push @{"$pkg\::ISA"}, __PACKAGE__;
1739 1927
1740 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1928 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1741} 1929}
1742 1930
1743# also paths starting with '/' 1931# also paths starting with '/'
1744$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1932$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1745 1933
1746sub thawer_merge { 1934sub thawer_merge {
1747 my ($self, $merge) = @_; 1935 my ($self, $merge) = @_;
1748 1936
1749 # we have to keep some variables in memory intact 1937 # we have to keep some variables in memory intact
1754} 1942}
1755 1943
1756sub normalise { 1944sub normalise {
1757 my ($path, $base) = @_; 1945 my ($path, $base) = @_;
1758 1946
1759 $path = "$path"; # make sure its a string 1947 $path = "$path"; # make sure it's a string
1760 1948
1761 $path =~ s/\.map$//; 1949 $path =~ s/\.map$//;
1762 1950
1763 # map plan: 1951 # map plan:
1764 # 1952 #
1779 $base =~ s{[^/]+/?$}{}; 1967 $base =~ s{[^/]+/?$}{};
1780 $path = "$base/$path"; 1968 $path = "$base/$path";
1781 } 1969 }
1782 1970
1783 for ($path) { 1971 for ($path) {
1784 redo if s{//}{/};
1785 redo if s{/\.?/}{/}; 1972 redo if s{/\.?/}{/};
1786 redo if s{/[^/]+/\.\./}{/}; 1973 redo if s{/[^/]+/\.\./}{/};
1787 } 1974 }
1788 1975
1789 $path 1976 $path
1803 $self->init; # pass $1 etc. 1990 $self->init; # pass $1 etc.
1804 return $self; 1991 return $self;
1805 } 1992 }
1806 } 1993 }
1807 1994
1808 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1995 Carp::cluck "unable to resolve path '$path' (base '$base')";
1809 () 1996 ()
1810} 1997}
1811 1998
1999# may re-bless or do other evil things
1812sub init { 2000sub init {
1813 my ($self) = @_; 2001 my ($self) = @_;
1814 2002
1815 $self 2003 $self
1816} 2004}
1845sub uniq_path { 2033sub uniq_path {
1846 my ($self) = @_; 2034 my ($self) = @_;
1847 2035
1848 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 2036 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1849 "$UNIQUEDIR/$path" 2037 "$UNIQUEDIR/$path"
1850}
1851
1852# and all this just because we cannot iterate over
1853# all maps in C++...
1854sub change_all_map_light {
1855 my ($change) = @_;
1856
1857 $_->change_map_light ($change)
1858 for grep $_->outdoor, values %cf::MAP;
1859} 2038}
1860 2039
1861sub decay_objects { 2040sub decay_objects {
1862 my ($self) = @_; 2041 my ($self) = @_;
1863 2042
1945 2124
1946sub find; 2125sub find;
1947sub find { 2126sub find {
1948 my ($path, $origin) = @_; 2127 my ($path, $origin) = @_;
1949 2128
2129 cf::cede_to_tick;
2130
1950 $path = normalise $path, $origin && $origin->path; 2131 $path = normalise $path, $origin && $origin->path;
1951 2132
1952 cf::lock_wait "map_data:$path";#d#remove 2133 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1953 cf::lock_wait "map_find:$path"; 2134 my $guard2 = cf::lock_acquire "map_find:$path";
1954 2135
1955 $cf::MAP{$path} || do { 2136 $cf::MAP{$path} || do {
1956 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1957 my $guard2 = cf::lock_acquire "map_find:$path";
1958
1959 my $map = new_from_path cf::map $path 2137 my $map = new_from_path cf::map $path
1960 or return; 2138 or return;
1961 2139
1962 $map->{last_save} = $cf::RUNTIME; 2140 $map->{last_save} = $cf::RUNTIME;
1963 2141
1975 2153
1976 $cf::MAP{$path} = $map 2154 $cf::MAP{$path} = $map
1977 } 2155 }
1978} 2156}
1979 2157
1980sub pre_load { } 2158sub pre_load { }
1981sub post_load { } 2159#sub post_load { } # XS
1982 2160
1983sub load { 2161sub load {
1984 my ($self) = @_; 2162 my ($self) = @_;
1985 2163
1986 local $self->{deny_reset} = 1; # loading can take a long time 2164 local $self->{deny_reset} = 1; # loading can take a long time
2031 unless ($self->{deny_activate}) { 2209 unless ($self->{deny_activate}) {
2032 $self->decay_objects; 2210 $self->decay_objects;
2033 $self->fix_auto_apply; 2211 $self->fix_auto_apply;
2034 $self->update_buttons; 2212 $self->update_buttons;
2035 cf::cede_to_tick; 2213 cf::cede_to_tick;
2036 $self->set_darkness_map;
2037 cf::cede_to_tick;
2038 $self->activate; 2214 $self->activate;
2039 } 2215 }
2040 2216
2041 $self->{last_save} = $cf::RUNTIME; 2217 $self->{last_save} = $cf::RUNTIME;
2042 $self->last_access ($cf::RUNTIME); 2218 $self->last_access ($cf::RUNTIME);
2043 2219
2044 $self->in_memory (cf::MAP_ACTIVE); 2220 $self->in_memory (cf::MAP_ACTIVE);
2045 } 2221 }
2046 2222
2047 $self->post_load; 2223 $self->post_load;
2048}
2049 2224
2225 1
2226}
2227
2228# customize the map for a given player, i.e.
2229# return the _real_ map. used by e.g. per-player
2230# maps to change the path to ~playername/mappath
2050sub customise_for { 2231sub customise_for {
2051 my ($self, $ob) = @_; 2232 my ($self, $ob) = @_;
2052 2233
2053 return find "~" . $ob->name . "/" . $self->{path} 2234 return find "~" . $ob->name . "/" . $self->{path}
2054 if $self->per_player; 2235 if $self->per_player;
2070 or next; 2251 or next;
2071 $neigh = find $neigh, $map 2252 $neigh = find $neigh, $map
2072 or next; 2253 or next;
2073 $neigh->load; 2254 $neigh->load;
2074 2255
2256 # now find the diagonal neighbours
2075 push @neigh, 2257 push @neigh,
2076 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2258 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2077 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2259 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2078 } 2260 }
2079 2261
2086} 2268}
2087 2269
2088sub find_sync { 2270sub find_sync {
2089 my ($path, $origin) = @_; 2271 my ($path, $origin) = @_;
2090 2272
2091 cf::sync_job { find $path, $origin } 2273 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2274 if $Coro::current == $Coro::main;
2275
2276 find $path, $origin
2092} 2277}
2093 2278
2094sub do_load_sync { 2279sub do_load_sync {
2095 my ($map) = @_; 2280 my ($map) = @_;
2096 2281
2097 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2282 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2098 if $Coro::current == $Coro::main; 2283 if $Coro::current == $Coro::main;
2099 2284
2100 cf::sync_job { $map->load }; 2285 $map->load;
2101} 2286}
2102 2287
2103our %MAP_PREFETCH; 2288our %MAP_PREFETCH;
2104our $MAP_PREFETCHER = undef; 2289our $MAP_PREFETCHER = undef;
2105 2290
2131 $MAP_PREFETCHER->prio (6); 2316 $MAP_PREFETCHER->prio (6);
2132 2317
2133 () 2318 ()
2134} 2319}
2135 2320
2321# common code, used by both ->save and ->swapout
2136sub save { 2322sub _save {
2137 my ($self) = @_; 2323 my ($self) = @_;
2138
2139 my $lock = cf::lock_acquire "map_data:$self->{path}";
2140 2324
2141 $self->{last_save} = $cf::RUNTIME; 2325 $self->{last_save} = $cf::RUNTIME;
2142 2326
2143 return unless $self->dirty; 2327 return unless $self->dirty;
2144 2328
2164 } else { 2348 } else {
2165 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2349 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2166 } 2350 }
2167} 2351}
2168 2352
2353sub save {
2354 my ($self) = @_;
2355
2356 my $lock = cf::lock_acquire "map_data:$self->{path}";
2357
2358 $self->_save;
2359}
2360
2169sub swap_out { 2361sub swap_out {
2170 my ($self) = @_; 2362 my ($self) = @_;
2171 2363
2172 # save first because save cedes
2173 $self->save;
2174
2175 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2364 my $lock = cf::lock_acquire "map_data:$self->{path}";
2176 2365
2177 return if $self->players;
2178 return if $self->in_memory != cf::MAP_ACTIVE; 2366 return if $self->in_memory != cf::MAP_ACTIVE;
2179 return if $self->{deny_save}; 2367 return if $self->{deny_save};
2368 return if $self->players;
2180 2369
2370 # first deactivate the map and "unlink" it from the core
2371 $self->deactivate;
2372 $_->clear_links_to ($self) for values %cf::MAP;
2181 $self->in_memory (cf::MAP_SWAPPED); 2373 $self->in_memory (cf::MAP_SWAPPED);
2374
2375 # then atomically save
2376 $self->_save;
2377
2378 # then free the map
2379 $self->clear;
2380}
2381
2382sub reset_at {
2383 my ($self) = @_;
2384
2385 # TODO: safety, remove and allow resettable per-player maps
2386 return 1e99 if $self->{deny_reset};
2387
2388 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2389 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2390
2391 $time + $to
2392}
2393
2394sub should_reset {
2395 my ($self) = @_;
2396
2397 $self->reset_at <= $cf::RUNTIME
2398}
2399
2400sub reset {
2401 my ($self) = @_;
2402
2403 my $lock = cf::lock_acquire "map_data:$self->{path}";
2404
2405 return if $self->players;
2406
2407 cf::trace "resetting map ", $self->path, "\n";
2408
2409 $self->in_memory (cf::MAP_SWAPPED);
2410
2411 # need to save uniques path
2412 unless ($self->{deny_save}) {
2413 my $uniq = $self->uniq_path; utf8::encode $uniq;
2414
2415 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2416 if $uniq;
2417 }
2418
2419 delete $cf::MAP{$self->path};
2182 2420
2183 $self->deactivate; 2421 $self->deactivate;
2184 $_->clear_links_to ($self) for values %cf::MAP; 2422 $_->clear_links_to ($self) for values %cf::MAP;
2185 $self->clear; 2423 $self->clear;
2186}
2187
2188sub reset_at {
2189 my ($self) = @_;
2190
2191 # TODO: safety, remove and allow resettable per-player maps
2192 return 1e99 if $self->{deny_reset};
2193
2194 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2195 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2196
2197 $time + $to
2198}
2199
2200sub should_reset {
2201 my ($self) = @_;
2202
2203 $self->reset_at <= $cf::RUNTIME
2204}
2205
2206sub reset {
2207 my ($self) = @_;
2208
2209 my $lock = cf::lock_acquire "map_data:$self->{path}";
2210
2211 return if $self->players;
2212
2213 warn "resetting map ", $self->path;
2214
2215 $self->in_memory (cf::MAP_SWAPPED);
2216
2217 # need to save uniques path
2218 unless ($self->{deny_save}) {
2219 my $uniq = $self->uniq_path; utf8::encode $uniq;
2220
2221 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2222 if $uniq;
2223 }
2224
2225 delete $cf::MAP{$self->path};
2226
2227 $self->deactivate;
2228 $_->clear_links_to ($self) for values %cf::MAP;
2229 $self->clear;
2230 2424
2231 $self->unlink_save; 2425 $self->unlink_save;
2232 $self->destroy; 2426 $self->destroy;
2233} 2427}
2234 2428
2242 2436
2243 delete $cf::MAP{$self->path}; 2437 delete $cf::MAP{$self->path};
2244 2438
2245 $self->unlink_save; 2439 $self->unlink_save;
2246 2440
2247 bless $self, "cf::map"; 2441 bless $self, "cf::map::wrap";
2248 delete $self->{deny_reset}; 2442 delete $self->{deny_reset};
2249 $self->{deny_save} = 1; 2443 $self->{deny_save} = 1;
2250 $self->reset_timeout (1); 2444 $self->reset_timeout (1);
2251 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2445 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2252 2446
2309 : normalise $_ 2503 : normalise $_
2310 } @{ aio_readdir $UNIQUEDIR or [] } 2504 } @{ aio_readdir $UNIQUEDIR or [] }
2311 ] 2505 ]
2312} 2506}
2313 2507
2508=item cf::map::static_maps
2509
2510Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2511file in the shared directory excluding F</styles> and F</editor>). May
2512block.
2513
2514=cut
2515
2516sub static_maps() {
2517 my @dirs = "";
2518 my @maps;
2519
2520 while (@dirs) {
2521 my $dir = shift @dirs;
2522
2523 next if $dir eq "/styles" || $dir eq "/editor";
2524
2525 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2526 or return;
2527
2528 for (@$files) {
2529 s/\.map$// or next;
2530 utf8::decode $_;
2531 push @maps, "$dir/$_";
2532 }
2533
2534 push @dirs, map "$dir/$_", @$dirs;
2535 }
2536
2537 \@maps
2538}
2539
2314=back 2540=back
2315 2541
2316=head3 cf::object 2542=head3 cf::object
2317 2543
2318=cut 2544=cut
2383 2609
2384our $SAY_CHANNEL = { 2610our $SAY_CHANNEL = {
2385 id => "say", 2611 id => "say",
2386 title => "Map", 2612 title => "Map",
2387 reply => "say ", 2613 reply => "say ",
2388 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2614 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2389}; 2615};
2390 2616
2391our $CHAT_CHANNEL = { 2617our $CHAT_CHANNEL = {
2392 id => "chat", 2618 id => "chat",
2393 title => "Chat", 2619 title => "Chat",
2450 2676
2451Freezes the player and moves him/her to a special map (C<{link}>). 2677Freezes the player and moves him/her to a special map (C<{link}>).
2452 2678
2453The player should be reasonably safe there for short amounts of time (e.g. 2679The player should be reasonably safe there for short amounts of time (e.g.
2454for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2680for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2455though, as the palyer cannot control the character while it is on the link 2681though, as the player cannot control the character while it is on the link
2456map. 2682map.
2457 2683
2458Will never block. 2684Will never block.
2459 2685
2460=item $player_object->leave_link ($map, $x, $y) 2686=item $player_object->leave_link ($map, $x, $y)
2481sub cf::object::player::enter_link { 2707sub cf::object::player::enter_link {
2482 my ($self) = @_; 2708 my ($self) = @_;
2483 2709
2484 $self->deactivate_recursive; 2710 $self->deactivate_recursive;
2485 2711
2712 ++$self->{_link_recursion};
2713
2486 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2714 return if UNIVERSAL::isa $self->map, "ext::map_link";
2487 2715
2488 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2716 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2489 if $self->map && $self->map->{path} ne "{link}"; 2717 if $self->map && $self->map->{path} ne "{link}";
2490 2718
2491 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2719 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2492} 2720}
2493 2721
2494sub cf::object::player::leave_link { 2722sub cf::object::player::leave_link {
2495 my ($self, $map, $x, $y) = @_; 2723 my ($self, $map, $x, $y) = @_;
2496 2724
2513 ($x, $y) = (-1, -1) 2741 ($x, $y) = (-1, -1)
2514 unless (defined $x) && (defined $y); 2742 unless (defined $x) && (defined $y);
2515 2743
2516 # use -1 or undef as default coordinates, not 0, 0 2744 # use -1 or undef as default coordinates, not 0, 0
2517 ($x, $y) = ($map->enter_x, $map->enter_y) 2745 ($x, $y) = ($map->enter_x, $map->enter_y)
2518 if $x <=0 && $y <= 0; 2746 if $x <= 0 && $y <= 0;
2519 2747
2520 $map->load; 2748 $map->load;
2521 $map->load_neighbours; 2749 $map->load_neighbours;
2522 2750
2523 return unless $self->contr->active; 2751 return unless $self->contr->active;
2524 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2525 $self->activate_recursive;
2526 2752
2527 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2753 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2528 $self->enter_map ($map, $x, $y); 2754 if ($self->enter_map ($map, $x, $y)) {
2529} 2755 # entering was successful
2756 delete $self->{_link_recursion};
2757 # only activate afterwards, to support waiting in hooks
2758 $self->activate_recursive;
2759 }
2530 2760
2761}
2762
2531=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2763=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2532 2764
2533Moves the player to the given map-path and coordinates by first freezing 2765Moves the player to the given map-path and coordinates by first freezing
2534her, loading and preparing them map, calling the provided $check callback 2766her, loading and preparing them map, calling the provided $check callback
2535that has to return the map if sucecssful, and then unfreezes the player on 2767that has to return the map if sucecssful, and then unfreezes the player on
2536the new (success) or old (failed) map position. In either case, $done will 2768the new (success) or old (failed) map position. In either case, $done will
2543 2775
2544our $GOTOGEN; 2776our $GOTOGEN;
2545 2777
2546sub cf::object::player::goto { 2778sub cf::object::player::goto {
2547 my ($self, $path, $x, $y, $check, $done) = @_; 2779 my ($self, $path, $x, $y, $check, $done) = @_;
2780
2781 if ($self->{_link_recursion} >= $MAX_LINKS) {
2782 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2783 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2784 ($path, $x, $y) = @$EMERGENCY_POSITION;
2785 }
2548 2786
2549 # do generation counting so two concurrent goto's will be executed in-order 2787 # do generation counting so two concurrent goto's will be executed in-order
2550 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2788 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2551 2789
2552 $self->enter_link; 2790 $self->enter_link;
2576 my $map = eval { 2814 my $map = eval {
2577 my $map = defined $path ? cf::map::find $path : undef; 2815 my $map = defined $path ? cf::map::find $path : undef;
2578 2816
2579 if ($map) { 2817 if ($map) {
2580 $map = $map->customise_for ($self); 2818 $map = $map->customise_for ($self);
2581 $map = $check->($map) if $check && $map; 2819 $map = $check->($map, $x, $y, $self) if $check && $map;
2582 } else { 2820 } else {
2583 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2821 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2584 } 2822 }
2585 2823
2586 $map 2824 $map
2594 if ($gen == $self->{_goto_generation}) { 2832 if ($gen == $self->{_goto_generation}) {
2595 delete $self->{_goto_generation}; 2833 delete $self->{_goto_generation};
2596 $self->leave_link ($map, $x, $y); 2834 $self->leave_link ($map, $x, $y);
2597 } 2835 }
2598 2836
2599 $done->() if $done; 2837 $done->($self) if $done;
2600 })->prio (1); 2838 })->prio (1);
2601} 2839}
2602 2840
2603=item $player_object->enter_exit ($exit_object) 2841=item $player_object->enter_exit ($exit_object)
2604 2842
2697 $self->message ("Something went wrong deep within the deliantra server. " 2935 $self->message ("Something went wrong deep within the deliantra server. "
2698 . "I'll try to bring you back to the map you were before. " 2936 . "I'll try to bring you back to the map you were before. "
2699 . "Please report this to the dungeon master!", 2937 . "Please report this to the dungeon master!",
2700 cf::NDI_UNIQUE | cf::NDI_RED); 2938 cf::NDI_UNIQUE | cf::NDI_RED);
2701 2939
2702 warn "ERROR in enter_exit: $@"; 2940 error "ERROR in enter_exit: $@";
2703 $self->leave_link; 2941 $self->leave_link;
2704 } 2942 }
2705 })->prio (1); 2943 })->prio (1);
2706} 2944}
2707 2945
2719sub cf::client::send_drawinfo { 2957sub cf::client::send_drawinfo {
2720 my ($self, $text, $flags) = @_; 2958 my ($self, $text, $flags) = @_;
2721 2959
2722 utf8::encode $text; 2960 utf8::encode $text;
2723 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2961 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2962}
2963
2964=item $client->send_big_packet ($pkt)
2965
2966Like C<send_packet>, but tries to compress large packets, and fragments
2967them as required.
2968
2969=cut
2970
2971our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2972
2973sub cf::client::send_big_packet {
2974 my ($self, $pkt) = @_;
2975
2976 # try lzf for large packets
2977 $pkt = "lzf " . Compress::LZF::compress $pkt
2978 if 1024 <= length $pkt and $self->{can_lzf};
2979
2980 # split very large packets
2981 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2982 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2983 $pkt = "frag";
2984 }
2985
2986 $self->send_packet ($pkt);
2724} 2987}
2725 2988
2726=item $client->send_msg ($channel, $msg, $color, [extra...]) 2989=item $client->send_msg ($channel, $msg, $color, [extra...])
2727 2990
2728Send a drawinfo or msg packet to the client, formatting the msg for the 2991Send a drawinfo or msg packet to the client, formatting the msg for the
2732 2995
2733=cut 2996=cut
2734 2997
2735# non-persistent channels (usually the info channel) 2998# non-persistent channels (usually the info channel)
2736our %CHANNEL = ( 2999our %CHANNEL = (
3000 "c/motd" => {
3001 id => "infobox",
3002 title => "MOTD",
3003 reply => undef,
3004 tooltip => "The message of the day",
3005 },
2737 "c/identify" => { 3006 "c/identify" => {
2738 id => "infobox", 3007 id => "infobox",
2739 title => "Identify", 3008 title => "Identify",
2740 reply => undef, 3009 reply => undef,
2741 tooltip => "Items recently identified", 3010 tooltip => "Items recently identified",
2743 "c/examine" => { 3012 "c/examine" => {
2744 id => "infobox", 3013 id => "infobox",
2745 title => "Examine", 3014 title => "Examine",
2746 reply => undef, 3015 reply => undef,
2747 tooltip => "Signs and other items you examined", 3016 tooltip => "Signs and other items you examined",
3017 },
3018 "c/shopinfo" => {
3019 id => "infobox",
3020 title => "Shop Info",
3021 reply => undef,
3022 tooltip => "What your bargaining skill tells you about the shop",
2748 }, 3023 },
2749 "c/book" => { 3024 "c/book" => {
2750 id => "infobox", 3025 id => "infobox",
2751 title => "Book", 3026 title => "Book",
2752 reply => undef, 3027 reply => undef,
2768 id => "infobox", 3043 id => "infobox",
2769 title => "Body Parts", 3044 title => "Body Parts",
2770 reply => undef, 3045 reply => undef,
2771 tooltip => "Shows which body parts you posess and are available", 3046 tooltip => "Shows which body parts you posess and are available",
2772 }, 3047 },
3048 "c/statistics" => {
3049 id => "infobox",
3050 title => "Statistics",
3051 reply => undef,
3052 tooltip => "Shows your primary statistics",
3053 },
3054 "c/skills" => {
3055 id => "infobox",
3056 title => "Skills",
3057 reply => undef,
3058 tooltip => "Shows your experience per skill and item power",
3059 },
3060 "c/shopitems" => {
3061 id => "infobox",
3062 title => "Shop Items",
3063 reply => undef,
3064 tooltip => "Shows the items currently for sale in this shop",
3065 },
3066 "c/resistances" => {
3067 id => "infobox",
3068 title => "Resistances",
3069 reply => undef,
3070 tooltip => "Shows your resistances",
3071 },
3072 "c/pets" => {
3073 id => "infobox",
3074 title => "Pets",
3075 reply => undef,
3076 tooltip => "Shows information abotu your pets/a specific pet",
3077 },
3078 "c/perceiveself" => {
3079 id => "infobox",
3080 title => "Perceive Self",
3081 reply => undef,
3082 tooltip => "You gained detailed knowledge about yourself",
3083 },
2773 "c/uptime" => { 3084 "c/uptime" => {
2774 id => "infobox", 3085 id => "infobox",
2775 title => "Uptime", 3086 title => "Uptime",
2776 reply => undef, 3087 reply => undef,
2777 tooltip => "How long the server has been running since last restart", 3088 tooltip => "How long the server has been running since last restart",
2786 id => "party", 3097 id => "party",
2787 title => "Party", 3098 title => "Party",
2788 reply => "gsay ", 3099 reply => "gsay ",
2789 tooltip => "Messages and chat related to your party", 3100 tooltip => "Messages and chat related to your party",
2790 }, 3101 },
3102 "c/death" => {
3103 id => "death",
3104 title => "Death",
3105 reply => undef,
3106 tooltip => "Reason for and more info about your most recent death",
3107 },
3108 "c/say" => $SAY_CHANNEL,
3109 "c/chat" => $CHAT_CHANNEL,
2791); 3110);
2792 3111
2793sub cf::client::send_msg { 3112sub cf::client::send_msg {
2794 my ($self, $channel, $msg, $color, @extra) = @_; 3113 my ($self, $channel, $msg, $color, @extra) = @_;
2795 3114
2800 3119
2801 # check predefined channels, for the benefit of C 3120 # check predefined channels, for the benefit of C
2802 if ($CHANNEL{$channel}) { 3121 if ($CHANNEL{$channel}) {
2803 $channel = $CHANNEL{$channel}; 3122 $channel = $CHANNEL{$channel};
2804 3123
2805 $self->ext_msg (channel_info => $channel) 3124 $self->ext_msg (channel_info => $channel);
2806 if $self->can_msg;
2807
2808 $channel = $channel->{id}; 3125 $channel = $channel->{id};
2809 3126
2810 } elsif (ref $channel) { 3127 } elsif (ref $channel) {
2811 # send meta info to client, if not yet sent 3128 # send meta info to client, if not yet sent
2812 unless (exists $self->{channel}{$channel->{id}}) { 3129 unless (exists $self->{channel}{$channel->{id}}) {
2813 $self->{channel}{$channel->{id}} = $channel; 3130 $self->{channel}{$channel->{id}} = $channel;
2814 $self->ext_msg (channel_info => $channel) 3131 $self->ext_msg (channel_info => $channel);
2815 if $self->can_msg;
2816 } 3132 }
2817 3133
2818 $channel = $channel->{id}; 3134 $channel = $channel->{id};
2819 } 3135 }
2820 3136
2821 return unless @extra || length $msg; 3137 return unless @extra || length $msg;
2822 3138
2823 if ($self->can_msg) {
2824 # default colour, mask it out 3139 # default colour, mask it out
2825 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3140 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2826 if $color & cf::NDI_DEF; 3141 if $color & cf::NDI_DEF;
2827 3142
2828 my $pkt = "msg " 3143 my $pkt = "msg "
2829 . $self->{json_coder}->encode ( 3144 . $self->{json_coder}->encode (
2830 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3145 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2831 ); 3146 );
2832 3147
2833 # try lzf for large packets
2834 $pkt = "lzf " . Compress::LZF::compress $pkt
2835 if 1024 <= length $pkt and $self->{can_lzf};
2836
2837 # split very large packets
2838 if (8192 < length $pkt and $self->{can_lzf}) {
2839 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2840 $pkt = "frag";
2841 }
2842
2843 $self->send_packet ($pkt); 3148 $self->send_big_packet ($pkt);
2844 } else {
2845 if ($color >= 0) {
2846 # replace some tags by gcfclient-compatible ones
2847 for ($msg) {
2848 1 while
2849 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2850 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2851 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2852 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2853 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2854 }
2855
2856 $color &= cf::NDI_COLOR_MASK;
2857
2858 utf8::encode $msg;
2859
2860 if (0 && $msg =~ /\[/) {
2861 # COMMAND/INFO
2862 $self->send_packet ("drawextinfo $color 10 8 $msg")
2863 } else {
2864 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2865 $self->send_packet ("drawinfo $color $msg")
2866 }
2867 }
2868 }
2869} 3149}
2870 3150
2871=item $client->ext_msg ($type, @msg) 3151=item $client->ext_msg ($type, @msg)
2872 3152
2873Sends an ext event to the client. 3153Sends an ext event to the client.
2876 3156
2877sub cf::client::ext_msg($$@) { 3157sub cf::client::ext_msg($$@) {
2878 my ($self, $type, @msg) = @_; 3158 my ($self, $type, @msg) = @_;
2879 3159
2880 if ($self->extcmd == 2) { 3160 if ($self->extcmd == 2) {
2881 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3161 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2882 } elsif ($self->extcmd == 1) { # TODO: remove 3162 } elsif ($self->extcmd == 1) { # TODO: remove
2883 push @msg, msgtype => "event_$type"; 3163 push @msg, msgtype => "event_$type";
2884 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3164 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2885 } 3165 }
2886} 3166}
2887 3167
2888=item $client->ext_reply ($msgid, @msg) 3168=item $client->ext_reply ($msgid, @msg)
2889 3169
2893 3173
2894sub cf::client::ext_reply($$@) { 3174sub cf::client::ext_reply($$@) {
2895 my ($self, $id, @msg) = @_; 3175 my ($self, $id, @msg) = @_;
2896 3176
2897 if ($self->extcmd == 2) { 3177 if ($self->extcmd == 2) {
2898 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3178 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2899 } elsif ($self->extcmd == 1) { 3179 } elsif ($self->extcmd == 1) {
2900 #TODO: version 1, remove 3180 #TODO: version 1, remove
2901 unshift @msg, msgtype => "reply", msgid => $id; 3181 unshift @msg, msgtype => "reply", msgid => $id;
2902 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3182 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2903 } 3183 }
2904} 3184}
2905 3185
2906=item $success = $client->query ($flags, "text", \&cb) 3186=item $success = $client->query ($flags, "text", \&cb)
2907 3187
2978 3258
2979 $ns->ext_reply ($reply, @reply) 3259 $ns->ext_reply ($reply, @reply)
2980 if $reply; 3260 if $reply;
2981 3261
2982 } else { 3262 } else {
2983 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3263 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2984 } 3264 }
2985 3265
2986 cf::override; 3266 cf::override;
2987 }, 3267 },
2988); 3268);
3008 3288
3009 $coro 3289 $coro
3010} 3290}
3011 3291
3012cf::client->attach ( 3292cf::client->attach (
3013 on_destroy => sub { 3293 on_client_destroy => sub {
3014 my ($ns) = @_; 3294 my ($ns) = @_;
3015 3295
3016 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3296 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3017 }, 3297 },
3018); 3298);
3034our $safe_hole = new Safe::Hole; 3314our $safe_hole = new Safe::Hole;
3035 3315
3036$SIG{FPE} = 'IGNORE'; 3316$SIG{FPE} = 'IGNORE';
3037 3317
3038$safe->permit_only (Opcode::opset qw( 3318$safe->permit_only (Opcode::opset qw(
3039 :base_core :base_mem :base_orig :base_math 3319 :base_core :base_mem :base_orig :base_math :base_loop
3040 grepstart grepwhile mapstart mapwhile 3320 grepstart grepwhile mapstart mapwhile
3041 sort time 3321 sort time
3042)); 3322));
3043 3323
3044# here we export the classes and methods available to script code 3324# here we export the classes and methods available to script code
3048The following functions and methods are available within a safe environment: 3328The following functions and methods are available within a safe environment:
3049 3329
3050 cf::object 3330 cf::object
3051 contr pay_amount pay_player map x y force_find force_add destroy 3331 contr pay_amount pay_player map x y force_find force_add destroy
3052 insert remove name archname title slaying race decrease split 3332 insert remove name archname title slaying race decrease split
3333 value
3053 3334
3054 cf::object::player 3335 cf::object::player
3055 player 3336 player
3056 3337
3057 cf::player 3338 cf::player
3063=cut 3344=cut
3064 3345
3065for ( 3346for (
3066 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3347 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3067 insert remove inv nrof name archname title slaying race 3348 insert remove inv nrof name archname title slaying race
3068 decrease split destroy change_exp)], 3349 decrease split destroy change_exp value msg lore send_msg)],
3069 ["cf::object::player" => qw(player)], 3350 ["cf::object::player" => qw(player)],
3070 ["cf::player" => qw(peaceful)], 3351 ["cf::player" => qw(peaceful send_msg)],
3071 ["cf::map" => qw(trigger)], 3352 ["cf::map" => qw(trigger)],
3072) { 3353) {
3073 no strict 'refs';
3074 my ($pkg, @funs) = @$_; 3354 my ($pkg, @funs) = @$_;
3075 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3355 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3076 for @funs; 3356 for @funs;
3077} 3357}
3078 3358
3093 3373
3094 my $qcode = $code; 3374 my $qcode = $code;
3095 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3375 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3096 $qcode =~ s/\n/\\n/g; 3376 $qcode =~ s/\n/\\n/g;
3097 3377
3378 %vars = (_dummy => 0) unless %vars;
3379
3380 my @res;
3098 local $_; 3381 local $_;
3099 local @safe::cf::_safe_eval_args = values %vars;
3100 3382
3101 my $eval = 3383 my $eval =
3102 "do {\n" 3384 "do {\n"
3103 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3385 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3104 . "#line 0 \"{$qcode}\"\n" 3386 . "#line 0 \"{$qcode}\"\n"
3105 . $code 3387 . $code
3106 . "\n}" 3388 . "\n}"
3107 ; 3389 ;
3108 3390
3391 if ($CFG{safe_eval}) {
3109 sub_generation_inc; 3392 sub_generation_inc;
3393 local @safe::cf::_safe_eval_args = values %vars;
3110 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3394 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3111 sub_generation_inc; 3395 sub_generation_inc;
3396 } else {
3397 local @cf::_safe_eval_args = values %vars;
3398 @res = wantarray ? eval eval : scalar eval $eval;
3399 }
3112 3400
3113 if ($@) { 3401 if ($@) {
3114 warn "$@"; 3402 warn "$@",
3115 warn "while executing safe code '$code'\n"; 3403 "while executing safe code '$code'\n",
3116 warn "with arguments " . (join " ", %vars) . "\n"; 3404 "with arguments " . (join " ", %vars) . "\n";
3117 } 3405 }
3118 3406
3119 wantarray ? @res : $res[0] 3407 wantarray ? @res : $res[0]
3120} 3408}
3121 3409
3135=cut 3423=cut
3136 3424
3137sub register_script_function { 3425sub register_script_function {
3138 my ($fun, $cb) = @_; 3426 my ($fun, $cb) = @_;
3139 3427
3140 no strict 'refs'; 3428 $fun = "safe::$fun" if $CFG{safe_eval};
3141 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3429 *$fun = $safe_hole->wrap ($cb);
3142} 3430}
3143 3431
3144=back 3432=back
3145 3433
3146=cut 3434=cut
3155 # for this (global event?) 3443 # for this (global event?)
3156 %ext::player_env::MUSIC_FACE_CACHE = (); 3444 %ext::player_env::MUSIC_FACE_CACHE = ();
3157 3445
3158 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3446 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3159 3447
3160 warn "loading facedata from $path\n"; 3448 trace "loading facedata from $path\n";
3161 3449
3162 my $facedata; 3450 my $facedata = decode_storable load_file $path;
3163 0 < aio_load $path, $facedata
3164 or die "$path: $!";
3165
3166 $facedata = Coro::Storable::thaw $facedata;
3167 3451
3168 $facedata->{version} == 2 3452 $facedata->{version} == 2
3169 or cf::cleanup "$path: version mismatch, cannot proceed."; 3453 or cf::cleanup "$path: version mismatch, cannot proceed.";
3170 3454
3171 # patch in the exptable 3455 # patch in the exptable
3456 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3172 $facedata->{resource}{"res/exp_table"} = { 3457 $facedata->{resource}{"res/exp_table"} = {
3173 type => FT_RSRC, 3458 type => FT_RSRC,
3174 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3459 data => $exp_table,
3460 hash => (Digest::MD5::md5 $exp_table),
3175 }; 3461 };
3176 cf::cede_to_tick; 3462 cf::cede_to_tick;
3177 3463
3178 { 3464 {
3179 my $faces = $facedata->{faceinfo}; 3465 my $faces = $facedata->{faceinfo};
3181 while (my ($face, $info) = each %$faces) { 3467 while (my ($face, $info) = each %$faces) {
3182 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3468 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3183 3469
3184 cf::face::set_visibility $idx, $info->{visibility}; 3470 cf::face::set_visibility $idx, $info->{visibility};
3185 cf::face::set_magicmap $idx, $info->{magicmap}; 3471 cf::face::set_magicmap $idx, $info->{magicmap};
3186 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3472 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3187 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3473 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3474 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3188 3475
3189 cf::cede_to_tick; 3476 cf::cede_to_tick;
3190 } 3477 }
3191 3478
3192 while (my ($face, $info) = each %$faces) { 3479 while (my ($face, $info) = each %$faces) {
3197 3484
3198 if (my $smooth = cf::face::find $info->{smooth}) { 3485 if (my $smooth = cf::face::find $info->{smooth}) {
3199 cf::face::set_smooth $idx, $smooth; 3486 cf::face::set_smooth $idx, $smooth;
3200 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3487 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3201 } else { 3488 } else {
3202 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3489 error "smooth face '$info->{smooth}' not found for face '$face'";
3203 } 3490 }
3204 3491
3205 cf::cede_to_tick; 3492 cf::cede_to_tick;
3206 } 3493 }
3207 } 3494 }
3216 3503
3217 cf::anim::invalidate_all; # d'oh 3504 cf::anim::invalidate_all; # d'oh
3218 } 3505 }
3219 3506
3220 { 3507 {
3221 # TODO: for gcfclient pleasure, we should give resources
3222 # that gcfclient doesn't grok a >10000 face index.
3223 my $res = $facedata->{resource}; 3508 my $res = $facedata->{resource};
3224 3509
3225 while (my ($name, $info) = each %$res) { 3510 while (my ($name, $info) = each %$res) {
3226 if (defined $info->{type}) { 3511 if (defined $info->{type}) {
3227 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3512 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3228 my $data;
3229 3513
3230 if ($info->{type} & 1) { 3514 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3231 # prepend meta info
3232
3233 my $meta = $enc->encode ({
3234 name => $name,
3235 %{ $info->{meta} || {} },
3236 });
3237
3238 $data = pack "(w/a*)*", $meta, $info->{data};
3239 } else {
3240 $data = $info->{data};
3241 }
3242
3243 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3244 cf::face::set_type $idx, $info->{type}; 3515 cf::face::set_type $idx, $info->{type};
3245 } else { 3516 } else {
3246 $RESOURCE{$name} = $info; 3517 $RESOURCE{$name} = $info; # unused
3247 } 3518 }
3248 3519
3249 cf::cede_to_tick; 3520 cf::cede_to_tick;
3250 } 3521 }
3251 } 3522 }
3252 3523
3253 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3524 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3254 3525
3255 1 3526 1
3256} 3527}
3257
3258cf::global->attach (on_resource_update => sub {
3259 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3260 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3261
3262 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3263 my $sound = $soundconf->{compat}[$_]
3264 or next;
3265
3266 my $face = cf::face::find "sound/$sound->[1]";
3267 cf::sound::set $sound->[0] => $face;
3268 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3269 }
3270
3271 while (my ($k, $v) = each %{$soundconf->{event}}) {
3272 my $face = cf::face::find "sound/$v";
3273 cf::sound::set $k => $face;
3274 }
3275 }
3276});
3277 3528
3278register_exticmd fx_want => sub { 3529register_exticmd fx_want => sub {
3279 my ($ns, $want) = @_; 3530 my ($ns, $want) = @_;
3280 3531
3281 while (my ($k, $v) = each %$want) { 3532 while (my ($k, $v) = each %$want) {
3320sub reload_treasures { 3571sub reload_treasures {
3321 load_resource_file "$DATADIR/treasures" 3572 load_resource_file "$DATADIR/treasures"
3322 or die "unable to load treasurelists\n"; 3573 or die "unable to load treasurelists\n";
3323} 3574}
3324 3575
3576sub reload_sound {
3577 trace "loading sound config from $DATADIR/sound\n";
3578
3579 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3580
3581 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3582 my $sound = $soundconf->{compat}[$_]
3583 or next;
3584
3585 my $face = cf::face::find "sound/$sound->[1]";
3586 cf::sound::set $sound->[0] => $face;
3587 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3588 }
3589
3590 while (my ($k, $v) = each %{$soundconf->{event}}) {
3591 my $face = cf::face::find "sound/$v";
3592 cf::sound::set $k => $face;
3593 }
3594}
3595
3325sub reload_resources { 3596sub reload_resources {
3326 warn "reloading resource files...\n"; 3597 trace "reloading resource files...\n";
3327 3598
3599 reload_exp_table;
3600 reload_materials;
3328 reload_facedata; 3601 reload_facedata;
3602 reload_sound;
3329 reload_archetypes; 3603 reload_archetypes;
3330 reload_regions; 3604 reload_regions;
3331 reload_treasures; 3605 reload_treasures;
3332 3606
3333 warn "finished reloading resource files\n"; 3607 trace "finished reloading resource files\n";
3334}
3335
3336sub init {
3337 my $guard = freeze_mainloop;
3338
3339 evthread_start IO::AIO::poll_fileno;
3340
3341 reload_resources;
3342} 3608}
3343 3609
3344sub reload_config { 3610sub reload_config {
3345 open my $fh, "<:utf8", "$CONFDIR/config" 3611 trace "reloading config file...\n";
3346 or return;
3347 3612
3348 local $/; 3613 my $config = load_file "$CONFDIR/config";
3349 *CFG = YAML::Load <$fh>; 3614 utf8::decode $config;
3615 *CFG = decode_yaml $config;
3350 3616
3351 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3617 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3352 3618
3353 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3619 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3354 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3620 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3355 3621
3356 if (exists $CFG{mlockall}) { 3622 if (exists $CFG{mlockall}) {
3379 3645
3380 seek $fh, 0, 0; 3646 seek $fh, 0, 0;
3381 print $fh $$; 3647 print $fh $$;
3382} 3648}
3383 3649
3650sub main_loop {
3651 trace "EV::loop starting\n";
3652 if (1) {
3653 EV::loop;
3654 }
3655 trace "EV::loop returned\n";
3656 goto &main_loop unless $REALLY_UNLOOP;
3657}
3658
3384sub main { 3659sub main {
3385 atomic; 3660 cf::init_globals; # initialise logging
3661
3662 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3663 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3664 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3665 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3666
3667 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3386 3668
3387 # we must not ever block the main coroutine 3669 # we must not ever block the main coroutine
3388 local $Coro::idle = sub { 3670 local $Coro::idle = sub {
3389 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3671 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3390 (async { 3672 (async {
3391 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3673 $Coro::current->{desc} = "IDLE BUG HANDLER";
3392 EV::loop EV::LOOP_ONESHOT; 3674 EV::loop EV::LOOP_ONESHOT;
3393 })->prio (Coro::PRIO_MAX); 3675 })->prio (Coro::PRIO_MAX);
3394 }; 3676 };
3395 3677
3396 { 3678 evthread_start IO::AIO::poll_fileno;
3397 my $guard = freeze_mainloop; 3679
3680 cf::sync_job {
3681 cf::incloader::init ();
3682
3683 cf::init_anim;
3684 cf::init_attackmess;
3685 cf::init_dynamic;
3686
3687 cf::load_settings;
3688
3689 reload_resources;
3398 reload_config; 3690 reload_config;
3399 db_init; 3691 db_init;
3692
3693 cf::init_uuid;
3694 cf::init_signals;
3695 cf::init_skills;
3696
3697 cf::init_beforeplay;
3698
3699 atomic;
3700
3400 load_extensions; 3701 load_extensions;
3401 3702
3402 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3403 }
3404
3405 utime time, time, $RUNTIMEFILE; 3703 utime time, time, $RUNTIMEFILE;
3406 3704
3407 # no (long-running) fork's whatsoever before this point(!) 3705 # no (long-running) fork's whatsoever before this point(!)
3706 use POSIX ();
3408 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3707 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3409 3708
3410 EV::loop; 3709 cf::_post_init 0;
3710 };
3711
3712 cf::object::thawer::errors_are_fatal 0;
3713 info "parse errors in files are no longer fatal from this point on.\n";
3714
3715 my $free_main; $free_main = EV::idle sub {
3716 undef $free_main;
3717 undef &main; # free gobs of memory :)
3718 };
3719
3720 goto &main_loop;
3411} 3721}
3412 3722
3413############################################################################# 3723#############################################################################
3414# initialisation and cleanup 3724# initialisation and cleanup
3415 3725
3416# install some emergency cleanup handlers 3726# install some emergency cleanup handlers
3417BEGIN { 3727BEGIN {
3418 our %SIGWATCHER = (); 3728 our %SIGWATCHER = ();
3419 for my $signal (qw(INT HUP TERM)) { 3729 for my $signal (qw(INT HUP TERM)) {
3420 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3730 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3421 cf::cleanup "SIG$signal"; 3731 cf::cleanup "SIG$signal";
3422 }; 3732 };
3423 } 3733 }
3424} 3734}
3425 3735
3426sub write_runtime_sync { 3736sub write_runtime_sync {
3737 my $t0 = AE::time;
3738
3427 # first touch the runtime file to show we are still running: 3739 # first touch the runtime file to show we are still running:
3428 # the fsync below can take a very very long time. 3740 # the fsync below can take a very very long time.
3429 3741
3430 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3742 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3431 3743
3432 my $guard = cf::lock_acquire "write_runtime"; 3744 my $guard = cf::lock_acquire "write_runtime";
3433 3745
3434 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3746 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3435 or return; 3747 or return;
3436 3748
3437 my $value = $cf::RUNTIME + 90 + 10; 3749 my $value = $cf::RUNTIME + 90 + 10;
3438 # 10 is the runtime save interval, for a monotonic clock 3750 # 10 is the runtime save interval, for a monotonic clock
3439 # 60 allows for the watchdog to kill the server. 3751 # 60 allows for the watchdog to kill the server.
3452 or return; 3764 or return;
3453 3765
3454 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3766 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3455 and return; 3767 and return;
3456 3768
3457 warn "runtime file written.\n"; 3769 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3458 3770
3459 1 3771 1
3460} 3772}
3461 3773
3462our $uuid_lock; 3774our $uuid_lock;
3471 my $uuid = "$LOCALDIR/uuid"; 3783 my $uuid = "$LOCALDIR/uuid";
3472 3784
3473 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3785 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3474 or return; 3786 or return;
3475 3787
3476 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3788 my $value = uuid_seq uuid_cur;
3789
3790 unless ($value) {
3791 info "cowardly refusing to write zero uuid value!\n";
3792 return;
3793 }
3794
3795 my $value = uuid_str $value + $uuid_skip;
3477 $uuid_skip = 0; 3796 $uuid_skip = 0;
3478 3797
3479 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3798 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3480 and return; 3799 and return;
3481 3800
3487 or return; 3806 or return;
3488 3807
3489 aio_rename "$uuid~", $uuid 3808 aio_rename "$uuid~", $uuid
3490 and return; 3809 and return;
3491 3810
3492 warn "uuid file written ($value).\n"; 3811 trace "uuid file written ($value).\n";
3493 3812
3494 1 3813 1
3495 3814
3496} 3815}
3497 3816
3503} 3822}
3504 3823
3505sub emergency_save() { 3824sub emergency_save() {
3506 my $freeze_guard = cf::freeze_mainloop; 3825 my $freeze_guard = cf::freeze_mainloop;
3507 3826
3508 warn "enter emergency perl save\n"; 3827 info "emergency_perl_save: enter\n";
3828
3829 # this is a trade-off: we want to be very quick here, so
3830 # save all maps without fsync, and later call a global sync
3831 # (which in turn might be very very slow)
3832 local $USE_FSYNC = 0;
3509 3833
3510 cf::sync_job { 3834 cf::sync_job {
3835 cf::write_runtime_sync; # external watchdog should not bark
3836
3511 # use a peculiar iteration method to avoid tripping on perl 3837 # use a peculiar iteration method to avoid tripping on perl
3512 # refcount bugs in for. also avoids problems with players 3838 # refcount bugs in for. also avoids problems with players
3513 # and maps saved/destroyed asynchronously. 3839 # and maps saved/destroyed asynchronously.
3514 warn "begin emergency player save\n"; 3840 info "emergency_perl_save: begin player save\n";
3515 for my $login (keys %cf::PLAYER) { 3841 for my $login (keys %cf::PLAYER) {
3516 my $pl = $cf::PLAYER{$login} or next; 3842 my $pl = $cf::PLAYER{$login} or next;
3517 $pl->valid or next; 3843 $pl->valid or next;
3518 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3844 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3519 $pl->save; 3845 $pl->save;
3520 } 3846 }
3521 warn "end emergency player save\n"; 3847 info "emergency_perl_save: end player save\n";
3522 3848
3523 warn "begin emergency map save\n"; 3849 cf::write_runtime_sync; # external watchdog should not bark
3850
3851 info "emergency_perl_save: begin map save\n";
3524 for my $path (keys %cf::MAP) { 3852 for my $path (keys %cf::MAP) {
3525 my $map = $cf::MAP{$path} or next; 3853 my $map = $cf::MAP{$path} or next;
3526 $map->valid or next; 3854 $map->valid or next;
3527 $map->save; 3855 $map->save;
3528 } 3856 }
3529 warn "end emergency map save\n"; 3857 info "emergency_perl_save: end map save\n";
3530 3858
3531 warn "begin emergency database checkpoint\n"; 3859 cf::write_runtime_sync; # external watchdog should not bark
3860
3861 info "emergency_perl_save: begin database checkpoint\n";
3532 BDB::db_env_txn_checkpoint $DB_ENV; 3862 BDB::db_env_txn_checkpoint $DB_ENV;
3533 warn "end emergency database checkpoint\n"; 3863 info "emergency_perl_save: end database checkpoint\n";
3534 3864
3535 warn "begin write uuid\n"; 3865 info "emergency_perl_save: begin write uuid\n";
3536 write_uuid_sync 1; 3866 write_uuid_sync 1;
3537 warn "end write uuid\n"; 3867 info "emergency_perl_save: end write uuid\n";
3868
3869 cf::write_runtime_sync; # external watchdog should not bark
3870
3871 trace "emergency_perl_save: syncing database to disk";
3872 BDB::db_env_txn_checkpoint $DB_ENV;
3873
3874 info "emergency_perl_save: starting sync\n";
3875 IO::AIO::aio_sync sub {
3876 info "emergency_perl_save: finished sync\n";
3877 };
3878
3879 cf::write_runtime_sync; # external watchdog should not bark
3880
3881 trace "emergency_perl_save: flushing outstanding aio requests";
3882 while (IO::AIO::nreqs || BDB::nreqs) {
3883 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3884 }
3885
3886 cf::write_runtime_sync; # external watchdog should not bark
3538 }; 3887 };
3539 3888
3540 warn "leave emergency perl save\n"; 3889 info "emergency_perl_save: leave\n";
3541} 3890}
3542 3891
3543sub post_cleanup { 3892sub post_cleanup {
3544 my ($make_core) = @_; 3893 my ($make_core) = @_;
3545 3894
3895 IO::AIO::flush;
3896
3546 warn Carp::longmess "post_cleanup backtrace" 3897 error Carp::longmess "post_cleanup backtrace"
3547 if $make_core; 3898 if $make_core;
3548 3899
3549 my $fh = pidfile; 3900 my $fh = pidfile;
3550 unlink $PIDFILE if <$fh> == $$; 3901 unlink $PIDFILE if <$fh> == $$;
3551} 3902}
3571 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3922 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3572 for my $name (keys %$leaf_symtab) { 3923 for my $name (keys %$leaf_symtab) {
3573 _gv_clear *{"$pkg$name"}; 3924 _gv_clear *{"$pkg$name"};
3574# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3925# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3575 } 3926 }
3576 warn "cleared package #$pkg\n";#d#
3577} 3927}
3578
3579our $RELOAD; # how many times to reload
3580 3928
3581sub do_reload_perl() { 3929sub do_reload_perl() {
3582 # can/must only be called in main 3930 # can/must only be called in main
3583 if ($Coro::current != $Coro::main) { 3931 unless (in_main) {
3584 warn "can only reload from main coroutine"; 3932 error "can only reload from main coroutine";
3585 return; 3933 return;
3586 } 3934 }
3587 3935
3588 return if $RELOAD++; 3936 return if $RELOAD++;
3589 3937
3938 my $t1 = AE::time;
3939
3590 while ($RELOAD) { 3940 while ($RELOAD) {
3591 warn "reloading..."; 3941 cf::get_slot 0.1, -1, "reload_perl";
3942 info "perl_reload: reloading...";
3592 3943
3593 warn "entering sync_job"; 3944 trace "perl_reload: entering sync_job";
3594 3945
3595 cf::sync_job { 3946 cf::sync_job {
3596 cf::write_runtime_sync; # external watchdog should not bark
3597 cf::emergency_save; 3947 #cf::emergency_save;
3598 cf::write_runtime_sync; # external watchdog should not bark
3599 3948
3600 warn "syncing database to disk";
3601 BDB::db_env_txn_checkpoint $DB_ENV;
3602
3603 # if anything goes wrong in here, we should simply crash as we already saved
3604
3605 warn "flushing outstanding aio requests";
3606 while (IO::AIO::nreqs || BDB::nreqs) {
3607 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3608 }
3609
3610 warn "cancelling all extension coros"; 3949 trace "perl_reload: cancelling all extension coros";
3611 $_->cancel for values %EXT_CORO; 3950 $_->cancel for values %EXT_CORO;
3612 %EXT_CORO = (); 3951 %EXT_CORO = ();
3613 3952
3614 warn "removing commands"; 3953 trace "perl_reload: removing commands";
3615 %COMMAND = (); 3954 %COMMAND = ();
3616 3955
3617 warn "removing ext/exti commands"; 3956 trace "perl_reload: removing ext/exti commands";
3618 %EXTCMD = (); 3957 %EXTCMD = ();
3619 %EXTICMD = (); 3958 %EXTICMD = ();
3620 3959
3621 warn "unloading/nuking all extensions"; 3960 trace "perl_reload: unloading/nuking all extensions";
3622 for my $pkg (@EXTS) { 3961 for my $pkg (@EXTS) {
3623 warn "... unloading $pkg"; 3962 trace "... unloading $pkg";
3624 3963
3625 if (my $cb = $pkg->can ("unload")) { 3964 if (my $cb = $pkg->can ("unload")) {
3626 eval { 3965 eval {
3627 $cb->($pkg); 3966 $cb->($pkg);
3628 1 3967 1
3629 } or warn "$pkg unloaded, but with errors: $@"; 3968 } or error "$pkg unloaded, but with errors: $@";
3630 } 3969 }
3631 3970
3632 warn "... clearing $pkg"; 3971 trace "... clearing $pkg";
3633 clear_package $pkg; 3972 clear_package $pkg;
3634 } 3973 }
3635 3974
3636 warn "unloading all perl modules loaded from $LIBDIR"; 3975 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3637 while (my ($k, $v) = each %INC) { 3976 while (my ($k, $v) = each %INC) {
3638 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3977 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3639 3978
3640 warn "... unloading $k"; 3979 trace "... unloading $k";
3641 delete $INC{$k}; 3980 delete $INC{$k};
3642 3981
3643 $k =~ s/\.pm$//; 3982 $k =~ s/\.pm$//;
3644 $k =~ s/\//::/g; 3983 $k =~ s/\//::/g;
3645 3984
3648 } 3987 }
3649 3988
3650 clear_package $k; 3989 clear_package $k;
3651 } 3990 }
3652 3991
3653 warn "getting rid of safe::, as good as possible"; 3992 trace "perl_reload: getting rid of safe::, as good as possible";
3654 clear_package "safe::$_" 3993 clear_package "safe::$_"
3655 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3994 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3656 3995
3657 warn "unloading cf.pm \"a bit\""; 3996 trace "perl_reload: unloading cf.pm \"a bit\"";
3658 delete $INC{"cf.pm"}; 3997 delete $INC{"cf.pm"};
3659 delete $INC{"cf/pod.pm"}; 3998 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3660 3999
3661 # don't, removes xs symbols, too, 4000 # don't, removes xs symbols, too,
3662 # and global variables created in xs 4001 # and global variables created in xs
3663 #clear_package __PACKAGE__; 4002 #clear_package __PACKAGE__;
3664 4003
3665 warn "unload completed, starting to reload now"; 4004 info "perl_reload: unload completed, starting to reload now";
3666 4005
3667 warn "reloading cf.pm"; 4006 trace "perl_reload: reloading cf.pm";
3668 require cf; 4007 require cf;
3669 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4008 cf::_connect_to_perl_1;
3670 4009
3671 warn "loading config and database again"; 4010 trace "perl_reload: loading config and database again";
3672 cf::reload_config; 4011 cf::reload_config;
3673 4012
3674 warn "loading extensions"; 4013 trace "perl_reload: loading extensions";
3675 cf::load_extensions; 4014 cf::load_extensions;
3676 4015
4016 if ($REATTACH_ON_RELOAD) {
3677 warn "reattaching attachments to objects/players"; 4017 trace "perl_reload: reattaching attachments to objects/players";
3678 _global_reattach; # objects, sockets 4018 _global_reattach; # objects, sockets
3679 warn "reattaching attachments to maps"; 4019 trace "perl_reload: reattaching attachments to maps";
3680 reattach $_ for values %MAP; 4020 reattach $_ for values %MAP;
3681 warn "reattaching attachments to players"; 4021 trace "perl_reload: reattaching attachments to players";
3682 reattach $_ for values %PLAYER; 4022 reattach $_ for values %PLAYER;
4023 }
3683 4024
3684 warn "leaving sync_job"; 4025 cf::_post_init 1;
4026
4027 trace "perl_reload: leaving sync_job";
3685 4028
3686 1 4029 1
3687 } or do { 4030 } or do {
3688 warn $@; 4031 error $@;
3689 cf::cleanup "error while reloading, exiting."; 4032 cf::cleanup "perl_reload: error, exiting.";
3690 }; 4033 };
3691 4034
3692 warn "reloaded";
3693 --$RELOAD; 4035 --$RELOAD;
3694 } 4036 }
4037
4038 $t1 = AE::time - $t1;
4039 info "perl_reload: completed in ${t1}s\n";
3695}; 4040};
3696 4041
3697our $RELOAD_WATCHER; # used only during reload 4042our $RELOAD_WATCHER; # used only during reload
3698 4043
3699sub reload_perl() { 4044sub reload_perl() {
3700 # doing reload synchronously and two reloads happen back-to-back, 4045 # doing reload synchronously and two reloads happen back-to-back,
3701 # coro crashes during coro_state_free->destroy here. 4046 # coro crashes during coro_state_free->destroy here.
3702 4047
4048 $RELOAD_WATCHER ||= cf::async {
4049 Coro::AIO::aio_wait cache_extensions;
4050
3703 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4051 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3704 do_reload_perl; 4052 do_reload_perl;
3705 undef $RELOAD_WATCHER; 4053 undef $RELOAD_WATCHER;
4054 };
3706 }; 4055 };
3707} 4056}
3708 4057
3709register_command "reload" => sub { 4058register_command "reload" => sub {
3710 my ($who, $arg) = @_; 4059 my ($who, $arg) = @_;
3716 reload_perl; 4065 reload_perl;
3717 }; 4066 };
3718 } 4067 }
3719}; 4068};
3720 4069
3721unshift @INC, $LIBDIR; 4070#############################################################################
3722 4071
3723my $bug_warning = 0; 4072my $bug_warning = 0;
3724 4073
3725our @WAIT_FOR_TICK; 4074our @WAIT_FOR_TICK;
3726our @WAIT_FOR_TICK_BEGIN; 4075our @WAIT_FOR_TICK_BEGIN;
3727 4076
3728sub wait_for_tick { 4077sub wait_for_tick() {
3729 return if tick_inhibit || $Coro::current == $Coro::main; 4078 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3730 4079
3731 my $signal = new Coro::Signal; 4080 my $signal = new Coro::Signal;
3732 push @WAIT_FOR_TICK, $signal; 4081 push @WAIT_FOR_TICK, $signal;
3733 $signal->wait; 4082 $signal->wait;
3734} 4083}
3735 4084
3736sub wait_for_tick_begin { 4085sub wait_for_tick_begin() {
3737 return if tick_inhibit || $Coro::current == $Coro::main; 4086 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3738 4087
3739 my $signal = new Coro::Signal; 4088 my $signal = new Coro::Signal;
3740 push @WAIT_FOR_TICK_BEGIN, $signal; 4089 push @WAIT_FOR_TICK_BEGIN, $signal;
3741 $signal->wait; 4090 $signal->wait;
3742} 4091}
3748 return; 4097 return;
3749 } 4098 }
3750 4099
3751 cf::server_tick; # one server iteration 4100 cf::server_tick; # one server iteration
3752 4101
4102 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4103
3753 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4104 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3754 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4105 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3755 Coro::async_pool { 4106 Coro::async_pool {
3756 $Coro::current->{desc} = "runtime saver"; 4107 $Coro::current->{desc} = "runtime saver";
3757 write_runtime_sync 4108 write_runtime_sync
3758 or warn "ERROR: unable to write runtime file: $!"; 4109 or error "ERROR: unable to write runtime file: $!";
3759 }; 4110 };
3760 } 4111 }
3761 4112
3762 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4113 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3763 $sig->send; 4114 $sig->send;
3771 4122
3772 if (0) { 4123 if (0) {
3773 if ($NEXT_TICK) { 4124 if ($NEXT_TICK) {
3774 my $jitter = $TICK_START - $NEXT_TICK; 4125 my $jitter = $TICK_START - $NEXT_TICK;
3775 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4126 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3776 warn "jitter $JITTER\n";#d# 4127 debug "jitter $JITTER\n";#d#
3777 } 4128 }
3778 } 4129 }
3779} 4130}
3780 4131
3781{ 4132{
3782 # configure BDB 4133 # configure BDB
3783 4134
3784 BDB::min_parallel 8; 4135 BDB::min_parallel 16;
3785 BDB::max_poll_reqs $TICK * 0.1; 4136 BDB::max_poll_reqs $TICK * 0.1;
3786 $AnyEvent::BDB::WATCHER->priority (1); 4137 $AnyEvent::BDB::WATCHER->priority (1);
3787 4138
3788 unless ($DB_ENV) { 4139 unless ($DB_ENV) {
3789 $DB_ENV = BDB::db_env_create; 4140 $DB_ENV = BDB::db_env_create;
3826 IO::AIO::min_parallel 8; 4177 IO::AIO::min_parallel 8;
3827 IO::AIO::max_poll_time $TICK * 0.1; 4178 IO::AIO::max_poll_time $TICK * 0.1;
3828 undef $AnyEvent::AIO::WATCHER; 4179 undef $AnyEvent::AIO::WATCHER;
3829} 4180}
3830 4181
3831my $_log_backtrace; 4182our $_log_backtrace;
4183our $_log_backtrace_last;
3832 4184
3833sub _log_backtrace { 4185sub _log_backtrace {
3834 my ($msg, @addr) = @_; 4186 my ($msg, @addr) = @_;
3835 4187
3836 $msg =~ s/\n//; 4188 $msg =~ s/\n$//;
3837 4189
4190 if ($_log_backtrace_last eq $msg) {
4191 LOG llevInfo, "[ABT] $msg\n";
4192 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3838 # limit the # of concurrent backtraces 4193 # limit the # of concurrent backtraces
3839 if ($_log_backtrace < 2) { 4194 } elsif ($_log_backtrace < 2) {
4195 $_log_backtrace_last = $msg;
3840 ++$_log_backtrace; 4196 ++$_log_backtrace;
3841 my $perl_bt = Carp::longmess $msg; 4197 my $perl_bt = Carp::longmess $msg;
3842 async { 4198 async {
3843 $Coro::current->{desc} = "abt $msg"; 4199 $Coro::current->{desc} = "abt $msg";
3844 4200
3864 LOG llevInfo, "[ABT] $_\n" for @bt; 4220 LOG llevInfo, "[ABT] $_\n" for @bt;
3865 --$_log_backtrace; 4221 --$_log_backtrace;
3866 }; 4222 };
3867 } else { 4223 } else {
3868 LOG llevInfo, "[ABT] $msg\n"; 4224 LOG llevInfo, "[ABT] $msg\n";
3869 LOG llevInfo, "[ABT] [suppressed]\n"; 4225 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3870 } 4226 }
3871} 4227}
3872 4228
3873# load additional modules 4229# load additional modules
3874use cf::pod; 4230require "cf/$_.pm" for @EXTRA_MODULES;
4231cf::_connect_to_perl_2;
3875 4232
3876END { cf::emergency_save } 4233END { cf::emergency_save }
3877 4234
38781 42351
3879 4236

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines