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.451 by root, Mon Sep 22 05:42:41 2008 UTC vs.
Revision 1.523 by root, Sat Apr 17 02:39:46 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";
100our $PIDFILE = "$LOCALDIR/pid"; 108our $PIDFILE = "$LOCALDIR/pid";
101our $RUNTIMEFILE = "$LOCALDIR/runtime"; 109our $RUNTIMEFILE = "$LOCALDIR/runtime";
102 110
103our %RESOURCE; 111our %RESOURCE;
104 112
113our $OUTPUT_RATE_MIN = 4000;
114our $OUTPUT_RATE_MAX = 100000;
115
105our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 116our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
106our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 117our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
107our $NEXT_TICK; 118our $NEXT_TICK;
108our $USE_FSYNC = 1; # use fsync to write maps - default off 119our $USE_FSYNC = 1; # use fsync to write maps - default on
109 120
110our $BDB_DEADLOCK_WATCHER; 121our $BDB_DEADLOCK_WATCHER;
111our $BDB_CHECKPOINT_WATCHER; 122our $BDB_CHECKPOINT_WATCHER;
112our $BDB_TRICKLE_WATCHER; 123our $BDB_TRICKLE_WATCHER;
113our $DB_ENV; 124our $DB_ENV;
114 125
126our @EXTRA_MODULES = qw(pod match mapscript);
127
115our %CFG; 128our %CFG;
116 129
117our $UPTIME; $UPTIME ||= time; 130our $UPTIME; $UPTIME ||= time;
118our $RUNTIME; 131our $RUNTIME;
119our $NOW; 132our $NOW;
127 140
128our $LOAD; # a number between 0 (idle) and 1 (too many objects) 141our $LOAD; # a number between 0 (idle) and 1 (too many objects)
129our $LOADAVG; # same thing, but with alpha-smoothing 142our $LOADAVG; # same thing, but with alpha-smoothing
130our $JITTER; # average jitter 143our $JITTER; # average jitter
131our $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 :)
132 150
133binmode STDOUT; 151binmode STDOUT;
134binmode STDERR; 152binmode STDERR;
135 153
136# read virtual server time, if available 154# read virtual server time, if available
138 open my $fh, "<", $RUNTIMEFILE 156 open my $fh, "<", $RUNTIMEFILE
139 or die "unable to read $RUNTIMEFILE file: $!"; 157 or die "unable to read $RUNTIMEFILE file: $!";
140 $RUNTIME = <$fh> + 0.; 158 $RUNTIME = <$fh> + 0.;
141} 159}
142 160
161eval "sub TICK() { $TICK } 1" or die;
162
143mkdir $_ 163mkdir $_
144 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 164 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
145 165
146our $EMERGENCY_POSITION; 166our $EMERGENCY_POSITION;
147 167
148sub 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::"} };
149 184
150############################################################################# 185#############################################################################
151 186
152=head2 GLOBAL VARIABLES 187=head2 GLOBAL VARIABLES
153 188
200returns 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
201per 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.
202 237
203=item @cf::INVOKE_RESULTS 238=item @cf::INVOKE_RESULTS
204 239
205This array contains the results of the last C<invoke ()> call. When 240This 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 241C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
207that call. 242that call.
208 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
209=back 250=back
210 251
211=cut 252=cut
212 253
213BEGIN { 254$Coro::State::WARNHOOK = sub {
214 *CORE::GLOBAL::warn = sub {
215 my $msg = join "", @_; 255 my $msg = join "", @_;
216 256
217 $msg .= "\n" 257 $msg .= "\n"
218 unless $msg =~ /\n$/; 258 unless $msg =~ /\n$/;
219 259
220 $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;
221 261
222 LOG llevError, $msg; 262 LOG llevError, $msg;
223 }; 263};
224}
225 264
226$Coro::State::DIEHOOK = sub { 265$Coro::State::DIEHOOK = sub {
227 return unless $^S eq 0; # "eq", not "==" 266 return unless $^S eq 0; # "eq", not "=="
228 267
229 if ($Coro::current == $Coro::main) {#d# 268 warn Carp::longmess $_[0];
269
270 if (in_main) {#d#
230 warn "DIEHOOK called in main context, Coro bug?\n";#d# 271 warn "DIEHOOK called in main context, Coro bug?\n";#d#
231 return;#d# 272 return;#d#
232 }#d# 273 }#d#
233 274
234 # kill coroutine otherwise 275 # kill coroutine otherwise
235 warn Carp::longmess $_[0];
236 Coro::terminate 276 Coro::terminate
237}; 277};
238
239$SIG{__DIE__} = sub { }; #d#?
240 278
241@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 279@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
242@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 280@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
243@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 281@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
244@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 282@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
258)) { 296)) {
259 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 297 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
260} 298}
261 299
262$EV::DIED = sub { 300$EV::DIED = sub {
263 warn "error in event callback: @_"; 301 Carp::cluck "error in event callback: @_";
264}; 302};
265 303
266############################################################################# 304#############################################################################
267 305
268=head2 UTILITY FUNCTIONS 306=head2 UTILITY FUNCTIONS
305our $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
306 344
307sub encode_json($) { $json_coder->encode ($_[0]) } 345sub encode_json($) { $json_coder->encode ($_[0]) }
308sub decode_json($) { $json_coder->decode ($_[0]) } 346sub decode_json($) { $json_coder->decode ($_[0]) }
309 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
310=item cf::lock_wait $string 362=item cf::lock_wait $string
311 363
312Wait until the given lock is available. See cf::lock_acquire. 364Wait until the given lock is available. See cf::lock_acquire.
313 365
314=item my $lock = cf::lock_acquire $string 366=item my $lock = cf::lock_acquire $string
315 367
316Wait 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
317a 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,
318for example when the coroutine gets canceled), the lock is automatically 370for example when the coroutine gets canceled), the lock is automatically
319returned. 371returned.
320 372
321Locks 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
322deadlocked coro. 374deadlocked coro.
328 380
329Return 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.
330 382
331=cut 383=cut
332 384
333our %LOCK; 385our $LOCKS = new Coro::SemaphoreSet;
334our %LOCKER;#d#
335 386
336sub lock_wait($) { 387sub lock_wait($) {
337 my ($key) = @_; 388 $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} 389}
351 390
352sub lock_acquire($) { 391sub lock_acquire($) {
353 my ($key) = @_; 392 $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} 393}
367 394
368sub lock_active($) { 395sub lock_active($) {
369 my ($key) = @_; 396 $LOCKS->count ($_[0]) < 1
370
371 ! ! $LOCK{$key}
372} 397}
373 398
374sub freeze_mainloop { 399sub freeze_mainloop {
375 tick_inhibit_inc; 400 tick_inhibit_inc;
376 401
377 Coro::guard \&tick_inhibit_dec; 402 &Guard::guard (\&tick_inhibit_dec);
378} 403}
379 404
380=item cf::periodic $interval, $cb 405=item cf::periodic $interval, $cb
381 406
382Like 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
383get spread over timer. 408get spread over time.
384 409
385=cut 410=cut
386 411
387sub periodic($$) { 412sub periodic($$) {
388 my ($interval, $cb) = @_; 413 my ($interval, $cb) = @_;
405 430
406=cut 431=cut
407 432
408our @SLOT_QUEUE; 433our @SLOT_QUEUE;
409our $SLOT_QUEUE; 434our $SLOT_QUEUE;
435our $SLOT_DECAY = 0.9;
410 436
411$SLOT_QUEUE->cancel if $SLOT_QUEUE; 437$SLOT_QUEUE->cancel if $SLOT_QUEUE;
412$SLOT_QUEUE = Coro::async { 438$SLOT_QUEUE = Coro::async {
413 $Coro::current->desc ("timeslot manager"); 439 $Coro::current->desc ("timeslot manager");
414 440
415 my $signal = new Coro::Signal; 441 my $signal = new Coro::Signal;
442 my $busy;
416 443
417 while () { 444 while () {
418 next_job: 445 next_job:
446
419 my $avail = cf::till_tick; 447 my $avail = cf::till_tick;
420 if ($avail > 0.01) { 448
421 for (0 .. $#SLOT_QUEUE) { 449 for (0 .. $#SLOT_QUEUE) {
422 if ($SLOT_QUEUE[$_][0] < $avail) { 450 if ($SLOT_QUEUE[$_][0] <= $avail) {
451 $busy = 0;
423 my $job = splice @SLOT_QUEUE, $_, 1, (); 452 my $job = splice @SLOT_QUEUE, $_, 1, ();
424 $job->[2]->send; 453 $job->[2]->send;
425 Coro::cede; 454 Coro::cede;
426 goto next_job; 455 goto next_job;
427 } 456 } else {
457 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
428 } 458 }
429 } 459 }
430 460
431 if (@SLOT_QUEUE) { 461 if (@SLOT_QUEUE) {
432 # 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
433 push @cf::WAIT_FOR_TICK, $signal; 463 push @cf::WAIT_FOR_TICK, $signal;
434 $signal->wait; 464 $signal->wait;
435 } else { 465 } else {
466 $busy = 0;
436 Coro::schedule; 467 Coro::schedule;
437 } 468 }
438 } 469 }
439}; 470};
440 471
441sub get_slot($;$$) { 472sub get_slot($;$$) {
442 return if tick_inhibit || $Coro::current == $Coro::main; 473 return if tick_inhibit || $Coro::current == $Coro::main;
443 474
444 my ($time, $pri, $name) = @_; 475 my ($time, $pri, $name) = @_;
445 476
446 $time = $TICK * .6 if $time > $TICK * .6; 477 $time = clamp $time, 0.01, $TICK * .6;
478
447 my $sig = new Coro::Signal; 479 my $sig = new Coro::Signal;
448 480
449 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 481 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
450 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 482 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
451 $SLOT_QUEUE->ready; 483 $SLOT_QUEUE->ready;
478 510
479sub sync_job(&) { 511sub sync_job(&) {
480 my ($job) = @_; 512 my ($job) = @_;
481 513
482 if ($Coro::current == $Coro::main) { 514 if ($Coro::current == $Coro::main) {
483 my $time = EV::time; 515 my $time = AE::time;
484 516
485 # this is the main coro, too bad, we have to block 517 # this is the main coro, too bad, we have to block
486 # till the operation succeeds, freezing the server :/ 518 # till the operation succeeds, freezing the server :/
487 519
488 LOG llevError, Carp::longmess "sync job";#d# 520 LOG llevError, Carp::longmess "sync job";#d#
505 } else { 537 } else {
506 EV::loop EV::LOOP_ONESHOT; 538 EV::loop EV::LOOP_ONESHOT;
507 } 539 }
508 } 540 }
509 541
510 my $time = EV::time - $time; 542 my $time = AE::time - $time;
511 543
512 $TICK_START += $time; # do not account sync jobs to server load 544 $TICK_START += $time; # do not account sync jobs to server load
513 545
514 wantarray ? @res : $res[0] 546 wantarray ? @res : $res[0]
515 } else { 547 } else {
559 reset_signals; 591 reset_signals;
560 &$cb 592 &$cb
561 }, @args; 593 }, @args;
562 594
563 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 )
564} 607}
565 608
566=item $coin = coin_from_name $name 609=item $coin = coin_from_name $name
567 610
568=cut 611=cut
1154 $decname, length $$rdata, scalar @$objs; 1197 $decname, length $$rdata, scalar @$objs;
1155 1198
1156 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1199 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1157 aio_chmod $fh, SAVE_MODE; 1200 aio_chmod $fh, SAVE_MODE;
1158 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1201 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1159 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 }
1160 aio_close $fh; 1206 aio_close $fh;
1161 1207
1162 if (@$objs) { 1208 if (@$objs) {
1163 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) {
1164 aio_chmod $fh, SAVE_MODE; 1210 aio_chmod $fh, SAVE_MODE;
1165 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1211 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1166 aio_write $fh, 0, (length $data), $data, 0; 1212 aio_write $fh, 0, (length $data), $data, 0;
1167 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 }
1168 aio_close $fh; 1217 aio_close $fh;
1169 aio_rename "$filename.pst~", "$filename.pst"; 1218 aio_rename "$filename.pst~", "$filename.pst";
1170 } 1219 }
1171 } else { 1220 } else {
1172 aio_unlink "$filename.pst"; 1221 aio_unlink "$filename.pst";
1173 } 1222 }
1174 1223
1175 aio_rename "$filename~", $filename; 1224 aio_rename "$filename~", $filename;
1225
1226 $filename =~ s%/[^/]+$%%;
1227 aio_pathsync $filename if $cf::USE_FSYNC;
1176 } else { 1228 } else {
1177 warn "FATAL: $filename~: $!\n"; 1229 warn "unable to save objects: $filename~: $!\n";
1178 } 1230 }
1179 } else { 1231 } else {
1180 aio_unlink $filename; 1232 aio_unlink $filename;
1181 aio_unlink "$filename.pst"; 1233 aio_unlink "$filename.pst";
1182 } 1234 }
1273 my ($name, $cb) = @_; 1325 my ($name, $cb) = @_;
1274 1326
1275 $EXTICMD{$name} = $cb; 1327 $EXTICMD{$name} = $cb;
1276} 1328}
1277 1329
1330use File::Glob ();
1331
1278cf::player->attach ( 1332cf::player->attach (
1279 on_command => sub { 1333 on_unknown_command => sub {
1280 my ($pl, $name, $params) = @_; 1334 my ($pl, $name, $params) = @_;
1281 1335
1282 my $cb = $COMMAND{$name} 1336 my $cb = $COMMAND{$name}
1283 or return; 1337 or return;
1284 1338
1314 1368
1315 cf::override; 1369 cf::override;
1316 }, 1370 },
1317); 1371);
1318 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
1319sub load_extensions { 1386sub load_extensions {
1320 cf::sync_job { 1387 cf::sync_job {
1321 my %todo; 1388 my %todo;
1322 1389
1323 for my $path (<$LIBDIR/*.ext>) { 1390 for my $path (<$LIBDIR/*.ext>) {
1350 . "\n};\n1"; 1417 . "\n};\n1";
1351 1418
1352 $todo{$base} = \%ext; 1419 $todo{$base} = \%ext;
1353 } 1420 }
1354 1421
1422 my $pass = 0;
1355 my %done; 1423 my %done;
1356 while (%todo) { 1424 while (%todo) {
1357 my $progress; 1425 my $progress;
1358 1426
1427 ++$pass;
1428
1429 ext:
1359 while (my ($k, $v) = each %todo) { 1430 while (my ($k, $v) = each %todo) {
1360 for (split /,\s*/, $v->{meta}{depends}) { 1431 for (split /,\s*/, $v->{meta}{depends}) {
1361 goto skip 1432 next ext
1362 unless exists $done{$_}; 1433 unless exists $done{$_};
1363 } 1434 }
1364 1435
1365 warn "... loading '$k' into '$v->{pkg}'\n"; 1436 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1366 1437
1367 unless (eval $v->{source}) { 1438 my $active = eval $v->{source};
1439
1440 if (length $@) {
1368 my $msg = $@ ? "$v->{path}: $@\n" 1441 warn "$v->{path}: $@\n";
1369 : "$v->{base}: extension inactive.\n";
1370 1442
1371 if (exists $v->{meta}{mandatory}) {
1372 warn $msg;
1373 cf::cleanup "mandatory extension failed to load, exiting."; 1443 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1374 } 1444 if exists $v->{meta}{mandatory};
1375 1445
1376 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;
1377 } 1455 }
1378
1379 $done{$k} = delete $todo{$k};
1380 push @EXTS, $v->{pkg};
1381 $progress = 1;
1382 } 1456 }
1383 1457
1384 skip: 1458 unless ($progress) {
1385 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1459 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1386 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 }
1387 } 1466 }
1388 }; 1467 };
1389} 1468}
1390 1469
1391############################################################################# 1470#############################################################################
1445 1524
1446sub exists($) { 1525sub exists($) {
1447 my ($login) = @_; 1526 my ($login) = @_;
1448 1527
1449 $cf::PLAYER{$login} 1528 $cf::PLAYER{$login}
1450 or cf::sync_job { !aio_stat path $login } 1529 or !aio_stat path $login
1451} 1530}
1452 1531
1453sub find($) { 1532sub find($) {
1454 return $cf::PLAYER{$_[0]} || do { 1533 return $cf::PLAYER{$_[0]} || do {
1455 my $login = $_[0]; 1534 my $login = $_[0];
1475 $cf::PLAYER{$login} = $pl 1554 $cf::PLAYER{$login} = $pl
1476 } 1555 }
1477 } 1556 }
1478} 1557}
1479 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
1480sub save($) { 1572sub save($) {
1481 my ($pl) = @_; 1573 my ($pl) = @_;
1482 1574
1483 return if $pl->{deny_save}; 1575 return if $pl->{deny_save};
1484 1576
1489 1581
1490 aio_mkdir playerdir $pl, 0770; 1582 aio_mkdir playerdir $pl, 0770;
1491 $pl->{last_save} = $cf::RUNTIME; 1583 $pl->{last_save} = $cf::RUNTIME;
1492 1584
1493 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];
1494 1589
1495 $pl->save_pl ($path); 1590 $pl->save_pl ($path);
1496 cf::cede_to_tick; 1591 cf::cede_to_tick;
1497} 1592}
1498 1593
1600 \@logins 1695 \@logins
1601} 1696}
1602 1697
1603=item $player->maps 1698=item $player->maps
1604 1699
1700=item cf::player::maps $login
1701
1605Returns an arrayref of map paths that are private for this 1702Returns an arrayref of map paths that are private for this
1606player. May block. 1703player. May block.
1607 1704
1608=cut 1705=cut
1609 1706
1671=cut 1768=cut
1672 1769
1673sub find_by_path($) { 1770sub find_by_path($) {
1674 my ($path) = @_; 1771 my ($path) = @_;
1675 1772
1773 $path =~ s/^~[^\/]*//; # skip ~login
1774
1676 my ($match, $specificity); 1775 my ($match, $specificity);
1677 1776
1678 for my $region (list) { 1777 for my $region (list) {
1679 if ($region->{match} && $path =~ $region->{match}) { 1778 if ($region->{match} && $path =~ $region->{match}) {
1680 ($match, $specificity) = ($region, $region->specificity) 1779 ($match, $specificity) = ($region, $region->specificity)
1711 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
1712 1811
1713 # mit "rum" bekleckern, nicht 1812 # mit "rum" bekleckern, nicht
1714 $self->_create_random_map ( 1813 $self->_create_random_map (
1715 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1814 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1716 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1815 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1717 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1816 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1718 $rmp->{exit_on_final_map}, 1817 $rmp->{exit_on_final_map},
1719 $rmp->{xsize}, $rmp->{ysize}, 1818 $rmp->{xsize}, $rmp->{ysize},
1720 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1819 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1721 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1820 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1851 1950
1852 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1951 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1853 "$UNIQUEDIR/$path" 1952 "$UNIQUEDIR/$path"
1854} 1953}
1855 1954
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 { 1955sub decay_objects {
1866 my ($self) = @_; 1956 my ($self) = @_;
1867 1957
1868 return if $self->{deny_reset}; 1958 return if $self->{deny_reset};
1869 1959
1951sub find { 2041sub find {
1952 my ($path, $origin) = @_; 2042 my ($path, $origin) = @_;
1953 2043
1954 $path = normalise $path, $origin && $origin->path; 2044 $path = normalise $path, $origin && $origin->path;
1955 2045
1956 cf::lock_wait "map_data:$path";#d#remove 2046 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1957 cf::lock_wait "map_find:$path"; 2047 my $guard2 = cf::lock_acquire "map_find:$path";
1958 2048
1959 $cf::MAP{$path} || do { 2049 $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 2050 my $map = new_from_path cf::map $path
1964 or return; 2051 or return;
1965 2052
1966 $map->{last_save} = $cf::RUNTIME; 2053 $map->{last_save} = $cf::RUNTIME;
1967 2054
1979 2066
1980 $cf::MAP{$path} = $map 2067 $cf::MAP{$path} = $map
1981 } 2068 }
1982} 2069}
1983 2070
1984sub pre_load { } 2071sub pre_load { }
1985sub post_load { } 2072#sub post_load { } # XS
1986 2073
1987sub load { 2074sub load {
1988 my ($self) = @_; 2075 my ($self) = @_;
1989 2076
1990 local $self->{deny_reset} = 1; # loading can take a long time 2077 local $self->{deny_reset} = 1; # loading can take a long time
2035 unless ($self->{deny_activate}) { 2122 unless ($self->{deny_activate}) {
2036 $self->decay_objects; 2123 $self->decay_objects;
2037 $self->fix_auto_apply; 2124 $self->fix_auto_apply;
2038 $self->update_buttons; 2125 $self->update_buttons;
2039 cf::cede_to_tick; 2126 cf::cede_to_tick;
2040 $self->set_darkness_map;
2041 cf::cede_to_tick;
2042 $self->activate; 2127 $self->activate;
2043 } 2128 }
2044 2129
2045 $self->{last_save} = $cf::RUNTIME; 2130 $self->{last_save} = $cf::RUNTIME;
2046 $self->last_access ($cf::RUNTIME); 2131 $self->last_access ($cf::RUNTIME);
2049 } 2134 }
2050 2135
2051 $self->post_load; 2136 $self->post_load;
2052} 2137}
2053 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
2054sub customise_for { 2142sub customise_for {
2055 my ($self, $ob) = @_; 2143 my ($self, $ob) = @_;
2056 2144
2057 return find "~" . $ob->name . "/" . $self->{path} 2145 return find "~" . $ob->name . "/" . $self->{path}
2058 if $self->per_player; 2146 if $self->per_player;
2135 $MAP_PREFETCHER->prio (6); 2223 $MAP_PREFETCHER->prio (6);
2136 2224
2137 () 2225 ()
2138} 2226}
2139 2227
2228# common code, used by both ->save and ->swapout
2140sub save { 2229sub _save {
2141 my ($self) = @_; 2230 my ($self) = @_;
2142
2143 my $lock = cf::lock_acquire "map_data:$self->{path}";
2144 2231
2145 $self->{last_save} = $cf::RUNTIME; 2232 $self->{last_save} = $cf::RUNTIME;
2146 2233
2147 return unless $self->dirty; 2234 return unless $self->dirty;
2148 2235
2168 } else { 2255 } else {
2169 $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);
2170 } 2257 }
2171} 2258}
2172 2259
2260sub save {
2261 my ($self) = @_;
2262
2263 my $lock = cf::lock_acquire "map_data:$self->{path}";
2264
2265 $self->_save;
2266}
2267
2173sub swap_out { 2268sub swap_out {
2174 my ($self) = @_; 2269 my ($self) = @_;
2175 2270
2176 # save first because save cedes
2177 $self->save;
2178
2179 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2271 my $lock = cf::lock_acquire "map_data:$self->{path}";
2180 2272
2181 return if $self->players;
2182 return if $self->in_memory != cf::MAP_ACTIVE; 2273 return if $self->in_memory != cf::MAP_ACTIVE;
2183 return if $self->{deny_save}; 2274 return if $self->{deny_save};
2275 return if $self->players;
2184 2276
2185 $self->in_memory (cf::MAP_SWAPPED); 2277 # first deactivate the map and "unlink" it from the core
2186
2187 $self->deactivate; 2278 $self->deactivate;
2188 $_->clear_links_to ($self) for values %cf::MAP; 2279 $_->clear_links_to ($self) for values %cf::MAP;
2280 $self->in_memory (cf::MAP_SWAPPED);
2281
2282 # then atomically save
2283 $self->_save;
2284
2285 # then free the map
2189 $self->clear; 2286 $self->clear;
2190} 2287}
2191 2288
2192sub reset_at { 2289sub reset_at {
2193 my ($self) = @_; 2290 my ($self) = @_;
2212 2309
2213 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2310 my $lock = cf::lock_acquire "map_data:$self->{path}";
2214 2311
2215 return if $self->players; 2312 return if $self->players;
2216 2313
2217 warn "resetting map ", $self->path; 2314 warn "resetting map ", $self->path, "\n";
2218 2315
2219 $self->in_memory (cf::MAP_SWAPPED); 2316 $self->in_memory (cf::MAP_SWAPPED);
2220 2317
2221 # need to save uniques path 2318 # need to save uniques path
2222 unless ($self->{deny_save}) { 2319 unless ($self->{deny_save}) {
2313 : normalise $_ 2410 : normalise $_
2314 } @{ aio_readdir $UNIQUEDIR or [] } 2411 } @{ aio_readdir $UNIQUEDIR or [] }
2315 ] 2412 ]
2316} 2413}
2317 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
2318=back 2447=back
2319 2448
2320=head3 cf::object 2449=head3 cf::object
2321 2450
2322=cut 2451=cut
2387 2516
2388our $SAY_CHANNEL = { 2517our $SAY_CHANNEL = {
2389 id => "say", 2518 id => "say",
2390 title => "Map", 2519 title => "Map",
2391 reply => "say ", 2520 reply => "say ",
2392 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.",
2393}; 2522};
2394 2523
2395our $CHAT_CHANNEL = { 2524our $CHAT_CHANNEL = {
2396 id => "chat", 2525 id => "chat",
2397 title => "Chat", 2526 title => "Chat",
2490 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2619 return if UNIVERSAL::isa $self->map, "ext::map_link";
2491 2620
2492 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2621 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2493 if $self->map && $self->map->{path} ne "{link}"; 2622 if $self->map && $self->map->{path} ne "{link}";
2494 2623
2495 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2624 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2496} 2625}
2497 2626
2498sub cf::object::player::leave_link { 2627sub cf::object::player::leave_link {
2499 my ($self, $map, $x, $y) = @_; 2628 my ($self, $map, $x, $y) = @_;
2500 2629
2517 ($x, $y) = (-1, -1) 2646 ($x, $y) = (-1, -1)
2518 unless (defined $x) && (defined $y); 2647 unless (defined $x) && (defined $y);
2519 2648
2520 # use -1 or undef as default coordinates, not 0, 0 2649 # use -1 or undef as default coordinates, not 0, 0
2521 ($x, $y) = ($map->enter_x, $map->enter_y) 2650 ($x, $y) = ($map->enter_x, $map->enter_y)
2522 if $x <=0 && $y <= 0; 2651 if $x <= 0 && $y <= 0;
2523 2652
2524 $map->load; 2653 $map->load;
2525 $map->load_neighbours; 2654 $map->load_neighbours;
2526 2655
2527 return unless $self->contr->active; 2656 return unless $self->contr->active;
2528 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2529 $self->activate_recursive;
2530 2657
2531 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2658 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2532 $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;
2533} 2663}
2534 2664
2535=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2665=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2536 2666
2537Moves 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
2725 2855
2726 utf8::encode $text; 2856 utf8::encode $text;
2727 $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);
2728} 2858}
2729 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
2730=item $client->send_msg ($channel, $msg, $color, [extra...]) 2885=item $client->send_msg ($channel, $msg, $color, [extra...])
2731 2886
2732Send 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
2733client 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
2734the 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
2736 2891
2737=cut 2892=cut
2738 2893
2739# non-persistent channels (usually the info channel) 2894# non-persistent channels (usually the info channel)
2740our %CHANNEL = ( 2895our %CHANNEL = (
2896 "c/motd" => {
2897 id => "infobox",
2898 title => "MOTD",
2899 reply => undef,
2900 tooltip => "The message of the day",
2901 },
2741 "c/identify" => { 2902 "c/identify" => {
2742 id => "infobox", 2903 id => "infobox",
2743 title => "Identify", 2904 title => "Identify",
2744 reply => undef, 2905 reply => undef,
2745 tooltip => "Items recently identified", 2906 tooltip => "Items recently identified",
2747 "c/examine" => { 2908 "c/examine" => {
2748 id => "infobox", 2909 id => "infobox",
2749 title => "Examine", 2910 title => "Examine",
2750 reply => undef, 2911 reply => undef,
2751 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",
2752 }, 2919 },
2753 "c/book" => { 2920 "c/book" => {
2754 id => "infobox", 2921 id => "infobox",
2755 title => "Book", 2922 title => "Book",
2756 reply => undef, 2923 reply => undef,
2772 id => "infobox", 2939 id => "infobox",
2773 title => "Body Parts", 2940 title => "Body Parts",
2774 reply => undef, 2941 reply => undef,
2775 tooltip => "Shows which body parts you posess and are available", 2942 tooltip => "Shows which body parts you posess and are available",
2776 }, 2943 },
2944 "c/statistics" => {
2945 id => "infobox",
2946 title => "Statistics",
2947 reply => undef,
2948 tooltip => "Shows your primary statistics",
2949 },
2777 "c/skills" => { 2950 "c/skills" => {
2778 id => "infobox", 2951 id => "infobox",
2779 title => "Skills", 2952 title => "Skills",
2780 reply => undef, 2953 reply => undef,
2781 tooltip => "Shows your experience per skill and item power", 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",
2782 }, 2979 },
2783 "c/uptime" => { 2980 "c/uptime" => {
2784 id => "infobox", 2981 id => "infobox",
2785 title => "Uptime", 2982 title => "Uptime",
2786 reply => undef, 2983 reply => undef,
2796 id => "party", 2993 id => "party",
2797 title => "Party", 2994 title => "Party",
2798 reply => "gsay ", 2995 reply => "gsay ",
2799 tooltip => "Messages and chat related to your party", 2996 tooltip => "Messages and chat related to your party",
2800 }, 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,
2801); 3006);
2802 3007
2803sub cf::client::send_msg { 3008sub cf::client::send_msg {
2804 my ($self, $channel, $msg, $color, @extra) = @_; 3009 my ($self, $channel, $msg, $color, @extra) = @_;
2805 3010
2810 3015
2811 # check predefined channels, for the benefit of C 3016 # check predefined channels, for the benefit of C
2812 if ($CHANNEL{$channel}) { 3017 if ($CHANNEL{$channel}) {
2813 $channel = $CHANNEL{$channel}; 3018 $channel = $CHANNEL{$channel};
2814 3019
2815 $self->ext_msg (channel_info => $channel) 3020 $self->ext_msg (channel_info => $channel);
2816 if $self->can_msg;
2817
2818 $channel = $channel->{id}; 3021 $channel = $channel->{id};
2819 3022
2820 } elsif (ref $channel) { 3023 } elsif (ref $channel) {
2821 # send meta info to client, if not yet sent 3024 # send meta info to client, if not yet sent
2822 unless (exists $self->{channel}{$channel->{id}}) { 3025 unless (exists $self->{channel}{$channel->{id}}) {
2823 $self->{channel}{$channel->{id}} = $channel; 3026 $self->{channel}{$channel->{id}} = $channel;
2824 $self->ext_msg (channel_info => $channel) 3027 $self->ext_msg (channel_info => $channel);
2825 if $self->can_msg;
2826 } 3028 }
2827 3029
2828 $channel = $channel->{id}; 3030 $channel = $channel->{id};
2829 } 3031 }
2830 3032
2831 return unless @extra || length $msg; 3033 return unless @extra || length $msg;
2832 3034
2833 if ($self->can_msg) {
2834 # default colour, mask it out 3035 # default colour, mask it out
2835 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3036 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2836 if $color & cf::NDI_DEF; 3037 if $color & cf::NDI_DEF;
2837 3038
2838 my $pkt = "msg " 3039 my $pkt = "msg "
2839 . $self->{json_coder}->encode ( 3040 . $self->{json_coder}->encode (
2840 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3041 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2841 ); 3042 );
2842 3043
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); 3044 $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} 3045}
2880 3046
2881=item $client->ext_msg ($type, @msg) 3047=item $client->ext_msg ($type, @msg)
2882 3048
2883Sends an ext event to the client. 3049Sends an ext event to the client.
2886 3052
2887sub cf::client::ext_msg($$@) { 3053sub cf::client::ext_msg($$@) {
2888 my ($self, $type, @msg) = @_; 3054 my ($self, $type, @msg) = @_;
2889 3055
2890 if ($self->extcmd == 2) { 3056 if ($self->extcmd == 2) {
2891 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3057 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2892 } elsif ($self->extcmd == 1) { # TODO: remove 3058 } elsif ($self->extcmd == 1) { # TODO: remove
2893 push @msg, msgtype => "event_$type"; 3059 push @msg, msgtype => "event_$type";
2894 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3060 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2895 } 3061 }
2896} 3062}
2897 3063
2898=item $client->ext_reply ($msgid, @msg) 3064=item $client->ext_reply ($msgid, @msg)
2899 3065
2903 3069
2904sub cf::client::ext_reply($$@) { 3070sub cf::client::ext_reply($$@) {
2905 my ($self, $id, @msg) = @_; 3071 my ($self, $id, @msg) = @_;
2906 3072
2907 if ($self->extcmd == 2) { 3073 if ($self->extcmd == 2) {
2908 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3074 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2909 } elsif ($self->extcmd == 1) { 3075 } elsif ($self->extcmd == 1) {
2910 #TODO: version 1, remove 3076 #TODO: version 1, remove
2911 unshift @msg, msgtype => "reply", msgid => $id; 3077 unshift @msg, msgtype => "reply", msgid => $id;
2912 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3078 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2913 } 3079 }
2914} 3080}
2915 3081
2916=item $success = $client->query ($flags, "text", \&cb) 3082=item $success = $client->query ($flags, "text", \&cb)
2917 3083
3018 3184
3019 $coro 3185 $coro
3020} 3186}
3021 3187
3022cf::client->attach ( 3188cf::client->attach (
3023 on_destroy => sub { 3189 on_client_destroy => sub {
3024 my ($ns) = @_; 3190 my ($ns) = @_;
3025 3191
3026 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3192 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3027 }, 3193 },
3028); 3194);
3044our $safe_hole = new Safe::Hole; 3210our $safe_hole = new Safe::Hole;
3045 3211
3046$SIG{FPE} = 'IGNORE'; 3212$SIG{FPE} = 'IGNORE';
3047 3213
3048$safe->permit_only (Opcode::opset qw( 3214$safe->permit_only (Opcode::opset qw(
3049 :base_core :base_mem :base_orig :base_math 3215 :base_core :base_mem :base_orig :base_math :base_loop
3050 grepstart grepwhile mapstart mapwhile 3216 grepstart grepwhile mapstart mapwhile
3051 sort time 3217 sort time
3052)); 3218));
3053 3219
3054# here we export the classes and methods available to script code 3220# here we export the classes and methods available to script code
3058The following functions and methods are available within a safe environment: 3224The following functions and methods are available within a safe environment:
3059 3225
3060 cf::object 3226 cf::object
3061 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
3062 insert remove name archname title slaying race decrease split 3228 insert remove name archname title slaying race decrease split
3229 value
3063 3230
3064 cf::object::player 3231 cf::object::player
3065 player 3232 player
3066 3233
3067 cf::player 3234 cf::player
3073=cut 3240=cut
3074 3241
3075for ( 3242for (
3076 ["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
3077 insert remove inv nrof name archname title slaying race 3244 insert remove inv nrof name archname title slaying race
3078 decrease split destroy change_exp)], 3245 decrease split destroy change_exp value msg lore send_msg)],
3079 ["cf::object::player" => qw(player)], 3246 ["cf::object::player" => qw(player)],
3080 ["cf::player" => qw(peaceful)], 3247 ["cf::player" => qw(peaceful send_msg)],
3081 ["cf::map" => qw(trigger)], 3248 ["cf::map" => qw(trigger)],
3082) { 3249) {
3083 no strict 'refs'; 3250 no strict 'refs';
3084 my ($pkg, @funs) = @$_; 3251 my ($pkg, @funs) = @$_;
3085 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3252 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3103 3270
3104 my $qcode = $code; 3271 my $qcode = $code;
3105 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3272 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3106 $qcode =~ s/\n/\\n/g; 3273 $qcode =~ s/\n/\\n/g;
3107 3274
3275 %vars = (_dummy => 0) unless %vars;
3276
3277 my @res;
3108 local $_; 3278 local $_;
3109 local @safe::cf::_safe_eval_args = values %vars;
3110 3279
3111 my $eval = 3280 my $eval =
3112 "do {\n" 3281 "do {\n"
3113 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3282 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3114 . "#line 0 \"{$qcode}\"\n" 3283 . "#line 0 \"{$qcode}\"\n"
3115 . $code 3284 . $code
3116 . "\n}" 3285 . "\n}"
3117 ; 3286 ;
3118 3287
3288 if ($CFG{safe_eval}) {
3119 sub_generation_inc; 3289 sub_generation_inc;
3290 local @safe::cf::_safe_eval_args = values %vars;
3120 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3291 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3121 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 }
3122 3297
3123 if ($@) { 3298 if ($@) {
3124 warn "$@"; 3299 warn "$@";
3125 warn "while executing safe code '$code'\n"; 3300 warn "while executing safe code '$code'\n";
3126 warn "with arguments " . (join " ", %vars) . "\n"; 3301 warn "with arguments " . (join " ", %vars) . "\n";
3145=cut 3320=cut
3146 3321
3147sub register_script_function { 3322sub register_script_function {
3148 my ($fun, $cb) = @_; 3323 my ($fun, $cb) = @_;
3149 3324
3150 no strict 'refs'; 3325 $fun = "safe::$fun" if $CFG{safe_eval};
3151 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3326 *$fun = $safe_hole->wrap ($cb);
3152} 3327}
3153 3328
3154=back 3329=back
3155 3330
3156=cut 3331=cut
3177 3352
3178 $facedata->{version} == 2 3353 $facedata->{version} == 2
3179 or cf::cleanup "$path: version mismatch, cannot proceed."; 3354 or cf::cleanup "$path: version mismatch, cannot proceed.";
3180 3355
3181 # 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]);
3182 $facedata->{resource}{"res/exp_table"} = { 3358 $facedata->{resource}{"res/exp_table"} = {
3183 type => FT_RSRC, 3359 type => FT_RSRC,
3184 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),
3185 }; 3362 };
3186 cf::cede_to_tick; 3363 cf::cede_to_tick;
3187 3364
3188 { 3365 {
3189 my $faces = $facedata->{faceinfo}; 3366 my $faces = $facedata->{faceinfo};
3191 while (my ($face, $info) = each %$faces) { 3368 while (my ($face, $info) = each %$faces) {
3192 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3369 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3193 3370
3194 cf::face::set_visibility $idx, $info->{visibility}; 3371 cf::face::set_visibility $idx, $info->{visibility};
3195 cf::face::set_magicmap $idx, $info->{magicmap}; 3372 cf::face::set_magicmap $idx, $info->{magicmap};
3196 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3373 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3197 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3374 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3198 3375
3199 cf::cede_to_tick; 3376 cf::cede_to_tick;
3200 } 3377 }
3201 3378
3202 while (my ($face, $info) = each %$faces) { 3379 while (my ($face, $info) = each %$faces) {
3226 3403
3227 cf::anim::invalidate_all; # d'oh 3404 cf::anim::invalidate_all; # d'oh
3228 } 3405 }
3229 3406
3230 { 3407 {
3231 # TODO: for gcfclient pleasure, we should give resources
3232 # that gcfclient doesn't grok a >10000 face index.
3233 my $res = $facedata->{resource}; 3408 my $res = $facedata->{resource};
3234 3409
3235 while (my ($name, $info) = each %$res) { 3410 while (my ($name, $info) = each %$res) {
3236 if (defined $info->{type}) { 3411 if (defined $info->{type}) {
3237 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3412 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3238 my $data;
3239 3413
3240 if ($info->{type} & 1) { 3414 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}; 3415 cf::face::set_type $idx, $info->{type};
3255 } else { 3416 } else {
3256 $RESOURCE{$name} = $info; 3417 $RESOURCE{$name} = $info;
3257 } 3418 }
3258 3419
3341 reload_treasures; 3502 reload_treasures;
3342 3503
3343 warn "finished reloading resource files\n"; 3504 warn "finished reloading resource files\n";
3344} 3505}
3345 3506
3346sub init {
3347 my $guard = freeze_mainloop;
3348
3349 evthread_start IO::AIO::poll_fileno;
3350
3351 reload_resources;
3352}
3353
3354sub reload_config { 3507sub reload_config {
3508 warn "reloading config file...\n";
3509
3355 open my $fh, "<:utf8", "$CONFDIR/config" 3510 open my $fh, "<:utf8", "$CONFDIR/config"
3356 or return; 3511 or return;
3357 3512
3358 local $/; 3513 local $/;
3359 *CFG = YAML::Load <$fh>; 3514 *CFG = YAML::XS::Load scalar <$fh>;
3360 3515
3361 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3516 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3362 3517
3363 $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};
3364 $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};
3368 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3523 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3369 and die "WARNING: m(un)lockall failed: $!\n"; 3524 and die "WARNING: m(un)lockall failed: $!\n";
3370 }; 3525 };
3371 warn $@ if $@; 3526 warn $@ if $@;
3372 } 3527 }
3528
3529 warn "finished reloading resource files\n";
3373} 3530}
3374 3531
3375sub pidfile() { 3532sub pidfile() {
3376 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3533 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3377 or die "$PIDFILE: $!"; 3534 or die "$PIDFILE: $!";
3389 3546
3390 seek $fh, 0, 0; 3547 seek $fh, 0, 0;
3391 print $fh $$; 3548 print $fh $$;
3392} 3549}
3393 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
3394sub main { 3560sub main {
3395 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
3396 3569
3397 # we must not ever block the main coroutine 3570 # we must not ever block the main coroutine
3398 local $Coro::idle = sub { 3571 local $Coro::idle = sub {
3399 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#
3400 (async { 3573 (async {
3401 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3574 $Coro::current->{desc} = "IDLE BUG HANDLER";
3402 EV::loop EV::LOOP_ONESHOT; 3575 EV::loop EV::LOOP_ONESHOT;
3403 })->prio (Coro::PRIO_MAX); 3576 })->prio (Coro::PRIO_MAX);
3404 }; 3577 };
3405 3578
3406 { 3579 evthread_start IO::AIO::poll_fileno;
3407 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;
3408 reload_config; 3591 reload_config;
3409 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
3410 load_extensions; 3602 load_extensions;
3411 3603
3412 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3413 }
3414
3415 utime time, time, $RUNTIMEFILE; 3604 utime time, time, $RUNTIMEFILE;
3416 3605
3417 # no (long-running) fork's whatsoever before this point(!) 3606 # no (long-running) fork's whatsoever before this point(!)
3607 use POSIX ();
3418 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};
3419 3609
3420 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;
3421} 3617}
3422 3618
3423############################################################################# 3619#############################################################################
3424# initialisation and cleanup 3620# initialisation and cleanup
3425 3621
3426# install some emergency cleanup handlers 3622# install some emergency cleanup handlers
3427BEGIN { 3623BEGIN {
3428 our %SIGWATCHER = (); 3624 our %SIGWATCHER = ();
3429 for my $signal (qw(INT HUP TERM)) { 3625 for my $signal (qw(INT HUP TERM)) {
3430 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3626 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3431 cf::cleanup "SIG$signal"; 3627 cf::cleanup "SIG$signal";
3432 }; 3628 };
3433 } 3629 }
3434} 3630}
3435 3631
3436sub write_runtime_sync { 3632sub write_runtime_sync {
3633 my $t0 = AE::time;
3634
3437 # first touch the runtime file to show we are still running: 3635 # first touch the runtime file to show we are still running:
3438 # the fsync below can take a very very long time. 3636 # the fsync below can take a very very long time.
3439 3637
3440 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3638 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3441 3639
3442 my $guard = cf::lock_acquire "write_runtime"; 3640 my $guard = cf::lock_acquire "write_runtime";
3443 3641
3444 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3642 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3445 or return; 3643 or return;
3446 3644
3447 my $value = $cf::RUNTIME + 90 + 10; 3645 my $value = $cf::RUNTIME + 90 + 10;
3448 # 10 is the runtime save interval, for a monotonic clock 3646 # 10 is the runtime save interval, for a monotonic clock
3449 # 60 allows for the watchdog to kill the server. 3647 # 60 allows for the watchdog to kill the server.
3462 or return; 3660 or return;
3463 3661
3464 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3662 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3465 and return; 3663 and return;
3466 3664
3467 warn "runtime file written.\n"; 3665 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3468 3666
3469 1 3667 1
3470} 3668}
3471 3669
3472our $uuid_lock; 3670our $uuid_lock;
3481 my $uuid = "$LOCALDIR/uuid"; 3679 my $uuid = "$LOCALDIR/uuid";
3482 3680
3483 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3681 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3484 or return; 3682 or return;
3485 3683
3486 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;
3487 $uuid_skip = 0; 3692 $uuid_skip = 0;
3488 3693
3489 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3694 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3490 and return; 3695 and return;
3491 3696
3513} 3718}
3514 3719
3515sub emergency_save() { 3720sub emergency_save() {
3516 my $freeze_guard = cf::freeze_mainloop; 3721 my $freeze_guard = cf::freeze_mainloop;
3517 3722
3518 warn "enter emergency perl save\n"; 3723 warn "emergency_perl_save: enter\n";
3519 3724
3520 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
3521 # use a peculiar iteration method to avoid tripping on perl 3731 # use a peculiar iteration method to avoid tripping on perl
3522 # refcount bugs in for. also avoids problems with players 3732 # refcount bugs in for. also avoids problems with players
3523 # and maps saved/destroyed asynchronously. 3733 # and maps saved/destroyed asynchronously.
3524 warn "begin emergency player save\n"; 3734 warn "emergency_perl_save: begin player save\n";
3525 for my $login (keys %cf::PLAYER) { 3735 for my $login (keys %cf::PLAYER) {
3526 my $pl = $cf::PLAYER{$login} or next; 3736 my $pl = $cf::PLAYER{$login} or next;
3527 $pl->valid or next; 3737 $pl->valid or next;
3528 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3738 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3529 $pl->save; 3739 $pl->save;
3530 } 3740 }
3531 warn "end emergency player save\n"; 3741 warn "emergency_perl_save: end player save\n";
3532 3742
3533 warn "begin emergency map save\n"; 3743 warn "emergency_perl_save: begin map save\n";
3534 for my $path (keys %cf::MAP) { 3744 for my $path (keys %cf::MAP) {
3535 my $map = $cf::MAP{$path} or next; 3745 my $map = $cf::MAP{$path} or next;
3536 $map->valid or next; 3746 $map->valid or next;
3537 $map->save; 3747 $map->save;
3538 } 3748 }
3539 warn "end emergency map save\n"; 3749 warn "emergency_perl_save: end map save\n";
3540 3750
3541 warn "begin emergency database checkpoint\n"; 3751 warn "emergency_perl_save: begin database checkpoint\n";
3542 BDB::db_env_txn_checkpoint $DB_ENV; 3752 BDB::db_env_txn_checkpoint $DB_ENV;
3543 warn "end emergency database checkpoint\n"; 3753 warn "emergency_perl_save: end database checkpoint\n";
3544 3754
3545 warn "begin write uuid\n"; 3755 warn "emergency_perl_save: begin write uuid\n";
3546 write_uuid_sync 1; 3756 write_uuid_sync 1;
3547 warn "end write uuid\n"; 3757 warn "emergency_perl_save: end write uuid\n";
3548 }; 3758 };
3549 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
3550 warn "leave emergency perl save\n"; 3765 warn "emergency_perl_save: leave\n";
3551} 3766}
3552 3767
3553sub post_cleanup { 3768sub post_cleanup {
3554 my ($make_core) = @_; 3769 my ($make_core) = @_;
3555 3770
3581 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3796 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3582 for my $name (keys %$leaf_symtab) { 3797 for my $name (keys %$leaf_symtab) {
3583 _gv_clear *{"$pkg$name"}; 3798 _gv_clear *{"$pkg$name"};
3584# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3799# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3585 } 3800 }
3586 warn "cleared package $pkg\n";#d#
3587} 3801}
3588 3802
3589sub do_reload_perl() { 3803sub do_reload_perl() {
3590 # can/must only be called in main 3804 # can/must only be called in main
3591 if ($Coro::current != $Coro::main) { 3805 if (in_main) {
3592 warn "can only reload from main coroutine"; 3806 warn "can only reload from main coroutine";
3593 return; 3807 return;
3594 } 3808 }
3595 3809
3596 return if $RELOAD++; 3810 return if $RELOAD++;
3811
3812 my $t1 = AE::time;
3597 3813
3598 while ($RELOAD) { 3814 while ($RELOAD) {
3599 warn "reloading..."; 3815 warn "reloading...";
3600 3816
3601 warn "entering sync_job"; 3817 warn "entering sync_job";
3662 clear_package "safe::$_" 3878 clear_package "safe::$_"
3663 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);
3664 3880
3665 warn "unloading cf.pm \"a bit\""; 3881 warn "unloading cf.pm \"a bit\"";
3666 delete $INC{"cf.pm"}; 3882 delete $INC{"cf.pm"};
3667 delete $INC{"cf/pod.pm"}; 3883 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3668 3884
3669 # don't, removes xs symbols, too, 3885 # don't, removes xs symbols, too,
3670 # and global variables created in xs 3886 # and global variables created in xs
3671 #clear_package __PACKAGE__; 3887 #clear_package __PACKAGE__;
3672 3888
3673 warn "unload completed, starting to reload now"; 3889 warn "unload completed, starting to reload now";
3674 3890
3675 warn "reloading cf.pm"; 3891 warn "reloading cf.pm";
3676 require cf; 3892 require cf;
3677 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3893 cf::_connect_to_perl_1;
3678 3894
3679 warn "loading config and database again"; 3895 warn "loading config and database again";
3680 cf::reload_config; 3896 cf::reload_config;
3681 3897
3682 warn "loading extensions"; 3898 warn "loading extensions";
3683 cf::load_extensions; 3899 cf::load_extensions;
3684 3900
3901 if ($REATTACH_ON_RELOAD) {
3685 warn "reattaching attachments to objects/players"; 3902 warn "reattaching attachments to objects/players";
3686 _global_reattach; # objects, sockets 3903 _global_reattach; # objects, sockets
3687 warn "reattaching attachments to maps"; 3904 warn "reattaching attachments to maps";
3688 reattach $_ for values %MAP; 3905 reattach $_ for values %MAP;
3689 warn "reattaching attachments to players"; 3906 warn "reattaching attachments to players";
3690 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;
3691 3912
3692 warn "leaving sync_job"; 3913 warn "leaving sync_job";
3693 3914
3694 1 3915 1
3695 } or do { 3916 } or do {
3698 }; 3919 };
3699 3920
3700 warn "reloaded"; 3921 warn "reloaded";
3701 --$RELOAD; 3922 --$RELOAD;
3702 } 3923 }
3924
3925 $t1 = AE::time - $t1;
3926 warn "reload completed in ${t1}s\n";
3703}; 3927};
3704 3928
3705our $RELOAD_WATCHER; # used only during reload 3929our $RELOAD_WATCHER; # used only during reload
3706 3930
3707sub reload_perl() { 3931sub reload_perl() {
3708 # doing reload synchronously and two reloads happen back-to-back, 3932 # doing reload synchronously and two reloads happen back-to-back,
3709 # coro crashes during coro_state_free->destroy here. 3933 # coro crashes during coro_state_free->destroy here.
3710 3934
3935 $RELOAD_WATCHER ||= cf::async {
3936 Coro::AIO::aio_wait cache_extensions;
3937
3711 $RELOAD_WATCHER ||= EV::timer $TICK * 1.5, 0, sub { 3938 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3712 do_reload_perl; 3939 do_reload_perl;
3713 undef $RELOAD_WATCHER; 3940 undef $RELOAD_WATCHER;
3941 };
3714 }; 3942 };
3715} 3943}
3716 3944
3717register_command "reload" => sub { 3945register_command "reload" => sub {
3718 my ($who, $arg) = @_; 3946 my ($who, $arg) = @_;
3732 3960
3733our @WAIT_FOR_TICK; 3961our @WAIT_FOR_TICK;
3734our @WAIT_FOR_TICK_BEGIN; 3962our @WAIT_FOR_TICK_BEGIN;
3735 3963
3736sub wait_for_tick { 3964sub wait_for_tick {
3737 return if tick_inhibit || $Coro::current == $Coro::main; 3965 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3738 3966
3739 my $signal = new Coro::Signal; 3967 my $signal = new Coro::Signal;
3740 push @WAIT_FOR_TICK, $signal; 3968 push @WAIT_FOR_TICK, $signal;
3741 $signal->wait; 3969 $signal->wait;
3742} 3970}
3743 3971
3744sub wait_for_tick_begin { 3972sub wait_for_tick_begin {
3745 return if tick_inhibit || $Coro::current == $Coro::main; 3973 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3746 3974
3747 my $signal = new Coro::Signal; 3975 my $signal = new Coro::Signal;
3748 push @WAIT_FOR_TICK_BEGIN, $signal; 3976 push @WAIT_FOR_TICK_BEGIN, $signal;
3749 $signal->wait; 3977 $signal->wait;
3750} 3978}
3755 unless ++$bug_warning > 10; 3983 unless ++$bug_warning > 10;
3756 return; 3984 return;
3757 } 3985 }
3758 3986
3759 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#
3760 3990
3761 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3991 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3762 $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.;
3763 Coro::async_pool { 3993 Coro::async_pool {
3764 $Coro::current->{desc} = "runtime saver"; 3994 $Coro::current->{desc} = "runtime saver";
3787} 4017}
3788 4018
3789{ 4019{
3790 # configure BDB 4020 # configure BDB
3791 4021
3792 BDB::min_parallel 8; 4022 BDB::min_parallel 16;
3793 BDB::max_poll_reqs $TICK * 0.1; 4023 BDB::max_poll_reqs $TICK * 0.1;
3794 $AnyEvent::BDB::WATCHER->priority (1); 4024 $AnyEvent::BDB::WATCHER->priority (1);
3795 4025
3796 unless ($DB_ENV) { 4026 unless ($DB_ENV) {
3797 $DB_ENV = BDB::db_env_create; 4027 $DB_ENV = BDB::db_env_create;
3877 LOG llevInfo, "[ABT] [suppressed]\n"; 4107 LOG llevInfo, "[ABT] [suppressed]\n";
3878 } 4108 }
3879} 4109}
3880 4110
3881# load additional modules 4111# load additional modules
3882use cf::pod; 4112require "cf/$_.pm" for @EXTRA_MODULES;
4113cf::_connect_to_perl_2;
3883 4114
3884END { cf::emergency_save } 4115END { cf::emergency_save }
3885 4116
38861 41171
3887 4118

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines