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.449 by root, Sat Sep 20 00:09:27 2008 UTC vs.
Revision 1.531 by root, Wed Apr 28 21:07:41 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
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# make sure c-lzf reinitialises itself 74# make sure c-lzf reinitialises itself
72Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve"; 75Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
73Compress::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
77
78# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
74 80
75sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
76 82
77our %COMMAND = (); 83our %COMMAND = ();
78our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
81our %EXTCMD = (); 87our %EXTCMD = ();
82our %EXTICMD = (); 88our %EXTICMD = ();
83our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
84our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
85 91
86our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
87our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
88 96
89our $CONFDIR = confdir; 97our $CONFDIR = confdir;
90our $DATADIR = datadir; 98our $DATADIR = datadir;
91our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
92our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
98our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
99our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
100our $PIDFILE = "$LOCALDIR/pid"; 108our $PIDFILE = "$LOCALDIR/pid";
101our $RUNTIMEFILE = "$LOCALDIR/runtime"; 109our $RUNTIMEFILE = "$LOCALDIR/runtime";
102 110
103our %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;
104 118
105our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
106our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
107our $NEXT_TICK; 121our $NEXT_TICK;
108our $USE_FSYNC = 1; # use fsync to write maps - default off 122our $USE_FSYNC = 1; # use fsync to write maps - default on
109 123
110our $BDB_DEADLOCK_WATCHER; 124our $BDB_DEADLOCK_WATCHER;
111our $BDB_CHECKPOINT_WATCHER; 125our $BDB_CHECKPOINT_WATCHER;
112our $BDB_TRICKLE_WATCHER; 126our $BDB_TRICKLE_WATCHER;
113our $DB_ENV; 127our $DB_ENV;
114 128
129our @EXTRA_MODULES = qw(pod match mapscript);
130
115our %CFG; 131our %CFG;
116 132
117our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
118our $RUNTIME; 134our $RUNTIME;
119our $NOW; 135our $NOW;
127 143
128our $LOAD; # a number between 0 (idle) and 1 (too many objects) 144our $LOAD; # a number between 0 (idle) and 1 (too many objects)
129our $LOADAVG; # same thing, but with alpha-smoothing 145our $LOADAVG; # same thing, but with alpha-smoothing
130our $JITTER; # average jitter 146our $JITTER; # average jitter
131our $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 :)
132 153
133binmode STDOUT; 154binmode STDOUT;
134binmode STDERR; 155binmode STDERR;
135 156
136# read virtual server time, if available 157# read virtual server time, if available
138 open my $fh, "<", $RUNTIMEFILE 159 open my $fh, "<", $RUNTIMEFILE
139 or die "unable to read $RUNTIMEFILE file: $!"; 160 or die "unable to read $RUNTIMEFILE file: $!";
140 $RUNTIME = <$fh> + 0.; 161 $RUNTIME = <$fh> + 0.;
141} 162}
142 163
164eval "sub TICK() { $TICK } 1" or die;
165
143mkdir $_ 166mkdir $_
144 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 167 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
145 168
146our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
147 170
148sub 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::"} };
149 187
150############################################################################# 188#############################################################################
151 189
152=head2 GLOBAL VARIABLES 190=head2 GLOBAL VARIABLES
153 191
200returns 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
201per 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.
202 240
203=item @cf::INVOKE_RESULTS 241=item @cf::INVOKE_RESULTS
204 242
205This array contains the results of the last C<invoke ()> call. When 243This array contains the results of the last C<invoke ()> call. When
206C<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
207that call. 245that call.
208 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
209=back 253=back
210 254
211=cut 255=cut
212 256
213BEGIN { 257$Coro::State::WARNHOOK = sub {
214 *CORE::GLOBAL::warn = sub {
215 my $msg = join "", @_; 258 my $msg = join "", @_;
216 259
217 $msg .= "\n" 260 $msg .= "\n"
218 unless $msg =~ /\n$/; 261 unless $msg =~ /\n$/;
219 262
220 $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;
221 264
222 LOG llevError, $msg; 265 LOG llevError, $msg;
223 }; 266};
224}
225 267
226$Coro::State::DIEHOOK = sub { 268$Coro::State::DIEHOOK = sub {
227 return unless $^S eq 0; # "eq", not "==" 269 return unless $^S eq 0; # "eq", not "=="
228 270
229 if ($Coro::current == $Coro::main) {#d# 271 warn Carp::longmess $_[0];
272
273 if (in_main) {#d#
230 warn "DIEHOOK called in main context, Coro bug?\n";#d# 274 warn "DIEHOOK called in main context, Coro bug?\n";#d#
231 return;#d# 275 return;#d#
232 }#d# 276 }#d#
233 277
234 # kill coroutine otherwise 278 # kill coroutine otherwise
235 warn Carp::longmess $_[0];
236 Coro::terminate 279 Coro::terminate
237}; 280};
238
239$SIG{__DIE__} = sub { }; #d#?
240 281
241@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 282@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
242@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 283@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
243@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 284@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
244@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 285@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
258)) { 299)) {
259 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 300 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
260} 301}
261 302
262$EV::DIED = sub { 303$EV::DIED = sub {
263 warn "error in event callback: @_"; 304 Carp::cluck "error in event callback: @_";
264}; 305};
265 306
266############################################################################# 307#############################################################################
267 308
268=head2 UTILITY FUNCTIONS 309=head2 UTILITY FUNCTIONS
305our $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
306 347
307sub encode_json($) { $json_coder->encode ($_[0]) } 348sub encode_json($) { $json_coder->encode ($_[0]) }
308sub decode_json($) { $json_coder->decode ($_[0]) } 349sub decode_json($) { $json_coder->decode ($_[0]) }
309 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
310=item cf::lock_wait $string 365=item cf::lock_wait $string
311 366
312Wait until the given lock is available. See cf::lock_acquire. 367Wait until the given lock is available. See cf::lock_acquire.
313 368
314=item my $lock = cf::lock_acquire $string 369=item my $lock = cf::lock_acquire $string
315 370
316Wait 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
317a 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,
318for example when the coroutine gets canceled), the lock is automatically 373for example when the coroutine gets canceled), the lock is automatically
319returned. 374returned.
320 375
321Locks 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
322deadlocked coro. 377deadlocked coro.
328 383
329Return 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.
330 385
331=cut 386=cut
332 387
333our %LOCK; 388our $LOCKS = new Coro::SemaphoreSet;
334our %LOCKER;#d#
335 389
336sub lock_wait($) { 390sub lock_wait($) {
337 my ($key) = @_; 391 $LOCKS->wait ($_[0]);
338
339 if ($LOCKER{$key} == $Coro::current) {#d#
340 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
341 return;#d#
342 }#d#
343
344 # wait for lock, if any
345 while ($LOCK{$key}) {
346 push @{ $LOCK{$key} }, $Coro::current;
347 Coro::schedule;
348 }
349} 392}
350 393
351sub lock_acquire($) { 394sub lock_acquire($) {
352 my ($key) = @_; 395 $LOCKS->guard ($_[0])
353
354 # wait, to be sure we are not locked
355 lock_wait $key;
356
357 $LOCK{$key} = [];
358 $LOCKER{$key} = $Coro::current;#d#
359
360 Coro::guard {
361 delete $LOCKER{$key};#d#
362 # wake up all waiters, to be on the safe side
363 $_->ready for @{ delete $LOCK{$key} };
364 }
365} 396}
366 397
367sub lock_active($) { 398sub lock_active($) {
368 my ($key) = @_; 399 $LOCKS->count ($_[0]) < 1
369
370 ! ! $LOCK{$key}
371} 400}
372 401
373sub freeze_mainloop { 402sub freeze_mainloop {
374 tick_inhibit_inc; 403 tick_inhibit_inc;
375 404
376 Coro::guard \&tick_inhibit_dec; 405 &Guard::guard (\&tick_inhibit_dec);
377} 406}
378 407
379=item cf::periodic $interval, $cb 408=item cf::periodic $interval, $cb
380 409
381Like 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
382get spread over timer. 411get spread over time.
383 412
384=cut 413=cut
385 414
386sub periodic($$) { 415sub periodic($$) {
387 my ($interval, $cb) = @_; 416 my ($interval, $cb) = @_;
404 433
405=cut 434=cut
406 435
407our @SLOT_QUEUE; 436our @SLOT_QUEUE;
408our $SLOT_QUEUE; 437our $SLOT_QUEUE;
438our $SLOT_DECAY = 0.9;
409 439
410$SLOT_QUEUE->cancel if $SLOT_QUEUE; 440$SLOT_QUEUE->cancel if $SLOT_QUEUE;
411$SLOT_QUEUE = Coro::async { 441$SLOT_QUEUE = Coro::async {
412 $Coro::current->desc ("timeslot manager"); 442 $Coro::current->desc ("timeslot manager");
413 443
414 my $signal = new Coro::Signal; 444 my $signal = new Coro::Signal;
445 my $busy;
415 446
416 while () { 447 while () {
417 next_job: 448 next_job:
449
418 my $avail = cf::till_tick; 450 my $avail = cf::till_tick;
419 if ($avail > 0.01) { 451
420 for (0 .. $#SLOT_QUEUE) { 452 for (0 .. $#SLOT_QUEUE) {
421 if ($SLOT_QUEUE[$_][0] < $avail) { 453 if ($SLOT_QUEUE[$_][0] <= $avail) {
454 $busy = 0;
422 my $job = splice @SLOT_QUEUE, $_, 1, (); 455 my $job = splice @SLOT_QUEUE, $_, 1, ();
423 $job->[2]->send; 456 $job->[2]->send;
424 Coro::cede; 457 Coro::cede;
425 goto next_job; 458 goto next_job;
426 } 459 } else {
460 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
427 } 461 }
428 } 462 }
429 463
430 if (@SLOT_QUEUE) { 464 if (@SLOT_QUEUE) {
431 # 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
432 push @cf::WAIT_FOR_TICK, $signal; 466 push @cf::WAIT_FOR_TICK, $signal;
433 $signal->wait; 467 $signal->wait;
434 } else { 468 } else {
469 $busy = 0;
435 Coro::schedule; 470 Coro::schedule;
436 } 471 }
437 } 472 }
438}; 473};
439 474
440sub get_slot($;$$) { 475sub get_slot($;$$) {
441 return if tick_inhibit || $Coro::current == $Coro::main; 476 return if tick_inhibit || $Coro::current == $Coro::main;
442 477
443 my ($time, $pri, $name) = @_; 478 my ($time, $pri, $name) = @_;
444 479
445 $time = $TICK * .6 if $time > $TICK * .6; 480 $time = clamp $time, 0.01, $TICK * .6;
481
446 my $sig = new Coro::Signal; 482 my $sig = new Coro::Signal;
447 483
448 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 484 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
449 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 485 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
450 $SLOT_QUEUE->ready; 486 $SLOT_QUEUE->ready;
477 513
478sub sync_job(&) { 514sub sync_job(&) {
479 my ($job) = @_; 515 my ($job) = @_;
480 516
481 if ($Coro::current == $Coro::main) { 517 if ($Coro::current == $Coro::main) {
482 my $time = EV::time; 518 my $time = AE::time;
483 519
484 # this is the main coro, too bad, we have to block 520 # this is the main coro, too bad, we have to block
485 # till the operation succeeds, freezing the server :/ 521 # till the operation succeeds, freezing the server :/
486 522
487 LOG llevError, Carp::longmess "sync job";#d# 523 LOG llevError, Carp::longmess "sync job";#d#
504 } else { 540 } else {
505 EV::loop EV::LOOP_ONESHOT; 541 EV::loop EV::LOOP_ONESHOT;
506 } 542 }
507 } 543 }
508 544
509 my $time = EV::time - $time; 545 my $time = AE::time - $time;
510 546
511 $TICK_START += $time; # do not account sync jobs to server load 547 $TICK_START += $time; # do not account sync jobs to server load
512 548
513 wantarray ? @res : $res[0] 549 wantarray ? @res : $res[0]
514 } else { 550 } else {
558 reset_signals; 594 reset_signals;
559 &$cb 595 &$cb
560 }, @args; 596 }, @args;
561 597
562 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 )
563} 610}
564 611
565=item $coin = coin_from_name $name 612=item $coin = coin_from_name $name
566 613
567=cut 614=cut
1148 1195
1149 sync_job { 1196 sync_job {
1150 if (length $$rdata) { 1197 if (length $$rdata) {
1151 utf8::decode (my $decname = $filename); 1198 utf8::decode (my $decname = $filename);
1152 warn sprintf "saving %s (%d,%d)\n", 1199 warn sprintf "saving %s (%d,%d)\n",
1153 $decname, length $$rdata, scalar @$objs; 1200 $decname, length $$rdata, scalar @$objs
1201 if $VERBOSE_IO;
1154 1202
1155 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1203 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1156 aio_chmod $fh, SAVE_MODE; 1204 aio_chmod $fh, SAVE_MODE;
1157 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1205 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1158 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 }
1159 aio_close $fh; 1210 aio_close $fh;
1160 1211
1161 if (@$objs) { 1212 if (@$objs) {
1162 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) {
1163 aio_chmod $fh, SAVE_MODE; 1214 aio_chmod $fh, SAVE_MODE;
1164 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1215 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1165 aio_write $fh, 0, (length $data), $data, 0; 1216 aio_write $fh, 0, (length $data), $data, 0;
1166 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 }
1167 aio_close $fh; 1221 aio_close $fh;
1168 aio_rename "$filename.pst~", "$filename.pst"; 1222 aio_rename "$filename.pst~", "$filename.pst";
1169 } 1223 }
1170 } else { 1224 } else {
1171 aio_unlink "$filename.pst"; 1225 aio_unlink "$filename.pst";
1172 } 1226 }
1173 1227
1174 aio_rename "$filename~", $filename; 1228 aio_rename "$filename~", $filename;
1229
1230 $filename =~ s%/[^/]+$%%;
1231 aio_pathsync $filename if $cf::USE_FSYNC;
1175 } else { 1232 } else {
1176 warn "FATAL: $filename~: $!\n"; 1233 warn "unable to save objects: $filename~: $!\n";
1177 } 1234 }
1178 } else { 1235 } else {
1179 aio_unlink $filename; 1236 aio_unlink $filename;
1180 aio_unlink "$filename.pst"; 1237 aio_unlink "$filename.pst";
1181 } 1238 }
1206 $av = $st->{objs}; 1263 $av = $st->{objs};
1207 } 1264 }
1208 1265
1209 utf8::decode (my $decname = $filename); 1266 utf8::decode (my $decname = $filename);
1210 warn sprintf "loading %s (%d,%d)\n", 1267 warn sprintf "loading %s (%d,%d)\n",
1211 $decname, length $data, scalar @{$av || []}; 1268 $decname, length $data, scalar @{$av || []}
1269 if $VERBOSE_IO;
1212 1270
1213 ($data, $av) 1271 ($data, $av)
1214} 1272}
1215 1273
1216=head2 COMMAND CALLBACKS 1274=head2 COMMAND CALLBACKS
1272 my ($name, $cb) = @_; 1330 my ($name, $cb) = @_;
1273 1331
1274 $EXTICMD{$name} = $cb; 1332 $EXTICMD{$name} = $cb;
1275} 1333}
1276 1334
1335use File::Glob ();
1336
1277cf::player->attach ( 1337cf::player->attach (
1278 on_command => sub { 1338 on_unknown_command => sub {
1279 my ($pl, $name, $params) = @_; 1339 my ($pl, $name, $params) = @_;
1280 1340
1281 my $cb = $COMMAND{$name} 1341 my $cb = $COMMAND{$name}
1282 or return; 1342 or return;
1283 1343
1313 1373
1314 cf::override; 1374 cf::override;
1315 }, 1375 },
1316); 1376);
1317 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
1318sub load_extensions { 1391sub load_extensions {
1319 cf::sync_job { 1392 cf::sync_job {
1320 my %todo; 1393 my %todo;
1321 1394
1322 for my $path (<$LIBDIR/*.ext>) { 1395 for my $path (<$LIBDIR/*.ext>) {
1349 . "\n};\n1"; 1422 . "\n};\n1";
1350 1423
1351 $todo{$base} = \%ext; 1424 $todo{$base} = \%ext;
1352 } 1425 }
1353 1426
1427 my $pass = 0;
1354 my %done; 1428 my %done;
1355 while (%todo) { 1429 while (%todo) {
1356 my $progress; 1430 my $progress;
1357 1431
1432 ++$pass;
1433
1434 ext:
1358 while (my ($k, $v) = each %todo) { 1435 while (my ($k, $v) = each %todo) {
1359 for (split /,\s*/, $v->{meta}{depends}) { 1436 for (split /,\s*/, $v->{meta}{depends}) {
1360 goto skip 1437 next ext
1361 unless exists $done{$_}; 1438 unless exists $done{$_};
1362 } 1439 }
1363 1440
1364 warn "... loading '$k' into '$v->{pkg}'\n"; 1441 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1365 1442
1366 unless (eval $v->{source}) { 1443 my $active = eval $v->{source};
1444
1445 if (length $@) {
1367 my $msg = $@ ? "$v->{path}: $@\n" 1446 warn "$v->{path}: $@\n";
1368 : "$v->{base}: extension inactive.\n";
1369 1447
1370 if (exists $v->{meta}{mandatory}) {
1371 warn $msg;
1372 cf::cleanup "mandatory extension failed to load, exiting."; 1448 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1373 } 1449 if exists $v->{meta}{mandatory};
1374 1450
1375 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;
1376 } 1460 }
1377
1378 $done{$k} = delete $todo{$k};
1379 push @EXTS, $v->{pkg};
1380 $progress = 1;
1381 } 1461 }
1382 1462
1383 skip: 1463 unless ($progress) {
1384 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1464 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1385 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 }
1386 } 1471 }
1387 }; 1472 };
1388} 1473}
1389 1474
1390############################################################################# 1475#############################################################################
1444 1529
1445sub exists($) { 1530sub exists($) {
1446 my ($login) = @_; 1531 my ($login) = @_;
1447 1532
1448 $cf::PLAYER{$login} 1533 $cf::PLAYER{$login}
1449 or cf::sync_job { !aio_stat path $login } 1534 or !aio_stat path $login
1450} 1535}
1451 1536
1452sub find($) { 1537sub find($) {
1453 return $cf::PLAYER{$_[0]} || do { 1538 return $cf::PLAYER{$_[0]} || do {
1454 my $login = $_[0]; 1539 my $login = $_[0];
1474 $cf::PLAYER{$login} = $pl 1559 $cf::PLAYER{$login} = $pl
1475 } 1560 }
1476 } 1561 }
1477} 1562}
1478 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
1479sub save($) { 1577sub save($) {
1480 my ($pl) = @_; 1578 my ($pl) = @_;
1481 1579
1482 return if $pl->{deny_save}; 1580 return if $pl->{deny_save};
1483 1581
1488 1586
1489 aio_mkdir playerdir $pl, 0770; 1587 aio_mkdir playerdir $pl, 0770;
1490 $pl->{last_save} = $cf::RUNTIME; 1588 $pl->{last_save} = $cf::RUNTIME;
1491 1589
1492 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];
1493 1594
1494 $pl->save_pl ($path); 1595 $pl->save_pl ($path);
1495 cf::cede_to_tick; 1596 cf::cede_to_tick;
1496} 1597}
1497 1598
1534 $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
1535 1636
1536 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1637 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1537 $pl->deactivate; 1638 $pl->deactivate;
1538 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;
1539 $pl->ob->check_score;
1540 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1640 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1541 $pl->ns->destroy if $pl->ns; 1641 $pl->ns->destroy if $pl->ns;
1542 1642
1543 my $path = playerdir $pl; 1643 my $path = playerdir $pl;
1544 my $temp = "$path~$cf::RUNTIME~deleting~"; 1644 my $temp = "$path~$cf::RUNTIME~deleting~";
1599 \@logins 1699 \@logins
1600} 1700}
1601 1701
1602=item $player->maps 1702=item $player->maps
1603 1703
1704=item cf::player::maps $login
1705
1604Returns an arrayref of map paths that are private for this 1706Returns an arrayref of map paths that are private for this
1605player. May block. 1707player. May block.
1606 1708
1607=cut 1709=cut
1608 1710
1670=cut 1772=cut
1671 1773
1672sub find_by_path($) { 1774sub find_by_path($) {
1673 my ($path) = @_; 1775 my ($path) = @_;
1674 1776
1777 $path =~ s/^~[^\/]*//; # skip ~login
1778
1675 my ($match, $specificity); 1779 my ($match, $specificity);
1676 1780
1677 for my $region (list) { 1781 for my $region (list) {
1678 if ($region->{match} && $path =~ $region->{match}) { 1782 if ($region->{match} && $path =~ $region->{match}) {
1679 ($match, $specificity) = ($region, $region->specificity) 1783 ($match, $specificity) = ($region, $region->specificity)
1710 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
1711 1815
1712 # mit "rum" bekleckern, nicht 1816 # mit "rum" bekleckern, nicht
1713 $self->_create_random_map ( 1817 $self->_create_random_map (
1714 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1818 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1715 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1819 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1716 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1820 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1717 $rmp->{exit_on_final_map}, 1821 $rmp->{exit_on_final_map},
1718 $rmp->{xsize}, $rmp->{ysize}, 1822 $rmp->{xsize}, $rmp->{ysize},
1719 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1823 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1720 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1824 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1742 1846
1743 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1847 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1744} 1848}
1745 1849
1746# also paths starting with '/' 1850# also paths starting with '/'
1747$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1851$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1748 1852
1749sub thawer_merge { 1853sub thawer_merge {
1750 my ($self, $merge) = @_; 1854 my ($self, $merge) = @_;
1751 1855
1752 # we have to keep some variables in memory intact 1856 # we have to keep some variables in memory intact
1850 1954
1851 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1955 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1852 "$UNIQUEDIR/$path" 1956 "$UNIQUEDIR/$path"
1853} 1957}
1854 1958
1855# and all this just because we cannot iterate over
1856# all maps in C++...
1857sub change_all_map_light {
1858 my ($change) = @_;
1859
1860 $_->change_map_light ($change)
1861 for grep $_->outdoor, values %cf::MAP;
1862}
1863
1864sub decay_objects { 1959sub decay_objects {
1865 my ($self) = @_; 1960 my ($self) = @_;
1866 1961
1867 return if $self->{deny_reset}; 1962 return if $self->{deny_reset};
1868 1963
1950sub find { 2045sub find {
1951 my ($path, $origin) = @_; 2046 my ($path, $origin) = @_;
1952 2047
1953 $path = normalise $path, $origin && $origin->path; 2048 $path = normalise $path, $origin && $origin->path;
1954 2049
1955 cf::lock_wait "map_data:$path";#d#remove 2050 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1956 cf::lock_wait "map_find:$path"; 2051 my $guard2 = cf::lock_acquire "map_find:$path";
1957 2052
1958 $cf::MAP{$path} || do { 2053 $cf::MAP{$path} || do {
1959 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1960 my $guard2 = cf::lock_acquire "map_find:$path";
1961
1962 my $map = new_from_path cf::map $path 2054 my $map = new_from_path cf::map $path
1963 or return; 2055 or return;
1964 2056
1965 $map->{last_save} = $cf::RUNTIME; 2057 $map->{last_save} = $cf::RUNTIME;
1966 2058
1978 2070
1979 $cf::MAP{$path} = $map 2071 $cf::MAP{$path} = $map
1980 } 2072 }
1981} 2073}
1982 2074
1983sub pre_load { } 2075sub pre_load { }
1984sub post_load { } 2076#sub post_load { } # XS
1985 2077
1986sub load { 2078sub load {
1987 my ($self) = @_; 2079 my ($self) = @_;
1988 2080
1989 local $self->{deny_reset} = 1; # loading can take a long time 2081 local $self->{deny_reset} = 1; # loading can take a long time
2034 unless ($self->{deny_activate}) { 2126 unless ($self->{deny_activate}) {
2035 $self->decay_objects; 2127 $self->decay_objects;
2036 $self->fix_auto_apply; 2128 $self->fix_auto_apply;
2037 $self->update_buttons; 2129 $self->update_buttons;
2038 cf::cede_to_tick; 2130 cf::cede_to_tick;
2039 $self->set_darkness_map;
2040 cf::cede_to_tick;
2041 $self->activate; 2131 $self->activate;
2042 } 2132 }
2043 2133
2044 $self->{last_save} = $cf::RUNTIME; 2134 $self->{last_save} = $cf::RUNTIME;
2045 $self->last_access ($cf::RUNTIME); 2135 $self->last_access ($cf::RUNTIME);
2048 } 2138 }
2049 2139
2050 $self->post_load; 2140 $self->post_load;
2051} 2141}
2052 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
2053sub customise_for { 2146sub customise_for {
2054 my ($self, $ob) = @_; 2147 my ($self, $ob) = @_;
2055 2148
2056 return find "~" . $ob->name . "/" . $self->{path} 2149 return find "~" . $ob->name . "/" . $self->{path}
2057 if $self->per_player; 2150 if $self->per_player;
2073 or next; 2166 or next;
2074 $neigh = find $neigh, $map 2167 $neigh = find $neigh, $map
2075 or next; 2168 or next;
2076 $neigh->load; 2169 $neigh->load;
2077 2170
2171 # now find the diagonal neighbours
2078 push @neigh, 2172 push @neigh,
2079 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2173 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2080 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2174 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2081 } 2175 }
2082 2176
2134 $MAP_PREFETCHER->prio (6); 2228 $MAP_PREFETCHER->prio (6);
2135 2229
2136 () 2230 ()
2137} 2231}
2138 2232
2233# common code, used by both ->save and ->swapout
2139sub save { 2234sub _save {
2140 my ($self) = @_; 2235 my ($self) = @_;
2141
2142 my $lock = cf::lock_acquire "map_data:$self->{path}";
2143 2236
2144 $self->{last_save} = $cf::RUNTIME; 2237 $self->{last_save} = $cf::RUNTIME;
2145 2238
2146 return unless $self->dirty; 2239 return unless $self->dirty;
2147 2240
2167 } else { 2260 } else {
2168 $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);
2169 } 2262 }
2170} 2263}
2171 2264
2265sub save {
2266 my ($self) = @_;
2267
2268 my $lock = cf::lock_acquire "map_data:$self->{path}";
2269
2270 $self->_save;
2271}
2272
2172sub swap_out { 2273sub swap_out {
2173 my ($self) = @_; 2274 my ($self) = @_;
2174 2275
2175 # save first because save cedes
2176 $self->save;
2177
2178 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2276 my $lock = cf::lock_acquire "map_data:$self->{path}";
2179 2277
2180 return if $self->players;
2181 return if $self->in_memory != cf::MAP_ACTIVE; 2278 return if $self->in_memory != cf::MAP_ACTIVE;
2182 return if $self->{deny_save}; 2279 return if $self->{deny_save};
2280 return if $self->players;
2183 2281
2282 # first deactivate the map and "unlink" it from the core
2283 $self->deactivate;
2284 $_->clear_links_to ($self) for values %cf::MAP;
2184 $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};
2185 2332
2186 $self->deactivate; 2333 $self->deactivate;
2187 $_->clear_links_to ($self) for values %cf::MAP; 2334 $_->clear_links_to ($self) for values %cf::MAP;
2188 $self->clear; 2335 $self->clear;
2189}
2190
2191sub reset_at {
2192 my ($self) = @_;
2193
2194 # TODO: safety, remove and allow resettable per-player maps
2195 return 1e99 if $self->{deny_reset};
2196
2197 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2198 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2199
2200 $time + $to
2201}
2202
2203sub should_reset {
2204 my ($self) = @_;
2205
2206 $self->reset_at <= $cf::RUNTIME
2207}
2208
2209sub reset {
2210 my ($self) = @_;
2211
2212 my $lock = cf::lock_acquire "map_data:$self->{path}";
2213
2214 return if $self->players;
2215
2216 warn "resetting map ", $self->path;
2217
2218 $self->in_memory (cf::MAP_SWAPPED);
2219
2220 # need to save uniques path
2221 unless ($self->{deny_save}) {
2222 my $uniq = $self->uniq_path; utf8::encode $uniq;
2223
2224 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2225 if $uniq;
2226 }
2227
2228 delete $cf::MAP{$self->path};
2229
2230 $self->deactivate;
2231 $_->clear_links_to ($self) for values %cf::MAP;
2232 $self->clear;
2233 2336
2234 $self->unlink_save; 2337 $self->unlink_save;
2235 $self->destroy; 2338 $self->destroy;
2236} 2339}
2237 2340
2245 2348
2246 delete $cf::MAP{$self->path}; 2349 delete $cf::MAP{$self->path};
2247 2350
2248 $self->unlink_save; 2351 $self->unlink_save;
2249 2352
2250 bless $self, "cf::map"; 2353 bless $self, "cf::map::wrap";
2251 delete $self->{deny_reset}; 2354 delete $self->{deny_reset};
2252 $self->{deny_save} = 1; 2355 $self->{deny_save} = 1;
2253 $self->reset_timeout (1); 2356 $self->reset_timeout (1);
2254 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2357 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2255 2358
2312 : normalise $_ 2415 : normalise $_
2313 } @{ aio_readdir $UNIQUEDIR or [] } 2416 } @{ aio_readdir $UNIQUEDIR or [] }
2314 ] 2417 ]
2315} 2418}
2316 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
2317=back 2452=back
2318 2453
2319=head3 cf::object 2454=head3 cf::object
2320 2455
2321=cut 2456=cut
2386 2521
2387our $SAY_CHANNEL = { 2522our $SAY_CHANNEL = {
2388 id => "say", 2523 id => "say",
2389 title => "Map", 2524 title => "Map",
2390 reply => "say ", 2525 reply => "say ",
2391 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.",
2392}; 2527};
2393 2528
2394our $CHAT_CHANNEL = { 2529our $CHAT_CHANNEL = {
2395 id => "chat", 2530 id => "chat",
2396 title => "Chat", 2531 title => "Chat",
2453 2588
2454Freezes 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}>).
2455 2590
2456The 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.
2457for 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,
2458though, 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
2459map. 2594map.
2460 2595
2461Will never block. 2596Will never block.
2462 2597
2463=item $player_object->leave_link ($map, $x, $y) 2598=item $player_object->leave_link ($map, $x, $y)
2484sub cf::object::player::enter_link { 2619sub cf::object::player::enter_link {
2485 my ($self) = @_; 2620 my ($self) = @_;
2486 2621
2487 $self->deactivate_recursive; 2622 $self->deactivate_recursive;
2488 2623
2624 ++$self->{_link_recursion};
2625
2489 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2626 return if UNIVERSAL::isa $self->map, "ext::map_link";
2490 2627
2491 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2628 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2492 if $self->map && $self->map->{path} ne "{link}"; 2629 if $self->map && $self->map->{path} ne "{link}";
2493 2630
2494 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2631 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2495} 2632}
2496 2633
2497sub cf::object::player::leave_link { 2634sub cf::object::player::leave_link {
2498 my ($self, $map, $x, $y) = @_; 2635 my ($self, $map, $x, $y) = @_;
2499 2636
2516 ($x, $y) = (-1, -1) 2653 ($x, $y) = (-1, -1)
2517 unless (defined $x) && (defined $y); 2654 unless (defined $x) && (defined $y);
2518 2655
2519 # use -1 or undef as default coordinates, not 0, 0 2656 # use -1 or undef as default coordinates, not 0, 0
2520 ($x, $y) = ($map->enter_x, $map->enter_y) 2657 ($x, $y) = ($map->enter_x, $map->enter_y)
2521 if $x <=0 && $y <= 0; 2658 if $x <= 0 && $y <= 0;
2522 2659
2523 $map->load; 2660 $map->load;
2524 $map->load_neighbours; 2661 $map->load_neighbours;
2525 2662
2526 return unless $self->contr->active; 2663 return unless $self->contr->active;
2527 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2528 $self->activate_recursive;
2529 2664
2530 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2665 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2531 $self->enter_map ($map, $x, $y); 2666 if ($self->enter_map ($map, $x, $y)) {
2532} 2667 # entering was successful
2668 delete $self->{_link_recursion};
2669 # only activate afterwards, to support waiting in hooks
2670 $self->activate_recursive;
2671 }
2533 2672
2673}
2674
2534=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)]])
2535 2676
2536Moves 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
2537her, loading and preparing them map, calling the provided $check callback 2678her, loading and preparing them map, calling the provided $check callback
2538that 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
2539the 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
2546 2687
2547our $GOTOGEN; 2688our $GOTOGEN;
2548 2689
2549sub cf::object::player::goto { 2690sub cf::object::player::goto {
2550 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 }
2551 2698
2552 # 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
2553 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2700 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2554 2701
2555 $self->enter_link; 2702 $self->enter_link;
2579 my $map = eval { 2726 my $map = eval {
2580 my $map = defined $path ? cf::map::find $path : undef; 2727 my $map = defined $path ? cf::map::find $path : undef;
2581 2728
2582 if ($map) { 2729 if ($map) {
2583 $map = $map->customise_for ($self); 2730 $map = $map->customise_for ($self);
2584 $map = $check->($map) if $check && $map; 2731 $map = $check->($map, $x, $y, $self) if $check && $map;
2585 } else { 2732 } else {
2586 $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);
2587 } 2734 }
2588 2735
2589 $map 2736 $map
2597 if ($gen == $self->{_goto_generation}) { 2744 if ($gen == $self->{_goto_generation}) {
2598 delete $self->{_goto_generation}; 2745 delete $self->{_goto_generation};
2599 $self->leave_link ($map, $x, $y); 2746 $self->leave_link ($map, $x, $y);
2600 } 2747 }
2601 2748
2602 $done->() if $done; 2749 $done->($self) if $done;
2603 })->prio (1); 2750 })->prio (1);
2604} 2751}
2605 2752
2606=item $player_object->enter_exit ($exit_object) 2753=item $player_object->enter_exit ($exit_object)
2607 2754
2724 2871
2725 utf8::encode $text; 2872 utf8::encode $text;
2726 $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);
2727} 2874}
2728 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
2729=item $client->send_msg ($channel, $msg, $color, [extra...]) 2901=item $client->send_msg ($channel, $msg, $color, [extra...])
2730 2902
2731Send 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
2732client 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
2733the 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
2735 2907
2736=cut 2908=cut
2737 2909
2738# non-persistent channels (usually the info channel) 2910# non-persistent channels (usually the info channel)
2739our %CHANNEL = ( 2911our %CHANNEL = (
2912 "c/motd" => {
2913 id => "infobox",
2914 title => "MOTD",
2915 reply => undef,
2916 tooltip => "The message of the day",
2917 },
2740 "c/identify" => { 2918 "c/identify" => {
2741 id => "infobox", 2919 id => "infobox",
2742 title => "Identify", 2920 title => "Identify",
2743 reply => undef, 2921 reply => undef,
2744 tooltip => "Items recently identified", 2922 tooltip => "Items recently identified",
2746 "c/examine" => { 2924 "c/examine" => {
2747 id => "infobox", 2925 id => "infobox",
2748 title => "Examine", 2926 title => "Examine",
2749 reply => undef, 2927 reply => undef,
2750 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",
2751 }, 2935 },
2752 "c/book" => { 2936 "c/book" => {
2753 id => "infobox", 2937 id => "infobox",
2754 title => "Book", 2938 title => "Book",
2755 reply => undef, 2939 reply => undef,
2771 id => "infobox", 2955 id => "infobox",
2772 title => "Body Parts", 2956 title => "Body Parts",
2773 reply => undef, 2957 reply => undef,
2774 tooltip => "Shows which body parts you posess and are available", 2958 tooltip => "Shows which body parts you posess and are available",
2775 }, 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 },
2776 "c/uptime" => { 2996 "c/uptime" => {
2777 id => "infobox", 2997 id => "infobox",
2778 title => "Uptime", 2998 title => "Uptime",
2779 reply => undef, 2999 reply => undef,
2780 tooltip => "How long the server has been running since last restart", 3000 tooltip => "How long the server has been running since last restart",
2789 id => "party", 3009 id => "party",
2790 title => "Party", 3010 title => "Party",
2791 reply => "gsay ", 3011 reply => "gsay ",
2792 tooltip => "Messages and chat related to your party", 3012 tooltip => "Messages and chat related to your party",
2793 }, 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,
2794); 3022);
2795 3023
2796sub cf::client::send_msg { 3024sub cf::client::send_msg {
2797 my ($self, $channel, $msg, $color, @extra) = @_; 3025 my ($self, $channel, $msg, $color, @extra) = @_;
2798 3026
2803 3031
2804 # check predefined channels, for the benefit of C 3032 # check predefined channels, for the benefit of C
2805 if ($CHANNEL{$channel}) { 3033 if ($CHANNEL{$channel}) {
2806 $channel = $CHANNEL{$channel}; 3034 $channel = $CHANNEL{$channel};
2807 3035
2808 $self->ext_msg (channel_info => $channel) 3036 $self->ext_msg (channel_info => $channel);
2809 if $self->can_msg;
2810
2811 $channel = $channel->{id}; 3037 $channel = $channel->{id};
2812 3038
2813 } elsif (ref $channel) { 3039 } elsif (ref $channel) {
2814 # send meta info to client, if not yet sent 3040 # send meta info to client, if not yet sent
2815 unless (exists $self->{channel}{$channel->{id}}) { 3041 unless (exists $self->{channel}{$channel->{id}}) {
2816 $self->{channel}{$channel->{id}} = $channel; 3042 $self->{channel}{$channel->{id}} = $channel;
2817 $self->ext_msg (channel_info => $channel) 3043 $self->ext_msg (channel_info => $channel);
2818 if $self->can_msg;
2819 } 3044 }
2820 3045
2821 $channel = $channel->{id}; 3046 $channel = $channel->{id};
2822 } 3047 }
2823 3048
2824 return unless @extra || length $msg; 3049 return unless @extra || length $msg;
2825 3050
2826 if ($self->can_msg) {
2827 # default colour, mask it out 3051 # default colour, mask it out
2828 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3052 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2829 if $color & cf::NDI_DEF; 3053 if $color & cf::NDI_DEF;
2830 3054
2831 my $pkt = "msg " 3055 my $pkt = "msg "
2832 . $self->{json_coder}->encode ( 3056 . $self->{json_coder}->encode (
2833 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3057 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2834 ); 3058 );
2835 3059
2836 # try lzf for large packets
2837 $pkt = "lzf " . Compress::LZF::compress $pkt
2838 if 1024 <= length $pkt and $self->{can_lzf};
2839
2840 # split very large packets
2841 if (8192 < length $pkt and $self->{can_lzf}) {
2842 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2843 $pkt = "frag";
2844 }
2845
2846 $self->send_packet ($pkt); 3060 $self->send_big_packet ($pkt);
2847 } else {
2848 if ($color >= 0) {
2849 # replace some tags by gcfclient-compatible ones
2850 for ($msg) {
2851 1 while
2852 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2853 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2854 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2855 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2856 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2857 }
2858
2859 $color &= cf::NDI_COLOR_MASK;
2860
2861 utf8::encode $msg;
2862
2863 if (0 && $msg =~ /\[/) {
2864 # COMMAND/INFO
2865 $self->send_packet ("drawextinfo $color 10 8 $msg")
2866 } else {
2867 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2868 $self->send_packet ("drawinfo $color $msg")
2869 }
2870 }
2871 }
2872} 3061}
2873 3062
2874=item $client->ext_msg ($type, @msg) 3063=item $client->ext_msg ($type, @msg)
2875 3064
2876Sends an ext event to the client. 3065Sends an ext event to the client.
2879 3068
2880sub cf::client::ext_msg($$@) { 3069sub cf::client::ext_msg($$@) {
2881 my ($self, $type, @msg) = @_; 3070 my ($self, $type, @msg) = @_;
2882 3071
2883 if ($self->extcmd == 2) { 3072 if ($self->extcmd == 2) {
2884 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3073 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2885 } elsif ($self->extcmd == 1) { # TODO: remove 3074 } elsif ($self->extcmd == 1) { # TODO: remove
2886 push @msg, msgtype => "event_$type"; 3075 push @msg, msgtype => "event_$type";
2887 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3076 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2888 } 3077 }
2889} 3078}
2890 3079
2891=item $client->ext_reply ($msgid, @msg) 3080=item $client->ext_reply ($msgid, @msg)
2892 3081
2896 3085
2897sub cf::client::ext_reply($$@) { 3086sub cf::client::ext_reply($$@) {
2898 my ($self, $id, @msg) = @_; 3087 my ($self, $id, @msg) = @_;
2899 3088
2900 if ($self->extcmd == 2) { 3089 if ($self->extcmd == 2) {
2901 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3090 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2902 } elsif ($self->extcmd == 1) { 3091 } elsif ($self->extcmd == 1) {
2903 #TODO: version 1, remove 3092 #TODO: version 1, remove
2904 unshift @msg, msgtype => "reply", msgid => $id; 3093 unshift @msg, msgtype => "reply", msgid => $id;
2905 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3094 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2906 } 3095 }
2907} 3096}
2908 3097
2909=item $success = $client->query ($flags, "text", \&cb) 3098=item $success = $client->query ($flags, "text", \&cb)
2910 3099
3011 3200
3012 $coro 3201 $coro
3013} 3202}
3014 3203
3015cf::client->attach ( 3204cf::client->attach (
3016 on_destroy => sub { 3205 on_client_destroy => sub {
3017 my ($ns) = @_; 3206 my ($ns) = @_;
3018 3207
3019 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3208 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3020 }, 3209 },
3021); 3210);
3037our $safe_hole = new Safe::Hole; 3226our $safe_hole = new Safe::Hole;
3038 3227
3039$SIG{FPE} = 'IGNORE'; 3228$SIG{FPE} = 'IGNORE';
3040 3229
3041$safe->permit_only (Opcode::opset qw( 3230$safe->permit_only (Opcode::opset qw(
3042 :base_core :base_mem :base_orig :base_math 3231 :base_core :base_mem :base_orig :base_math :base_loop
3043 grepstart grepwhile mapstart mapwhile 3232 grepstart grepwhile mapstart mapwhile
3044 sort time 3233 sort time
3045)); 3234));
3046 3235
3047# here we export the classes and methods available to script code 3236# here we export the classes and methods available to script code
3051The following functions and methods are available within a safe environment: 3240The following functions and methods are available within a safe environment:
3052 3241
3053 cf::object 3242 cf::object
3054 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
3055 insert remove name archname title slaying race decrease split 3244 insert remove name archname title slaying race decrease split
3245 value
3056 3246
3057 cf::object::player 3247 cf::object::player
3058 player 3248 player
3059 3249
3060 cf::player 3250 cf::player
3066=cut 3256=cut
3067 3257
3068for ( 3258for (
3069 ["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
3070 insert remove inv nrof name archname title slaying race 3260 insert remove inv nrof name archname title slaying race
3071 decrease split destroy change_exp)], 3261 decrease split destroy change_exp value msg lore send_msg)],
3072 ["cf::object::player" => qw(player)], 3262 ["cf::object::player" => qw(player)],
3073 ["cf::player" => qw(peaceful)], 3263 ["cf::player" => qw(peaceful send_msg)],
3074 ["cf::map" => qw(trigger)], 3264 ["cf::map" => qw(trigger)],
3075) { 3265) {
3076 no strict 'refs'; 3266 no strict 'refs';
3077 my ($pkg, @funs) = @$_; 3267 my ($pkg, @funs) = @$_;
3078 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3268 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3096 3286
3097 my $qcode = $code; 3287 my $qcode = $code;
3098 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3288 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3099 $qcode =~ s/\n/\\n/g; 3289 $qcode =~ s/\n/\\n/g;
3100 3290
3291 %vars = (_dummy => 0) unless %vars;
3292
3293 my @res;
3101 local $_; 3294 local $_;
3102 local @safe::cf::_safe_eval_args = values %vars;
3103 3295
3104 my $eval = 3296 my $eval =
3105 "do {\n" 3297 "do {\n"
3106 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3298 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3107 . "#line 0 \"{$qcode}\"\n" 3299 . "#line 0 \"{$qcode}\"\n"
3108 . $code 3300 . $code
3109 . "\n}" 3301 . "\n}"
3110 ; 3302 ;
3111 3303
3304 if ($CFG{safe_eval}) {
3112 sub_generation_inc; 3305 sub_generation_inc;
3306 local @safe::cf::_safe_eval_args = values %vars;
3113 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3307 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3114 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 }
3115 3313
3116 if ($@) { 3314 if ($@) {
3117 warn "$@"; 3315 warn "$@";
3118 warn "while executing safe code '$code'\n"; 3316 warn "while executing safe code '$code'\n";
3119 warn "with arguments " . (join " ", %vars) . "\n"; 3317 warn "with arguments " . (join " ", %vars) . "\n";
3138=cut 3336=cut
3139 3337
3140sub register_script_function { 3338sub register_script_function {
3141 my ($fun, $cb) = @_; 3339 my ($fun, $cb) = @_;
3142 3340
3143 no strict 'refs'; 3341 $fun = "safe::$fun" if $CFG{safe_eval};
3144 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3342 *$fun = $safe_hole->wrap ($cb);
3145} 3343}
3146 3344
3147=back 3345=back
3148 3346
3149=cut 3347=cut
3170 3368
3171 $facedata->{version} == 2 3369 $facedata->{version} == 2
3172 or cf::cleanup "$path: version mismatch, cannot proceed."; 3370 or cf::cleanup "$path: version mismatch, cannot proceed.";
3173 3371
3174 # 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]);
3175 $facedata->{resource}{"res/exp_table"} = { 3374 $facedata->{resource}{"res/exp_table"} = {
3176 type => FT_RSRC, 3375 type => FT_RSRC,
3177 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),
3178 }; 3378 };
3179 cf::cede_to_tick; 3379 cf::cede_to_tick;
3180 3380
3181 { 3381 {
3182 my $faces = $facedata->{faceinfo}; 3382 my $faces = $facedata->{faceinfo};
3184 while (my ($face, $info) = each %$faces) { 3384 while (my ($face, $info) = each %$faces) {
3185 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3385 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3186 3386
3187 cf::face::set_visibility $idx, $info->{visibility}; 3387 cf::face::set_visibility $idx, $info->{visibility};
3188 cf::face::set_magicmap $idx, $info->{magicmap}; 3388 cf::face::set_magicmap $idx, $info->{magicmap};
3189 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3389 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3190 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3390 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3191 3391
3192 cf::cede_to_tick; 3392 cf::cede_to_tick;
3193 } 3393 }
3194 3394
3195 while (my ($face, $info) = each %$faces) { 3395 while (my ($face, $info) = each %$faces) {
3219 3419
3220 cf::anim::invalidate_all; # d'oh 3420 cf::anim::invalidate_all; # d'oh
3221 } 3421 }
3222 3422
3223 { 3423 {
3224 # TODO: for gcfclient pleasure, we should give resources
3225 # that gcfclient doesn't grok a >10000 face index.
3226 my $res = $facedata->{resource}; 3424 my $res = $facedata->{resource};
3227 3425
3228 while (my ($name, $info) = each %$res) { 3426 while (my ($name, $info) = each %$res) {
3229 if (defined $info->{type}) { 3427 if (defined $info->{type}) {
3230 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3428 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3231 my $data;
3232 3429
3233 if ($info->{type} & 1) { 3430 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3234 # prepend meta info
3235
3236 my $meta = $enc->encode ({
3237 name => $name,
3238 %{ $info->{meta} || {} },
3239 });
3240
3241 $data = pack "(w/a*)*", $meta, $info->{data};
3242 } else {
3243 $data = $info->{data};
3244 }
3245
3246 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3247 cf::face::set_type $idx, $info->{type}; 3431 cf::face::set_type $idx, $info->{type};
3248 } else { 3432 } else {
3249 $RESOURCE{$name} = $info; 3433 $RESOURCE{$name} = $info; # unused
3250 } 3434 }
3251 3435
3252 cf::cede_to_tick; 3436 cf::cede_to_tick;
3253 } 3437 }
3254 } 3438 }
3255 3439
3256 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3440 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3257 3441
3258 1 3442 1
3259} 3443}
3260
3261cf::global->attach (on_resource_update => sub {
3262 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3263 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3264
3265 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3266 my $sound = $soundconf->{compat}[$_]
3267 or next;
3268
3269 my $face = cf::face::find "sound/$sound->[1]";
3270 cf::sound::set $sound->[0] => $face;
3271 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3272 }
3273
3274 while (my ($k, $v) = each %{$soundconf->{event}}) {
3275 my $face = cf::face::find "sound/$v";
3276 cf::sound::set $k => $face;
3277 }
3278 }
3279});
3280 3444
3281register_exticmd fx_want => sub { 3445register_exticmd fx_want => sub {
3282 my ($ns, $want) = @_; 3446 my ($ns, $want) = @_;
3283 3447
3284 while (my ($k, $v) = each %$want) { 3448 while (my ($k, $v) = each %$want) {
3323sub reload_treasures { 3487sub reload_treasures {
3324 load_resource_file "$DATADIR/treasures" 3488 load_resource_file "$DATADIR/treasures"
3325 or die "unable to load treasurelists\n"; 3489 or die "unable to load treasurelists\n";
3326} 3490}
3327 3491
3492sub reload_sound {
3493 warn "loading sound config from $DATADIR/sound\n";
3494
3495 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3496 or die "$DATADIR/sound $!";
3497
3498 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3499
3500 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3501 my $sound = $soundconf->{compat}[$_]
3502 or next;
3503
3504 my $face = cf::face::find "sound/$sound->[1]";
3505 cf::sound::set $sound->[0] => $face;
3506 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3507 }
3508
3509 while (my ($k, $v) = each %{$soundconf->{event}}) {
3510 my $face = cf::face::find "sound/$v";
3511 cf::sound::set $k => $face;
3512 }
3513}
3514
3328sub reload_resources { 3515sub reload_resources {
3329 warn "reloading resource files...\n"; 3516 warn "reloading resource files...\n";
3330 3517
3331 reload_facedata; 3518 reload_facedata;
3519 reload_sound;
3332 reload_archetypes; 3520 reload_archetypes;
3333 reload_regions; 3521 reload_regions;
3334 reload_treasures; 3522 reload_treasures;
3335 3523
3336 warn "finished reloading resource files\n"; 3524 warn "finished reloading resource files\n";
3337} 3525}
3338 3526
3339sub init {
3340 my $guard = freeze_mainloop;
3341
3342 evthread_start IO::AIO::poll_fileno;
3343
3344 reload_resources;
3345}
3346
3347sub reload_config { 3527sub reload_config {
3528 warn "reloading config file...\n";
3529
3348 open my $fh, "<:utf8", "$CONFDIR/config" 3530 open my $fh, "<:utf8", "$CONFDIR/config"
3349 or return; 3531 or return;
3350 3532
3351 local $/; 3533 local $/;
3352 *CFG = YAML::Load <$fh>; 3534 *CFG = YAML::XS::Load scalar <$fh>;
3353 3535
3354 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3536 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3355 3537
3356 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3538 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3357 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3539 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3358 3540
3359 if (exists $CFG{mlockall}) { 3541 if (exists $CFG{mlockall}) {
3361 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3543 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3362 and die "WARNING: m(un)lockall failed: $!\n"; 3544 and die "WARNING: m(un)lockall failed: $!\n";
3363 }; 3545 };
3364 warn $@ if $@; 3546 warn $@ if $@;
3365 } 3547 }
3548
3549 warn "finished reloading resource files\n";
3366} 3550}
3367 3551
3368sub pidfile() { 3552sub pidfile() {
3369 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3553 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3370 or die "$PIDFILE: $!"; 3554 or die "$PIDFILE: $!";
3382 3566
3383 seek $fh, 0, 0; 3567 seek $fh, 0, 0;
3384 print $fh $$; 3568 print $fh $$;
3385} 3569}
3386 3570
3571sub main_loop {
3572 warn "EV::loop starting\n";
3573 if (1) {
3574 EV::loop;
3575 }
3576 warn "EV::loop returned\n";
3577 goto &main_loop unless $REALLY_UNLOOP;
3578}
3579
3387sub main { 3580sub main {
3388 atomic; 3581 cf::init_globals; # initialise logging
3582
3583 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3584 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3585 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3586 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3587
3588 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3389 3589
3390 # we must not ever block the main coroutine 3590 # we must not ever block the main coroutine
3391 local $Coro::idle = sub { 3591 local $Coro::idle = sub {
3392 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3592 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3393 (async { 3593 (async {
3394 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3594 $Coro::current->{desc} = "IDLE BUG HANDLER";
3395 EV::loop EV::LOOP_ONESHOT; 3595 EV::loop EV::LOOP_ONESHOT;
3396 })->prio (Coro::PRIO_MAX); 3596 })->prio (Coro::PRIO_MAX);
3397 }; 3597 };
3398 3598
3399 { 3599 evthread_start IO::AIO::poll_fileno;
3400 my $guard = freeze_mainloop; 3600
3601 cf::sync_job {
3602 cf::init_experience;
3603 cf::init_anim;
3604 cf::init_attackmess;
3605 cf::init_dynamic;
3606
3607 cf::load_settings;
3608 cf::load_materials;
3609
3610 reload_resources;
3401 reload_config; 3611 reload_config;
3402 db_init; 3612 db_init;
3613
3614 cf::init_uuid;
3615 cf::init_signals;
3616 cf::init_skills;
3617
3618 cf::init_beforeplay;
3619
3620 atomic;
3621
3403 load_extensions; 3622 load_extensions;
3404 3623
3405 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3406 }
3407
3408 utime time, time, $RUNTIMEFILE; 3624 utime time, time, $RUNTIMEFILE;
3409 3625
3410 # no (long-running) fork's whatsoever before this point(!) 3626 # no (long-running) fork's whatsoever before this point(!)
3627 use POSIX ();
3411 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3628 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3412 3629
3413 EV::loop; 3630 (pop @POST_INIT)->(0) while @POST_INIT;
3631 };
3632
3633 cf::object::thawer::errors_are_fatal 0;
3634 warn "parse errors in files are no longer fatal from this point on.\n";
3635
3636 main_loop;
3414} 3637}
3415 3638
3416############################################################################# 3639#############################################################################
3417# initialisation and cleanup 3640# initialisation and cleanup
3418 3641
3419# install some emergency cleanup handlers 3642# install some emergency cleanup handlers
3420BEGIN { 3643BEGIN {
3421 our %SIGWATCHER = (); 3644 our %SIGWATCHER = ();
3422 for my $signal (qw(INT HUP TERM)) { 3645 for my $signal (qw(INT HUP TERM)) {
3423 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3646 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3424 cf::cleanup "SIG$signal"; 3647 cf::cleanup "SIG$signal";
3425 }; 3648 };
3426 } 3649 }
3427} 3650}
3428 3651
3429sub write_runtime_sync { 3652sub write_runtime_sync {
3653 my $t0 = AE::time;
3654
3430 # first touch the runtime file to show we are still running: 3655 # first touch the runtime file to show we are still running:
3431 # the fsync below can take a very very long time. 3656 # the fsync below can take a very very long time.
3432 3657
3433 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3658 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3434 3659
3435 my $guard = cf::lock_acquire "write_runtime"; 3660 my $guard = cf::lock_acquire "write_runtime";
3436 3661
3437 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3662 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3438 or return; 3663 or return;
3439 3664
3440 my $value = $cf::RUNTIME + 90 + 10; 3665 my $value = $cf::RUNTIME + 90 + 10;
3441 # 10 is the runtime save interval, for a monotonic clock 3666 # 10 is the runtime save interval, for a monotonic clock
3442 # 60 allows for the watchdog to kill the server. 3667 # 60 allows for the watchdog to kill the server.
3455 or return; 3680 or return;
3456 3681
3457 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3682 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3458 and return; 3683 and return;
3459 3684
3460 warn "runtime file written.\n"; 3685 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3461 3686
3462 1 3687 1
3463} 3688}
3464 3689
3465our $uuid_lock; 3690our $uuid_lock;
3474 my $uuid = "$LOCALDIR/uuid"; 3699 my $uuid = "$LOCALDIR/uuid";
3475 3700
3476 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3701 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3477 or return; 3702 or return;
3478 3703
3479 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3704 my $value = uuid_seq uuid_cur;
3705
3706 unless ($value) {
3707 warn "cowardly refusing to write zero uuid value!\n";
3708 return;
3709 }
3710
3711 my $value = uuid_str $value + $uuid_skip;
3480 $uuid_skip = 0; 3712 $uuid_skip = 0;
3481 3713
3482 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3714 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3483 and return; 3715 and return;
3484 3716
3506} 3738}
3507 3739
3508sub emergency_save() { 3740sub emergency_save() {
3509 my $freeze_guard = cf::freeze_mainloop; 3741 my $freeze_guard = cf::freeze_mainloop;
3510 3742
3511 warn "enter emergency perl save\n"; 3743 warn "emergency_perl_save: enter\n";
3512 3744
3513 cf::sync_job { 3745 cf::sync_job {
3746 # this is a trade-off: we want to be very quick here, so
3747 # save all maps without fsync, and later call a global sync
3748 # (which in turn might be very very slow)
3749 local $USE_FSYNC = 0;
3750
3514 # use a peculiar iteration method to avoid tripping on perl 3751 # use a peculiar iteration method to avoid tripping on perl
3515 # refcount bugs in for. also avoids problems with players 3752 # refcount bugs in for. also avoids problems with players
3516 # and maps saved/destroyed asynchronously. 3753 # and maps saved/destroyed asynchronously.
3517 warn "begin emergency player save\n"; 3754 warn "emergency_perl_save: begin player save\n";
3518 for my $login (keys %cf::PLAYER) { 3755 for my $login (keys %cf::PLAYER) {
3519 my $pl = $cf::PLAYER{$login} or next; 3756 my $pl = $cf::PLAYER{$login} or next;
3520 $pl->valid or next; 3757 $pl->valid or next;
3521 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3758 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3522 $pl->save; 3759 $pl->save;
3523 } 3760 }
3524 warn "end emergency player save\n"; 3761 warn "emergency_perl_save: end player save\n";
3525 3762
3526 warn "begin emergency map save\n"; 3763 warn "emergency_perl_save: begin map save\n";
3527 for my $path (keys %cf::MAP) { 3764 for my $path (keys %cf::MAP) {
3528 my $map = $cf::MAP{$path} or next; 3765 my $map = $cf::MAP{$path} or next;
3529 $map->valid or next; 3766 $map->valid or next;
3530 $map->save; 3767 $map->save;
3531 } 3768 }
3532 warn "end emergency map save\n"; 3769 warn "emergency_perl_save: end map save\n";
3533 3770
3534 warn "begin emergency database checkpoint\n"; 3771 warn "emergency_perl_save: begin database checkpoint\n";
3535 BDB::db_env_txn_checkpoint $DB_ENV; 3772 BDB::db_env_txn_checkpoint $DB_ENV;
3536 warn "end emergency database checkpoint\n"; 3773 warn "emergency_perl_save: end database checkpoint\n";
3537 3774
3538 warn "begin write uuid\n"; 3775 warn "emergency_perl_save: begin write uuid\n";
3539 write_uuid_sync 1; 3776 write_uuid_sync 1;
3540 warn "end write uuid\n"; 3777 warn "emergency_perl_save: end write uuid\n";
3541 }; 3778 };
3542 3779
3780 warn "emergency_perl_save: starting sync()\n";
3781 IO::AIO::aio_sync sub {
3782 warn "emergency_perl_save: finished sync()\n";
3783 };
3784
3543 warn "leave emergency perl save\n"; 3785 warn "emergency_perl_save: leave\n";
3544} 3786}
3545 3787
3546sub post_cleanup { 3788sub post_cleanup {
3547 my ($make_core) = @_; 3789 my ($make_core) = @_;
3548 3790
3574 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3816 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3575 for my $name (keys %$leaf_symtab) { 3817 for my $name (keys %$leaf_symtab) {
3576 _gv_clear *{"$pkg$name"}; 3818 _gv_clear *{"$pkg$name"};
3577# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3819# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3578 } 3820 }
3579 warn "cleared package #$pkg\n";#d#
3580} 3821}
3581
3582our $RELOAD; # how many times to reload
3583 3822
3584sub do_reload_perl() { 3823sub do_reload_perl() {
3585 # can/must only be called in main 3824 # can/must only be called in main
3586 if ($Coro::current != $Coro::main) { 3825 if (in_main) {
3587 warn "can only reload from main coroutine"; 3826 warn "can only reload from main coroutine";
3588 return; 3827 return;
3589 } 3828 }
3590 3829
3591 return if $RELOAD++; 3830 return if $RELOAD++;
3831
3832 my $t1 = AE::time;
3592 3833
3593 while ($RELOAD) { 3834 while ($RELOAD) {
3594 warn "reloading..."; 3835 warn "reloading...";
3595 3836
3596 warn "entering sync_job"; 3837 warn "entering sync_job";
3657 clear_package "safe::$_" 3898 clear_package "safe::$_"
3658 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3899 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3659 3900
3660 warn "unloading cf.pm \"a bit\""; 3901 warn "unloading cf.pm \"a bit\"";
3661 delete $INC{"cf.pm"}; 3902 delete $INC{"cf.pm"};
3662 delete $INC{"cf/pod.pm"}; 3903 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3663 3904
3664 # don't, removes xs symbols, too, 3905 # don't, removes xs symbols, too,
3665 # and global variables created in xs 3906 # and global variables created in xs
3666 #clear_package __PACKAGE__; 3907 #clear_package __PACKAGE__;
3667 3908
3668 warn "unload completed, starting to reload now"; 3909 warn "unload completed, starting to reload now";
3669 3910
3670 warn "reloading cf.pm"; 3911 warn "reloading cf.pm";
3671 require cf; 3912 require cf;
3672 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3913 cf::_connect_to_perl_1;
3673 3914
3674 warn "loading config and database again"; 3915 warn "loading config and database again";
3675 cf::reload_config; 3916 cf::reload_config;
3676 3917
3677 warn "loading extensions"; 3918 warn "loading extensions";
3678 cf::load_extensions; 3919 cf::load_extensions;
3679 3920
3921 if ($REATTACH_ON_RELOAD) {
3680 warn "reattaching attachments to objects/players"; 3922 warn "reattaching attachments to objects/players";
3681 _global_reattach; # objects, sockets 3923 _global_reattach; # objects, sockets
3682 warn "reattaching attachments to maps"; 3924 warn "reattaching attachments to maps";
3683 reattach $_ for values %MAP; 3925 reattach $_ for values %MAP;
3684 warn "reattaching attachments to players"; 3926 warn "reattaching attachments to players";
3685 reattach $_ for values %PLAYER; 3927 reattach $_ for values %PLAYER;
3928 }
3929
3930 warn "running post_init jobs";
3931 (pop @POST_INIT)->(1) while @POST_INIT;
3686 3932
3687 warn "leaving sync_job"; 3933 warn "leaving sync_job";
3688 3934
3689 1 3935 1
3690 } or do { 3936 } or do {
3693 }; 3939 };
3694 3940
3695 warn "reloaded"; 3941 warn "reloaded";
3696 --$RELOAD; 3942 --$RELOAD;
3697 } 3943 }
3944
3945 $t1 = AE::time - $t1;
3946 warn "reload completed in ${t1}s\n";
3698}; 3947};
3699 3948
3700our $RELOAD_WATCHER; # used only during reload 3949our $RELOAD_WATCHER; # used only during reload
3701 3950
3702sub reload_perl() { 3951sub reload_perl() {
3703 # doing reload synchronously and two reloads happen back-to-back, 3952 # doing reload synchronously and two reloads happen back-to-back,
3704 # coro crashes during coro_state_free->destroy here. 3953 # coro crashes during coro_state_free->destroy here.
3705 3954
3955 $RELOAD_WATCHER ||= cf::async {
3956 Coro::AIO::aio_wait cache_extensions;
3957
3706 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3958 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3707 do_reload_perl; 3959 do_reload_perl;
3708 undef $RELOAD_WATCHER; 3960 undef $RELOAD_WATCHER;
3961 };
3709 }; 3962 };
3710} 3963}
3711 3964
3712register_command "reload" => sub { 3965register_command "reload" => sub {
3713 my ($who, $arg) = @_; 3966 my ($who, $arg) = @_;
3727 3980
3728our @WAIT_FOR_TICK; 3981our @WAIT_FOR_TICK;
3729our @WAIT_FOR_TICK_BEGIN; 3982our @WAIT_FOR_TICK_BEGIN;
3730 3983
3731sub wait_for_tick { 3984sub wait_for_tick {
3732 return if tick_inhibit || $Coro::current == $Coro::main; 3985 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3733 3986
3734 my $signal = new Coro::Signal; 3987 my $signal = new Coro::Signal;
3735 push @WAIT_FOR_TICK, $signal; 3988 push @WAIT_FOR_TICK, $signal;
3736 $signal->wait; 3989 $signal->wait;
3737} 3990}
3738 3991
3739sub wait_for_tick_begin { 3992sub wait_for_tick_begin {
3740 return if tick_inhibit || $Coro::current == $Coro::main; 3993 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3741 3994
3742 my $signal = new Coro::Signal; 3995 my $signal = new Coro::Signal;
3743 push @WAIT_FOR_TICK_BEGIN, $signal; 3996 push @WAIT_FOR_TICK_BEGIN, $signal;
3744 $signal->wait; 3997 $signal->wait;
3745} 3998}
3750 unless ++$bug_warning > 10; 4003 unless ++$bug_warning > 10;
3751 return; 4004 return;
3752 } 4005 }
3753 4006
3754 cf::server_tick; # one server iteration 4007 cf::server_tick; # one server iteration
4008
4009 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3755 4010
3756 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4011 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3757 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4012 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3758 Coro::async_pool { 4013 Coro::async_pool {
3759 $Coro::current->{desc} = "runtime saver"; 4014 $Coro::current->{desc} = "runtime saver";
3782} 4037}
3783 4038
3784{ 4039{
3785 # configure BDB 4040 # configure BDB
3786 4041
3787 BDB::min_parallel 8; 4042 BDB::min_parallel 16;
3788 BDB::max_poll_reqs $TICK * 0.1; 4043 BDB::max_poll_reqs $TICK * 0.1;
3789 $AnyEvent::BDB::WATCHER->priority (1); 4044 $AnyEvent::BDB::WATCHER->priority (1);
3790 4045
3791 unless ($DB_ENV) { 4046 unless ($DB_ENV) {
3792 $DB_ENV = BDB::db_env_create; 4047 $DB_ENV = BDB::db_env_create;
3872 LOG llevInfo, "[ABT] [suppressed]\n"; 4127 LOG llevInfo, "[ABT] [suppressed]\n";
3873 } 4128 }
3874} 4129}
3875 4130
3876# load additional modules 4131# load additional modules
3877use cf::pod; 4132require "cf/$_.pm" for @EXTRA_MODULES;
4133cf::_connect_to_perl_2;
3878 4134
3879END { cf::emergency_save } 4135END { cf::emergency_save }
3880 4136
38811 41371
3882 4138

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines