ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.447 by root, Fri Sep 19 01:39:45 2008 UTC vs.
Revision 1.524 by root, Sun Apr 18 07:08:07 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
63 66
64# configure various modules to our taste 67# configure various modules to our taste
65# 68#
66$Storable::canonical = 1; # reduce rsync transfers 69$Storable::canonical = 1; # reduce rsync transfers
67Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 70Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
71
72$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
73
74# make sure c-lzf reinitialises itself
75Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
68Compress::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
69 77
70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 78# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
71 80
72sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
73 82
74our %COMMAND = (); 83our %COMMAND = ();
75our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
78our %EXTCMD = (); 87our %EXTCMD = ();
79our %EXTICMD = (); 88our %EXTICMD = ();
80our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
81our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
82 91
83our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
84our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
85 96
86our $CONFDIR = confdir; 97our $CONFDIR = confdir;
87our $DATADIR = datadir; 98our $DATADIR = datadir;
88our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
89our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
97our $PIDFILE = "$LOCALDIR/pid"; 108our $PIDFILE = "$LOCALDIR/pid";
98our $RUNTIMEFILE = "$LOCALDIR/runtime"; 109our $RUNTIMEFILE = "$LOCALDIR/runtime";
99 110
100our %RESOURCE; 111our %RESOURCE;
101 112
113our $OUTPUT_RATE_MIN = 4000;
114our $OUTPUT_RATE_MAX = 100000;
115
102our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 116our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
103our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 117our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
104our $NEXT_TICK; 118our $NEXT_TICK;
105our $USE_FSYNC = 1; # use fsync to write maps - default off 119our $USE_FSYNC = 1; # use fsync to write maps - default on
106 120
107our $BDB_DEADLOCK_WATCHER; 121our $BDB_DEADLOCK_WATCHER;
108our $BDB_CHECKPOINT_WATCHER; 122our $BDB_CHECKPOINT_WATCHER;
109our $BDB_TRICKLE_WATCHER; 123our $BDB_TRICKLE_WATCHER;
110our $DB_ENV; 124our $DB_ENV;
111 125
126our @EXTRA_MODULES = qw(pod match mapscript);
127
112our %CFG; 128our %CFG;
113 129
114our $UPTIME; $UPTIME ||= time; 130our $UPTIME; $UPTIME ||= time;
115our $RUNTIME; 131our $RUNTIME;
116our $NOW; 132our $NOW;
124 140
125our $LOAD; # a number between 0 (idle) and 1 (too many objects) 141our $LOAD; # a number between 0 (idle) and 1 (too many objects)
126our $LOADAVG; # same thing, but with alpha-smoothing 142our $LOADAVG; # same thing, but with alpha-smoothing
127our $JITTER; # average jitter 143our $JITTER; # average jitter
128our $TICK_START; # for load detecting purposes 144our $TICK_START; # for load detecting purposes
145
146our @POST_INIT;
147
148our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
149our $REALLY_UNLOOP; # never set to true, please :)
129 150
130binmode STDOUT; 151binmode STDOUT;
131binmode STDERR; 152binmode STDERR;
132 153
133# read virtual server time, if available 154# read virtual server time, if available
135 open my $fh, "<", $RUNTIMEFILE 156 open my $fh, "<", $RUNTIMEFILE
136 or die "unable to read $RUNTIMEFILE file: $!"; 157 or die "unable to read $RUNTIMEFILE file: $!";
137 $RUNTIME = <$fh> + 0.; 158 $RUNTIME = <$fh> + 0.;
138} 159}
139 160
161eval "sub TICK() { $TICK } 1" or die;
162
140mkdir $_ 163mkdir $_
141 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 164 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
142 165
143our $EMERGENCY_POSITION; 166our $EMERGENCY_POSITION;
144 167
145sub cf::map::normalise; 168sub cf::map::normalise;
169
170sub in_main() {
171 $Coro::current == $Coro::main
172}
173
174#############################################################################
175
176%REFLECT = ();
177for (@REFLECT) {
178 my $reflect = JSON::XS::decode_json $_;
179 $REFLECT{$reflect->{class}} = $reflect;
180}
181
182# this is decidedly evil
183$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
146 184
147############################################################################# 185#############################################################################
148 186
149=head2 GLOBAL VARIABLES 187=head2 GLOBAL VARIABLES
150 188
197returns directly I<after> the tick processing (and consequently, can only wake one process 235returns directly I<after> the tick processing (and consequently, can only wake one process
198per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 236per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
199 237
200=item @cf::INVOKE_RESULTS 238=item @cf::INVOKE_RESULTS
201 239
202This array contains the results of the last C<invoke ()> call. When 240This array contains the results of the last C<invoke ()> call. When
203C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 241C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
204that call. 242that call.
205 243
244=item %cf::REFLECT
245
246Contains, for each (C++) class name, a hash reference with information
247about object members (methods, scalars, arrays and flags) and other
248metadata, which is useful for introspection.
249
206=back 250=back
207 251
208=cut 252=cut
209 253
210BEGIN { 254$Coro::State::WARNHOOK = sub {
211 *CORE::GLOBAL::warn = sub {
212 my $msg = join "", @_; 255 my $msg = join "", @_;
213 256
214 $msg .= "\n" 257 $msg .= "\n"
215 unless $msg =~ /\n$/; 258 unless $msg =~ /\n$/;
216 259
217 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 260 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
218 261
219 LOG llevError, $msg; 262 LOG llevError, $msg;
220 }; 263};
221}
222 264
223$Coro::State::DIEHOOK = sub { 265$Coro::State::DIEHOOK = sub {
224 return unless $^S eq 0; # "eq", not "==" 266 return unless $^S eq 0; # "eq", not "=="
225 267
226 if ($Coro::current == $Coro::main) {#d# 268 warn Carp::longmess $_[0];
269
270 if (in_main) {#d#
227 warn "DIEHOOK called in main context, Coro bug?\n";#d# 271 warn "DIEHOOK called in main context, Coro bug?\n";#d#
228 return;#d# 272 return;#d#
229 }#d# 273 }#d#
230 274
231 # kill coroutine otherwise 275 # kill coroutine otherwise
232 warn Carp::longmess $_[0];
233 Coro::terminate 276 Coro::terminate
234}; 277};
235
236$SIG{__DIE__} = sub { }; #d#?
237 278
238@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 279@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
239@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 280@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
240@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 281@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
241@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 282@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
255)) { 296)) {
256 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 297 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
257} 298}
258 299
259$EV::DIED = sub { 300$EV::DIED = sub {
260 warn "error in event callback: @_"; 301 Carp::cluck "error in event callback: @_";
261}; 302};
262 303
263############################################################################# 304#############################################################################
264 305
265=head2 UTILITY FUNCTIONS 306=head2 UTILITY FUNCTIONS
302our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 343our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
303 344
304sub encode_json($) { $json_coder->encode ($_[0]) } 345sub encode_json($) { $json_coder->encode ($_[0]) }
305sub decode_json($) { $json_coder->decode ($_[0]) } 346sub decode_json($) { $json_coder->decode ($_[0]) }
306 347
348=item cf::post_init { BLOCK }
349
350Execute the given codeblock, I<after> all extensions have been (re-)loaded,
351but I<before> the server starts ticking again.
352
353The cdoeblock will have a single boolean argument to indicate whether this
354is a reload or not.
355
356=cut
357
358sub post_init(&) {
359 push @POST_INIT, shift;
360}
361
307=item cf::lock_wait $string 362=item cf::lock_wait $string
308 363
309Wait until the given lock is available. See cf::lock_acquire. 364Wait until the given lock is available. See cf::lock_acquire.
310 365
311=item my $lock = cf::lock_acquire $string 366=item my $lock = cf::lock_acquire $string
312 367
313Wait until the given lock is available and then acquires it and returns 368Wait until the given lock is available and then acquires it and returns
314a Coro::guard object. If the guard object gets destroyed (goes out of scope, 369a L<Guard> object. If the guard object gets destroyed (goes out of scope,
315for example when the coroutine gets canceled), the lock is automatically 370for example when the coroutine gets canceled), the lock is automatically
316returned. 371returned.
317 372
318Locks are *not* recursive, locking from the same coro twice results in a 373Locks are *not* recursive, locking from the same coro twice results in a
319deadlocked coro. 374deadlocked coro.
325 380
326Return true if the lock is currently active, i.e. somebody has locked it. 381Return true if the lock is currently active, i.e. somebody has locked it.
327 382
328=cut 383=cut
329 384
330our %LOCK; 385our $LOCKS = new Coro::SemaphoreSet;
331our %LOCKER;#d#
332 386
333sub lock_wait($) { 387sub lock_wait($) {
334 my ($key) = @_; 388 $LOCKS->wait ($_[0]);
335
336 if ($LOCKER{$key} == $Coro::current) {#d#
337 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
338 return;#d#
339 }#d#
340
341 # wait for lock, if any
342 while ($LOCK{$key}) {
343 push @{ $LOCK{$key} }, $Coro::current;
344 Coro::schedule;
345 }
346} 389}
347 390
348sub lock_acquire($) { 391sub lock_acquire($) {
349 my ($key) = @_; 392 $LOCKS->guard ($_[0])
350
351 # wait, to be sure we are not locked
352 lock_wait $key;
353
354 $LOCK{$key} = [];
355 $LOCKER{$key} = $Coro::current;#d#
356
357 Coro::guard {
358 delete $LOCKER{$key};#d#
359 # wake up all waiters, to be on the safe side
360 $_->ready for @{ delete $LOCK{$key} };
361 }
362} 393}
363 394
364sub lock_active($) { 395sub lock_active($) {
365 my ($key) = @_; 396 $LOCKS->count ($_[0]) < 1
366
367 ! ! $LOCK{$key}
368} 397}
369 398
370sub freeze_mainloop { 399sub freeze_mainloop {
371 tick_inhibit_inc; 400 tick_inhibit_inc;
372 401
373 Coro::guard \&tick_inhibit_dec; 402 &Guard::guard (\&tick_inhibit_dec);
374} 403}
375 404
376=item cf::periodic $interval, $cb 405=item cf::periodic $interval, $cb
377 406
378Like EV::periodic, but randomly selects a starting point so that the actions 407Like EV::periodic, but randomly selects a starting point so that the actions
379get spread over timer. 408get spread over time.
380 409
381=cut 410=cut
382 411
383sub periodic($$) { 412sub periodic($$) {
384 my ($interval, $cb) = @_; 413 my ($interval, $cb) = @_;
401 430
402=cut 431=cut
403 432
404our @SLOT_QUEUE; 433our @SLOT_QUEUE;
405our $SLOT_QUEUE; 434our $SLOT_QUEUE;
435our $SLOT_DECAY = 0.9;
406 436
407$SLOT_QUEUE->cancel if $SLOT_QUEUE; 437$SLOT_QUEUE->cancel if $SLOT_QUEUE;
408$SLOT_QUEUE = Coro::async { 438$SLOT_QUEUE = Coro::async {
409 $Coro::current->desc ("timeslot manager"); 439 $Coro::current->desc ("timeslot manager");
410 440
411 my $signal = new Coro::Signal; 441 my $signal = new Coro::Signal;
442 my $busy;
412 443
413 while () { 444 while () {
414 next_job: 445 next_job:
446
415 my $avail = cf::till_tick; 447 my $avail = cf::till_tick;
416 if ($avail > 0.01) { 448
417 for (0 .. $#SLOT_QUEUE) { 449 for (0 .. $#SLOT_QUEUE) {
418 if ($SLOT_QUEUE[$_][0] < $avail) { 450 if ($SLOT_QUEUE[$_][0] <= $avail) {
451 $busy = 0;
419 my $job = splice @SLOT_QUEUE, $_, 1, (); 452 my $job = splice @SLOT_QUEUE, $_, 1, ();
420 $job->[2]->send; 453 $job->[2]->send;
421 Coro::cede; 454 Coro::cede;
422 goto next_job; 455 goto next_job;
423 } 456 } else {
457 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
424 } 458 }
425 } 459 }
426 460
427 if (@SLOT_QUEUE) { 461 if (@SLOT_QUEUE) {
428 # we do not use wait_for_tick() as it returns immediately when tick is inactive 462 # we do not use wait_for_tick() as it returns immediately when tick is inactive
429 push @cf::WAIT_FOR_TICK, $signal; 463 push @cf::WAIT_FOR_TICK, $signal;
430 $signal->wait; 464 $signal->wait;
431 } else { 465 } else {
466 $busy = 0;
432 Coro::schedule; 467 Coro::schedule;
433 } 468 }
434 } 469 }
435}; 470};
436 471
437sub get_slot($;$$) { 472sub get_slot($;$$) {
438 return if tick_inhibit || $Coro::current == $Coro::main; 473 return if tick_inhibit || $Coro::current == $Coro::main;
439 474
440 my ($time, $pri, $name) = @_; 475 my ($time, $pri, $name) = @_;
441 476
442 $time = $TICK * .6 if $time > $TICK * .6; 477 $time = clamp $time, 0.01, $TICK * .6;
478
443 my $sig = new Coro::Signal; 479 my $sig = new Coro::Signal;
444 480
445 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 481 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
446 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 482 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
447 $SLOT_QUEUE->ready; 483 $SLOT_QUEUE->ready;
474 510
475sub sync_job(&) { 511sub sync_job(&) {
476 my ($job) = @_; 512 my ($job) = @_;
477 513
478 if ($Coro::current == $Coro::main) { 514 if ($Coro::current == $Coro::main) {
479 my $time = EV::time; 515 my $time = AE::time;
480 516
481 # this is the main coro, too bad, we have to block 517 # this is the main coro, too bad, we have to block
482 # till the operation succeeds, freezing the server :/ 518 # till the operation succeeds, freezing the server :/
483 519
484 LOG llevError, Carp::longmess "sync job";#d# 520 LOG llevError, Carp::longmess "sync job";#d#
501 } else { 537 } else {
502 EV::loop EV::LOOP_ONESHOT; 538 EV::loop EV::LOOP_ONESHOT;
503 } 539 }
504 } 540 }
505 541
506 my $time = EV::time - $time; 542 my $time = AE::time - $time;
507 543
508 $TICK_START += $time; # do not account sync jobs to server load 544 $TICK_START += $time; # do not account sync jobs to server load
509 545
510 wantarray ? @res : $res[0] 546 wantarray ? @res : $res[0]
511 } else { 547 } else {
555 reset_signals; 591 reset_signals;
556 &$cb 592 &$cb
557 }, @args; 593 }, @args;
558 594
559 wantarray ? @res : $res[-1] 595 wantarray ? @res : $res[-1]
596}
597
598sub objinfo {
599 (
600 "counter value" => cf::object::object_count,
601 "objects created" => cf::object::create_count,
602 "objects destroyed" => cf::object::destroy_count,
603 "freelist size" => cf::object::free_count,
604 "allocated objects" => cf::object::objects_size,
605 "active objects" => cf::object::actives_size,
606 )
560} 607}
561 608
562=item $coin = coin_from_name $name 609=item $coin = coin_from_name $name
563 610
564=cut 611=cut
1150 $decname, length $$rdata, scalar @$objs; 1197 $decname, length $$rdata, scalar @$objs;
1151 1198
1152 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1199 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1153 aio_chmod $fh, SAVE_MODE; 1200 aio_chmod $fh, SAVE_MODE;
1154 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1201 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1155 aio_fsync $fh if $cf::USE_FSYNC; 1202 if ($cf::USE_FSYNC) {
1203 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;
1204 aio_fsync $fh;
1205 }
1156 aio_close $fh; 1206 aio_close $fh;
1157 1207
1158 if (@$objs) { 1208 if (@$objs) {
1159 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1209 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1160 aio_chmod $fh, SAVE_MODE; 1210 aio_chmod $fh, SAVE_MODE;
1161 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1211 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1162 aio_write $fh, 0, (length $data), $data, 0; 1212 aio_write $fh, 0, (length $data), $data, 0;
1163 aio_fsync $fh if $cf::USE_FSYNC; 1213 if ($cf::USE_FSYNC) {
1214 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;
1215 aio_fsync $fh;
1216 }
1164 aio_close $fh; 1217 aio_close $fh;
1165 aio_rename "$filename.pst~", "$filename.pst"; 1218 aio_rename "$filename.pst~", "$filename.pst";
1166 } 1219 }
1167 } else { 1220 } else {
1168 aio_unlink "$filename.pst"; 1221 aio_unlink "$filename.pst";
1169 } 1222 }
1170 1223
1171 aio_rename "$filename~", $filename; 1224 aio_rename "$filename~", $filename;
1225
1226 $filename =~ s%/[^/]+$%%;
1227 aio_pathsync $filename if $cf::USE_FSYNC;
1172 } else { 1228 } else {
1173 warn "FATAL: $filename~: $!\n"; 1229 warn "unable to save objects: $filename~: $!\n";
1174 } 1230 }
1175 } else { 1231 } else {
1176 aio_unlink $filename; 1232 aio_unlink $filename;
1177 aio_unlink "$filename.pst"; 1233 aio_unlink "$filename.pst";
1178 } 1234 }
1269 my ($name, $cb) = @_; 1325 my ($name, $cb) = @_;
1270 1326
1271 $EXTICMD{$name} = $cb; 1327 $EXTICMD{$name} = $cb;
1272} 1328}
1273 1329
1330use File::Glob ();
1331
1274cf::player->attach ( 1332cf::player->attach (
1275 on_command => sub { 1333 on_unknown_command => sub {
1276 my ($pl, $name, $params) = @_; 1334 my ($pl, $name, $params) = @_;
1277 1335
1278 my $cb = $COMMAND{$name} 1336 my $cb = $COMMAND{$name}
1279 or return; 1337 or return;
1280 1338
1310 1368
1311 cf::override; 1369 cf::override;
1312 }, 1370 },
1313); 1371);
1314 1372
1373# "readahead" all extensions
1374sub cache_extensions {
1375 my $grp = IO::AIO::aio_group;
1376
1377 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1378 for (grep /\.ext$/, @{$_[0]}) {
1379 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1380 }
1381 };
1382
1383 $grp
1384}
1385
1315sub load_extensions { 1386sub load_extensions {
1316 cf::sync_job { 1387 cf::sync_job {
1317 my %todo; 1388 my %todo;
1318 1389
1319 for my $path (<$LIBDIR/*.ext>) { 1390 for my $path (<$LIBDIR/*.ext>) {
1346 . "\n};\n1"; 1417 . "\n};\n1";
1347 1418
1348 $todo{$base} = \%ext; 1419 $todo{$base} = \%ext;
1349 } 1420 }
1350 1421
1422 my $pass = 0;
1351 my %done; 1423 my %done;
1352 while (%todo) { 1424 while (%todo) {
1353 my $progress; 1425 my $progress;
1354 1426
1427 ++$pass;
1428
1429 ext:
1355 while (my ($k, $v) = each %todo) { 1430 while (my ($k, $v) = each %todo) {
1356 for (split /,\s*/, $v->{meta}{depends}) { 1431 for (split /,\s*/, $v->{meta}{depends}) {
1357 goto skip 1432 next ext
1358 unless exists $done{$_}; 1433 unless exists $done{$_};
1359 } 1434 }
1360 1435
1361 warn "... loading '$k' into '$v->{pkg}'\n"; 1436 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1362 1437
1363 unless (eval $v->{source}) { 1438 my $active = eval $v->{source};
1439
1440 if (length $@) {
1364 my $msg = $@ ? "$v->{path}: $@\n" 1441 warn "$v->{path}: $@\n";
1365 : "$v->{base}: extension inactive.\n";
1366 1442
1367 if (exists $v->{meta}{mandatory}) {
1368 warn $msg;
1369 cf::cleanup "mandatory extension failed to load, exiting."; 1443 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1370 } 1444 if exists $v->{meta}{mandatory};
1371 1445
1372 warn $msg; 1446 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1447 delete $todo{$k};
1448 } else {
1449 $done{$k} = delete $todo{$k};
1450 push @EXTS, $v->{pkg};
1451 $progress = 1;
1452
1453 warn "$v->{base}: extension inactive.\n"
1454 unless $active;
1373 } 1455 }
1374
1375 $done{$k} = delete $todo{$k};
1376 push @EXTS, $v->{pkg};
1377 $progress = 1;
1378 } 1456 }
1379 1457
1380 skip: 1458 unless ($progress) {
1381 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1459 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1382 unless $progress; 1460
1461 while (my ($k, $v) = each %todo) {
1462 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1463 if exists $v->{meta}{mandatory};
1464 }
1465 }
1383 } 1466 }
1384 }; 1467 };
1385} 1468}
1386 1469
1387############################################################################# 1470#############################################################################
1441 1524
1442sub exists($) { 1525sub exists($) {
1443 my ($login) = @_; 1526 my ($login) = @_;
1444 1527
1445 $cf::PLAYER{$login} 1528 $cf::PLAYER{$login}
1446 or cf::sync_job { !aio_stat path $login } 1529 or !aio_stat path $login
1447} 1530}
1448 1531
1449sub find($) { 1532sub find($) {
1450 return $cf::PLAYER{$_[0]} || do { 1533 return $cf::PLAYER{$_[0]} || do {
1451 my $login = $_[0]; 1534 my $login = $_[0];
1471 $cf::PLAYER{$login} = $pl 1554 $cf::PLAYER{$login} = $pl
1472 } 1555 }
1473 } 1556 }
1474} 1557}
1475 1558
1559cf::player->attach (
1560 on_load => sub {
1561 my ($pl, $path) = @_;
1562
1563 # restore slots saved in save, below
1564 my $slots = delete $pl->{_slots};
1565
1566 $pl->ob->current_weapon ($slots->[0]);
1567 $pl->combat_ob ($slots->[1]);
1568 $pl->ranged_ob ($slots->[2]);
1569 },
1570);
1571
1476sub save($) { 1572sub save($) {
1477 my ($pl) = @_; 1573 my ($pl) = @_;
1478 1574
1479 return if $pl->{deny_save}; 1575 return if $pl->{deny_save};
1480 1576
1485 1581
1486 aio_mkdir playerdir $pl, 0770; 1582 aio_mkdir playerdir $pl, 0770;
1487 $pl->{last_save} = $cf::RUNTIME; 1583 $pl->{last_save} = $cf::RUNTIME;
1488 1584
1489 cf::get_slot 0.01; 1585 cf::get_slot 0.01;
1586
1587 # save slots, to be restored later
1588 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1490 1589
1491 $pl->save_pl ($path); 1590 $pl->save_pl ($path);
1492 cf::cede_to_tick; 1591 cf::cede_to_tick;
1493} 1592}
1494 1593
1596 \@logins 1695 \@logins
1597} 1696}
1598 1697
1599=item $player->maps 1698=item $player->maps
1600 1699
1700=item cf::player::maps $login
1701
1601Returns an arrayref of map paths that are private for this 1702Returns an arrayref of map paths that are private for this
1602player. May block. 1703player. May block.
1603 1704
1604=cut 1705=cut
1605 1706
1667=cut 1768=cut
1668 1769
1669sub find_by_path($) { 1770sub find_by_path($) {
1670 my ($path) = @_; 1771 my ($path) = @_;
1671 1772
1773 $path =~ s/^~[^\/]*//; # skip ~login
1774
1672 my ($match, $specificity); 1775 my ($match, $specificity);
1673 1776
1674 for my $region (list) { 1777 for my $region (list) {
1675 if ($region->{match} && $path =~ $region->{match}) { 1778 if ($region->{match} && $path =~ $region->{match}) {
1676 ($match, $specificity) = ($region, $region->specificity) 1779 ($match, $specificity) = ($region, $region->specificity)
1707 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1810 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1708 1811
1709 # mit "rum" bekleckern, nicht 1812 # mit "rum" bekleckern, nicht
1710 $self->_create_random_map ( 1813 $self->_create_random_map (
1711 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1814 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1712 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1815 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1713 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1816 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1714 $rmp->{exit_on_final_map}, 1817 $rmp->{exit_on_final_map},
1715 $rmp->{xsize}, $rmp->{ysize}, 1818 $rmp->{xsize}, $rmp->{ysize},
1716 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1819 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1717 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1820 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1739 1842
1740 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1843 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1741} 1844}
1742 1845
1743# also paths starting with '/' 1846# also paths starting with '/'
1744$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1847$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1745 1848
1746sub thawer_merge { 1849sub thawer_merge {
1747 my ($self, $merge) = @_; 1850 my ($self, $merge) = @_;
1748 1851
1749 # we have to keep some variables in memory intact 1852 # we have to keep some variables in memory intact
1847 1950
1848 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1951 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1849 "$UNIQUEDIR/$path" 1952 "$UNIQUEDIR/$path"
1850} 1953}
1851 1954
1852# and all this just because we cannot iterate over
1853# all maps in C++...
1854sub change_all_map_light {
1855 my ($change) = @_;
1856
1857 $_->change_map_light ($change)
1858 for grep $_->outdoor, values %cf::MAP;
1859}
1860
1861sub decay_objects { 1955sub decay_objects {
1862 my ($self) = @_; 1956 my ($self) = @_;
1863 1957
1864 return if $self->{deny_reset}; 1958 return if $self->{deny_reset};
1865 1959
1947sub find { 2041sub find {
1948 my ($path, $origin) = @_; 2042 my ($path, $origin) = @_;
1949 2043
1950 $path = normalise $path, $origin && $origin->path; 2044 $path = normalise $path, $origin && $origin->path;
1951 2045
1952 cf::lock_wait "map_data:$path";#d#remove 2046 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1953 cf::lock_wait "map_find:$path"; 2047 my $guard2 = cf::lock_acquire "map_find:$path";
1954 2048
1955 $cf::MAP{$path} || do { 2049 $cf::MAP{$path} || do {
1956 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1957 my $guard2 = cf::lock_acquire "map_find:$path";
1958
1959 my $map = new_from_path cf::map $path 2050 my $map = new_from_path cf::map $path
1960 or return; 2051 or return;
1961 2052
1962 $map->{last_save} = $cf::RUNTIME; 2053 $map->{last_save} = $cf::RUNTIME;
1963 2054
1975 2066
1976 $cf::MAP{$path} = $map 2067 $cf::MAP{$path} = $map
1977 } 2068 }
1978} 2069}
1979 2070
1980sub pre_load { } 2071sub pre_load { }
1981sub post_load { } 2072#sub post_load { } # XS
1982 2073
1983sub load { 2074sub load {
1984 my ($self) = @_; 2075 my ($self) = @_;
1985 2076
1986 local $self->{deny_reset} = 1; # loading can take a long time 2077 local $self->{deny_reset} = 1; # loading can take a long time
2031 unless ($self->{deny_activate}) { 2122 unless ($self->{deny_activate}) {
2032 $self->decay_objects; 2123 $self->decay_objects;
2033 $self->fix_auto_apply; 2124 $self->fix_auto_apply;
2034 $self->update_buttons; 2125 $self->update_buttons;
2035 cf::cede_to_tick; 2126 cf::cede_to_tick;
2036 $self->set_darkness_map;
2037 cf::cede_to_tick;
2038 $self->activate; 2127 $self->activate;
2039 } 2128 }
2040 2129
2041 $self->{last_save} = $cf::RUNTIME; 2130 $self->{last_save} = $cf::RUNTIME;
2042 $self->last_access ($cf::RUNTIME); 2131 $self->last_access ($cf::RUNTIME);
2045 } 2134 }
2046 2135
2047 $self->post_load; 2136 $self->post_load;
2048} 2137}
2049 2138
2139# customize the map for a given player, i.e.
2140# return the _real_ map. used by e.g. per-player
2141# maps to change the path to ~playername/mappath
2050sub customise_for { 2142sub customise_for {
2051 my ($self, $ob) = @_; 2143 my ($self, $ob) = @_;
2052 2144
2053 return find "~" . $ob->name . "/" . $self->{path} 2145 return find "~" . $ob->name . "/" . $self->{path}
2054 if $self->per_player; 2146 if $self->per_player;
2131 $MAP_PREFETCHER->prio (6); 2223 $MAP_PREFETCHER->prio (6);
2132 2224
2133 () 2225 ()
2134} 2226}
2135 2227
2228# common code, used by both ->save and ->swapout
2136sub save { 2229sub _save {
2137 my ($self) = @_; 2230 my ($self) = @_;
2138
2139 my $lock = cf::lock_acquire "map_data:$self->{path}";
2140 2231
2141 $self->{last_save} = $cf::RUNTIME; 2232 $self->{last_save} = $cf::RUNTIME;
2142 2233
2143 return unless $self->dirty; 2234 return unless $self->dirty;
2144 2235
2164 } else { 2255 } else {
2165 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2256 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2166 } 2257 }
2167} 2258}
2168 2259
2260sub save {
2261 my ($self) = @_;
2262
2263 my $lock = cf::lock_acquire "map_data:$self->{path}";
2264
2265 $self->_save;
2266}
2267
2169sub swap_out { 2268sub swap_out {
2170 my ($self) = @_; 2269 my ($self) = @_;
2171 2270
2172 # save first because save cedes
2173 $self->save;
2174
2175 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2271 my $lock = cf::lock_acquire "map_data:$self->{path}";
2176 2272
2177 return if $self->players;
2178 return if $self->in_memory != cf::MAP_ACTIVE; 2273 return if $self->in_memory != cf::MAP_ACTIVE;
2179 return if $self->{deny_save}; 2274 return if $self->{deny_save};
2275 return if $self->players;
2180 2276
2277 # first deactivate the map and "unlink" it from the core
2278 $self->deactivate;
2279 $_->clear_links_to ($self) for values %cf::MAP;
2181 $self->in_memory (cf::MAP_SWAPPED); 2280 $self->in_memory (cf::MAP_SWAPPED);
2281
2282 # then atomically save
2283 $self->_save;
2284
2285 # then free the map
2286 $self->clear;
2287}
2288
2289sub reset_at {
2290 my ($self) = @_;
2291
2292 # TODO: safety, remove and allow resettable per-player maps
2293 return 1e99 if $self->{deny_reset};
2294
2295 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2296 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2297
2298 $time + $to
2299}
2300
2301sub should_reset {
2302 my ($self) = @_;
2303
2304 $self->reset_at <= $cf::RUNTIME
2305}
2306
2307sub reset {
2308 my ($self) = @_;
2309
2310 my $lock = cf::lock_acquire "map_data:$self->{path}";
2311
2312 return if $self->players;
2313
2314 warn "resetting map ", $self->path, "\n";
2315
2316 $self->in_memory (cf::MAP_SWAPPED);
2317
2318 # need to save uniques path
2319 unless ($self->{deny_save}) {
2320 my $uniq = $self->uniq_path; utf8::encode $uniq;
2321
2322 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2323 if $uniq;
2324 }
2325
2326 delete $cf::MAP{$self->path};
2182 2327
2183 $self->deactivate; 2328 $self->deactivate;
2184 $_->clear_links_to ($self) for values %cf::MAP; 2329 $_->clear_links_to ($self) for values %cf::MAP;
2185 $self->clear; 2330 $self->clear;
2186}
2187
2188sub reset_at {
2189 my ($self) = @_;
2190
2191 # TODO: safety, remove and allow resettable per-player maps
2192 return 1e99 if $self->{deny_reset};
2193
2194 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2195 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2196
2197 $time + $to
2198}
2199
2200sub should_reset {
2201 my ($self) = @_;
2202
2203 $self->reset_at <= $cf::RUNTIME
2204}
2205
2206sub reset {
2207 my ($self) = @_;
2208
2209 my $lock = cf::lock_acquire "map_data:$self->{path}";
2210
2211 return if $self->players;
2212
2213 warn "resetting map ", $self->path;
2214
2215 $self->in_memory (cf::MAP_SWAPPED);
2216
2217 # need to save uniques path
2218 unless ($self->{deny_save}) {
2219 my $uniq = $self->uniq_path; utf8::encode $uniq;
2220
2221 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2222 if $uniq;
2223 }
2224
2225 delete $cf::MAP{$self->path};
2226
2227 $self->deactivate;
2228 $_->clear_links_to ($self) for values %cf::MAP;
2229 $self->clear;
2230 2331
2231 $self->unlink_save; 2332 $self->unlink_save;
2232 $self->destroy; 2333 $self->destroy;
2233} 2334}
2234 2335
2242 2343
2243 delete $cf::MAP{$self->path}; 2344 delete $cf::MAP{$self->path};
2244 2345
2245 $self->unlink_save; 2346 $self->unlink_save;
2246 2347
2247 bless $self, "cf::map"; 2348 bless $self, "cf::map::wrap";
2248 delete $self->{deny_reset}; 2349 delete $self->{deny_reset};
2249 $self->{deny_save} = 1; 2350 $self->{deny_save} = 1;
2250 $self->reset_timeout (1); 2351 $self->reset_timeout (1);
2251 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2352 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2252 2353
2309 : normalise $_ 2410 : normalise $_
2310 } @{ aio_readdir $UNIQUEDIR or [] } 2411 } @{ aio_readdir $UNIQUEDIR or [] }
2311 ] 2412 ]
2312} 2413}
2313 2414
2415=item cf::map::static_maps
2416
2417Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2418file in the shared directory excluding F</styles> and F</editor>). May
2419block.
2420
2421=cut
2422
2423sub static_maps() {
2424 my @dirs = "";
2425 my @maps;
2426
2427 while (@dirs) {
2428 my $dir = shift @dirs;
2429
2430 next if $dir eq "/styles" || $dir eq "/editor";
2431
2432 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2433 or return;
2434
2435 for (@$files) {
2436 s/\.map$// or next;
2437 utf8::decode $_;
2438 push @maps, "$dir/$_";
2439 }
2440
2441 push @dirs, map "$dir/$_", @$dirs;
2442 }
2443
2444 \@maps
2445}
2446
2314=back 2447=back
2315 2448
2316=head3 cf::object 2449=head3 cf::object
2317 2450
2318=cut 2451=cut
2383 2516
2384our $SAY_CHANNEL = { 2517our $SAY_CHANNEL = {
2385 id => "say", 2518 id => "say",
2386 title => "Map", 2519 title => "Map",
2387 reply => "say ", 2520 reply => "say ",
2388 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2521 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2389}; 2522};
2390 2523
2391our $CHAT_CHANNEL = { 2524our $CHAT_CHANNEL = {
2392 id => "chat", 2525 id => "chat",
2393 title => "Chat", 2526 title => "Chat",
2486 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2619 return if UNIVERSAL::isa $self->map, "ext::map_link";
2487 2620
2488 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2621 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2489 if $self->map && $self->map->{path} ne "{link}"; 2622 if $self->map && $self->map->{path} ne "{link}";
2490 2623
2491 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2624 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2492} 2625}
2493 2626
2494sub cf::object::player::leave_link { 2627sub cf::object::player::leave_link {
2495 my ($self, $map, $x, $y) = @_; 2628 my ($self, $map, $x, $y) = @_;
2496 2629
2513 ($x, $y) = (-1, -1) 2646 ($x, $y) = (-1, -1)
2514 unless (defined $x) && (defined $y); 2647 unless (defined $x) && (defined $y);
2515 2648
2516 # use -1 or undef as default coordinates, not 0, 0 2649 # use -1 or undef as default coordinates, not 0, 0
2517 ($x, $y) = ($map->enter_x, $map->enter_y) 2650 ($x, $y) = ($map->enter_x, $map->enter_y)
2518 if $x <=0 && $y <= 0; 2651 if $x <= 0 && $y <= 0;
2519 2652
2520 $map->load; 2653 $map->load;
2521 $map->load_neighbours; 2654 $map->load_neighbours;
2522 2655
2523 return unless $self->contr->active; 2656 return unless $self->contr->active;
2524 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2525 $self->activate_recursive;
2526 2657
2527 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2658 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2528 $self->enter_map ($map, $x, $y); 2659 $self->enter_map ($map, $x, $y);
2660
2661 # only activate afterwards, to support waiting in hooks
2662 $self->activate_recursive;
2529} 2663}
2530 2664
2531=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2665=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2532 2666
2533Moves the player to the given map-path and coordinates by first freezing 2667Moves the player to the given map-path and coordinates by first freezing
2721 2855
2722 utf8::encode $text; 2856 utf8::encode $text;
2723 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2857 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2724} 2858}
2725 2859
2860=item $client->send_big_packet ($pkt)
2861
2862Like C<send_packet>, but tries to compress large packets, and fragments
2863them as required.
2864
2865=cut
2866
2867our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2868
2869sub cf::client::send_big_packet {
2870 my ($self, $pkt) = @_;
2871
2872 # try lzf for large packets
2873 $pkt = "lzf " . Compress::LZF::compress $pkt
2874 if 1024 <= length $pkt and $self->{can_lzf};
2875
2876 # split very large packets
2877 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2878 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2879 $pkt = "frag";
2880 }
2881
2882 $self->send_packet ($pkt);
2883}
2884
2726=item $client->send_msg ($channel, $msg, $color, [extra...]) 2885=item $client->send_msg ($channel, $msg, $color, [extra...])
2727 2886
2728Send a drawinfo or msg packet to the client, formatting the msg for the 2887Send a drawinfo or msg packet to the client, formatting the msg for the
2729client if neccessary. C<$type> should be a string identifying the type of 2888client if neccessary. C<$type> should be a string identifying the type of
2730the message, with C<log> being the default. If C<$color> is negative, suppress 2889the message, with C<log> being the default. If C<$color> is negative, suppress
2732 2891
2733=cut 2892=cut
2734 2893
2735# non-persistent channels (usually the info channel) 2894# non-persistent channels (usually the info channel)
2736our %CHANNEL = ( 2895our %CHANNEL = (
2896 "c/motd" => {
2897 id => "infobox",
2898 title => "MOTD",
2899 reply => undef,
2900 tooltip => "The message of the day",
2901 },
2737 "c/identify" => { 2902 "c/identify" => {
2738 id => "infobox", 2903 id => "infobox",
2739 title => "Identify", 2904 title => "Identify",
2740 reply => undef, 2905 reply => undef,
2741 tooltip => "Items recently identified", 2906 tooltip => "Items recently identified",
2743 "c/examine" => { 2908 "c/examine" => {
2744 id => "infobox", 2909 id => "infobox",
2745 title => "Examine", 2910 title => "Examine",
2746 reply => undef, 2911 reply => undef,
2747 tooltip => "Signs and other items you examined", 2912 tooltip => "Signs and other items you examined",
2913 },
2914 "c/shopinfo" => {
2915 id => "infobox",
2916 title => "Shop Info",
2917 reply => undef,
2918 tooltip => "What your bargaining skill tells you about the shop",
2748 }, 2919 },
2749 "c/book" => { 2920 "c/book" => {
2750 id => "infobox", 2921 id => "infobox",
2751 title => "Book", 2922 title => "Book",
2752 reply => undef, 2923 reply => undef,
2768 id => "infobox", 2939 id => "infobox",
2769 title => "Body Parts", 2940 title => "Body Parts",
2770 reply => undef, 2941 reply => undef,
2771 tooltip => "Shows which body parts you posess and are available", 2942 tooltip => "Shows which body parts you posess and are available",
2772 }, 2943 },
2944 "c/statistics" => {
2945 id => "infobox",
2946 title => "Statistics",
2947 reply => undef,
2948 tooltip => "Shows your primary statistics",
2949 },
2950 "c/skills" => {
2951 id => "infobox",
2952 title => "Skills",
2953 reply => undef,
2954 tooltip => "Shows your experience per skill and item power",
2955 },
2956 "c/shopitems" => {
2957 id => "infobox",
2958 title => "Shop Items",
2959 reply => undef,
2960 tooltip => "Shows the items currently for sale in this shop",
2961 },
2962 "c/resistances" => {
2963 id => "infobox",
2964 title => "Resistances",
2965 reply => undef,
2966 tooltip => "Shows your resistances",
2967 },
2968 "c/pets" => {
2969 id => "infobox",
2970 title => "Pets",
2971 reply => undef,
2972 tooltip => "Shows information abotu your pets/a specific pet",
2973 },
2974 "c/perceiveself" => {
2975 id => "infobox",
2976 title => "Perceive Self",
2977 reply => undef,
2978 tooltip => "You gained detailed knowledge about yourself",
2979 },
2773 "c/uptime" => { 2980 "c/uptime" => {
2774 id => "infobox", 2981 id => "infobox",
2775 title => "Uptime", 2982 title => "Uptime",
2776 reply => undef, 2983 reply => undef,
2777 tooltip => "How long the server has been running since last restart", 2984 tooltip => "How long the server has been running since last restart",
2786 id => "party", 2993 id => "party",
2787 title => "Party", 2994 title => "Party",
2788 reply => "gsay ", 2995 reply => "gsay ",
2789 tooltip => "Messages and chat related to your party", 2996 tooltip => "Messages and chat related to your party",
2790 }, 2997 },
2998 "c/death" => {
2999 id => "death",
3000 title => "Death",
3001 reply => undef,
3002 tooltip => "Reason for and more info about your most recent death",
3003 },
3004 "c/say" => $SAY_CHANNEL,
3005 "c/chat" => $CHAT_CHANNEL,
2791); 3006);
2792 3007
2793sub cf::client::send_msg { 3008sub cf::client::send_msg {
2794 my ($self, $channel, $msg, $color, @extra) = @_; 3009 my ($self, $channel, $msg, $color, @extra) = @_;
2795 3010
2800 3015
2801 # check predefined channels, for the benefit of C 3016 # check predefined channels, for the benefit of C
2802 if ($CHANNEL{$channel}) { 3017 if ($CHANNEL{$channel}) {
2803 $channel = $CHANNEL{$channel}; 3018 $channel = $CHANNEL{$channel};
2804 3019
2805 $self->ext_msg (channel_info => $channel) 3020 $self->ext_msg (channel_info => $channel);
2806 if $self->can_msg;
2807
2808 $channel = $channel->{id}; 3021 $channel = $channel->{id};
2809 3022
2810 } elsif (ref $channel) { 3023 } elsif (ref $channel) {
2811 # send meta info to client, if not yet sent 3024 # send meta info to client, if not yet sent
2812 unless (exists $self->{channel}{$channel->{id}}) { 3025 unless (exists $self->{channel}{$channel->{id}}) {
2813 $self->{channel}{$channel->{id}} = $channel; 3026 $self->{channel}{$channel->{id}} = $channel;
2814 $self->ext_msg (channel_info => $channel) 3027 $self->ext_msg (channel_info => $channel);
2815 if $self->can_msg;
2816 } 3028 }
2817 3029
2818 $channel = $channel->{id}; 3030 $channel = $channel->{id};
2819 } 3031 }
2820 3032
2821 return unless @extra || length $msg; 3033 return unless @extra || length $msg;
2822 3034
2823 if ($self->can_msg) {
2824 # default colour, mask it out 3035 # default colour, mask it out
2825 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3036 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2826 if $color & cf::NDI_DEF; 3037 if $color & cf::NDI_DEF;
2827 3038
2828 my $pkt = "msg " 3039 my $pkt = "msg "
2829 . $self->{json_coder}->encode ( 3040 . $self->{json_coder}->encode (
2830 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3041 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2831 ); 3042 );
2832 3043
2833 # try lzf for large packets
2834 $pkt = "lzf " . Compress::LZF::compress $pkt
2835 if 1024 <= length $pkt and $self->{can_lzf};
2836
2837 # split very large packets
2838 if (8192 < length $pkt and $self->{can_lzf}) {
2839 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2840 $pkt = "frag";
2841 }
2842
2843 $self->send_packet ($pkt); 3044 $self->send_big_packet ($pkt);
2844 } else {
2845 if ($color >= 0) {
2846 # replace some tags by gcfclient-compatible ones
2847 for ($msg) {
2848 1 while
2849 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2850 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2851 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2852 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2853 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2854 }
2855
2856 $color &= cf::NDI_COLOR_MASK;
2857
2858 utf8::encode $msg;
2859
2860 if (0 && $msg =~ /\[/) {
2861 # COMMAND/INFO
2862 $self->send_packet ("drawextinfo $color 10 8 $msg")
2863 } else {
2864 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2865 $self->send_packet ("drawinfo $color $msg")
2866 }
2867 }
2868 }
2869} 3045}
2870 3046
2871=item $client->ext_msg ($type, @msg) 3047=item $client->ext_msg ($type, @msg)
2872 3048
2873Sends an ext event to the client. 3049Sends an ext event to the client.
2876 3052
2877sub cf::client::ext_msg($$@) { 3053sub cf::client::ext_msg($$@) {
2878 my ($self, $type, @msg) = @_; 3054 my ($self, $type, @msg) = @_;
2879 3055
2880 if ($self->extcmd == 2) { 3056 if ($self->extcmd == 2) {
2881 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3057 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2882 } elsif ($self->extcmd == 1) { # TODO: remove 3058 } elsif ($self->extcmd == 1) { # TODO: remove
2883 push @msg, msgtype => "event_$type"; 3059 push @msg, msgtype => "event_$type";
2884 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3060 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2885 } 3061 }
2886} 3062}
2887 3063
2888=item $client->ext_reply ($msgid, @msg) 3064=item $client->ext_reply ($msgid, @msg)
2889 3065
2893 3069
2894sub cf::client::ext_reply($$@) { 3070sub cf::client::ext_reply($$@) {
2895 my ($self, $id, @msg) = @_; 3071 my ($self, $id, @msg) = @_;
2896 3072
2897 if ($self->extcmd == 2) { 3073 if ($self->extcmd == 2) {
2898 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3074 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2899 } elsif ($self->extcmd == 1) { 3075 } elsif ($self->extcmd == 1) {
2900 #TODO: version 1, remove 3076 #TODO: version 1, remove
2901 unshift @msg, msgtype => "reply", msgid => $id; 3077 unshift @msg, msgtype => "reply", msgid => $id;
2902 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3078 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2903 } 3079 }
2904} 3080}
2905 3081
2906=item $success = $client->query ($flags, "text", \&cb) 3082=item $success = $client->query ($flags, "text", \&cb)
2907 3083
3008 3184
3009 $coro 3185 $coro
3010} 3186}
3011 3187
3012cf::client->attach ( 3188cf::client->attach (
3013 on_destroy => sub { 3189 on_client_destroy => sub {
3014 my ($ns) = @_; 3190 my ($ns) = @_;
3015 3191
3016 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3192 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3017 }, 3193 },
3018); 3194);
3034our $safe_hole = new Safe::Hole; 3210our $safe_hole = new Safe::Hole;
3035 3211
3036$SIG{FPE} = 'IGNORE'; 3212$SIG{FPE} = 'IGNORE';
3037 3213
3038$safe->permit_only (Opcode::opset qw( 3214$safe->permit_only (Opcode::opset qw(
3039 :base_core :base_mem :base_orig :base_math 3215 :base_core :base_mem :base_orig :base_math :base_loop
3040 grepstart grepwhile mapstart mapwhile 3216 grepstart grepwhile mapstart mapwhile
3041 sort time 3217 sort time
3042)); 3218));
3043 3219
3044# here we export the classes and methods available to script code 3220# here we export the classes and methods available to script code
3048The following functions and methods are available within a safe environment: 3224The following functions and methods are available within a safe environment:
3049 3225
3050 cf::object 3226 cf::object
3051 contr pay_amount pay_player map x y force_find force_add destroy 3227 contr pay_amount pay_player map x y force_find force_add destroy
3052 insert remove name archname title slaying race decrease split 3228 insert remove name archname title slaying race decrease split
3229 value
3053 3230
3054 cf::object::player 3231 cf::object::player
3055 player 3232 player
3056 3233
3057 cf::player 3234 cf::player
3063=cut 3240=cut
3064 3241
3065for ( 3242for (
3066 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3243 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3067 insert remove inv nrof name archname title slaying race 3244 insert remove inv nrof name archname title slaying race
3068 decrease split destroy change_exp)], 3245 decrease split destroy change_exp value msg lore send_msg)],
3069 ["cf::object::player" => qw(player)], 3246 ["cf::object::player" => qw(player)],
3070 ["cf::player" => qw(peaceful)], 3247 ["cf::player" => qw(peaceful send_msg)],
3071 ["cf::map" => qw(trigger)], 3248 ["cf::map" => qw(trigger)],
3072) { 3249) {
3073 no strict 'refs'; 3250 no strict 'refs';
3074 my ($pkg, @funs) = @$_; 3251 my ($pkg, @funs) = @$_;
3075 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3252 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3093 3270
3094 my $qcode = $code; 3271 my $qcode = $code;
3095 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3272 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3096 $qcode =~ s/\n/\\n/g; 3273 $qcode =~ s/\n/\\n/g;
3097 3274
3275 %vars = (_dummy => 0) unless %vars;
3276
3277 my @res;
3098 local $_; 3278 local $_;
3099 local @safe::cf::_safe_eval_args = values %vars;
3100 3279
3101 my $eval = 3280 my $eval =
3102 "do {\n" 3281 "do {\n"
3103 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3282 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3104 . "#line 0 \"{$qcode}\"\n" 3283 . "#line 0 \"{$qcode}\"\n"
3105 . $code 3284 . $code
3106 . "\n}" 3285 . "\n}"
3107 ; 3286 ;
3108 3287
3288 if ($CFG{safe_eval}) {
3109 sub_generation_inc; 3289 sub_generation_inc;
3290 local @safe::cf::_safe_eval_args = values %vars;
3110 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3291 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3111 sub_generation_inc; 3292 sub_generation_inc;
3293 } else {
3294 local @cf::_safe_eval_args = values %vars;
3295 @res = wantarray ? eval eval : scalar eval $eval;
3296 }
3112 3297
3113 if ($@) { 3298 if ($@) {
3114 warn "$@"; 3299 warn "$@";
3115 warn "while executing safe code '$code'\n"; 3300 warn "while executing safe code '$code'\n";
3116 warn "with arguments " . (join " ", %vars) . "\n"; 3301 warn "with arguments " . (join " ", %vars) . "\n";
3135=cut 3320=cut
3136 3321
3137sub register_script_function { 3322sub register_script_function {
3138 my ($fun, $cb) = @_; 3323 my ($fun, $cb) = @_;
3139 3324
3140 no strict 'refs'; 3325 $fun = "safe::$fun" if $CFG{safe_eval};
3141 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3326 *$fun = $safe_hole->wrap ($cb);
3142} 3327}
3143 3328
3144=back 3329=back
3145 3330
3146=cut 3331=cut
3167 3352
3168 $facedata->{version} == 2 3353 $facedata->{version} == 2
3169 or cf::cleanup "$path: version mismatch, cannot proceed."; 3354 or cf::cleanup "$path: version mismatch, cannot proceed.";
3170 3355
3171 # patch in the exptable 3356 # patch in the exptable
3357 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3172 $facedata->{resource}{"res/exp_table"} = { 3358 $facedata->{resource}{"res/exp_table"} = {
3173 type => FT_RSRC, 3359 type => FT_RSRC,
3174 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3360 data => $exp_table,
3361 hash => (Digest::MD5::md5 $exp_table),
3175 }; 3362 };
3176 cf::cede_to_tick; 3363 cf::cede_to_tick;
3177 3364
3178 { 3365 {
3179 my $faces = $facedata->{faceinfo}; 3366 my $faces = $facedata->{faceinfo};
3181 while (my ($face, $info) = each %$faces) { 3368 while (my ($face, $info) = each %$faces) {
3182 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3369 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3183 3370
3184 cf::face::set_visibility $idx, $info->{visibility}; 3371 cf::face::set_visibility $idx, $info->{visibility};
3185 cf::face::set_magicmap $idx, $info->{magicmap}; 3372 cf::face::set_magicmap $idx, $info->{magicmap};
3186 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3373 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3187 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3374 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3188 3375
3189 cf::cede_to_tick; 3376 cf::cede_to_tick;
3190 } 3377 }
3191 3378
3192 while (my ($face, $info) = each %$faces) { 3379 while (my ($face, $info) = each %$faces) {
3216 3403
3217 cf::anim::invalidate_all; # d'oh 3404 cf::anim::invalidate_all; # d'oh
3218 } 3405 }
3219 3406
3220 { 3407 {
3221 # TODO: for gcfclient pleasure, we should give resources
3222 # that gcfclient doesn't grok a >10000 face index.
3223 my $res = $facedata->{resource}; 3408 my $res = $facedata->{resource};
3224 3409
3225 while (my ($name, $info) = each %$res) { 3410 while (my ($name, $info) = each %$res) {
3226 if (defined $info->{type}) { 3411 if (defined $info->{type}) {
3227 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3412 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3228 my $data;
3229 3413
3230 if ($info->{type} & 1) { 3414 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3231 # prepend meta info
3232
3233 my $meta = $enc->encode ({
3234 name => $name,
3235 %{ $info->{meta} || {} },
3236 });
3237
3238 $data = pack "(w/a*)*", $meta, $info->{data};
3239 } else {
3240 $data = $info->{data};
3241 }
3242
3243 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3244 cf::face::set_type $idx, $info->{type}; 3415 cf::face::set_type $idx, $info->{type};
3245 } else { 3416 } else {
3246 $RESOURCE{$name} = $info; 3417 $RESOURCE{$name} = $info;
3247 } 3418 }
3248 3419
3331 reload_treasures; 3502 reload_treasures;
3332 3503
3333 warn "finished reloading resource files\n"; 3504 warn "finished reloading resource files\n";
3334} 3505}
3335 3506
3336sub init {
3337 my $guard = freeze_mainloop;
3338
3339 evthread_start IO::AIO::poll_fileno;
3340
3341 reload_resources;
3342}
3343
3344sub reload_config { 3507sub reload_config {
3508 warn "reloading config file...\n";
3509
3345 open my $fh, "<:utf8", "$CONFDIR/config" 3510 open my $fh, "<:utf8", "$CONFDIR/config"
3346 or return; 3511 or return;
3347 3512
3348 local $/; 3513 local $/;
3349 *CFG = YAML::Load <$fh>; 3514 *CFG = YAML::XS::Load scalar <$fh>;
3350 3515
3351 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3516 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3352 3517
3353 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3518 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3354 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3519 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3358 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3523 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3359 and die "WARNING: m(un)lockall failed: $!\n"; 3524 and die "WARNING: m(un)lockall failed: $!\n";
3360 }; 3525 };
3361 warn $@ if $@; 3526 warn $@ if $@;
3362 } 3527 }
3528
3529 warn "finished reloading resource files\n";
3363} 3530}
3364 3531
3365sub pidfile() { 3532sub pidfile() {
3366 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3533 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3367 or die "$PIDFILE: $!"; 3534 or die "$PIDFILE: $!";
3379 3546
3380 seek $fh, 0, 0; 3547 seek $fh, 0, 0;
3381 print $fh $$; 3548 print $fh $$;
3382} 3549}
3383 3550
3551sub main_loop {
3552 warn "EV::loop starting\n";
3553 if (1) {
3554 EV::loop;
3555 }
3556 warn "EV::loop returned\n";
3557 goto &main_loop unless $REALLY_UNLOOP;
3558}
3559
3384sub main { 3560sub main {
3385 atomic; 3561 cf::init_globals; # initialise logging
3562
3563 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3564 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3565 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3566 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3567
3568 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3386 3569
3387 # we must not ever block the main coroutine 3570 # we must not ever block the main coroutine
3388 local $Coro::idle = sub { 3571 local $Coro::idle = sub {
3389 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3572 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3390 (async { 3573 (async {
3391 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3574 $Coro::current->{desc} = "IDLE BUG HANDLER";
3392 EV::loop EV::LOOP_ONESHOT; 3575 EV::loop EV::LOOP_ONESHOT;
3393 })->prio (Coro::PRIO_MAX); 3576 })->prio (Coro::PRIO_MAX);
3394 }; 3577 };
3395 3578
3396 { 3579 evthread_start IO::AIO::poll_fileno;
3397 my $guard = freeze_mainloop; 3580
3581 cf::sync_job {
3582 cf::init_experience;
3583 cf::init_anim;
3584 cf::init_attackmess;
3585 cf::init_dynamic;
3586
3587 cf::load_settings;
3588 cf::load_materials;
3589
3590 reload_resources;
3398 reload_config; 3591 reload_config;
3399 db_init; 3592 db_init;
3593
3594 cf::init_uuid;
3595 cf::init_signals;
3596 cf::init_skills;
3597
3598 cf::init_beforeplay;
3599
3600 atomic;
3601
3400 load_extensions; 3602 load_extensions;
3401 3603
3402 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3403 }
3404
3405 utime time, time, $RUNTIMEFILE; 3604 utime time, time, $RUNTIMEFILE;
3406 3605
3407 # no (long-running) fork's whatsoever before this point(!) 3606 # no (long-running) fork's whatsoever before this point(!)
3607 use POSIX ();
3408 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3608 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3409 3609
3410 EV::loop; 3610 (pop @POST_INIT)->(0) while @POST_INIT;
3611 };
3612
3613 cf::object::thawer::errors_are_fatal 0;
3614 warn "parse errors in files are no longer fatal from this point on.\n";
3615
3616 main_loop;
3411} 3617}
3412 3618
3413############################################################################# 3619#############################################################################
3414# initialisation and cleanup 3620# initialisation and cleanup
3415 3621
3416# install some emergency cleanup handlers 3622# install some emergency cleanup handlers
3417BEGIN { 3623BEGIN {
3418 our %SIGWATCHER = (); 3624 our %SIGWATCHER = ();
3419 for my $signal (qw(INT HUP TERM)) { 3625 for my $signal (qw(INT HUP TERM)) {
3420 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3626 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3421 cf::cleanup "SIG$signal"; 3627 cf::cleanup "SIG$signal";
3422 }; 3628 };
3423 } 3629 }
3424} 3630}
3425 3631
3426sub write_runtime_sync { 3632sub write_runtime_sync {
3633 my $t0 = AE::time;
3634
3427 # first touch the runtime file to show we are still running: 3635 # first touch the runtime file to show we are still running:
3428 # the fsync below can take a very very long time. 3636 # the fsync below can take a very very long time.
3429 3637
3430 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3638 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3431 3639
3432 my $guard = cf::lock_acquire "write_runtime"; 3640 my $guard = cf::lock_acquire "write_runtime";
3433 3641
3434 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3642 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3435 or return; 3643 or return;
3436 3644
3437 my $value = $cf::RUNTIME + 90 + 10; 3645 my $value = $cf::RUNTIME + 90 + 10;
3438 # 10 is the runtime save interval, for a monotonic clock 3646 # 10 is the runtime save interval, for a monotonic clock
3439 # 60 allows for the watchdog to kill the server. 3647 # 60 allows for the watchdog to kill the server.
3452 or return; 3660 or return;
3453 3661
3454 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3662 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3455 and return; 3663 and return;
3456 3664
3457 warn "runtime file written.\n"; 3665 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3458 3666
3459 1 3667 1
3460} 3668}
3461 3669
3462our $uuid_lock; 3670our $uuid_lock;
3471 my $uuid = "$LOCALDIR/uuid"; 3679 my $uuid = "$LOCALDIR/uuid";
3472 3680
3473 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3681 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3474 or return; 3682 or return;
3475 3683
3476 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3684 my $value = uuid_seq uuid_cur;
3685
3686 unless ($value) {
3687 warn "cowardly refusing to write zero uuid value!\n";
3688 return;
3689 }
3690
3691 my $value = uuid_str $value + $uuid_skip;
3477 $uuid_skip = 0; 3692 $uuid_skip = 0;
3478 3693
3479 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3694 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3480 and return; 3695 and return;
3481 3696
3503} 3718}
3504 3719
3505sub emergency_save() { 3720sub emergency_save() {
3506 my $freeze_guard = cf::freeze_mainloop; 3721 my $freeze_guard = cf::freeze_mainloop;
3507 3722
3508 warn "enter emergency perl save\n"; 3723 warn "emergency_perl_save: enter\n";
3509 3724
3510 cf::sync_job { 3725 cf::sync_job {
3726 # this is a trade-off: we want to be very quick here, so
3727 # save all maps without fsync, and later call a global sync
3728 # (which in turn might be very very slow)
3729 local $USE_FSYNC = 0;
3730
3511 # use a peculiar iteration method to avoid tripping on perl 3731 # use a peculiar iteration method to avoid tripping on perl
3512 # refcount bugs in for. also avoids problems with players 3732 # refcount bugs in for. also avoids problems with players
3513 # and maps saved/destroyed asynchronously. 3733 # and maps saved/destroyed asynchronously.
3514 warn "begin emergency player save\n"; 3734 warn "emergency_perl_save: begin player save\n";
3515 for my $login (keys %cf::PLAYER) { 3735 for my $login (keys %cf::PLAYER) {
3516 my $pl = $cf::PLAYER{$login} or next; 3736 my $pl = $cf::PLAYER{$login} or next;
3517 $pl->valid or next; 3737 $pl->valid or next;
3518 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3738 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3519 $pl->save; 3739 $pl->save;
3520 } 3740 }
3521 warn "end emergency player save\n"; 3741 warn "emergency_perl_save: end player save\n";
3522 3742
3523 warn "begin emergency map save\n"; 3743 warn "emergency_perl_save: begin map save\n";
3524 for my $path (keys %cf::MAP) { 3744 for my $path (keys %cf::MAP) {
3525 my $map = $cf::MAP{$path} or next; 3745 my $map = $cf::MAP{$path} or next;
3526 $map->valid or next; 3746 $map->valid or next;
3527 $map->save; 3747 $map->save;
3528 } 3748 }
3529 warn "end emergency map save\n"; 3749 warn "emergency_perl_save: end map save\n";
3530 3750
3531 warn "begin emergency database checkpoint\n"; 3751 warn "emergency_perl_save: begin database checkpoint\n";
3532 BDB::db_env_txn_checkpoint $DB_ENV; 3752 BDB::db_env_txn_checkpoint $DB_ENV;
3533 warn "end emergency database checkpoint\n"; 3753 warn "emergency_perl_save: end database checkpoint\n";
3534 3754
3535 warn "begin write uuid\n"; 3755 warn "emergency_perl_save: begin write uuid\n";
3536 write_uuid_sync 1; 3756 write_uuid_sync 1;
3537 warn "end write uuid\n"; 3757 warn "emergency_perl_save: end write uuid\n";
3538 }; 3758 };
3539 3759
3760 warn "emergency_perl_save: starting sync()\n";
3761 IO::AIO::aio_sync sub {
3762 warn "emergency_perl_save: finished sync()\n";
3763 };
3764
3540 warn "leave emergency perl save\n"; 3765 warn "emergency_perl_save: leave\n";
3541} 3766}
3542 3767
3543sub post_cleanup { 3768sub post_cleanup {
3544 my ($make_core) = @_; 3769 my ($make_core) = @_;
3545 3770
3571 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3796 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3572 for my $name (keys %$leaf_symtab) { 3797 for my $name (keys %$leaf_symtab) {
3573 _gv_clear *{"$pkg$name"}; 3798 _gv_clear *{"$pkg$name"};
3574# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3799# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3575 } 3800 }
3576 warn "cleared package #$pkg\n";#d#
3577} 3801}
3578
3579our $RELOAD; # how many times to reload
3580 3802
3581sub do_reload_perl() { 3803sub do_reload_perl() {
3582 # can/must only be called in main 3804 # can/must only be called in main
3583 if ($Coro::current != $Coro::main) { 3805 if (in_main) {
3584 warn "can only reload from main coroutine"; 3806 warn "can only reload from main coroutine";
3585 return; 3807 return;
3586 } 3808 }
3587 3809
3588 return if $RELOAD++; 3810 return if $RELOAD++;
3811
3812 my $t1 = AE::time;
3589 3813
3590 while ($RELOAD) { 3814 while ($RELOAD) {
3591 warn "reloading..."; 3815 warn "reloading...";
3592 3816
3593 warn "entering sync_job"; 3817 warn "entering sync_job";
3654 clear_package "safe::$_" 3878 clear_package "safe::$_"
3655 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3879 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3656 3880
3657 warn "unloading cf.pm \"a bit\""; 3881 warn "unloading cf.pm \"a bit\"";
3658 delete $INC{"cf.pm"}; 3882 delete $INC{"cf.pm"};
3659 delete $INC{"cf/pod.pm"}; 3883 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3660 3884
3661 # don't, removes xs symbols, too, 3885 # don't, removes xs symbols, too,
3662 # and global variables created in xs 3886 # and global variables created in xs
3663 #clear_package __PACKAGE__; 3887 #clear_package __PACKAGE__;
3664 3888
3665 warn "unload completed, starting to reload now"; 3889 warn "unload completed, starting to reload now";
3666 3890
3667 warn "reloading cf.pm"; 3891 warn "reloading cf.pm";
3668 require cf; 3892 require cf;
3669 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3893 cf::_connect_to_perl_1;
3670 3894
3671 warn "loading config and database again"; 3895 warn "loading config and database again";
3672 cf::reload_config; 3896 cf::reload_config;
3673 3897
3674 warn "loading extensions"; 3898 warn "loading extensions";
3675 cf::load_extensions; 3899 cf::load_extensions;
3676 3900
3901 if ($REATTACH_ON_RELOAD) {
3677 warn "reattaching attachments to objects/players"; 3902 warn "reattaching attachments to objects/players";
3678 _global_reattach; # objects, sockets 3903 _global_reattach; # objects, sockets
3679 warn "reattaching attachments to maps"; 3904 warn "reattaching attachments to maps";
3680 reattach $_ for values %MAP; 3905 reattach $_ for values %MAP;
3681 warn "reattaching attachments to players"; 3906 warn "reattaching attachments to players";
3682 reattach $_ for values %PLAYER; 3907 reattach $_ for values %PLAYER;
3908 }
3909
3910 warn "running post_init jobs";
3911 (pop @POST_INIT)->(1) while @POST_INIT;
3683 3912
3684 warn "leaving sync_job"; 3913 warn "leaving sync_job";
3685 3914
3686 1 3915 1
3687 } or do { 3916 } or do {
3690 }; 3919 };
3691 3920
3692 warn "reloaded"; 3921 warn "reloaded";
3693 --$RELOAD; 3922 --$RELOAD;
3694 } 3923 }
3924
3925 $t1 = AE::time - $t1;
3926 warn "reload completed in ${t1}s\n";
3695}; 3927};
3696 3928
3697our $RELOAD_WATCHER; # used only during reload 3929our $RELOAD_WATCHER; # used only during reload
3698 3930
3699sub reload_perl() { 3931sub reload_perl() {
3700 # doing reload synchronously and two reloads happen back-to-back, 3932 # doing reload synchronously and two reloads happen back-to-back,
3701 # coro crashes during coro_state_free->destroy here. 3933 # coro crashes during coro_state_free->destroy here.
3702 3934
3935 $RELOAD_WATCHER ||= cf::async {
3936 Coro::AIO::aio_wait cache_extensions;
3937
3703 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3938 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3704 do_reload_perl; 3939 do_reload_perl;
3705 undef $RELOAD_WATCHER; 3940 undef $RELOAD_WATCHER;
3941 };
3706 }; 3942 };
3707} 3943}
3708 3944
3709register_command "reload" => sub { 3945register_command "reload" => sub {
3710 my ($who, $arg) = @_; 3946 my ($who, $arg) = @_;
3724 3960
3725our @WAIT_FOR_TICK; 3961our @WAIT_FOR_TICK;
3726our @WAIT_FOR_TICK_BEGIN; 3962our @WAIT_FOR_TICK_BEGIN;
3727 3963
3728sub wait_for_tick { 3964sub wait_for_tick {
3729 return if tick_inhibit || $Coro::current == $Coro::main; 3965 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3730 3966
3731 my $signal = new Coro::Signal; 3967 my $signal = new Coro::Signal;
3732 push @WAIT_FOR_TICK, $signal; 3968 push @WAIT_FOR_TICK, $signal;
3733 $signal->wait; 3969 $signal->wait;
3734} 3970}
3735 3971
3736sub wait_for_tick_begin { 3972sub wait_for_tick_begin {
3737 return if tick_inhibit || $Coro::current == $Coro::main; 3973 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3738 3974
3739 my $signal = new Coro::Signal; 3975 my $signal = new Coro::Signal;
3740 push @WAIT_FOR_TICK_BEGIN, $signal; 3976 push @WAIT_FOR_TICK_BEGIN, $signal;
3741 $signal->wait; 3977 $signal->wait;
3742} 3978}
3747 unless ++$bug_warning > 10; 3983 unless ++$bug_warning > 10;
3748 return; 3984 return;
3749 } 3985 }
3750 3986
3751 cf::server_tick; # one server iteration 3987 cf::server_tick; # one server iteration
3988
3989 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3752 3990
3753 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3991 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3754 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3992 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3755 Coro::async_pool { 3993 Coro::async_pool {
3756 $Coro::current->{desc} = "runtime saver"; 3994 $Coro::current->{desc} = "runtime saver";
3779} 4017}
3780 4018
3781{ 4019{
3782 # configure BDB 4020 # configure BDB
3783 4021
3784 BDB::min_parallel 8; 4022 BDB::min_parallel 16;
3785 BDB::max_poll_reqs $TICK * 0.1; 4023 BDB::max_poll_reqs $TICK * 0.1;
3786 $AnyEvent::BDB::WATCHER->priority (1); 4024 $AnyEvent::BDB::WATCHER->priority (1);
3787 4025
3788 unless ($DB_ENV) { 4026 unless ($DB_ENV) {
3789 $DB_ENV = BDB::db_env_create; 4027 $DB_ENV = BDB::db_env_create;
3869 LOG llevInfo, "[ABT] [suppressed]\n"; 4107 LOG llevInfo, "[ABT] [suppressed]\n";
3870 } 4108 }
3871} 4109}
3872 4110
3873# load additional modules 4111# load additional modules
3874use cf::pod; 4112require "cf/$_.pm" for @EXTRA_MODULES;
4113cf::_connect_to_perl_2;
3875 4114
3876END { cf::emergency_save } 4115END { cf::emergency_save }
3877 4116
38781 41171
3879 4118

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines