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.448 by root, Fri Sep 19 05:30:23 2008 UTC vs.
Revision 1.530 by root, Wed Apr 28 21:05:33 2010 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
18# 19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use 5.10.0; 25use 5.10.0;
25use utf8; 26use utf8;
26use strict "vars", "subs"; 27use strict qw(vars subs);
27 28
28use Symbol; 29use Symbol;
29use List::Util; 30use List::Util;
30use Socket; 31use Socket;
31use EV; 32use EV;
32use Opcode; 33use Opcode;
33use Safe; 34use Safe;
34use Safe::Hole; 35use Safe::Hole;
35use Storable (); 36use Storable ();
37use Carp ();
36 38
39use Guard ();
37use Coro (); 40use Coro ();
38use Coro::State; 41use Coro::State;
39use Coro::Handle; 42use Coro::Handle;
40use Coro::EV; 43use Coro::EV;
41use Coro::AnyEvent; 44use Coro::AnyEvent;
42use Coro::Timer; 45use Coro::Timer;
43use Coro::Signal; 46use Coro::Signal;
44use Coro::Semaphore; 47use Coro::Semaphore;
48use Coro::SemaphoreSet;
45use Coro::AnyEvent; 49use Coro::AnyEvent;
46use Coro::AIO; 50use Coro::AIO;
47use Coro::BDB 1.6; 51use Coro::BDB 1.6;
48use Coro::Storable; 52use Coro::Storable;
49use Coro::Util (); 53use Coro::Util ();
50 54
51use JSON::XS 2.01 (); 55use JSON::XS 2.01 ();
52use BDB (); 56use BDB ();
53use Data::Dumper; 57use Data::Dumper;
54use Digest::MD5;
55use Fcntl; 58use Fcntl;
56use YAML (); 59use YAML::XS ();
57use IO::AIO (); 60use IO::AIO ();
58use Time::HiRes; 61use Time::HiRes;
59use Compress::LZF; 62use Compress::LZF;
60use Digest::MD5 (); 63use Digest::MD5 ();
61 64
66$Storable::canonical = 1; # reduce rsync transfers 69$Storable::canonical = 1; # reduce rsync transfers
67Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 70Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
68 71
69$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 72$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
70 73
71{ 74# make sure c-lzf reinitialises itself
72 # very ugly, but ensure we acquire the storable lock
73
74 sub net_mstore {
75 my $guard = Coro::Storable::guard;
76 &Storable::net_mstore
77 }
78
79 sub mretrieve {
80 my $guard = Coro::Storable::guard;
81 &Storable::mretrieve
82 }
83
84 Compress::LZF::set_serializer "Coro::Storable", "cf::net_mstore", "cf::mretrieve"; 75Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
85 Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 76Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
86} 77
78# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
87 80
88sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
89 82
90our %COMMAND = (); 83our %COMMAND = ();
91our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
94our %EXTCMD = (); 87our %EXTCMD = ();
95our %EXTICMD = (); 88our %EXTICMD = ();
96our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
97our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
98 91
99our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
100our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
101 96
102our $CONFDIR = confdir; 97our $CONFDIR = confdir;
103our $DATADIR = datadir; 98our $DATADIR = datadir;
104our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
105our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
111our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
112our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
113our $PIDFILE = "$LOCALDIR/pid"; 108our $PIDFILE = "$LOCALDIR/pid";
114our $RUNTIMEFILE = "$LOCALDIR/runtime"; 109our $RUNTIMEFILE = "$LOCALDIR/runtime";
115 110
116our %RESOURCE; 111our %RESOURCE; # unused
112
113our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 1000000;
115
116our $MAX_LINKS = 32; # how many chained exits to follow
117our $VERBOSE_IO = 1;
117 118
118our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
119our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
120our $NEXT_TICK; 121our $NEXT_TICK;
121our $USE_FSYNC = 1; # use fsync to write maps - default off 122our $USE_FSYNC = 1; # use fsync to write maps - default on
122 123
123our $BDB_DEADLOCK_WATCHER; 124our $BDB_DEADLOCK_WATCHER;
124our $BDB_CHECKPOINT_WATCHER; 125our $BDB_CHECKPOINT_WATCHER;
125our $BDB_TRICKLE_WATCHER; 126our $BDB_TRICKLE_WATCHER;
126our $DB_ENV; 127our $DB_ENV;
127 128
129our @EXTRA_MODULES = qw(pod match mapscript);
130
128our %CFG; 131our %CFG;
129 132
130our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
131our $RUNTIME; 134our $RUNTIME;
132our $NOW; 135our $NOW;
140 143
141our $LOAD; # a number between 0 (idle) and 1 (too many objects) 144our $LOAD; # a number between 0 (idle) and 1 (too many objects)
142our $LOADAVG; # same thing, but with alpha-smoothing 145our $LOADAVG; # same thing, but with alpha-smoothing
143our $JITTER; # average jitter 146our $JITTER; # average jitter
144our $TICK_START; # for load detecting purposes 147our $TICK_START; # for load detecting purposes
148
149our @POST_INIT;
150
151our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
152our $REALLY_UNLOOP; # never set to true, please :)
145 153
146binmode STDOUT; 154binmode STDOUT;
147binmode STDERR; 155binmode STDERR;
148 156
149# read virtual server time, if available 157# read virtual server time, if available
151 open my $fh, "<", $RUNTIMEFILE 159 open my $fh, "<", $RUNTIMEFILE
152 or die "unable to read $RUNTIMEFILE file: $!"; 160 or die "unable to read $RUNTIMEFILE file: $!";
153 $RUNTIME = <$fh> + 0.; 161 $RUNTIME = <$fh> + 0.;
154} 162}
155 163
164eval "sub TICK() { $TICK } 1" or die;
165
156mkdir $_ 166mkdir $_
157 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 167 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
158 168
159our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
160 170
161sub cf::map::normalise; 171sub cf::map::normalise;
172
173sub in_main() {
174 $Coro::current == $Coro::main
175}
176
177#############################################################################
178
179%REFLECT = ();
180for (@REFLECT) {
181 my $reflect = JSON::XS::decode_json $_;
182 $REFLECT{$reflect->{class}} = $reflect;
183}
184
185# this is decidedly evil
186$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
162 187
163############################################################################# 188#############################################################################
164 189
165=head2 GLOBAL VARIABLES 190=head2 GLOBAL VARIABLES
166 191
213returns directly I<after> the tick processing (and consequently, can only wake one process 238returns directly I<after> the tick processing (and consequently, can only wake one process
214per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 239per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
215 240
216=item @cf::INVOKE_RESULTS 241=item @cf::INVOKE_RESULTS
217 242
218This array contains the results of the last C<invoke ()> call. When 243This array contains the results of the last C<invoke ()> call. When
219C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 244C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
220that call. 245that call.
221 246
247=item %cf::REFLECT
248
249Contains, for each (C++) class name, a hash reference with information
250about object members (methods, scalars, arrays and flags) and other
251metadata, which is useful for introspection.
252
222=back 253=back
223 254
224=cut 255=cut
225 256
226BEGIN { 257$Coro::State::WARNHOOK = sub {
227 *CORE::GLOBAL::warn = sub {
228 my $msg = join "", @_; 258 my $msg = join "", @_;
229 259
230 $msg .= "\n" 260 $msg .= "\n"
231 unless $msg =~ /\n$/; 261 unless $msg =~ /\n$/;
232 262
233 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 263 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
234 264
235 LOG llevError, $msg; 265 LOG llevError, $msg;
236 }; 266};
237}
238 267
239$Coro::State::DIEHOOK = sub { 268$Coro::State::DIEHOOK = sub {
240 return unless $^S eq 0; # "eq", not "==" 269 return unless $^S eq 0; # "eq", not "=="
241 270
242 if ($Coro::current == $Coro::main) {#d# 271 warn Carp::longmess $_[0];
272
273 if (in_main) {#d#
243 warn "DIEHOOK called in main context, Coro bug?\n";#d# 274 warn "DIEHOOK called in main context, Coro bug?\n";#d#
244 return;#d# 275 return;#d#
245 }#d# 276 }#d#
246 277
247 # kill coroutine otherwise 278 # kill coroutine otherwise
248 warn Carp::longmess $_[0];
249 Coro::terminate 279 Coro::terminate
250}; 280};
251
252$SIG{__DIE__} = sub { }; #d#?
253 281
254@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 282@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
255@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 283@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
256@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 284@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
257@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 285@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
271)) { 299)) {
272 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 300 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
273} 301}
274 302
275$EV::DIED = sub { 303$EV::DIED = sub {
276 warn "error in event callback: @_"; 304 Carp::cluck "error in event callback: @_";
277}; 305};
278 306
279############################################################################# 307#############################################################################
280 308
281=head2 UTILITY FUNCTIONS 309=head2 UTILITY FUNCTIONS
318our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 346our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
319 347
320sub encode_json($) { $json_coder->encode ($_[0]) } 348sub encode_json($) { $json_coder->encode ($_[0]) }
321sub decode_json($) { $json_coder->decode ($_[0]) } 349sub decode_json($) { $json_coder->decode ($_[0]) }
322 350
351=item cf::post_init { BLOCK }
352
353Execute the given codeblock, I<after> all extensions have been (re-)loaded,
354but I<before> the server starts ticking again.
355
356The cdoeblock will have a single boolean argument to indicate whether this
357is a reload or not.
358
359=cut
360
361sub post_init(&) {
362 push @POST_INIT, shift;
363}
364
323=item cf::lock_wait $string 365=item cf::lock_wait $string
324 366
325Wait until the given lock is available. See cf::lock_acquire. 367Wait until the given lock is available. See cf::lock_acquire.
326 368
327=item my $lock = cf::lock_acquire $string 369=item my $lock = cf::lock_acquire $string
328 370
329Wait until the given lock is available and then acquires it and returns 371Wait until the given lock is available and then acquires it and returns
330a Coro::guard object. If the guard object gets destroyed (goes out of scope, 372a L<Guard> object. If the guard object gets destroyed (goes out of scope,
331for example when the coroutine gets canceled), the lock is automatically 373for example when the coroutine gets canceled), the lock is automatically
332returned. 374returned.
333 375
334Locks are *not* recursive, locking from the same coro twice results in a 376Locks are *not* recursive, locking from the same coro twice results in a
335deadlocked coro. 377deadlocked coro.
341 383
342Return true if the lock is currently active, i.e. somebody has locked it. 384Return true if the lock is currently active, i.e. somebody has locked it.
343 385
344=cut 386=cut
345 387
346our %LOCK; 388our $LOCKS = new Coro::SemaphoreSet;
347our %LOCKER;#d#
348 389
349sub lock_wait($) { 390sub lock_wait($) {
350 my ($key) = @_; 391 $LOCKS->wait ($_[0]);
351
352 if ($LOCKER{$key} == $Coro::current) {#d#
353 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
354 return;#d#
355 }#d#
356
357 # wait for lock, if any
358 while ($LOCK{$key}) {
359 push @{ $LOCK{$key} }, $Coro::current;
360 Coro::schedule;
361 }
362} 392}
363 393
364sub lock_acquire($) { 394sub lock_acquire($) {
365 my ($key) = @_; 395 $LOCKS->guard ($_[0])
366
367 # wait, to be sure we are not locked
368 lock_wait $key;
369
370 $LOCK{$key} = [];
371 $LOCKER{$key} = $Coro::current;#d#
372
373 Coro::guard {
374 delete $LOCKER{$key};#d#
375 # wake up all waiters, to be on the safe side
376 $_->ready for @{ delete $LOCK{$key} };
377 }
378} 396}
379 397
380sub lock_active($) { 398sub lock_active($) {
381 my ($key) = @_; 399 $LOCKS->count ($_[0]) < 1
382
383 ! ! $LOCK{$key}
384} 400}
385 401
386sub freeze_mainloop { 402sub freeze_mainloop {
387 tick_inhibit_inc; 403 tick_inhibit_inc;
388 404
389 Coro::guard \&tick_inhibit_dec; 405 &Guard::guard (\&tick_inhibit_dec);
390} 406}
391 407
392=item cf::periodic $interval, $cb 408=item cf::periodic $interval, $cb
393 409
394Like EV::periodic, but randomly selects a starting point so that the actions 410Like EV::periodic, but randomly selects a starting point so that the actions
395get spread over timer. 411get spread over time.
396 412
397=cut 413=cut
398 414
399sub periodic($$) { 415sub periodic($$) {
400 my ($interval, $cb) = @_; 416 my ($interval, $cb) = @_;
417 433
418=cut 434=cut
419 435
420our @SLOT_QUEUE; 436our @SLOT_QUEUE;
421our $SLOT_QUEUE; 437our $SLOT_QUEUE;
438our $SLOT_DECAY = 0.9;
422 439
423$SLOT_QUEUE->cancel if $SLOT_QUEUE; 440$SLOT_QUEUE->cancel if $SLOT_QUEUE;
424$SLOT_QUEUE = Coro::async { 441$SLOT_QUEUE = Coro::async {
425 $Coro::current->desc ("timeslot manager"); 442 $Coro::current->desc ("timeslot manager");
426 443
427 my $signal = new Coro::Signal; 444 my $signal = new Coro::Signal;
445 my $busy;
428 446
429 while () { 447 while () {
430 next_job: 448 next_job:
449
431 my $avail = cf::till_tick; 450 my $avail = cf::till_tick;
432 if ($avail > 0.01) { 451
433 for (0 .. $#SLOT_QUEUE) { 452 for (0 .. $#SLOT_QUEUE) {
434 if ($SLOT_QUEUE[$_][0] < $avail) { 453 if ($SLOT_QUEUE[$_][0] <= $avail) {
454 $busy = 0;
435 my $job = splice @SLOT_QUEUE, $_, 1, (); 455 my $job = splice @SLOT_QUEUE, $_, 1, ();
436 $job->[2]->send; 456 $job->[2]->send;
437 Coro::cede; 457 Coro::cede;
438 goto next_job; 458 goto next_job;
439 } 459 } else {
460 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
440 } 461 }
441 } 462 }
442 463
443 if (@SLOT_QUEUE) { 464 if (@SLOT_QUEUE) {
444 # we do not use wait_for_tick() as it returns immediately when tick is inactive 465 # we do not use wait_for_tick() as it returns immediately when tick is inactive
445 push @cf::WAIT_FOR_TICK, $signal; 466 push @cf::WAIT_FOR_TICK, $signal;
446 $signal->wait; 467 $signal->wait;
447 } else { 468 } else {
469 $busy = 0;
448 Coro::schedule; 470 Coro::schedule;
449 } 471 }
450 } 472 }
451}; 473};
452 474
453sub get_slot($;$$) { 475sub get_slot($;$$) {
454 return if tick_inhibit || $Coro::current == $Coro::main; 476 return if tick_inhibit || $Coro::current == $Coro::main;
455 477
456 my ($time, $pri, $name) = @_; 478 my ($time, $pri, $name) = @_;
457 479
458 $time = $TICK * .6 if $time > $TICK * .6; 480 $time = clamp $time, 0.01, $TICK * .6;
481
459 my $sig = new Coro::Signal; 482 my $sig = new Coro::Signal;
460 483
461 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 484 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
462 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 485 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
463 $SLOT_QUEUE->ready; 486 $SLOT_QUEUE->ready;
490 513
491sub sync_job(&) { 514sub sync_job(&) {
492 my ($job) = @_; 515 my ($job) = @_;
493 516
494 if ($Coro::current == $Coro::main) { 517 if ($Coro::current == $Coro::main) {
495 my $time = EV::time; 518 my $time = AE::time;
496 519
497 # this is the main coro, too bad, we have to block 520 # this is the main coro, too bad, we have to block
498 # till the operation succeeds, freezing the server :/ 521 # till the operation succeeds, freezing the server :/
499 522
500 LOG llevError, Carp::longmess "sync job";#d# 523 LOG llevError, Carp::longmess "sync job";#d#
517 } else { 540 } else {
518 EV::loop EV::LOOP_ONESHOT; 541 EV::loop EV::LOOP_ONESHOT;
519 } 542 }
520 } 543 }
521 544
522 my $time = EV::time - $time; 545 my $time = AE::time - $time;
523 546
524 $TICK_START += $time; # do not account sync jobs to server load 547 $TICK_START += $time; # do not account sync jobs to server load
525 548
526 wantarray ? @res : $res[0] 549 wantarray ? @res : $res[0]
527 } else { 550 } else {
571 reset_signals; 594 reset_signals;
572 &$cb 595 &$cb
573 }, @args; 596 }, @args;
574 597
575 wantarray ? @res : $res[-1] 598 wantarray ? @res : $res[-1]
599}
600
601sub objinfo {
602 (
603 "counter value" => cf::object::object_count,
604 "objects created" => cf::object::create_count,
605 "objects destroyed" => cf::object::destroy_count,
606 "freelist size" => cf::object::free_count,
607 "allocated objects" => cf::object::objects_size,
608 "active objects" => cf::object::actives_size,
609 )
576} 610}
577 611
578=item $coin = coin_from_name $name 612=item $coin = coin_from_name $name
579 613
580=cut 614=cut
1161 1195
1162 sync_job { 1196 sync_job {
1163 if (length $$rdata) { 1197 if (length $$rdata) {
1164 utf8::decode (my $decname = $filename); 1198 utf8::decode (my $decname = $filename);
1165 warn sprintf "saving %s (%d,%d)\n", 1199 warn sprintf "saving %s (%d,%d)\n",
1166 $decname, length $$rdata, scalar @$objs; 1200 $decname, length $$rdata, scalar @$objs
1201 if $VERBOSE_IO;
1167 1202
1168 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1203 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1169 aio_chmod $fh, SAVE_MODE; 1204 aio_chmod $fh, SAVE_MODE;
1170 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1205 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1171 aio_fsync $fh if $cf::USE_FSYNC; 1206 if ($cf::USE_FSYNC) {
1207 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;
1208 aio_fsync $fh;
1209 }
1172 aio_close $fh; 1210 aio_close $fh;
1173 1211
1174 if (@$objs) { 1212 if (@$objs) {
1175 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1213 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1176 aio_chmod $fh, SAVE_MODE; 1214 aio_chmod $fh, SAVE_MODE;
1177 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1215 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1178 aio_write $fh, 0, (length $data), $data, 0; 1216 aio_write $fh, 0, (length $data), $data, 0;
1179 aio_fsync $fh if $cf::USE_FSYNC; 1217 if ($cf::USE_FSYNC) {
1218 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;
1219 aio_fsync $fh;
1220 }
1180 aio_close $fh; 1221 aio_close $fh;
1181 aio_rename "$filename.pst~", "$filename.pst"; 1222 aio_rename "$filename.pst~", "$filename.pst";
1182 } 1223 }
1183 } else { 1224 } else {
1184 aio_unlink "$filename.pst"; 1225 aio_unlink "$filename.pst";
1185 } 1226 }
1186 1227
1187 aio_rename "$filename~", $filename; 1228 aio_rename "$filename~", $filename;
1229
1230 $filename =~ s%/[^/]+$%%;
1231 aio_pathsync $filename if $cf::USE_FSYNC;
1188 } else { 1232 } else {
1189 warn "FATAL: $filename~: $!\n"; 1233 warn "unable to save objects: $filename~: $!\n";
1190 } 1234 }
1191 } else { 1235 } else {
1192 aio_unlink $filename; 1236 aio_unlink $filename;
1193 aio_unlink "$filename.pst"; 1237 aio_unlink "$filename.pst";
1194 } 1238 }
1219 $av = $st->{objs}; 1263 $av = $st->{objs};
1220 } 1264 }
1221 1265
1222 utf8::decode (my $decname = $filename); 1266 utf8::decode (my $decname = $filename);
1223 warn sprintf "loading %s (%d,%d)\n", 1267 warn sprintf "loading %s (%d,%d)\n",
1224 $decname, length $data, scalar @{$av || []}; 1268 $decname, length $data, scalar @{$av || []}
1269 if $VERBOSE_IO;
1225 1270
1226 ($data, $av) 1271 ($data, $av)
1227} 1272}
1228 1273
1229=head2 COMMAND CALLBACKS 1274=head2 COMMAND CALLBACKS
1285 my ($name, $cb) = @_; 1330 my ($name, $cb) = @_;
1286 1331
1287 $EXTICMD{$name} = $cb; 1332 $EXTICMD{$name} = $cb;
1288} 1333}
1289 1334
1335use File::Glob ();
1336
1290cf::player->attach ( 1337cf::player->attach (
1291 on_command => sub { 1338 on_unknown_command => sub {
1292 my ($pl, $name, $params) = @_; 1339 my ($pl, $name, $params) = @_;
1293 1340
1294 my $cb = $COMMAND{$name} 1341 my $cb = $COMMAND{$name}
1295 or return; 1342 or return;
1296 1343
1326 1373
1327 cf::override; 1374 cf::override;
1328 }, 1375 },
1329); 1376);
1330 1377
1378# "readahead" all extensions
1379sub cache_extensions {
1380 my $grp = IO::AIO::aio_group;
1381
1382 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1383 for (grep /\.ext$/, @{$_[0]}) {
1384 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1385 }
1386 };
1387
1388 $grp
1389}
1390
1331sub load_extensions { 1391sub load_extensions {
1332 cf::sync_job { 1392 cf::sync_job {
1333 my %todo; 1393 my %todo;
1334 1394
1335 for my $path (<$LIBDIR/*.ext>) { 1395 for my $path (<$LIBDIR/*.ext>) {
1362 . "\n};\n1"; 1422 . "\n};\n1";
1363 1423
1364 $todo{$base} = \%ext; 1424 $todo{$base} = \%ext;
1365 } 1425 }
1366 1426
1427 my $pass = 0;
1367 my %done; 1428 my %done;
1368 while (%todo) { 1429 while (%todo) {
1369 my $progress; 1430 my $progress;
1370 1431
1432 ++$pass;
1433
1434 ext:
1371 while (my ($k, $v) = each %todo) { 1435 while (my ($k, $v) = each %todo) {
1372 for (split /,\s*/, $v->{meta}{depends}) { 1436 for (split /,\s*/, $v->{meta}{depends}) {
1373 goto skip 1437 next ext
1374 unless exists $done{$_}; 1438 unless exists $done{$_};
1375 } 1439 }
1376 1440
1377 warn "... loading '$k' into '$v->{pkg}'\n"; 1441 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1378 1442
1379 unless (eval $v->{source}) { 1443 my $active = eval $v->{source};
1444
1445 if (length $@) {
1380 my $msg = $@ ? "$v->{path}: $@\n" 1446 warn "$v->{path}: $@\n";
1381 : "$v->{base}: extension inactive.\n";
1382 1447
1383 if (exists $v->{meta}{mandatory}) {
1384 warn $msg;
1385 cf::cleanup "mandatory extension failed to load, exiting."; 1448 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1386 } 1449 if exists $v->{meta}{mandatory};
1387 1450
1388 warn $msg; 1451 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1452 delete $todo{$k};
1453 } else {
1454 $done{$k} = delete $todo{$k};
1455 push @EXTS, $v->{pkg};
1456 $progress = 1;
1457
1458 warn "$v->{base}: extension inactive.\n"
1459 unless $active;
1389 } 1460 }
1390
1391 $done{$k} = delete $todo{$k};
1392 push @EXTS, $v->{pkg};
1393 $progress = 1;
1394 } 1461 }
1395 1462
1396 skip: 1463 unless ($progress) {
1397 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1464 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1398 unless $progress; 1465
1466 while (my ($k, $v) = each %todo) {
1467 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1468 if exists $v->{meta}{mandatory};
1469 }
1470 }
1399 } 1471 }
1400 }; 1472 };
1401} 1473}
1402 1474
1403############################################################################# 1475#############################################################################
1457 1529
1458sub exists($) { 1530sub exists($) {
1459 my ($login) = @_; 1531 my ($login) = @_;
1460 1532
1461 $cf::PLAYER{$login} 1533 $cf::PLAYER{$login}
1462 or cf::sync_job { !aio_stat path $login } 1534 or !aio_stat path $login
1463} 1535}
1464 1536
1465sub find($) { 1537sub find($) {
1466 return $cf::PLAYER{$_[0]} || do { 1538 return $cf::PLAYER{$_[0]} || do {
1467 my $login = $_[0]; 1539 my $login = $_[0];
1487 $cf::PLAYER{$login} = $pl 1559 $cf::PLAYER{$login} = $pl
1488 } 1560 }
1489 } 1561 }
1490} 1562}
1491 1563
1564cf::player->attach (
1565 on_load => sub {
1566 my ($pl, $path) = @_;
1567
1568 # restore slots saved in save, below
1569 my $slots = delete $pl->{_slots};
1570
1571 $pl->ob->current_weapon ($slots->[0]);
1572 $pl->combat_ob ($slots->[1]);
1573 $pl->ranged_ob ($slots->[2]);
1574 },
1575);
1576
1492sub save($) { 1577sub save($) {
1493 my ($pl) = @_; 1578 my ($pl) = @_;
1494 1579
1495 return if $pl->{deny_save}; 1580 return if $pl->{deny_save};
1496 1581
1501 1586
1502 aio_mkdir playerdir $pl, 0770; 1587 aio_mkdir playerdir $pl, 0770;
1503 $pl->{last_save} = $cf::RUNTIME; 1588 $pl->{last_save} = $cf::RUNTIME;
1504 1589
1505 cf::get_slot 0.01; 1590 cf::get_slot 0.01;
1591
1592 # save slots, to be restored later
1593 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1506 1594
1507 $pl->save_pl ($path); 1595 $pl->save_pl ($path);
1508 cf::cede_to_tick; 1596 cf::cede_to_tick;
1509} 1597}
1510 1598
1547 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1635 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1548 1636
1549 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1637 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1550 $pl->deactivate; 1638 $pl->deactivate;
1551 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1639 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1552 $pl->ob->check_score;
1553 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1640 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1554 $pl->ns->destroy if $pl->ns; 1641 $pl->ns->destroy if $pl->ns;
1555 1642
1556 my $path = playerdir $pl; 1643 my $path = playerdir $pl;
1557 my $temp = "$path~$cf::RUNTIME~deleting~"; 1644 my $temp = "$path~$cf::RUNTIME~deleting~";
1612 \@logins 1699 \@logins
1613} 1700}
1614 1701
1615=item $player->maps 1702=item $player->maps
1616 1703
1704=item cf::player::maps $login
1705
1617Returns an arrayref of map paths that are private for this 1706Returns an arrayref of map paths that are private for this
1618player. May block. 1707player. May block.
1619 1708
1620=cut 1709=cut
1621 1710
1683=cut 1772=cut
1684 1773
1685sub find_by_path($) { 1774sub find_by_path($) {
1686 my ($path) = @_; 1775 my ($path) = @_;
1687 1776
1777 $path =~ s/^~[^\/]*//; # skip ~login
1778
1688 my ($match, $specificity); 1779 my ($match, $specificity);
1689 1780
1690 for my $region (list) { 1781 for my $region (list) {
1691 if ($region->{match} && $path =~ $region->{match}) { 1782 if ($region->{match} && $path =~ $region->{match}) {
1692 ($match, $specificity) = ($region, $region->specificity) 1783 ($match, $specificity) = ($region, $region->specificity)
1723 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1814 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1724 1815
1725 # mit "rum" bekleckern, nicht 1816 # mit "rum" bekleckern, nicht
1726 $self->_create_random_map ( 1817 $self->_create_random_map (
1727 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1818 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1728 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1819 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1729 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1820 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1730 $rmp->{exit_on_final_map}, 1821 $rmp->{exit_on_final_map},
1731 $rmp->{xsize}, $rmp->{ysize}, 1822 $rmp->{xsize}, $rmp->{ysize},
1732 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1823 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1733 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1824 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1755 1846
1756 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1847 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1757} 1848}
1758 1849
1759# also paths starting with '/' 1850# also paths starting with '/'
1760$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1851$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1761 1852
1762sub thawer_merge { 1853sub thawer_merge {
1763 my ($self, $merge) = @_; 1854 my ($self, $merge) = @_;
1764 1855
1765 # we have to keep some variables in memory intact 1856 # we have to keep some variables in memory intact
1863 1954
1864 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1955 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1865 "$UNIQUEDIR/$path" 1956 "$UNIQUEDIR/$path"
1866} 1957}
1867 1958
1868# and all this just because we cannot iterate over
1869# all maps in C++...
1870sub change_all_map_light {
1871 my ($change) = @_;
1872
1873 $_->change_map_light ($change)
1874 for grep $_->outdoor, values %cf::MAP;
1875}
1876
1877sub decay_objects { 1959sub decay_objects {
1878 my ($self) = @_; 1960 my ($self) = @_;
1879 1961
1880 return if $self->{deny_reset}; 1962 return if $self->{deny_reset};
1881 1963
1963sub find { 2045sub find {
1964 my ($path, $origin) = @_; 2046 my ($path, $origin) = @_;
1965 2047
1966 $path = normalise $path, $origin && $origin->path; 2048 $path = normalise $path, $origin && $origin->path;
1967 2049
1968 cf::lock_wait "map_data:$path";#d#remove 2050 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1969 cf::lock_wait "map_find:$path"; 2051 my $guard2 = cf::lock_acquire "map_find:$path";
1970 2052
1971 $cf::MAP{$path} || do { 2053 $cf::MAP{$path} || do {
1972 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1973 my $guard2 = cf::lock_acquire "map_find:$path";
1974
1975 my $map = new_from_path cf::map $path 2054 my $map = new_from_path cf::map $path
1976 or return; 2055 or return;
1977 2056
1978 $map->{last_save} = $cf::RUNTIME; 2057 $map->{last_save} = $cf::RUNTIME;
1979 2058
1991 2070
1992 $cf::MAP{$path} = $map 2071 $cf::MAP{$path} = $map
1993 } 2072 }
1994} 2073}
1995 2074
1996sub pre_load { } 2075sub pre_load { }
1997sub post_load { } 2076#sub post_load { } # XS
1998 2077
1999sub load { 2078sub load {
2000 my ($self) = @_; 2079 my ($self) = @_;
2001 2080
2002 local $self->{deny_reset} = 1; # loading can take a long time 2081 local $self->{deny_reset} = 1; # loading can take a long time
2047 unless ($self->{deny_activate}) { 2126 unless ($self->{deny_activate}) {
2048 $self->decay_objects; 2127 $self->decay_objects;
2049 $self->fix_auto_apply; 2128 $self->fix_auto_apply;
2050 $self->update_buttons; 2129 $self->update_buttons;
2051 cf::cede_to_tick; 2130 cf::cede_to_tick;
2052 $self->set_darkness_map;
2053 cf::cede_to_tick;
2054 $self->activate; 2131 $self->activate;
2055 } 2132 }
2056 2133
2057 $self->{last_save} = $cf::RUNTIME; 2134 $self->{last_save} = $cf::RUNTIME;
2058 $self->last_access ($cf::RUNTIME); 2135 $self->last_access ($cf::RUNTIME);
2061 } 2138 }
2062 2139
2063 $self->post_load; 2140 $self->post_load;
2064} 2141}
2065 2142
2143# customize the map for a given player, i.e.
2144# return the _real_ map. used by e.g. per-player
2145# maps to change the path to ~playername/mappath
2066sub customise_for { 2146sub customise_for {
2067 my ($self, $ob) = @_; 2147 my ($self, $ob) = @_;
2068 2148
2069 return find "~" . $ob->name . "/" . $self->{path} 2149 return find "~" . $ob->name . "/" . $self->{path}
2070 if $self->per_player; 2150 if $self->per_player;
2086 or next; 2166 or next;
2087 $neigh = find $neigh, $map 2167 $neigh = find $neigh, $map
2088 or next; 2168 or next;
2089 $neigh->load; 2169 $neigh->load;
2090 2170
2171 # now find the diagonal neighbours
2091 push @neigh, 2172 push @neigh,
2092 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2173 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2093 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2174 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2094 } 2175 }
2095 2176
2147 $MAP_PREFETCHER->prio (6); 2228 $MAP_PREFETCHER->prio (6);
2148 2229
2149 () 2230 ()
2150} 2231}
2151 2232
2233# common code, used by both ->save and ->swapout
2152sub save { 2234sub _save {
2153 my ($self) = @_; 2235 my ($self) = @_;
2154
2155 my $lock = cf::lock_acquire "map_data:$self->{path}";
2156 2236
2157 $self->{last_save} = $cf::RUNTIME; 2237 $self->{last_save} = $cf::RUNTIME;
2158 2238
2159 return unless $self->dirty; 2239 return unless $self->dirty;
2160 2240
2180 } else { 2260 } else {
2181 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2261 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2182 } 2262 }
2183} 2263}
2184 2264
2265sub save {
2266 my ($self) = @_;
2267
2268 my $lock = cf::lock_acquire "map_data:$self->{path}";
2269
2270 $self->_save;
2271}
2272
2185sub swap_out { 2273sub swap_out {
2186 my ($self) = @_; 2274 my ($self) = @_;
2187 2275
2188 # save first because save cedes
2189 $self->save;
2190
2191 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2276 my $lock = cf::lock_acquire "map_data:$self->{path}";
2192 2277
2193 return if $self->players;
2194 return if $self->in_memory != cf::MAP_ACTIVE; 2278 return if $self->in_memory != cf::MAP_ACTIVE;
2195 return if $self->{deny_save}; 2279 return if $self->{deny_save};
2280 return if $self->players;
2196 2281
2282 # first deactivate the map and "unlink" it from the core
2283 $self->deactivate;
2284 $_->clear_links_to ($self) for values %cf::MAP;
2197 $self->in_memory (cf::MAP_SWAPPED); 2285 $self->in_memory (cf::MAP_SWAPPED);
2286
2287 # then atomically save
2288 $self->_save;
2289
2290 # then free the map
2291 $self->clear;
2292}
2293
2294sub reset_at {
2295 my ($self) = @_;
2296
2297 # TODO: safety, remove and allow resettable per-player maps
2298 return 1e99 if $self->{deny_reset};
2299
2300 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2301 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2302
2303 $time + $to
2304}
2305
2306sub should_reset {
2307 my ($self) = @_;
2308
2309 $self->reset_at <= $cf::RUNTIME
2310}
2311
2312sub reset {
2313 my ($self) = @_;
2314
2315 my $lock = cf::lock_acquire "map_data:$self->{path}";
2316
2317 return if $self->players;
2318
2319 warn "resetting map ", $self->path, "\n";
2320
2321 $self->in_memory (cf::MAP_SWAPPED);
2322
2323 # need to save uniques path
2324 unless ($self->{deny_save}) {
2325 my $uniq = $self->uniq_path; utf8::encode $uniq;
2326
2327 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2328 if $uniq;
2329 }
2330
2331 delete $cf::MAP{$self->path};
2198 2332
2199 $self->deactivate; 2333 $self->deactivate;
2200 $_->clear_links_to ($self) for values %cf::MAP; 2334 $_->clear_links_to ($self) for values %cf::MAP;
2201 $self->clear; 2335 $self->clear;
2202}
2203
2204sub reset_at {
2205 my ($self) = @_;
2206
2207 # TODO: safety, remove and allow resettable per-player maps
2208 return 1e99 if $self->{deny_reset};
2209
2210 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2211 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2212
2213 $time + $to
2214}
2215
2216sub should_reset {
2217 my ($self) = @_;
2218
2219 $self->reset_at <= $cf::RUNTIME
2220}
2221
2222sub reset {
2223 my ($self) = @_;
2224
2225 my $lock = cf::lock_acquire "map_data:$self->{path}";
2226
2227 return if $self->players;
2228
2229 warn "resetting map ", $self->path;
2230
2231 $self->in_memory (cf::MAP_SWAPPED);
2232
2233 # need to save uniques path
2234 unless ($self->{deny_save}) {
2235 my $uniq = $self->uniq_path; utf8::encode $uniq;
2236
2237 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2238 if $uniq;
2239 }
2240
2241 delete $cf::MAP{$self->path};
2242
2243 $self->deactivate;
2244 $_->clear_links_to ($self) for values %cf::MAP;
2245 $self->clear;
2246 2336
2247 $self->unlink_save; 2337 $self->unlink_save;
2248 $self->destroy; 2338 $self->destroy;
2249} 2339}
2250 2340
2258 2348
2259 delete $cf::MAP{$self->path}; 2349 delete $cf::MAP{$self->path};
2260 2350
2261 $self->unlink_save; 2351 $self->unlink_save;
2262 2352
2263 bless $self, "cf::map"; 2353 bless $self, "cf::map::wrap";
2264 delete $self->{deny_reset}; 2354 delete $self->{deny_reset};
2265 $self->{deny_save} = 1; 2355 $self->{deny_save} = 1;
2266 $self->reset_timeout (1); 2356 $self->reset_timeout (1);
2267 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2357 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2268 2358
2325 : normalise $_ 2415 : normalise $_
2326 } @{ aio_readdir $UNIQUEDIR or [] } 2416 } @{ aio_readdir $UNIQUEDIR or [] }
2327 ] 2417 ]
2328} 2418}
2329 2419
2420=item cf::map::static_maps
2421
2422Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2423file in the shared directory excluding F</styles> and F</editor>). May
2424block.
2425
2426=cut
2427
2428sub static_maps() {
2429 my @dirs = "";
2430 my @maps;
2431
2432 while (@dirs) {
2433 my $dir = shift @dirs;
2434
2435 next if $dir eq "/styles" || $dir eq "/editor";
2436
2437 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2438 or return;
2439
2440 for (@$files) {
2441 s/\.map$// or next;
2442 utf8::decode $_;
2443 push @maps, "$dir/$_";
2444 }
2445
2446 push @dirs, map "$dir/$_", @$dirs;
2447 }
2448
2449 \@maps
2450}
2451
2330=back 2452=back
2331 2453
2332=head3 cf::object 2454=head3 cf::object
2333 2455
2334=cut 2456=cut
2399 2521
2400our $SAY_CHANNEL = { 2522our $SAY_CHANNEL = {
2401 id => "say", 2523 id => "say",
2402 title => "Map", 2524 title => "Map",
2403 reply => "say ", 2525 reply => "say ",
2404 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2526 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2405}; 2527};
2406 2528
2407our $CHAT_CHANNEL = { 2529our $CHAT_CHANNEL = {
2408 id => "chat", 2530 id => "chat",
2409 title => "Chat", 2531 title => "Chat",
2466 2588
2467Freezes the player and moves him/her to a special map (C<{link}>). 2589Freezes the player and moves him/her to a special map (C<{link}>).
2468 2590
2469The player should be reasonably safe there for short amounts of time (e.g. 2591The player should be reasonably safe there for short amounts of time (e.g.
2470for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2592for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2471though, as the palyer cannot control the character while it is on the link 2593though, as the player cannot control the character while it is on the link
2472map. 2594map.
2473 2595
2474Will never block. 2596Will never block.
2475 2597
2476=item $player_object->leave_link ($map, $x, $y) 2598=item $player_object->leave_link ($map, $x, $y)
2497sub cf::object::player::enter_link { 2619sub cf::object::player::enter_link {
2498 my ($self) = @_; 2620 my ($self) = @_;
2499 2621
2500 $self->deactivate_recursive; 2622 $self->deactivate_recursive;
2501 2623
2624 ++$self->{_link_recursion};
2625
2502 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2626 return if UNIVERSAL::isa $self->map, "ext::map_link";
2503 2627
2504 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2628 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2505 if $self->map && $self->map->{path} ne "{link}"; 2629 if $self->map && $self->map->{path} ne "{link}";
2506 2630
2507 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2631 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2508} 2632}
2509 2633
2510sub cf::object::player::leave_link { 2634sub cf::object::player::leave_link {
2511 my ($self, $map, $x, $y) = @_; 2635 my ($self, $map, $x, $y) = @_;
2512 2636
2529 ($x, $y) = (-1, -1) 2653 ($x, $y) = (-1, -1)
2530 unless (defined $x) && (defined $y); 2654 unless (defined $x) && (defined $y);
2531 2655
2532 # use -1 or undef as default coordinates, not 0, 0 2656 # use -1 or undef as default coordinates, not 0, 0
2533 ($x, $y) = ($map->enter_x, $map->enter_y) 2657 ($x, $y) = ($map->enter_x, $map->enter_y)
2534 if $x <=0 && $y <= 0; 2658 if $x <= 0 && $y <= 0;
2535 2659
2536 $map->load; 2660 $map->load;
2537 $map->load_neighbours; 2661 $map->load_neighbours;
2538 2662
2539 return unless $self->contr->active; 2663 return unless $self->contr->active;
2540 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2541 $self->activate_recursive;
2542 2664
2543 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2665 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2544 $self->enter_map ($map, $x, $y); 2666 if ($self->enter_map ($map, $x, $y)) {
2545} 2667 # entering was successful
2668 delete $self->{_link_recursion};
2669 # only activate afterwards, to support waiting in hooks
2670 $self->activate_recursive;
2671 }
2546 2672
2673}
2674
2547=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2675=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2548 2676
2549Moves the player to the given map-path and coordinates by first freezing 2677Moves the player to the given map-path and coordinates by first freezing
2550her, loading and preparing them map, calling the provided $check callback 2678her, loading and preparing them map, calling the provided $check callback
2551that has to return the map if sucecssful, and then unfreezes the player on 2679that has to return the map if sucecssful, and then unfreezes the player on
2552the new (success) or old (failed) map position. In either case, $done will 2680the new (success) or old (failed) map position. In either case, $done will
2559 2687
2560our $GOTOGEN; 2688our $GOTOGEN;
2561 2689
2562sub cf::object::player::goto { 2690sub cf::object::player::goto {
2563 my ($self, $path, $x, $y, $check, $done) = @_; 2691 my ($self, $path, $x, $y, $check, $done) = @_;
2692
2693 if ($self->{_link_recursion} >= $MAX_LINKS) {
2694 warn "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2695 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2696 ($path, $x, $y) = @$EMERGENCY_POSITION;
2697 }
2564 2698
2565 # do generation counting so two concurrent goto's will be executed in-order 2699 # do generation counting so two concurrent goto's will be executed in-order
2566 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2700 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2567 2701
2568 $self->enter_link; 2702 $self->enter_link;
2592 my $map = eval { 2726 my $map = eval {
2593 my $map = defined $path ? cf::map::find $path : undef; 2727 my $map = defined $path ? cf::map::find $path : undef;
2594 2728
2595 if ($map) { 2729 if ($map) {
2596 $map = $map->customise_for ($self); 2730 $map = $map->customise_for ($self);
2597 $map = $check->($map) if $check && $map; 2731 $map = $check->($map, $x, $y, $self) if $check && $map;
2598 } else { 2732 } else {
2599 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2733 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2600 } 2734 }
2601 2735
2602 $map 2736 $map
2610 if ($gen == $self->{_goto_generation}) { 2744 if ($gen == $self->{_goto_generation}) {
2611 delete $self->{_goto_generation}; 2745 delete $self->{_goto_generation};
2612 $self->leave_link ($map, $x, $y); 2746 $self->leave_link ($map, $x, $y);
2613 } 2747 }
2614 2748
2615 $done->() if $done; 2749 $done->($self) if $done;
2616 })->prio (1); 2750 })->prio (1);
2617} 2751}
2618 2752
2619=item $player_object->enter_exit ($exit_object) 2753=item $player_object->enter_exit ($exit_object)
2620 2754
2737 2871
2738 utf8::encode $text; 2872 utf8::encode $text;
2739 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2873 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2740} 2874}
2741 2875
2876=item $client->send_big_packet ($pkt)
2877
2878Like C<send_packet>, but tries to compress large packets, and fragments
2879them as required.
2880
2881=cut
2882
2883our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2884
2885sub cf::client::send_big_packet {
2886 my ($self, $pkt) = @_;
2887
2888 # try lzf for large packets
2889 $pkt = "lzf " . Compress::LZF::compress $pkt
2890 if 1024 <= length $pkt and $self->{can_lzf};
2891
2892 # split very large packets
2893 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2894 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2895 $pkt = "frag";
2896 }
2897
2898 $self->send_packet ($pkt);
2899}
2900
2742=item $client->send_msg ($channel, $msg, $color, [extra...]) 2901=item $client->send_msg ($channel, $msg, $color, [extra...])
2743 2902
2744Send a drawinfo or msg packet to the client, formatting the msg for the 2903Send a drawinfo or msg packet to the client, formatting the msg for the
2745client if neccessary. C<$type> should be a string identifying the type of 2904client if neccessary. C<$type> should be a string identifying the type of
2746the message, with C<log> being the default. If C<$color> is negative, suppress 2905the message, with C<log> being the default. If C<$color> is negative, suppress
2748 2907
2749=cut 2908=cut
2750 2909
2751# non-persistent channels (usually the info channel) 2910# non-persistent channels (usually the info channel)
2752our %CHANNEL = ( 2911our %CHANNEL = (
2912 "c/motd" => {
2913 id => "infobox",
2914 title => "MOTD",
2915 reply => undef,
2916 tooltip => "The message of the day",
2917 },
2753 "c/identify" => { 2918 "c/identify" => {
2754 id => "infobox", 2919 id => "infobox",
2755 title => "Identify", 2920 title => "Identify",
2756 reply => undef, 2921 reply => undef,
2757 tooltip => "Items recently identified", 2922 tooltip => "Items recently identified",
2759 "c/examine" => { 2924 "c/examine" => {
2760 id => "infobox", 2925 id => "infobox",
2761 title => "Examine", 2926 title => "Examine",
2762 reply => undef, 2927 reply => undef,
2763 tooltip => "Signs and other items you examined", 2928 tooltip => "Signs and other items you examined",
2929 },
2930 "c/shopinfo" => {
2931 id => "infobox",
2932 title => "Shop Info",
2933 reply => undef,
2934 tooltip => "What your bargaining skill tells you about the shop",
2764 }, 2935 },
2765 "c/book" => { 2936 "c/book" => {
2766 id => "infobox", 2937 id => "infobox",
2767 title => "Book", 2938 title => "Book",
2768 reply => undef, 2939 reply => undef,
2784 id => "infobox", 2955 id => "infobox",
2785 title => "Body Parts", 2956 title => "Body Parts",
2786 reply => undef, 2957 reply => undef,
2787 tooltip => "Shows which body parts you posess and are available", 2958 tooltip => "Shows which body parts you posess and are available",
2788 }, 2959 },
2960 "c/statistics" => {
2961 id => "infobox",
2962 title => "Statistics",
2963 reply => undef,
2964 tooltip => "Shows your primary statistics",
2965 },
2966 "c/skills" => {
2967 id => "infobox",
2968 title => "Skills",
2969 reply => undef,
2970 tooltip => "Shows your experience per skill and item power",
2971 },
2972 "c/shopitems" => {
2973 id => "infobox",
2974 title => "Shop Items",
2975 reply => undef,
2976 tooltip => "Shows the items currently for sale in this shop",
2977 },
2978 "c/resistances" => {
2979 id => "infobox",
2980 title => "Resistances",
2981 reply => undef,
2982 tooltip => "Shows your resistances",
2983 },
2984 "c/pets" => {
2985 id => "infobox",
2986 title => "Pets",
2987 reply => undef,
2988 tooltip => "Shows information abotu your pets/a specific pet",
2989 },
2990 "c/perceiveself" => {
2991 id => "infobox",
2992 title => "Perceive Self",
2993 reply => undef,
2994 tooltip => "You gained detailed knowledge about yourself",
2995 },
2789 "c/uptime" => { 2996 "c/uptime" => {
2790 id => "infobox", 2997 id => "infobox",
2791 title => "Uptime", 2998 title => "Uptime",
2792 reply => undef, 2999 reply => undef,
2793 tooltip => "How long the server has been running since last restart", 3000 tooltip => "How long the server has been running since last restart",
2802 id => "party", 3009 id => "party",
2803 title => "Party", 3010 title => "Party",
2804 reply => "gsay ", 3011 reply => "gsay ",
2805 tooltip => "Messages and chat related to your party", 3012 tooltip => "Messages and chat related to your party",
2806 }, 3013 },
3014 "c/death" => {
3015 id => "death",
3016 title => "Death",
3017 reply => undef,
3018 tooltip => "Reason for and more info about your most recent death",
3019 },
3020 "c/say" => $SAY_CHANNEL,
3021 "c/chat" => $CHAT_CHANNEL,
2807); 3022);
2808 3023
2809sub cf::client::send_msg { 3024sub cf::client::send_msg {
2810 my ($self, $channel, $msg, $color, @extra) = @_; 3025 my ($self, $channel, $msg, $color, @extra) = @_;
2811 3026
2816 3031
2817 # check predefined channels, for the benefit of C 3032 # check predefined channels, for the benefit of C
2818 if ($CHANNEL{$channel}) { 3033 if ($CHANNEL{$channel}) {
2819 $channel = $CHANNEL{$channel}; 3034 $channel = $CHANNEL{$channel};
2820 3035
2821 $self->ext_msg (channel_info => $channel) 3036 $self->ext_msg (channel_info => $channel);
2822 if $self->can_msg;
2823
2824 $channel = $channel->{id}; 3037 $channel = $channel->{id};
2825 3038
2826 } elsif (ref $channel) { 3039 } elsif (ref $channel) {
2827 # send meta info to client, if not yet sent 3040 # send meta info to client, if not yet sent
2828 unless (exists $self->{channel}{$channel->{id}}) { 3041 unless (exists $self->{channel}{$channel->{id}}) {
2829 $self->{channel}{$channel->{id}} = $channel; 3042 $self->{channel}{$channel->{id}} = $channel;
2830 $self->ext_msg (channel_info => $channel) 3043 $self->ext_msg (channel_info => $channel);
2831 if $self->can_msg;
2832 } 3044 }
2833 3045
2834 $channel = $channel->{id}; 3046 $channel = $channel->{id};
2835 } 3047 }
2836 3048
2837 return unless @extra || length $msg; 3049 return unless @extra || length $msg;
2838 3050
2839 if ($self->can_msg) {
2840 # default colour, mask it out 3051 # default colour, mask it out
2841 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3052 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2842 if $color & cf::NDI_DEF; 3053 if $color & cf::NDI_DEF;
2843 3054
2844 my $pkt = "msg " 3055 my $pkt = "msg "
2845 . $self->{json_coder}->encode ( 3056 . $self->{json_coder}->encode (
2846 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3057 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2847 ); 3058 );
2848 3059
2849 # try lzf for large packets
2850 $pkt = "lzf " . Compress::LZF::compress $pkt
2851 if 1024 <= length $pkt and $self->{can_lzf};
2852
2853 # split very large packets
2854 if (8192 < length $pkt and $self->{can_lzf}) {
2855 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2856 $pkt = "frag";
2857 }
2858
2859 $self->send_packet ($pkt); 3060 $self->send_big_packet ($pkt);
2860 } else {
2861 if ($color >= 0) {
2862 # replace some tags by gcfclient-compatible ones
2863 for ($msg) {
2864 1 while
2865 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2866 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2867 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2868 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2869 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2870 }
2871
2872 $color &= cf::NDI_COLOR_MASK;
2873
2874 utf8::encode $msg;
2875
2876 if (0 && $msg =~ /\[/) {
2877 # COMMAND/INFO
2878 $self->send_packet ("drawextinfo $color 10 8 $msg")
2879 } else {
2880 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2881 $self->send_packet ("drawinfo $color $msg")
2882 }
2883 }
2884 }
2885} 3061}
2886 3062
2887=item $client->ext_msg ($type, @msg) 3063=item $client->ext_msg ($type, @msg)
2888 3064
2889Sends an ext event to the client. 3065Sends an ext event to the client.
2892 3068
2893sub cf::client::ext_msg($$@) { 3069sub cf::client::ext_msg($$@) {
2894 my ($self, $type, @msg) = @_; 3070 my ($self, $type, @msg) = @_;
2895 3071
2896 if ($self->extcmd == 2) { 3072 if ($self->extcmd == 2) {
2897 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3073 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2898 } elsif ($self->extcmd == 1) { # TODO: remove 3074 } elsif ($self->extcmd == 1) { # TODO: remove
2899 push @msg, msgtype => "event_$type"; 3075 push @msg, msgtype => "event_$type";
2900 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3076 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2901 } 3077 }
2902} 3078}
2903 3079
2904=item $client->ext_reply ($msgid, @msg) 3080=item $client->ext_reply ($msgid, @msg)
2905 3081
2909 3085
2910sub cf::client::ext_reply($$@) { 3086sub cf::client::ext_reply($$@) {
2911 my ($self, $id, @msg) = @_; 3087 my ($self, $id, @msg) = @_;
2912 3088
2913 if ($self->extcmd == 2) { 3089 if ($self->extcmd == 2) {
2914 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3090 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2915 } elsif ($self->extcmd == 1) { 3091 } elsif ($self->extcmd == 1) {
2916 #TODO: version 1, remove 3092 #TODO: version 1, remove
2917 unshift @msg, msgtype => "reply", msgid => $id; 3093 unshift @msg, msgtype => "reply", msgid => $id;
2918 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3094 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2919 } 3095 }
2920} 3096}
2921 3097
2922=item $success = $client->query ($flags, "text", \&cb) 3098=item $success = $client->query ($flags, "text", \&cb)
2923 3099
3024 3200
3025 $coro 3201 $coro
3026} 3202}
3027 3203
3028cf::client->attach ( 3204cf::client->attach (
3029 on_destroy => sub { 3205 on_client_destroy => sub {
3030 my ($ns) = @_; 3206 my ($ns) = @_;
3031 3207
3032 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3208 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3033 }, 3209 },
3034); 3210);
3050our $safe_hole = new Safe::Hole; 3226our $safe_hole = new Safe::Hole;
3051 3227
3052$SIG{FPE} = 'IGNORE'; 3228$SIG{FPE} = 'IGNORE';
3053 3229
3054$safe->permit_only (Opcode::opset qw( 3230$safe->permit_only (Opcode::opset qw(
3055 :base_core :base_mem :base_orig :base_math 3231 :base_core :base_mem :base_orig :base_math :base_loop
3056 grepstart grepwhile mapstart mapwhile 3232 grepstart grepwhile mapstart mapwhile
3057 sort time 3233 sort time
3058)); 3234));
3059 3235
3060# here we export the classes and methods available to script code 3236# here we export the classes and methods available to script code
3064The following functions and methods are available within a safe environment: 3240The following functions and methods are available within a safe environment:
3065 3241
3066 cf::object 3242 cf::object
3067 contr pay_amount pay_player map x y force_find force_add destroy 3243 contr pay_amount pay_player map x y force_find force_add destroy
3068 insert remove name archname title slaying race decrease split 3244 insert remove name archname title slaying race decrease split
3245 value
3069 3246
3070 cf::object::player 3247 cf::object::player
3071 player 3248 player
3072 3249
3073 cf::player 3250 cf::player
3079=cut 3256=cut
3080 3257
3081for ( 3258for (
3082 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3259 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3083 insert remove inv nrof name archname title slaying race 3260 insert remove inv nrof name archname title slaying race
3084 decrease split destroy change_exp)], 3261 decrease split destroy change_exp value msg lore send_msg)],
3085 ["cf::object::player" => qw(player)], 3262 ["cf::object::player" => qw(player)],
3086 ["cf::player" => qw(peaceful)], 3263 ["cf::player" => qw(peaceful send_msg)],
3087 ["cf::map" => qw(trigger)], 3264 ["cf::map" => qw(trigger)],
3088) { 3265) {
3089 no strict 'refs'; 3266 no strict 'refs';
3090 my ($pkg, @funs) = @$_; 3267 my ($pkg, @funs) = @$_;
3091 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3268 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3109 3286
3110 my $qcode = $code; 3287 my $qcode = $code;
3111 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3288 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3112 $qcode =~ s/\n/\\n/g; 3289 $qcode =~ s/\n/\\n/g;
3113 3290
3291 %vars = (_dummy => 0) unless %vars;
3292
3293 my @res;
3114 local $_; 3294 local $_;
3115 local @safe::cf::_safe_eval_args = values %vars;
3116 3295
3117 my $eval = 3296 my $eval =
3118 "do {\n" 3297 "do {\n"
3119 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3298 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3120 . "#line 0 \"{$qcode}\"\n" 3299 . "#line 0 \"{$qcode}\"\n"
3121 . $code 3300 . $code
3122 . "\n}" 3301 . "\n}"
3123 ; 3302 ;
3124 3303
3304 if ($CFG{safe_eval}) {
3125 sub_generation_inc; 3305 sub_generation_inc;
3306 local @safe::cf::_safe_eval_args = values %vars;
3126 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3307 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3127 sub_generation_inc; 3308 sub_generation_inc;
3309 } else {
3310 local @cf::_safe_eval_args = values %vars;
3311 @res = wantarray ? eval eval : scalar eval $eval;
3312 }
3128 3313
3129 if ($@) { 3314 if ($@) {
3130 warn "$@"; 3315 warn "$@";
3131 warn "while executing safe code '$code'\n"; 3316 warn "while executing safe code '$code'\n";
3132 warn "with arguments " . (join " ", %vars) . "\n"; 3317 warn "with arguments " . (join " ", %vars) . "\n";
3151=cut 3336=cut
3152 3337
3153sub register_script_function { 3338sub register_script_function {
3154 my ($fun, $cb) = @_; 3339 my ($fun, $cb) = @_;
3155 3340
3156 no strict 'refs'; 3341 $fun = "safe::$fun" if $CFG{safe_eval};
3157 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3342 *$fun = $safe_hole->wrap ($cb);
3158} 3343}
3159 3344
3160=back 3345=back
3161 3346
3162=cut 3347=cut
3183 3368
3184 $facedata->{version} == 2 3369 $facedata->{version} == 2
3185 or cf::cleanup "$path: version mismatch, cannot proceed."; 3370 or cf::cleanup "$path: version mismatch, cannot proceed.";
3186 3371
3187 # patch in the exptable 3372 # patch in the exptable
3373 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3188 $facedata->{resource}{"res/exp_table"} = { 3374 $facedata->{resource}{"res/exp_table"} = {
3189 type => FT_RSRC, 3375 type => FT_RSRC,
3190 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3376 data => $exp_table,
3377 hash => (Digest::MD5::md5 $exp_table),
3191 }; 3378 };
3192 cf::cede_to_tick; 3379 cf::cede_to_tick;
3193 3380
3194 { 3381 {
3195 my $faces = $facedata->{faceinfo}; 3382 my $faces = $facedata->{faceinfo};
3197 while (my ($face, $info) = each %$faces) { 3384 while (my ($face, $info) = each %$faces) {
3198 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3385 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3199 3386
3200 cf::face::set_visibility $idx, $info->{visibility}; 3387 cf::face::set_visibility $idx, $info->{visibility};
3201 cf::face::set_magicmap $idx, $info->{magicmap}; 3388 cf::face::set_magicmap $idx, $info->{magicmap};
3202 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3389 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3203 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3390 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3204 3391
3205 cf::cede_to_tick; 3392 cf::cede_to_tick;
3206 } 3393 }
3207 3394
3208 while (my ($face, $info) = each %$faces) { 3395 while (my ($face, $info) = each %$faces) {
3232 3419
3233 cf::anim::invalidate_all; # d'oh 3420 cf::anim::invalidate_all; # d'oh
3234 } 3421 }
3235 3422
3236 { 3423 {
3237 # TODO: for gcfclient pleasure, we should give resources
3238 # that gcfclient doesn't grok a >10000 face index.
3239 my $res = $facedata->{resource}; 3424 my $res = $facedata->{resource};
3240 3425
3241 while (my ($name, $info) = each %$res) { 3426 while (my ($name, $info) = each %$res) {
3242 if (defined $info->{type}) { 3427 if (defined $info->{type}) {
3243 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3428 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3244 my $data;
3245 3429
3246 if ($info->{type} & 1) { 3430 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3247 # prepend meta info
3248
3249 my $meta = $enc->encode ({
3250 name => $name,
3251 %{ $info->{meta} || {} },
3252 });
3253
3254 $data = pack "(w/a*)*", $meta, $info->{data};
3255 } else {
3256 $data = $info->{data};
3257 }
3258
3259 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3260 cf::face::set_type $idx, $info->{type}; 3431 cf::face::set_type $idx, $info->{type};
3261 } else { 3432 } else {
3262 $RESOURCE{$name} = $info; 3433 $RESOURCE{$name} = $info; # unused
3263 } 3434 }
3264 3435
3265 cf::cede_to_tick; 3436 cf::cede_to_tick;
3266 } 3437 }
3267 } 3438 }
3268 3439
3269 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3440 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3270 3441
3271 1 3442 1
3272} 3443}
3273
3274cf::global->attach (on_resource_update => sub {
3275 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3276 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3277
3278 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3279 my $sound = $soundconf->{compat}[$_]
3280 or next;
3281
3282 my $face = cf::face::find "sound/$sound->[1]";
3283 cf::sound::set $sound->[0] => $face;
3284 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3285 }
3286
3287 while (my ($k, $v) = each %{$soundconf->{event}}) {
3288 my $face = cf::face::find "sound/$v";
3289 cf::sound::set $k => $face;
3290 }
3291 }
3292});
3293 3444
3294register_exticmd fx_want => sub { 3445register_exticmd fx_want => sub {
3295 my ($ns, $want) = @_; 3446 my ($ns, $want) = @_;
3296 3447
3297 while (my ($k, $v) = each %$want) { 3448 while (my ($k, $v) = each %$want) {
3336sub reload_treasures { 3487sub reload_treasures {
3337 load_resource_file "$DATADIR/treasures" 3488 load_resource_file "$DATADIR/treasures"
3338 or die "unable to load treasurelists\n"; 3489 or die "unable to load treasurelists\n";
3339} 3490}
3340 3491
3492sub reload_sound {
3493 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3494 or die "$DATADIR/sound $!";
3495
3496 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3497
3498 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3499 my $sound = $soundconf->{compat}[$_]
3500 or next;
3501
3502 my $face = cf::face::find "sound/$sound->[1]";
3503 cf::sound::set $sound->[0] => $face;
3504 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3505 }
3506
3507 while (my ($k, $v) = each %{$soundconf->{event}}) {
3508 my $face = cf::face::find "sound/$v";
3509 cf::sound::set $k => $face;
3510 }
3511}
3512
3341sub reload_resources { 3513sub reload_resources {
3342 warn "reloading resource files...\n"; 3514 warn "reloading resource files...\n";
3343 3515
3344 reload_facedata; 3516 reload_facedata;
3517 reload_sound;
3345 reload_archetypes; 3518 reload_archetypes;
3346 reload_regions; 3519 reload_regions;
3347 reload_treasures; 3520 reload_treasures;
3348 3521
3349 warn "finished reloading resource files\n"; 3522 warn "finished reloading resource files\n";
3350} 3523}
3351 3524
3352sub init {
3353 my $guard = freeze_mainloop;
3354
3355 evthread_start IO::AIO::poll_fileno;
3356
3357 reload_resources;
3358}
3359
3360sub reload_config { 3525sub reload_config {
3526 warn "reloading config file...\n";
3527
3361 open my $fh, "<:utf8", "$CONFDIR/config" 3528 open my $fh, "<:utf8", "$CONFDIR/config"
3362 or return; 3529 or return;
3363 3530
3364 local $/; 3531 local $/;
3365 *CFG = YAML::Load <$fh>; 3532 *CFG = YAML::XS::Load scalar <$fh>;
3366 3533
3367 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3534 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3368 3535
3369 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3536 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3370 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3537 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3371 3538
3372 if (exists $CFG{mlockall}) { 3539 if (exists $CFG{mlockall}) {
3374 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3541 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3375 and die "WARNING: m(un)lockall failed: $!\n"; 3542 and die "WARNING: m(un)lockall failed: $!\n";
3376 }; 3543 };
3377 warn $@ if $@; 3544 warn $@ if $@;
3378 } 3545 }
3546
3547 warn "finished reloading resource files\n";
3379} 3548}
3380 3549
3381sub pidfile() { 3550sub pidfile() {
3382 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3551 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3383 or die "$PIDFILE: $!"; 3552 or die "$PIDFILE: $!";
3395 3564
3396 seek $fh, 0, 0; 3565 seek $fh, 0, 0;
3397 print $fh $$; 3566 print $fh $$;
3398} 3567}
3399 3568
3569sub main_loop {
3570 warn "EV::loop starting\n";
3571 if (1) {
3572 EV::loop;
3573 }
3574 warn "EV::loop returned\n";
3575 goto &main_loop unless $REALLY_UNLOOP;
3576}
3577
3400sub main { 3578sub main {
3401 atomic; 3579 cf::init_globals; # initialise logging
3580
3581 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3582 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3583 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3584 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3585
3586 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3402 3587
3403 # we must not ever block the main coroutine 3588 # we must not ever block the main coroutine
3404 local $Coro::idle = sub { 3589 local $Coro::idle = sub {
3405 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3590 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3406 (async { 3591 (async {
3407 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3592 $Coro::current->{desc} = "IDLE BUG HANDLER";
3408 EV::loop EV::LOOP_ONESHOT; 3593 EV::loop EV::LOOP_ONESHOT;
3409 })->prio (Coro::PRIO_MAX); 3594 })->prio (Coro::PRIO_MAX);
3410 }; 3595 };
3411 3596
3412 { 3597 evthread_start IO::AIO::poll_fileno;
3413 my $guard = freeze_mainloop; 3598
3599 cf::sync_job {
3600 cf::init_experience;
3601 cf::init_anim;
3602 cf::init_attackmess;
3603 cf::init_dynamic;
3604
3605 cf::load_settings;
3606 cf::load_materials;
3607
3608 reload_resources;
3414 reload_config; 3609 reload_config;
3415 db_init; 3610 db_init;
3611
3612 cf::init_uuid;
3613 cf::init_signals;
3614 cf::init_skills;
3615
3616 cf::init_beforeplay;
3617
3618 atomic;
3619
3416 load_extensions; 3620 load_extensions;
3417 3621
3418 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3419 }
3420
3421 utime time, time, $RUNTIMEFILE; 3622 utime time, time, $RUNTIMEFILE;
3422 3623
3423 # no (long-running) fork's whatsoever before this point(!) 3624 # no (long-running) fork's whatsoever before this point(!)
3625 use POSIX ();
3424 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3626 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3425 3627
3426 EV::loop; 3628 (pop @POST_INIT)->(0) while @POST_INIT;
3629 };
3630
3631 cf::object::thawer::errors_are_fatal 0;
3632 warn "parse errors in files are no longer fatal from this point on.\n";
3633
3634 main_loop;
3427} 3635}
3428 3636
3429############################################################################# 3637#############################################################################
3430# initialisation and cleanup 3638# initialisation and cleanup
3431 3639
3432# install some emergency cleanup handlers 3640# install some emergency cleanup handlers
3433BEGIN { 3641BEGIN {
3434 our %SIGWATCHER = (); 3642 our %SIGWATCHER = ();
3435 for my $signal (qw(INT HUP TERM)) { 3643 for my $signal (qw(INT HUP TERM)) {
3436 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3644 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3437 cf::cleanup "SIG$signal"; 3645 cf::cleanup "SIG$signal";
3438 }; 3646 };
3439 } 3647 }
3440} 3648}
3441 3649
3442sub write_runtime_sync { 3650sub write_runtime_sync {
3651 my $t0 = AE::time;
3652
3443 # first touch the runtime file to show we are still running: 3653 # first touch the runtime file to show we are still running:
3444 # the fsync below can take a very very long time. 3654 # the fsync below can take a very very long time.
3445 3655
3446 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3656 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3447 3657
3448 my $guard = cf::lock_acquire "write_runtime"; 3658 my $guard = cf::lock_acquire "write_runtime";
3449 3659
3450 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3660 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3451 or return; 3661 or return;
3452 3662
3453 my $value = $cf::RUNTIME + 90 + 10; 3663 my $value = $cf::RUNTIME + 90 + 10;
3454 # 10 is the runtime save interval, for a monotonic clock 3664 # 10 is the runtime save interval, for a monotonic clock
3455 # 60 allows for the watchdog to kill the server. 3665 # 60 allows for the watchdog to kill the server.
3468 or return; 3678 or return;
3469 3679
3470 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3680 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3471 and return; 3681 and return;
3472 3682
3473 warn "runtime file written.\n"; 3683 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3474 3684
3475 1 3685 1
3476} 3686}
3477 3687
3478our $uuid_lock; 3688our $uuid_lock;
3487 my $uuid = "$LOCALDIR/uuid"; 3697 my $uuid = "$LOCALDIR/uuid";
3488 3698
3489 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3699 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3490 or return; 3700 or return;
3491 3701
3492 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3702 my $value = uuid_seq uuid_cur;
3703
3704 unless ($value) {
3705 warn "cowardly refusing to write zero uuid value!\n";
3706 return;
3707 }
3708
3709 my $value = uuid_str $value + $uuid_skip;
3493 $uuid_skip = 0; 3710 $uuid_skip = 0;
3494 3711
3495 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3712 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3496 and return; 3713 and return;
3497 3714
3519} 3736}
3520 3737
3521sub emergency_save() { 3738sub emergency_save() {
3522 my $freeze_guard = cf::freeze_mainloop; 3739 my $freeze_guard = cf::freeze_mainloop;
3523 3740
3524 warn "enter emergency perl save\n"; 3741 warn "emergency_perl_save: enter\n";
3525 3742
3526 cf::sync_job { 3743 cf::sync_job {
3744 # this is a trade-off: we want to be very quick here, so
3745 # save all maps without fsync, and later call a global sync
3746 # (which in turn might be very very slow)
3747 local $USE_FSYNC = 0;
3748
3527 # use a peculiar iteration method to avoid tripping on perl 3749 # use a peculiar iteration method to avoid tripping on perl
3528 # refcount bugs in for. also avoids problems with players 3750 # refcount bugs in for. also avoids problems with players
3529 # and maps saved/destroyed asynchronously. 3751 # and maps saved/destroyed asynchronously.
3530 warn "begin emergency player save\n"; 3752 warn "emergency_perl_save: begin player save\n";
3531 for my $login (keys %cf::PLAYER) { 3753 for my $login (keys %cf::PLAYER) {
3532 my $pl = $cf::PLAYER{$login} or next; 3754 my $pl = $cf::PLAYER{$login} or next;
3533 $pl->valid or next; 3755 $pl->valid or next;
3534 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3756 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3535 $pl->save; 3757 $pl->save;
3536 } 3758 }
3537 warn "end emergency player save\n"; 3759 warn "emergency_perl_save: end player save\n";
3538 3760
3539 warn "begin emergency map save\n"; 3761 warn "emergency_perl_save: begin map save\n";
3540 for my $path (keys %cf::MAP) { 3762 for my $path (keys %cf::MAP) {
3541 my $map = $cf::MAP{$path} or next; 3763 my $map = $cf::MAP{$path} or next;
3542 $map->valid or next; 3764 $map->valid or next;
3543 $map->save; 3765 $map->save;
3544 } 3766 }
3545 warn "end emergency map save\n"; 3767 warn "emergency_perl_save: end map save\n";
3546 3768
3547 warn "begin emergency database checkpoint\n"; 3769 warn "emergency_perl_save: begin database checkpoint\n";
3548 BDB::db_env_txn_checkpoint $DB_ENV; 3770 BDB::db_env_txn_checkpoint $DB_ENV;
3549 warn "end emergency database checkpoint\n"; 3771 warn "emergency_perl_save: end database checkpoint\n";
3550 3772
3551 warn "begin write uuid\n"; 3773 warn "emergency_perl_save: begin write uuid\n";
3552 write_uuid_sync 1; 3774 write_uuid_sync 1;
3553 warn "end write uuid\n"; 3775 warn "emergency_perl_save: end write uuid\n";
3554 }; 3776 };
3555 3777
3778 warn "emergency_perl_save: starting sync()\n";
3779 IO::AIO::aio_sync sub {
3780 warn "emergency_perl_save: finished sync()\n";
3781 };
3782
3556 warn "leave emergency perl save\n"; 3783 warn "emergency_perl_save: leave\n";
3557} 3784}
3558 3785
3559sub post_cleanup { 3786sub post_cleanup {
3560 my ($make_core) = @_; 3787 my ($make_core) = @_;
3561 3788
3587 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3814 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3588 for my $name (keys %$leaf_symtab) { 3815 for my $name (keys %$leaf_symtab) {
3589 _gv_clear *{"$pkg$name"}; 3816 _gv_clear *{"$pkg$name"};
3590# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3817# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3591 } 3818 }
3592 warn "cleared package #$pkg\n";#d#
3593} 3819}
3594
3595our $RELOAD; # how many times to reload
3596 3820
3597sub do_reload_perl() { 3821sub do_reload_perl() {
3598 # can/must only be called in main 3822 # can/must only be called in main
3599 if ($Coro::current != $Coro::main) { 3823 if (in_main) {
3600 warn "can only reload from main coroutine"; 3824 warn "can only reload from main coroutine";
3601 return; 3825 return;
3602 } 3826 }
3603 3827
3604 return if $RELOAD++; 3828 return if $RELOAD++;
3829
3830 my $t1 = AE::time;
3605 3831
3606 while ($RELOAD) { 3832 while ($RELOAD) {
3607 warn "reloading..."; 3833 warn "reloading...";
3608 3834
3609 warn "entering sync_job"; 3835 warn "entering sync_job";
3670 clear_package "safe::$_" 3896 clear_package "safe::$_"
3671 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3897 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3672 3898
3673 warn "unloading cf.pm \"a bit\""; 3899 warn "unloading cf.pm \"a bit\"";
3674 delete $INC{"cf.pm"}; 3900 delete $INC{"cf.pm"};
3675 delete $INC{"cf/pod.pm"}; 3901 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3676 3902
3677 # don't, removes xs symbols, too, 3903 # don't, removes xs symbols, too,
3678 # and global variables created in xs 3904 # and global variables created in xs
3679 #clear_package __PACKAGE__; 3905 #clear_package __PACKAGE__;
3680 3906
3681 warn "unload completed, starting to reload now"; 3907 warn "unload completed, starting to reload now";
3682 3908
3683 warn "reloading cf.pm"; 3909 warn "reloading cf.pm";
3684 require cf; 3910 require cf;
3685 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3911 cf::_connect_to_perl_1;
3686 3912
3687 warn "loading config and database again"; 3913 warn "loading config and database again";
3688 cf::reload_config; 3914 cf::reload_config;
3689 3915
3690 warn "loading extensions"; 3916 warn "loading extensions";
3691 cf::load_extensions; 3917 cf::load_extensions;
3692 3918
3919 if ($REATTACH_ON_RELOAD) {
3693 warn "reattaching attachments to objects/players"; 3920 warn "reattaching attachments to objects/players";
3694 _global_reattach; # objects, sockets 3921 _global_reattach; # objects, sockets
3695 warn "reattaching attachments to maps"; 3922 warn "reattaching attachments to maps";
3696 reattach $_ for values %MAP; 3923 reattach $_ for values %MAP;
3697 warn "reattaching attachments to players"; 3924 warn "reattaching attachments to players";
3698 reattach $_ for values %PLAYER; 3925 reattach $_ for values %PLAYER;
3926 }
3927
3928 warn "running post_init jobs";
3929 (pop @POST_INIT)->(1) while @POST_INIT;
3699 3930
3700 warn "leaving sync_job"; 3931 warn "leaving sync_job";
3701 3932
3702 1 3933 1
3703 } or do { 3934 } or do {
3706 }; 3937 };
3707 3938
3708 warn "reloaded"; 3939 warn "reloaded";
3709 --$RELOAD; 3940 --$RELOAD;
3710 } 3941 }
3942
3943 $t1 = AE::time - $t1;
3944 warn "reload completed in ${t1}s\n";
3711}; 3945};
3712 3946
3713our $RELOAD_WATCHER; # used only during reload 3947our $RELOAD_WATCHER; # used only during reload
3714 3948
3715sub reload_perl() { 3949sub reload_perl() {
3716 # doing reload synchronously and two reloads happen back-to-back, 3950 # doing reload synchronously and two reloads happen back-to-back,
3717 # coro crashes during coro_state_free->destroy here. 3951 # coro crashes during coro_state_free->destroy here.
3718 3952
3953 $RELOAD_WATCHER ||= cf::async {
3954 Coro::AIO::aio_wait cache_extensions;
3955
3719 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3956 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3720 do_reload_perl; 3957 do_reload_perl;
3721 undef $RELOAD_WATCHER; 3958 undef $RELOAD_WATCHER;
3959 };
3722 }; 3960 };
3723} 3961}
3724 3962
3725register_command "reload" => sub { 3963register_command "reload" => sub {
3726 my ($who, $arg) = @_; 3964 my ($who, $arg) = @_;
3740 3978
3741our @WAIT_FOR_TICK; 3979our @WAIT_FOR_TICK;
3742our @WAIT_FOR_TICK_BEGIN; 3980our @WAIT_FOR_TICK_BEGIN;
3743 3981
3744sub wait_for_tick { 3982sub wait_for_tick {
3745 return if tick_inhibit || $Coro::current == $Coro::main; 3983 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3746 3984
3747 my $signal = new Coro::Signal; 3985 my $signal = new Coro::Signal;
3748 push @WAIT_FOR_TICK, $signal; 3986 push @WAIT_FOR_TICK, $signal;
3749 $signal->wait; 3987 $signal->wait;
3750} 3988}
3751 3989
3752sub wait_for_tick_begin { 3990sub wait_for_tick_begin {
3753 return if tick_inhibit || $Coro::current == $Coro::main; 3991 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3754 3992
3755 my $signal = new Coro::Signal; 3993 my $signal = new Coro::Signal;
3756 push @WAIT_FOR_TICK_BEGIN, $signal; 3994 push @WAIT_FOR_TICK_BEGIN, $signal;
3757 $signal->wait; 3995 $signal->wait;
3758} 3996}
3763 unless ++$bug_warning > 10; 4001 unless ++$bug_warning > 10;
3764 return; 4002 return;
3765 } 4003 }
3766 4004
3767 cf::server_tick; # one server iteration 4005 cf::server_tick; # one server iteration
4006
4007 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3768 4008
3769 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4009 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3770 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4010 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3771 Coro::async_pool { 4011 Coro::async_pool {
3772 $Coro::current->{desc} = "runtime saver"; 4012 $Coro::current->{desc} = "runtime saver";
3795} 4035}
3796 4036
3797{ 4037{
3798 # configure BDB 4038 # configure BDB
3799 4039
3800 BDB::min_parallel 8; 4040 BDB::min_parallel 16;
3801 BDB::max_poll_reqs $TICK * 0.1; 4041 BDB::max_poll_reqs $TICK * 0.1;
3802 $AnyEvent::BDB::WATCHER->priority (1); 4042 $AnyEvent::BDB::WATCHER->priority (1);
3803 4043
3804 unless ($DB_ENV) { 4044 unless ($DB_ENV) {
3805 $DB_ENV = BDB::db_env_create; 4045 $DB_ENV = BDB::db_env_create;
3885 LOG llevInfo, "[ABT] [suppressed]\n"; 4125 LOG llevInfo, "[ABT] [suppressed]\n";
3886 } 4126 }
3887} 4127}
3888 4128
3889# load additional modules 4129# load additional modules
3890use cf::pod; 4130require "cf/$_.pm" for @EXTRA_MODULES;
4131cf::_connect_to_perl_2;
3891 4132
3892END { cf::emergency_save } 4133END { cf::emergency_save }
3893 4134
38941 41351
3895 4136

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines