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.452 by root, Tue Sep 23 00:24:52 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
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 = ();
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, non-zero while in reload 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 #local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
347 push @{ $LOCK{$key} }, $Coro::current;
348 Coro::schedule;
349 }
350} 392}
351 393
352sub lock_acquire($) { 394sub lock_acquire($) {
353 my ($key) = @_; 395 $LOCKS->guard ($_[0])
354
355 # wait, to be sure we are not locked
356 lock_wait $key;
357
358 $LOCK{$key} = [];
359 $LOCKER{$key} = $Coro::current;#d#
360
361 Coro::guard {
362 delete $LOCKER{$key};#d#
363 # wake up all waiters, to be on the safe side
364 $_->ready for @{ delete $LOCK{$key} };
365 }
366} 396}
367 397
368sub lock_active($) { 398sub lock_active($) {
369 my ($key) = @_; 399 $LOCKS->count ($_[0]) < 1
370
371 ! ! $LOCK{$key}
372} 400}
373 401
374sub freeze_mainloop { 402sub freeze_mainloop {
375 tick_inhibit_inc; 403 tick_inhibit_inc;
376 404
377 Coro::guard \&tick_inhibit_dec; 405 &Guard::guard (\&tick_inhibit_dec);
378} 406}
379 407
380=item cf::periodic $interval, $cb 408=item cf::periodic $interval, $cb
381 409
382Like 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
383get spread over timer. 411get spread over time.
384 412
385=cut 413=cut
386 414
387sub periodic($$) { 415sub periodic($$) {
388 my ($interval, $cb) = @_; 416 my ($interval, $cb) = @_;
405 433
406=cut 434=cut
407 435
408our @SLOT_QUEUE; 436our @SLOT_QUEUE;
409our $SLOT_QUEUE; 437our $SLOT_QUEUE;
438our $SLOT_DECAY = 0.9;
410 439
411$SLOT_QUEUE->cancel if $SLOT_QUEUE; 440$SLOT_QUEUE->cancel if $SLOT_QUEUE;
412$SLOT_QUEUE = Coro::async { 441$SLOT_QUEUE = Coro::async {
413 $Coro::current->desc ("timeslot manager"); 442 $Coro::current->desc ("timeslot manager");
414 443
415 my $signal = new Coro::Signal; 444 my $signal = new Coro::Signal;
445 my $busy;
416 446
417 while () { 447 while () {
418 next_job: 448 next_job:
449
419 my $avail = cf::till_tick; 450 my $avail = cf::till_tick;
420 if ($avail > 0.01) { 451
421 for (0 .. $#SLOT_QUEUE) { 452 for (0 .. $#SLOT_QUEUE) {
422 if ($SLOT_QUEUE[$_][0] < $avail) { 453 if ($SLOT_QUEUE[$_][0] <= $avail) {
454 $busy = 0;
423 my $job = splice @SLOT_QUEUE, $_, 1, (); 455 my $job = splice @SLOT_QUEUE, $_, 1, ();
424 $job->[2]->send; 456 $job->[2]->send;
425 Coro::cede; 457 Coro::cede;
426 goto next_job; 458 goto next_job;
427 } 459 } else {
460 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
428 } 461 }
429 } 462 }
430 463
431 if (@SLOT_QUEUE) { 464 if (@SLOT_QUEUE) {
432 # 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
433 push @cf::WAIT_FOR_TICK, $signal; 466 push @cf::WAIT_FOR_TICK, $signal;
434 $signal->wait; 467 $signal->wait;
435 } else { 468 } else {
469 $busy = 0;
436 Coro::schedule; 470 Coro::schedule;
437 } 471 }
438 } 472 }
439}; 473};
440 474
441sub get_slot($;$$) { 475sub get_slot($;$$) {
442 return if tick_inhibit || $Coro::current == $Coro::main; 476 return if tick_inhibit || $Coro::current == $Coro::main;
443 477
444 my ($time, $pri, $name) = @_; 478 my ($time, $pri, $name) = @_;
445 479
446 $time = $TICK * .6 if $time > $TICK * .6; 480 $time = clamp $time, 0.01, $TICK * .6;
481
447 my $sig = new Coro::Signal; 482 my $sig = new Coro::Signal;
448 483
449 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 484 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
450 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 485 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
451 $SLOT_QUEUE->ready; 486 $SLOT_QUEUE->ready;
478 513
479sub sync_job(&) { 514sub sync_job(&) {
480 my ($job) = @_; 515 my ($job) = @_;
481 516
482 if ($Coro::current == $Coro::main) { 517 if ($Coro::current == $Coro::main) {
483 my $time = EV::time; 518 my $time = AE::time;
484 519
485 # this is the main coro, too bad, we have to block 520 # this is the main coro, too bad, we have to block
486 # till the operation succeeds, freezing the server :/ 521 # till the operation succeeds, freezing the server :/
487 522
488 LOG llevError, Carp::longmess "sync job";#d# 523 LOG llevError, Carp::longmess "sync job";#d#
505 } else { 540 } else {
506 EV::loop EV::LOOP_ONESHOT; 541 EV::loop EV::LOOP_ONESHOT;
507 } 542 }
508 } 543 }
509 544
510 my $time = EV::time - $time; 545 my $time = AE::time - $time;
511 546
512 $TICK_START += $time; # do not account sync jobs to server load 547 $TICK_START += $time; # do not account sync jobs to server load
513 548
514 wantarray ? @res : $res[0] 549 wantarray ? @res : $res[0]
515 } else { 550 } else {
559 reset_signals; 594 reset_signals;
560 &$cb 595 &$cb
561 }, @args; 596 }, @args;
562 597
563 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 )
564} 610}
565 611
566=item $coin = coin_from_name $name 612=item $coin = coin_from_name $name
567 613
568=cut 614=cut
1149 1195
1150 sync_job { 1196 sync_job {
1151 if (length $$rdata) { 1197 if (length $$rdata) {
1152 utf8::decode (my $decname = $filename); 1198 utf8::decode (my $decname = $filename);
1153 warn sprintf "saving %s (%d,%d)\n", 1199 warn sprintf "saving %s (%d,%d)\n",
1154 $decname, length $$rdata, scalar @$objs; 1200 $decname, length $$rdata, scalar @$objs
1201 if $VERBOSE_IO;
1155 1202
1156 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1203 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1157 aio_chmod $fh, SAVE_MODE; 1204 aio_chmod $fh, SAVE_MODE;
1158 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1205 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1159 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 }
1160 aio_close $fh; 1210 aio_close $fh;
1161 1211
1162 if (@$objs) { 1212 if (@$objs) {
1163 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) {
1164 aio_chmod $fh, SAVE_MODE; 1214 aio_chmod $fh, SAVE_MODE;
1165 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1215 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1166 aio_write $fh, 0, (length $data), $data, 0; 1216 aio_write $fh, 0, (length $data), $data, 0;
1167 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 }
1168 aio_close $fh; 1221 aio_close $fh;
1169 aio_rename "$filename.pst~", "$filename.pst"; 1222 aio_rename "$filename.pst~", "$filename.pst";
1170 } 1223 }
1171 } else { 1224 } else {
1172 aio_unlink "$filename.pst"; 1225 aio_unlink "$filename.pst";
1173 } 1226 }
1174 1227
1175 aio_rename "$filename~", $filename; 1228 aio_rename "$filename~", $filename;
1229
1230 $filename =~ s%/[^/]+$%%;
1231 aio_pathsync $filename if $cf::USE_FSYNC;
1176 } else { 1232 } else {
1177 warn "FATAL: $filename~: $!\n"; 1233 warn "unable to save objects: $filename~: $!\n";
1178 } 1234 }
1179 } else { 1235 } else {
1180 aio_unlink $filename; 1236 aio_unlink $filename;
1181 aio_unlink "$filename.pst"; 1237 aio_unlink "$filename.pst";
1182 } 1238 }
1207 $av = $st->{objs}; 1263 $av = $st->{objs};
1208 } 1264 }
1209 1265
1210 utf8::decode (my $decname = $filename); 1266 utf8::decode (my $decname = $filename);
1211 warn sprintf "loading %s (%d,%d)\n", 1267 warn sprintf "loading %s (%d,%d)\n",
1212 $decname, length $data, scalar @{$av || []}; 1268 $decname, length $data, scalar @{$av || []}
1269 if $VERBOSE_IO;
1213 1270
1214 ($data, $av) 1271 ($data, $av)
1215} 1272}
1216 1273
1217=head2 COMMAND CALLBACKS 1274=head2 COMMAND CALLBACKS
1273 my ($name, $cb) = @_; 1330 my ($name, $cb) = @_;
1274 1331
1275 $EXTICMD{$name} = $cb; 1332 $EXTICMD{$name} = $cb;
1276} 1333}
1277 1334
1335use File::Glob ();
1336
1278cf::player->attach ( 1337cf::player->attach (
1279 on_command => sub { 1338 on_unknown_command => sub {
1280 my ($pl, $name, $params) = @_; 1339 my ($pl, $name, $params) = @_;
1281 1340
1282 my $cb = $COMMAND{$name} 1341 my $cb = $COMMAND{$name}
1283 or return; 1342 or return;
1284 1343
1314 1373
1315 cf::override; 1374 cf::override;
1316 }, 1375 },
1317); 1376);
1318 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
1319sub load_extensions { 1391sub load_extensions {
1320 cf::sync_job { 1392 cf::sync_job {
1321 my %todo; 1393 my %todo;
1322 1394
1323 for my $path (<$LIBDIR/*.ext>) { 1395 for my $path (<$LIBDIR/*.ext>) {
1350 . "\n};\n1"; 1422 . "\n};\n1";
1351 1423
1352 $todo{$base} = \%ext; 1424 $todo{$base} = \%ext;
1353 } 1425 }
1354 1426
1427 my $pass = 0;
1355 my %done; 1428 my %done;
1356 while (%todo) { 1429 while (%todo) {
1357 my $progress; 1430 my $progress;
1358 1431
1432 ++$pass;
1433
1434 ext:
1359 while (my ($k, $v) = each %todo) { 1435 while (my ($k, $v) = each %todo) {
1360 for (split /,\s*/, $v->{meta}{depends}) { 1436 for (split /,\s*/, $v->{meta}{depends}) {
1361 goto skip 1437 next ext
1362 unless exists $done{$_}; 1438 unless exists $done{$_};
1363 } 1439 }
1364 1440
1365 warn "... loading '$k' into '$v->{pkg}'\n"; 1441 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1366 1442
1367 unless (eval $v->{source}) { 1443 my $active = eval $v->{source};
1444
1445 if (length $@) {
1368 my $msg = $@ ? "$v->{path}: $@\n" 1446 warn "$v->{path}: $@\n";
1369 : "$v->{base}: extension inactive.\n";
1370 1447
1371 if (exists $v->{meta}{mandatory}) {
1372 warn $msg;
1373 cf::cleanup "mandatory extension failed to load, exiting."; 1448 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1374 } 1449 if exists $v->{meta}{mandatory};
1375 1450
1376 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;
1377 } 1460 }
1378
1379 $done{$k} = delete $todo{$k};
1380 push @EXTS, $v->{pkg};
1381 $progress = 1;
1382 } 1461 }
1383 1462
1384 skip: 1463 unless ($progress) {
1385 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1464 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1386 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 }
1387 } 1471 }
1388 }; 1472 };
1389} 1473}
1390 1474
1391############################################################################# 1475#############################################################################
1475 $cf::PLAYER{$login} = $pl 1559 $cf::PLAYER{$login} = $pl
1476 } 1560 }
1477 } 1561 }
1478} 1562}
1479 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
1480sub save($) { 1577sub save($) {
1481 my ($pl) = @_; 1578 my ($pl) = @_;
1482 1579
1483 return if $pl->{deny_save}; 1580 return if $pl->{deny_save};
1484 1581
1489 1586
1490 aio_mkdir playerdir $pl, 0770; 1587 aio_mkdir playerdir $pl, 0770;
1491 $pl->{last_save} = $cf::RUNTIME; 1588 $pl->{last_save} = $cf::RUNTIME;
1492 1589
1493 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];
1494 1594
1495 $pl->save_pl ($path); 1595 $pl->save_pl ($path);
1496 cf::cede_to_tick; 1596 cf::cede_to_tick;
1497} 1597}
1498 1598
1535 $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
1536 1636
1537 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1637 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1538 $pl->deactivate; 1638 $pl->deactivate;
1539 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;
1540 $pl->ob->check_score;
1541 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1640 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1542 $pl->ns->destroy if $pl->ns; 1641 $pl->ns->destroy if $pl->ns;
1543 1642
1544 my $path = playerdir $pl; 1643 my $path = playerdir $pl;
1545 my $temp = "$path~$cf::RUNTIME~deleting~"; 1644 my $temp = "$path~$cf::RUNTIME~deleting~";
1600 \@logins 1699 \@logins
1601} 1700}
1602 1701
1603=item $player->maps 1702=item $player->maps
1604 1703
1704=item cf::player::maps $login
1705
1605Returns an arrayref of map paths that are private for this 1706Returns an arrayref of map paths that are private for this
1606player. May block. 1707player. May block.
1607 1708
1608=cut 1709=cut
1609 1710
1671=cut 1772=cut
1672 1773
1673sub find_by_path($) { 1774sub find_by_path($) {
1674 my ($path) = @_; 1775 my ($path) = @_;
1675 1776
1777 $path =~ s/^~[^\/]*//; # skip ~login
1778
1676 my ($match, $specificity); 1779 my ($match, $specificity);
1677 1780
1678 for my $region (list) { 1781 for my $region (list) {
1679 if ($region->{match} && $path =~ $region->{match}) { 1782 if ($region->{match} && $path =~ $region->{match}) {
1680 ($match, $specificity) = ($region, $region->specificity) 1783 ($match, $specificity) = ($region, $region->specificity)
1711 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
1712 1815
1713 # mit "rum" bekleckern, nicht 1816 # mit "rum" bekleckern, nicht
1714 $self->_create_random_map ( 1817 $self->_create_random_map (
1715 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1818 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1716 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1819 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1717 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1820 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1718 $rmp->{exit_on_final_map}, 1821 $rmp->{exit_on_final_map},
1719 $rmp->{xsize}, $rmp->{ysize}, 1822 $rmp->{xsize}, $rmp->{ysize},
1720 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1823 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1721 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1824 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1743 1846
1744 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1847 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1745} 1848}
1746 1849
1747# also paths starting with '/' 1850# also paths starting with '/'
1748$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1851$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1749 1852
1750sub thawer_merge { 1853sub thawer_merge {
1751 my ($self, $merge) = @_; 1854 my ($self, $merge) = @_;
1752 1855
1753 # we have to keep some variables in memory intact 1856 # we have to keep some variables in memory intact
1851 1954
1852 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1955 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1853 "$UNIQUEDIR/$path" 1956 "$UNIQUEDIR/$path"
1854} 1957}
1855 1958
1856# and all this just because we cannot iterate over
1857# all maps in C++...
1858sub change_all_map_light {
1859 my ($change) = @_;
1860
1861 $_->change_map_light ($change)
1862 for grep $_->outdoor, values %cf::MAP;
1863}
1864
1865sub decay_objects { 1959sub decay_objects {
1866 my ($self) = @_; 1960 my ($self) = @_;
1867 1961
1868 return if $self->{deny_reset}; 1962 return if $self->{deny_reset};
1869 1963
1951sub find { 2045sub find {
1952 my ($path, $origin) = @_; 2046 my ($path, $origin) = @_;
1953 2047
1954 $path = normalise $path, $origin && $origin->path; 2048 $path = normalise $path, $origin && $origin->path;
1955 2049
1956 cf::lock_wait "map_data:$path";#d#remove 2050 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1957 cf::lock_wait "map_find:$path"; 2051 my $guard2 = cf::lock_acquire "map_find:$path";
1958 2052
1959 $cf::MAP{$path} || do { 2053 $cf::MAP{$path} || do {
1960 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1961 my $guard2 = cf::lock_acquire "map_find:$path";
1962
1963 my $map = new_from_path cf::map $path 2054 my $map = new_from_path cf::map $path
1964 or return; 2055 or return;
1965 2056
1966 $map->{last_save} = $cf::RUNTIME; 2057 $map->{last_save} = $cf::RUNTIME;
1967 2058
1979 2070
1980 $cf::MAP{$path} = $map 2071 $cf::MAP{$path} = $map
1981 } 2072 }
1982} 2073}
1983 2074
1984sub pre_load { } 2075sub pre_load { }
1985sub post_load { } 2076#sub post_load { } # XS
1986 2077
1987sub load { 2078sub load {
1988 my ($self) = @_; 2079 my ($self) = @_;
1989 2080
1990 local $self->{deny_reset} = 1; # loading can take a long time 2081 local $self->{deny_reset} = 1; # loading can take a long time
2035 unless ($self->{deny_activate}) { 2126 unless ($self->{deny_activate}) {
2036 $self->decay_objects; 2127 $self->decay_objects;
2037 $self->fix_auto_apply; 2128 $self->fix_auto_apply;
2038 $self->update_buttons; 2129 $self->update_buttons;
2039 cf::cede_to_tick; 2130 cf::cede_to_tick;
2040 $self->set_darkness_map;
2041 cf::cede_to_tick;
2042 $self->activate; 2131 $self->activate;
2043 } 2132 }
2044 2133
2045 $self->{last_save} = $cf::RUNTIME; 2134 $self->{last_save} = $cf::RUNTIME;
2046 $self->last_access ($cf::RUNTIME); 2135 $self->last_access ($cf::RUNTIME);
2049 } 2138 }
2050 2139
2051 $self->post_load; 2140 $self->post_load;
2052} 2141}
2053 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
2054sub customise_for { 2146sub customise_for {
2055 my ($self, $ob) = @_; 2147 my ($self, $ob) = @_;
2056 2148
2057 return find "~" . $ob->name . "/" . $self->{path} 2149 return find "~" . $ob->name . "/" . $self->{path}
2058 if $self->per_player; 2150 if $self->per_player;
2074 or next; 2166 or next;
2075 $neigh = find $neigh, $map 2167 $neigh = find $neigh, $map
2076 or next; 2168 or next;
2077 $neigh->load; 2169 $neigh->load;
2078 2170
2171 # now find the diagonal neighbours
2079 push @neigh, 2172 push @neigh,
2080 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2173 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2081 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2174 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2082 } 2175 }
2083 2176
2135 $MAP_PREFETCHER->prio (6); 2228 $MAP_PREFETCHER->prio (6);
2136 2229
2137 () 2230 ()
2138} 2231}
2139 2232
2233# common code, used by both ->save and ->swapout
2140sub save { 2234sub _save {
2141 my ($self) = @_; 2235 my ($self) = @_;
2142
2143 my $lock = cf::lock_acquire "map_data:$self->{path}";
2144 2236
2145 $self->{last_save} = $cf::RUNTIME; 2237 $self->{last_save} = $cf::RUNTIME;
2146 2238
2147 return unless $self->dirty; 2239 return unless $self->dirty;
2148 2240
2168 } else { 2260 } else {
2169 $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);
2170 } 2262 }
2171} 2263}
2172 2264
2265sub save {
2266 my ($self) = @_;
2267
2268 my $lock = cf::lock_acquire "map_data:$self->{path}";
2269
2270 $self->_save;
2271}
2272
2173sub swap_out { 2273sub swap_out {
2174 my ($self) = @_; 2274 my ($self) = @_;
2175 2275
2176 # save first because save cedes
2177 $self->save;
2178
2179 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2276 my $lock = cf::lock_acquire "map_data:$self->{path}";
2180 2277
2181 return if $self->players;
2182 return if $self->in_memory != cf::MAP_ACTIVE; 2278 return if $self->in_memory != cf::MAP_ACTIVE;
2183 return if $self->{deny_save}; 2279 return if $self->{deny_save};
2280 return if $self->players;
2184 2281
2282 # first deactivate the map and "unlink" it from the core
2283 $self->deactivate;
2284 $_->clear_links_to ($self) for values %cf::MAP;
2185 $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};
2186 2332
2187 $self->deactivate; 2333 $self->deactivate;
2188 $_->clear_links_to ($self) for values %cf::MAP; 2334 $_->clear_links_to ($self) for values %cf::MAP;
2189 $self->clear; 2335 $self->clear;
2190}
2191
2192sub reset_at {
2193 my ($self) = @_;
2194
2195 # TODO: safety, remove and allow resettable per-player maps
2196 return 1e99 if $self->{deny_reset};
2197
2198 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2199 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2200
2201 $time + $to
2202}
2203
2204sub should_reset {
2205 my ($self) = @_;
2206
2207 $self->reset_at <= $cf::RUNTIME
2208}
2209
2210sub reset {
2211 my ($self) = @_;
2212
2213 my $lock = cf::lock_acquire "map_data:$self->{path}";
2214
2215 return if $self->players;
2216
2217 warn "resetting map ", $self->path;
2218
2219 $self->in_memory (cf::MAP_SWAPPED);
2220
2221 # need to save uniques path
2222 unless ($self->{deny_save}) {
2223 my $uniq = $self->uniq_path; utf8::encode $uniq;
2224
2225 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2226 if $uniq;
2227 }
2228
2229 delete $cf::MAP{$self->path};
2230
2231 $self->deactivate;
2232 $_->clear_links_to ($self) for values %cf::MAP;
2233 $self->clear;
2234 2336
2235 $self->unlink_save; 2337 $self->unlink_save;
2236 $self->destroy; 2338 $self->destroy;
2237} 2339}
2238 2340
2246 2348
2247 delete $cf::MAP{$self->path}; 2349 delete $cf::MAP{$self->path};
2248 2350
2249 $self->unlink_save; 2351 $self->unlink_save;
2250 2352
2251 bless $self, "cf::map"; 2353 bless $self, "cf::map::wrap";
2252 delete $self->{deny_reset}; 2354 delete $self->{deny_reset};
2253 $self->{deny_save} = 1; 2355 $self->{deny_save} = 1;
2254 $self->reset_timeout (1); 2356 $self->reset_timeout (1);
2255 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2357 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2256 2358
2313 : normalise $_ 2415 : normalise $_
2314 } @{ aio_readdir $UNIQUEDIR or [] } 2416 } @{ aio_readdir $UNIQUEDIR or [] }
2315 ] 2417 ]
2316} 2418}
2317 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
2318=back 2452=back
2319 2453
2320=head3 cf::object 2454=head3 cf::object
2321 2455
2322=cut 2456=cut
2387 2521
2388our $SAY_CHANNEL = { 2522our $SAY_CHANNEL = {
2389 id => "say", 2523 id => "say",
2390 title => "Map", 2524 title => "Map",
2391 reply => "say ", 2525 reply => "say ",
2392 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.",
2393}; 2527};
2394 2528
2395our $CHAT_CHANNEL = { 2529our $CHAT_CHANNEL = {
2396 id => "chat", 2530 id => "chat",
2397 title => "Chat", 2531 title => "Chat",
2454 2588
2455Freezes 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}>).
2456 2590
2457The 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.
2458for 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,
2459though, 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
2460map. 2594map.
2461 2595
2462Will never block. 2596Will never block.
2463 2597
2464=item $player_object->leave_link ($map, $x, $y) 2598=item $player_object->leave_link ($map, $x, $y)
2485sub cf::object::player::enter_link { 2619sub cf::object::player::enter_link {
2486 my ($self) = @_; 2620 my ($self) = @_;
2487 2621
2488 $self->deactivate_recursive; 2622 $self->deactivate_recursive;
2489 2623
2624 ++$self->{_link_recursion};
2625
2490 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2626 return if UNIVERSAL::isa $self->map, "ext::map_link";
2491 2627
2492 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2628 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2493 if $self->map && $self->map->{path} ne "{link}"; 2629 if $self->map && $self->map->{path} ne "{link}";
2494 2630
2495 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2631 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2496} 2632}
2497 2633
2498sub cf::object::player::leave_link { 2634sub cf::object::player::leave_link {
2499 my ($self, $map, $x, $y) = @_; 2635 my ($self, $map, $x, $y) = @_;
2500 2636
2517 ($x, $y) = (-1, -1) 2653 ($x, $y) = (-1, -1)
2518 unless (defined $x) && (defined $y); 2654 unless (defined $x) && (defined $y);
2519 2655
2520 # use -1 or undef as default coordinates, not 0, 0 2656 # use -1 or undef as default coordinates, not 0, 0
2521 ($x, $y) = ($map->enter_x, $map->enter_y) 2657 ($x, $y) = ($map->enter_x, $map->enter_y)
2522 if $x <=0 && $y <= 0; 2658 if $x <= 0 && $y <= 0;
2523 2659
2524 $map->load; 2660 $map->load;
2525 $map->load_neighbours; 2661 $map->load_neighbours;
2526 2662
2527 return unless $self->contr->active; 2663 return unless $self->contr->active;
2528 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2529 $self->activate_recursive;
2530 2664
2531 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2665 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2532 $self->enter_map ($map, $x, $y); 2666 if ($self->enter_map ($map, $x, $y)) {
2533} 2667 # entering was successful
2668 delete $self->{_link_recursion};
2669 # only activate afterwards, to support waiting in hooks
2670 $self->activate_recursive;
2671 }
2534 2672
2673}
2674
2535=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)]])
2536 2676
2537Moves 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
2538her, loading and preparing them map, calling the provided $check callback 2678her, loading and preparing them map, calling the provided $check callback
2539that 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
2540the 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
2547 2687
2548our $GOTOGEN; 2688our $GOTOGEN;
2549 2689
2550sub cf::object::player::goto { 2690sub cf::object::player::goto {
2551 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 }
2552 2698
2553 # 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
2554 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2700 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2555 2701
2556 $self->enter_link; 2702 $self->enter_link;
2580 my $map = eval { 2726 my $map = eval {
2581 my $map = defined $path ? cf::map::find $path : undef; 2727 my $map = defined $path ? cf::map::find $path : undef;
2582 2728
2583 if ($map) { 2729 if ($map) {
2584 $map = $map->customise_for ($self); 2730 $map = $map->customise_for ($self);
2585 $map = $check->($map) if $check && $map; 2731 $map = $check->($map, $x, $y, $self) if $check && $map;
2586 } else { 2732 } else {
2587 $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);
2588 } 2734 }
2589 2735
2590 $map 2736 $map
2598 if ($gen == $self->{_goto_generation}) { 2744 if ($gen == $self->{_goto_generation}) {
2599 delete $self->{_goto_generation}; 2745 delete $self->{_goto_generation};
2600 $self->leave_link ($map, $x, $y); 2746 $self->leave_link ($map, $x, $y);
2601 } 2747 }
2602 2748
2603 $done->() if $done; 2749 $done->($self) if $done;
2604 })->prio (1); 2750 })->prio (1);
2605} 2751}
2606 2752
2607=item $player_object->enter_exit ($exit_object) 2753=item $player_object->enter_exit ($exit_object)
2608 2754
2725 2871
2726 utf8::encode $text; 2872 utf8::encode $text;
2727 $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);
2728} 2874}
2729 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
2730=item $client->send_msg ($channel, $msg, $color, [extra...]) 2901=item $client->send_msg ($channel, $msg, $color, [extra...])
2731 2902
2732Send 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
2733client 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
2734the 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
2736 2907
2737=cut 2908=cut
2738 2909
2739# non-persistent channels (usually the info channel) 2910# non-persistent channels (usually the info channel)
2740our %CHANNEL = ( 2911our %CHANNEL = (
2912 "c/motd" => {
2913 id => "infobox",
2914 title => "MOTD",
2915 reply => undef,
2916 tooltip => "The message of the day",
2917 },
2741 "c/identify" => { 2918 "c/identify" => {
2742 id => "infobox", 2919 id => "infobox",
2743 title => "Identify", 2920 title => "Identify",
2744 reply => undef, 2921 reply => undef,
2745 tooltip => "Items recently identified", 2922 tooltip => "Items recently identified",
2747 "c/examine" => { 2924 "c/examine" => {
2748 id => "infobox", 2925 id => "infobox",
2749 title => "Examine", 2926 title => "Examine",
2750 reply => undef, 2927 reply => undef,
2751 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",
2752 }, 2935 },
2753 "c/book" => { 2936 "c/book" => {
2754 id => "infobox", 2937 id => "infobox",
2755 title => "Book", 2938 title => "Book",
2756 reply => undef, 2939 reply => undef,
2772 id => "infobox", 2955 id => "infobox",
2773 title => "Body Parts", 2956 title => "Body Parts",
2774 reply => undef, 2957 reply => undef,
2775 tooltip => "Shows which body parts you posess and are available", 2958 tooltip => "Shows which body parts you posess and are available",
2776 }, 2959 },
2960 "c/statistics" => {
2961 id => "infobox",
2962 title => "Statistics",
2963 reply => undef,
2964 tooltip => "Shows your primary statistics",
2965 },
2777 "c/skills" => { 2966 "c/skills" => {
2778 id => "infobox", 2967 id => "infobox",
2779 title => "Skills", 2968 title => "Skills",
2780 reply => undef, 2969 reply => undef,
2781 tooltip => "Shows your experience per skill and item power", 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",
2782 }, 2995 },
2783 "c/uptime" => { 2996 "c/uptime" => {
2784 id => "infobox", 2997 id => "infobox",
2785 title => "Uptime", 2998 title => "Uptime",
2786 reply => undef, 2999 reply => undef,
2796 id => "party", 3009 id => "party",
2797 title => "Party", 3010 title => "Party",
2798 reply => "gsay ", 3011 reply => "gsay ",
2799 tooltip => "Messages and chat related to your party", 3012 tooltip => "Messages and chat related to your party",
2800 }, 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,
2801); 3022);
2802 3023
2803sub cf::client::send_msg { 3024sub cf::client::send_msg {
2804 my ($self, $channel, $msg, $color, @extra) = @_; 3025 my ($self, $channel, $msg, $color, @extra) = @_;
2805 3026
2810 3031
2811 # check predefined channels, for the benefit of C 3032 # check predefined channels, for the benefit of C
2812 if ($CHANNEL{$channel}) { 3033 if ($CHANNEL{$channel}) {
2813 $channel = $CHANNEL{$channel}; 3034 $channel = $CHANNEL{$channel};
2814 3035
2815 $self->ext_msg (channel_info => $channel) 3036 $self->ext_msg (channel_info => $channel);
2816 if $self->can_msg;
2817
2818 $channel = $channel->{id}; 3037 $channel = $channel->{id};
2819 3038
2820 } elsif (ref $channel) { 3039 } elsif (ref $channel) {
2821 # send meta info to client, if not yet sent 3040 # send meta info to client, if not yet sent
2822 unless (exists $self->{channel}{$channel->{id}}) { 3041 unless (exists $self->{channel}{$channel->{id}}) {
2823 $self->{channel}{$channel->{id}} = $channel; 3042 $self->{channel}{$channel->{id}} = $channel;
2824 $self->ext_msg (channel_info => $channel) 3043 $self->ext_msg (channel_info => $channel);
2825 if $self->can_msg;
2826 } 3044 }
2827 3045
2828 $channel = $channel->{id}; 3046 $channel = $channel->{id};
2829 } 3047 }
2830 3048
2831 return unless @extra || length $msg; 3049 return unless @extra || length $msg;
2832 3050
2833 if ($self->can_msg) {
2834 # default colour, mask it out 3051 # default colour, mask it out
2835 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3052 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2836 if $color & cf::NDI_DEF; 3053 if $color & cf::NDI_DEF;
2837 3054
2838 my $pkt = "msg " 3055 my $pkt = "msg "
2839 . $self->{json_coder}->encode ( 3056 . $self->{json_coder}->encode (
2840 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3057 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2841 ); 3058 );
2842 3059
2843 # try lzf for large packets
2844 $pkt = "lzf " . Compress::LZF::compress $pkt
2845 if 1024 <= length $pkt and $self->{can_lzf};
2846
2847 # split very large packets
2848 if (8192 < length $pkt and $self->{can_lzf}) {
2849 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2850 $pkt = "frag";
2851 }
2852
2853 $self->send_packet ($pkt); 3060 $self->send_big_packet ($pkt);
2854 } else {
2855 if ($color >= 0) {
2856 # replace some tags by gcfclient-compatible ones
2857 for ($msg) {
2858 1 while
2859 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2860 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2861 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2862 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2863 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2864 }
2865
2866 $color &= cf::NDI_COLOR_MASK;
2867
2868 utf8::encode $msg;
2869
2870 if (0 && $msg =~ /\[/) {
2871 # COMMAND/INFO
2872 $self->send_packet ("drawextinfo $color 10 8 $msg")
2873 } else {
2874 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2875 $self->send_packet ("drawinfo $color $msg")
2876 }
2877 }
2878 }
2879} 3061}
2880 3062
2881=item $client->ext_msg ($type, @msg) 3063=item $client->ext_msg ($type, @msg)
2882 3064
2883Sends an ext event to the client. 3065Sends an ext event to the client.
2886 3068
2887sub cf::client::ext_msg($$@) { 3069sub cf::client::ext_msg($$@) {
2888 my ($self, $type, @msg) = @_; 3070 my ($self, $type, @msg) = @_;
2889 3071
2890 if ($self->extcmd == 2) { 3072 if ($self->extcmd == 2) {
2891 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3073 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2892 } elsif ($self->extcmd == 1) { # TODO: remove 3074 } elsif ($self->extcmd == 1) { # TODO: remove
2893 push @msg, msgtype => "event_$type"; 3075 push @msg, msgtype => "event_$type";
2894 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3076 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2895 } 3077 }
2896} 3078}
2897 3079
2898=item $client->ext_reply ($msgid, @msg) 3080=item $client->ext_reply ($msgid, @msg)
2899 3081
2903 3085
2904sub cf::client::ext_reply($$@) { 3086sub cf::client::ext_reply($$@) {
2905 my ($self, $id, @msg) = @_; 3087 my ($self, $id, @msg) = @_;
2906 3088
2907 if ($self->extcmd == 2) { 3089 if ($self->extcmd == 2) {
2908 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3090 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2909 } elsif ($self->extcmd == 1) { 3091 } elsif ($self->extcmd == 1) {
2910 #TODO: version 1, remove 3092 #TODO: version 1, remove
2911 unshift @msg, msgtype => "reply", msgid => $id; 3093 unshift @msg, msgtype => "reply", msgid => $id;
2912 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3094 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2913 } 3095 }
2914} 3096}
2915 3097
2916=item $success = $client->query ($flags, "text", \&cb) 3098=item $success = $client->query ($flags, "text", \&cb)
2917 3099
3018 3200
3019 $coro 3201 $coro
3020} 3202}
3021 3203
3022cf::client->attach ( 3204cf::client->attach (
3023 on_destroy => sub { 3205 on_client_destroy => sub {
3024 my ($ns) = @_; 3206 my ($ns) = @_;
3025 3207
3026 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3208 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3027 }, 3209 },
3028); 3210);
3044our $safe_hole = new Safe::Hole; 3226our $safe_hole = new Safe::Hole;
3045 3227
3046$SIG{FPE} = 'IGNORE'; 3228$SIG{FPE} = 'IGNORE';
3047 3229
3048$safe->permit_only (Opcode::opset qw( 3230$safe->permit_only (Opcode::opset qw(
3049 :base_core :base_mem :base_orig :base_math 3231 :base_core :base_mem :base_orig :base_math :base_loop
3050 grepstart grepwhile mapstart mapwhile 3232 grepstart grepwhile mapstart mapwhile
3051 sort time 3233 sort time
3052)); 3234));
3053 3235
3054# here we export the classes and methods available to script code 3236# here we export the classes and methods available to script code
3058The following functions and methods are available within a safe environment: 3240The following functions and methods are available within a safe environment:
3059 3241
3060 cf::object 3242 cf::object
3061 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
3062 insert remove name archname title slaying race decrease split 3244 insert remove name archname title slaying race decrease split
3245 value
3063 3246
3064 cf::object::player 3247 cf::object::player
3065 player 3248 player
3066 3249
3067 cf::player 3250 cf::player
3073=cut 3256=cut
3074 3257
3075for ( 3258for (
3076 ["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
3077 insert remove inv nrof name archname title slaying race 3260 insert remove inv nrof name archname title slaying race
3078 decrease split destroy change_exp)], 3261 decrease split destroy change_exp value msg lore send_msg)],
3079 ["cf::object::player" => qw(player)], 3262 ["cf::object::player" => qw(player)],
3080 ["cf::player" => qw(peaceful)], 3263 ["cf::player" => qw(peaceful send_msg)],
3081 ["cf::map" => qw(trigger)], 3264 ["cf::map" => qw(trigger)],
3082) { 3265) {
3083 no strict 'refs'; 3266 no strict 'refs';
3084 my ($pkg, @funs) = @$_; 3267 my ($pkg, @funs) = @$_;
3085 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3268 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3103 3286
3104 my $qcode = $code; 3287 my $qcode = $code;
3105 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3288 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3106 $qcode =~ s/\n/\\n/g; 3289 $qcode =~ s/\n/\\n/g;
3107 3290
3291 %vars = (_dummy => 0) unless %vars;
3292
3293 my @res;
3108 local $_; 3294 local $_;
3109 local @safe::cf::_safe_eval_args = values %vars;
3110 3295
3111 my $eval = 3296 my $eval =
3112 "do {\n" 3297 "do {\n"
3113 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3298 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3114 . "#line 0 \"{$qcode}\"\n" 3299 . "#line 0 \"{$qcode}\"\n"
3115 . $code 3300 . $code
3116 . "\n}" 3301 . "\n}"
3117 ; 3302 ;
3118 3303
3304 if ($CFG{safe_eval}) {
3119 sub_generation_inc; 3305 sub_generation_inc;
3306 local @safe::cf::_safe_eval_args = values %vars;
3120 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3307 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3121 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 }
3122 3313
3123 if ($@) { 3314 if ($@) {
3124 warn "$@"; 3315 warn "$@";
3125 warn "while executing safe code '$code'\n"; 3316 warn "while executing safe code '$code'\n";
3126 warn "with arguments " . (join " ", %vars) . "\n"; 3317 warn "with arguments " . (join " ", %vars) . "\n";
3145=cut 3336=cut
3146 3337
3147sub register_script_function { 3338sub register_script_function {
3148 my ($fun, $cb) = @_; 3339 my ($fun, $cb) = @_;
3149 3340
3150 no strict 'refs'; 3341 $fun = "safe::$fun" if $CFG{safe_eval};
3151 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3342 *$fun = $safe_hole->wrap ($cb);
3152} 3343}
3153 3344
3154=back 3345=back
3155 3346
3156=cut 3347=cut
3177 3368
3178 $facedata->{version} == 2 3369 $facedata->{version} == 2
3179 or cf::cleanup "$path: version mismatch, cannot proceed."; 3370 or cf::cleanup "$path: version mismatch, cannot proceed.";
3180 3371
3181 # 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]);
3182 $facedata->{resource}{"res/exp_table"} = { 3374 $facedata->{resource}{"res/exp_table"} = {
3183 type => FT_RSRC, 3375 type => FT_RSRC,
3184 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),
3185 }; 3378 };
3186 cf::cede_to_tick; 3379 cf::cede_to_tick;
3187 3380
3188 { 3381 {
3189 my $faces = $facedata->{faceinfo}; 3382 my $faces = $facedata->{faceinfo};
3191 while (my ($face, $info) = each %$faces) { 3384 while (my ($face, $info) = each %$faces) {
3192 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3385 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3193 3386
3194 cf::face::set_visibility $idx, $info->{visibility}; 3387 cf::face::set_visibility $idx, $info->{visibility};
3195 cf::face::set_magicmap $idx, $info->{magicmap}; 3388 cf::face::set_magicmap $idx, $info->{magicmap};
3196 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3389 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3197 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3390 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3198 3391
3199 cf::cede_to_tick; 3392 cf::cede_to_tick;
3200 } 3393 }
3201 3394
3202 while (my ($face, $info) = each %$faces) { 3395 while (my ($face, $info) = each %$faces) {
3226 3419
3227 cf::anim::invalidate_all; # d'oh 3420 cf::anim::invalidate_all; # d'oh
3228 } 3421 }
3229 3422
3230 { 3423 {
3231 # TODO: for gcfclient pleasure, we should give resources
3232 # that gcfclient doesn't grok a >10000 face index.
3233 my $res = $facedata->{resource}; 3424 my $res = $facedata->{resource};
3234 3425
3235 while (my ($name, $info) = each %$res) { 3426 while (my ($name, $info) = each %$res) {
3236 if (defined $info->{type}) { 3427 if (defined $info->{type}) {
3237 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3428 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3238 my $data;
3239 3429
3240 if ($info->{type} & 1) { 3430 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3241 # prepend meta info
3242
3243 my $meta = $enc->encode ({
3244 name => $name,
3245 %{ $info->{meta} || {} },
3246 });
3247
3248 $data = pack "(w/a*)*", $meta, $info->{data};
3249 } else {
3250 $data = $info->{data};
3251 }
3252
3253 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3254 cf::face::set_type $idx, $info->{type}; 3431 cf::face::set_type $idx, $info->{type};
3255 } else { 3432 } else {
3256 $RESOURCE{$name} = $info; 3433 $RESOURCE{$name} = $info; # unused
3257 } 3434 }
3258 3435
3259 cf::cede_to_tick; 3436 cf::cede_to_tick;
3260 } 3437 }
3261 } 3438 }
3262 3439
3263 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3440 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3264 3441
3265 1 3442 1
3266} 3443}
3267
3268cf::global->attach (on_resource_update => sub {
3269 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3270 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3271
3272 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3273 my $sound = $soundconf->{compat}[$_]
3274 or next;
3275
3276 my $face = cf::face::find "sound/$sound->[1]";
3277 cf::sound::set $sound->[0] => $face;
3278 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3279 }
3280
3281 while (my ($k, $v) = each %{$soundconf->{event}}) {
3282 my $face = cf::face::find "sound/$v";
3283 cf::sound::set $k => $face;
3284 }
3285 }
3286});
3287 3444
3288register_exticmd fx_want => sub { 3445register_exticmd fx_want => sub {
3289 my ($ns, $want) = @_; 3446 my ($ns, $want) = @_;
3290 3447
3291 while (my ($k, $v) = each %$want) { 3448 while (my ($k, $v) = each %$want) {
3330sub reload_treasures { 3487sub reload_treasures {
3331 load_resource_file "$DATADIR/treasures" 3488 load_resource_file "$DATADIR/treasures"
3332 or die "unable to load treasurelists\n"; 3489 or die "unable to load treasurelists\n";
3333} 3490}
3334 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
3335sub reload_resources { 3513sub reload_resources {
3336 warn "reloading resource files...\n"; 3514 warn "reloading resource files...\n";
3337 3515
3338 reload_facedata; 3516 reload_facedata;
3517 reload_sound;
3339 reload_archetypes; 3518 reload_archetypes;
3340 reload_regions; 3519 reload_regions;
3341 reload_treasures; 3520 reload_treasures;
3342 3521
3343 warn "finished reloading resource files\n"; 3522 warn "finished reloading resource files\n";
3344} 3523}
3345 3524
3346sub init {
3347 my $guard = freeze_mainloop;
3348
3349 evthread_start IO::AIO::poll_fileno;
3350
3351 reload_resources;
3352}
3353
3354sub reload_config { 3525sub reload_config {
3526 warn "reloading config file...\n";
3527
3355 open my $fh, "<:utf8", "$CONFDIR/config" 3528 open my $fh, "<:utf8", "$CONFDIR/config"
3356 or return; 3529 or return;
3357 3530
3358 local $/; 3531 local $/;
3359 *CFG = YAML::Load <$fh>; 3532 *CFG = YAML::XS::Load scalar <$fh>;
3360 3533
3361 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3534 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3362 3535
3363 $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};
3364 $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};
3365 3538
3366 if (exists $CFG{mlockall}) { 3539 if (exists $CFG{mlockall}) {
3368 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3541 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3369 and die "WARNING: m(un)lockall failed: $!\n"; 3542 and die "WARNING: m(un)lockall failed: $!\n";
3370 }; 3543 };
3371 warn $@ if $@; 3544 warn $@ if $@;
3372 } 3545 }
3546
3547 warn "finished reloading resource files\n";
3373} 3548}
3374 3549
3375sub pidfile() { 3550sub pidfile() {
3376 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3551 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3377 or die "$PIDFILE: $!"; 3552 or die "$PIDFILE: $!";
3389 3564
3390 seek $fh, 0, 0; 3565 seek $fh, 0, 0;
3391 print $fh $$; 3566 print $fh $$;
3392} 3567}
3393 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
3394sub main { 3578sub main {
3395 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
3396 3587
3397 # we must not ever block the main coroutine 3588 # we must not ever block the main coroutine
3398 local $Coro::idle = sub { 3589 local $Coro::idle = sub {
3399 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#
3400 (async { 3591 (async {
3401 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3592 $Coro::current->{desc} = "IDLE BUG HANDLER";
3402 EV::loop EV::LOOP_ONESHOT; 3593 EV::loop EV::LOOP_ONESHOT;
3403 })->prio (Coro::PRIO_MAX); 3594 })->prio (Coro::PRIO_MAX);
3404 }; 3595 };
3405 3596
3406 { 3597 evthread_start IO::AIO::poll_fileno;
3407 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;
3408 reload_config; 3609 reload_config;
3409 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
3410 load_extensions; 3620 load_extensions;
3411 3621
3412 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3413 }
3414
3415 utime time, time, $RUNTIMEFILE; 3622 utime time, time, $RUNTIMEFILE;
3416 3623
3417 # no (long-running) fork's whatsoever before this point(!) 3624 # no (long-running) fork's whatsoever before this point(!)
3625 use POSIX ();
3418 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};
3419 3627
3420 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;
3421} 3635}
3422 3636
3423############################################################################# 3637#############################################################################
3424# initialisation and cleanup 3638# initialisation and cleanup
3425 3639
3426# install some emergency cleanup handlers 3640# install some emergency cleanup handlers
3427BEGIN { 3641BEGIN {
3428 our %SIGWATCHER = (); 3642 our %SIGWATCHER = ();
3429 for my $signal (qw(INT HUP TERM)) { 3643 for my $signal (qw(INT HUP TERM)) {
3430 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3644 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3431 cf::cleanup "SIG$signal"; 3645 cf::cleanup "SIG$signal";
3432 }; 3646 };
3433 } 3647 }
3434} 3648}
3435 3649
3436sub write_runtime_sync { 3650sub write_runtime_sync {
3651 my $t0 = AE::time;
3652
3437 # first touch the runtime file to show we are still running: 3653 # first touch the runtime file to show we are still running:
3438 # the fsync below can take a very very long time. 3654 # the fsync below can take a very very long time.
3439 3655
3440 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3656 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3441 3657
3442 my $guard = cf::lock_acquire "write_runtime"; 3658 my $guard = cf::lock_acquire "write_runtime";
3443 3659
3444 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3660 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3445 or return; 3661 or return;
3446 3662
3447 my $value = $cf::RUNTIME + 90 + 10; 3663 my $value = $cf::RUNTIME + 90 + 10;
3448 # 10 is the runtime save interval, for a monotonic clock 3664 # 10 is the runtime save interval, for a monotonic clock
3449 # 60 allows for the watchdog to kill the server. 3665 # 60 allows for the watchdog to kill the server.
3462 or return; 3678 or return;
3463 3679
3464 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3680 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3465 and return; 3681 and return;
3466 3682
3467 warn "runtime file written.\n"; 3683 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3468 3684
3469 1 3685 1
3470} 3686}
3471 3687
3472our $uuid_lock; 3688our $uuid_lock;
3481 my $uuid = "$LOCALDIR/uuid"; 3697 my $uuid = "$LOCALDIR/uuid";
3482 3698
3483 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3699 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3484 or return; 3700 or return;
3485 3701
3486 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;
3487 $uuid_skip = 0; 3710 $uuid_skip = 0;
3488 3711
3489 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3712 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3490 and return; 3713 and return;
3491 3714
3513} 3736}
3514 3737
3515sub emergency_save() { 3738sub emergency_save() {
3516 my $freeze_guard = cf::freeze_mainloop; 3739 my $freeze_guard = cf::freeze_mainloop;
3517 3740
3518 warn "enter emergency perl save\n"; 3741 warn "emergency_perl_save: enter\n";
3519 3742
3520 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
3521 # use a peculiar iteration method to avoid tripping on perl 3749 # use a peculiar iteration method to avoid tripping on perl
3522 # refcount bugs in for. also avoids problems with players 3750 # refcount bugs in for. also avoids problems with players
3523 # and maps saved/destroyed asynchronously. 3751 # and maps saved/destroyed asynchronously.
3524 warn "begin emergency player save\n"; 3752 warn "emergency_perl_save: begin player save\n";
3525 for my $login (keys %cf::PLAYER) { 3753 for my $login (keys %cf::PLAYER) {
3526 my $pl = $cf::PLAYER{$login} or next; 3754 my $pl = $cf::PLAYER{$login} or next;
3527 $pl->valid or next; 3755 $pl->valid or next;
3528 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3756 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3529 $pl->save; 3757 $pl->save;
3530 } 3758 }
3531 warn "end emergency player save\n"; 3759 warn "emergency_perl_save: end player save\n";
3532 3760
3533 warn "begin emergency map save\n"; 3761 warn "emergency_perl_save: begin map save\n";
3534 for my $path (keys %cf::MAP) { 3762 for my $path (keys %cf::MAP) {
3535 my $map = $cf::MAP{$path} or next; 3763 my $map = $cf::MAP{$path} or next;
3536 $map->valid or next; 3764 $map->valid or next;
3537 $map->save; 3765 $map->save;
3538 } 3766 }
3539 warn "end emergency map save\n"; 3767 warn "emergency_perl_save: end map save\n";
3540 3768
3541 warn "begin emergency database checkpoint\n"; 3769 warn "emergency_perl_save: begin database checkpoint\n";
3542 BDB::db_env_txn_checkpoint $DB_ENV; 3770 BDB::db_env_txn_checkpoint $DB_ENV;
3543 warn "end emergency database checkpoint\n"; 3771 warn "emergency_perl_save: end database checkpoint\n";
3544 3772
3545 warn "begin write uuid\n"; 3773 warn "emergency_perl_save: begin write uuid\n";
3546 write_uuid_sync 1; 3774 write_uuid_sync 1;
3547 warn "end write uuid\n"; 3775 warn "emergency_perl_save: end write uuid\n";
3548 }; 3776 };
3549 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
3550 warn "leave emergency perl save\n"; 3783 warn "emergency_perl_save: leave\n";
3551} 3784}
3552 3785
3553sub post_cleanup { 3786sub post_cleanup {
3554 my ($make_core) = @_; 3787 my ($make_core) = @_;
3555 3788
3581 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3814 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3582 for my $name (keys %$leaf_symtab) { 3815 for my $name (keys %$leaf_symtab) {
3583 _gv_clear *{"$pkg$name"}; 3816 _gv_clear *{"$pkg$name"};
3584# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3817# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3585 } 3818 }
3586 warn "cleared package $pkg\n";#d#
3587} 3819}
3588 3820
3589sub do_reload_perl() { 3821sub do_reload_perl() {
3590 # can/must only be called in main 3822 # can/must only be called in main
3591 if ($Coro::current != $Coro::main) { 3823 if (in_main) {
3592 warn "can only reload from main coroutine"; 3824 warn "can only reload from main coroutine";
3593 return; 3825 return;
3594 } 3826 }
3595 3827
3596 return if $RELOAD++; 3828 return if $RELOAD++;
3829
3830 my $t1 = AE::time;
3597 3831
3598 while ($RELOAD) { 3832 while ($RELOAD) {
3599 warn "reloading..."; 3833 warn "reloading...";
3600 3834
3601 warn "entering sync_job"; 3835 warn "entering sync_job";
3662 clear_package "safe::$_" 3896 clear_package "safe::$_"
3663 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);
3664 3898
3665 warn "unloading cf.pm \"a bit\""; 3899 warn "unloading cf.pm \"a bit\"";
3666 delete $INC{"cf.pm"}; 3900 delete $INC{"cf.pm"};
3667 delete $INC{"cf/pod.pm"}; 3901 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3668 3902
3669 # don't, removes xs symbols, too, 3903 # don't, removes xs symbols, too,
3670 # and global variables created in xs 3904 # and global variables created in xs
3671 #clear_package __PACKAGE__; 3905 #clear_package __PACKAGE__;
3672 3906
3673 warn "unload completed, starting to reload now"; 3907 warn "unload completed, starting to reload now";
3674 3908
3675 warn "reloading cf.pm"; 3909 warn "reloading cf.pm";
3676 require cf; 3910 require cf;
3677 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3911 cf::_connect_to_perl_1;
3678 3912
3679 warn "loading config and database again"; 3913 warn "loading config and database again";
3680 cf::reload_config; 3914 cf::reload_config;
3681 3915
3682 warn "loading extensions"; 3916 warn "loading extensions";
3683 cf::load_extensions; 3917 cf::load_extensions;
3684 3918
3919 if ($REATTACH_ON_RELOAD) {
3685 warn "reattaching attachments to objects/players"; 3920 warn "reattaching attachments to objects/players";
3686 _global_reattach; # objects, sockets 3921 _global_reattach; # objects, sockets
3687 warn "reattaching attachments to maps"; 3922 warn "reattaching attachments to maps";
3688 reattach $_ for values %MAP; 3923 reattach $_ for values %MAP;
3689 warn "reattaching attachments to players"; 3924 warn "reattaching attachments to players";
3690 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;
3691 3930
3692 warn "leaving sync_job"; 3931 warn "leaving sync_job";
3693 3932
3694 1 3933 1
3695 } or do { 3934 } or do {
3698 }; 3937 };
3699 3938
3700 warn "reloaded"; 3939 warn "reloaded";
3701 --$RELOAD; 3940 --$RELOAD;
3702 } 3941 }
3942
3943 $t1 = AE::time - $t1;
3944 warn "reload completed in ${t1}s\n";
3703}; 3945};
3704 3946
3705our $RELOAD_WATCHER; # used only during reload 3947our $RELOAD_WATCHER; # used only during reload
3706 3948
3707sub reload_perl() { 3949sub reload_perl() {
3708 # doing reload synchronously and two reloads happen back-to-back, 3950 # doing reload synchronously and two reloads happen back-to-back,
3709 # coro crashes during coro_state_free->destroy here. 3951 # coro crashes during coro_state_free->destroy here.
3710 3952
3953 $RELOAD_WATCHER ||= cf::async {
3954 Coro::AIO::aio_wait cache_extensions;
3955
3711 $RELOAD_WATCHER ||= EV::timer $TICK * 1.5, 0, sub { 3956 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3712 do_reload_perl; 3957 do_reload_perl;
3713 undef $RELOAD_WATCHER; 3958 undef $RELOAD_WATCHER;
3959 };
3714 }; 3960 };
3715} 3961}
3716 3962
3717register_command "reload" => sub { 3963register_command "reload" => sub {
3718 my ($who, $arg) = @_; 3964 my ($who, $arg) = @_;
3732 3978
3733our @WAIT_FOR_TICK; 3979our @WAIT_FOR_TICK;
3734our @WAIT_FOR_TICK_BEGIN; 3980our @WAIT_FOR_TICK_BEGIN;
3735 3981
3736sub wait_for_tick { 3982sub wait_for_tick {
3737 return if tick_inhibit || $Coro::current == $Coro::main; 3983 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3738 3984
3739 my $signal = new Coro::Signal; 3985 my $signal = new Coro::Signal;
3740 push @WAIT_FOR_TICK, $signal; 3986 push @WAIT_FOR_TICK, $signal;
3741 $signal->wait; 3987 $signal->wait;
3742} 3988}
3743 3989
3744sub wait_for_tick_begin { 3990sub wait_for_tick_begin {
3745 return if tick_inhibit || $Coro::current == $Coro::main; 3991 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3746 3992
3747 my $signal = new Coro::Signal; 3993 my $signal = new Coro::Signal;
3748 push @WAIT_FOR_TICK_BEGIN, $signal; 3994 push @WAIT_FOR_TICK_BEGIN, $signal;
3749 $signal->wait; 3995 $signal->wait;
3750} 3996}
3755 unless ++$bug_warning > 10; 4001 unless ++$bug_warning > 10;
3756 return; 4002 return;
3757 } 4003 }
3758 4004
3759 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#
3760 4008
3761 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4009 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3762 $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.;
3763 Coro::async_pool { 4011 Coro::async_pool {
3764 $Coro::current->{desc} = "runtime saver"; 4012 $Coro::current->{desc} = "runtime saver";
3787} 4035}
3788 4036
3789{ 4037{
3790 # configure BDB 4038 # configure BDB
3791 4039
3792 BDB::min_parallel 8; 4040 BDB::min_parallel 16;
3793 BDB::max_poll_reqs $TICK * 0.1; 4041 BDB::max_poll_reqs $TICK * 0.1;
3794 $AnyEvent::BDB::WATCHER->priority (1); 4042 $AnyEvent::BDB::WATCHER->priority (1);
3795 4043
3796 unless ($DB_ENV) { 4044 unless ($DB_ENV) {
3797 $DB_ENV = BDB::db_env_create; 4045 $DB_ENV = BDB::db_env_create;
3877 LOG llevInfo, "[ABT] [suppressed]\n"; 4125 LOG llevInfo, "[ABT] [suppressed]\n";
3878 } 4126 }
3879} 4127}
3880 4128
3881# load additional modules 4129# load additional modules
3882use cf::pod; 4130require "cf/$_.pm" for @EXTRA_MODULES;
4131cf::_connect_to_perl_2;
3883 4132
3884END { cf::emergency_save } 4133END { cf::emergency_save }
3885 4134
38861 41351
3887 4136

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines