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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.448 by root, Fri Sep 19 05:30:23 2008 UTC vs.
Revision 1.516 by root, Thu Apr 15 06:05:52 2010 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
18# 19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use 5.10.0; 25use 5.10.0;
25use utf8; 26use utf8;
26use strict "vars", "subs"; 27use strict qw(vars subs);
27 28
28use Symbol; 29use Symbol;
29use List::Util; 30use List::Util;
30use Socket; 31use Socket;
31use EV; 32use EV;
32use Opcode; 33use Opcode;
33use Safe; 34use Safe;
34use Safe::Hole; 35use Safe::Hole;
35use Storable (); 36use Storable ();
37use Carp ();
36 38
39use Guard ();
37use Coro (); 40use Coro ();
38use Coro::State; 41use Coro::State;
39use Coro::Handle; 42use Coro::Handle;
40use Coro::EV; 43use Coro::EV;
41use Coro::AnyEvent; 44use Coro::AnyEvent;
42use Coro::Timer; 45use Coro::Timer;
43use Coro::Signal; 46use Coro::Signal;
44use Coro::Semaphore; 47use Coro::Semaphore;
48use Coro::SemaphoreSet;
45use Coro::AnyEvent; 49use Coro::AnyEvent;
46use Coro::AIO; 50use Coro::AIO;
47use Coro::BDB 1.6; 51use Coro::BDB 1.6;
48use Coro::Storable; 52use Coro::Storable;
49use Coro::Util (); 53use Coro::Util ();
50 54
51use JSON::XS 2.01 (); 55use JSON::XS 2.01 ();
52use BDB (); 56use BDB ();
53use Data::Dumper; 57use Data::Dumper;
54use Digest::MD5;
55use Fcntl; 58use Fcntl;
56use YAML (); 59use YAML::XS ();
57use IO::AIO (); 60use IO::AIO ();
58use Time::HiRes; 61use Time::HiRes;
59use Compress::LZF; 62use Compress::LZF;
60use Digest::MD5 (); 63use Digest::MD5 ();
61 64
66$Storable::canonical = 1; # reduce rsync transfers 69$Storable::canonical = 1; # reduce rsync transfers
67Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 70Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
68 71
69$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 72$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
70 73
71{ 74# make sure c-lzf reinitialises itself
72 # very ugly, but ensure we acquire the storable lock
73
74 sub net_mstore {
75 my $guard = Coro::Storable::guard;
76 &Storable::net_mstore
77 }
78
79 sub mretrieve {
80 my $guard = Coro::Storable::guard;
81 &Storable::mretrieve
82 }
83
84 Compress::LZF::set_serializer "Coro::Storable", "cf::net_mstore", "cf::mretrieve"; 75Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
85 Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 76Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
86} 77
78# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
87 80
88sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
89 82
90our %COMMAND = (); 83our %COMMAND = ();
91our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
94our %EXTCMD = (); 87our %EXTCMD = ();
95our %EXTICMD = (); 88our %EXTICMD = ();
96our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
97our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
98 91
99our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
100our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
101 96
102our $CONFDIR = confdir; 97our $CONFDIR = confdir;
103our $DATADIR = datadir; 98our $DATADIR = datadir;
104our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
105our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
113our $PIDFILE = "$LOCALDIR/pid"; 108our $PIDFILE = "$LOCALDIR/pid";
114our $RUNTIMEFILE = "$LOCALDIR/runtime"; 109our $RUNTIMEFILE = "$LOCALDIR/runtime";
115 110
116our %RESOURCE; 111our %RESOURCE;
117 112
113our $OUTPUT_RATE_MIN = 4000;
114our $OUTPUT_RATE_MAX = 100000;
115
118our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 116our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
119our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 117our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
120our $NEXT_TICK; 118our $NEXT_TICK;
121our $USE_FSYNC = 1; # use fsync to write maps - default off 119our $USE_FSYNC = 1; # use fsync to write maps - default on
122 120
123our $BDB_DEADLOCK_WATCHER; 121our $BDB_DEADLOCK_WATCHER;
124our $BDB_CHECKPOINT_WATCHER; 122our $BDB_CHECKPOINT_WATCHER;
125our $BDB_TRICKLE_WATCHER; 123our $BDB_TRICKLE_WATCHER;
126our $DB_ENV; 124our $DB_ENV;
127 125
126our @EXTRA_MODULES = qw(pod match mapscript);
127
128our %CFG; 128our %CFG;
129 129
130our $UPTIME; $UPTIME ||= time; 130our $UPTIME; $UPTIME ||= time;
131our $RUNTIME; 131our $RUNTIME;
132our $NOW; 132our $NOW;
140 140
141our $LOAD; # a number between 0 (idle) and 1 (too many objects) 141our $LOAD; # a number between 0 (idle) and 1 (too many objects)
142our $LOADAVG; # same thing, but with alpha-smoothing 142our $LOADAVG; # same thing, but with alpha-smoothing
143our $JITTER; # average jitter 143our $JITTER; # average jitter
144our $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 :)
145 150
146binmode STDOUT; 151binmode STDOUT;
147binmode STDERR; 152binmode STDERR;
148 153
149# read virtual server time, if available 154# read virtual server time, if available
151 open my $fh, "<", $RUNTIMEFILE 156 open my $fh, "<", $RUNTIMEFILE
152 or die "unable to read $RUNTIMEFILE file: $!"; 157 or die "unable to read $RUNTIMEFILE file: $!";
153 $RUNTIME = <$fh> + 0.; 158 $RUNTIME = <$fh> + 0.;
154} 159}
155 160
161eval "sub TICK() { $TICK } 1" or die;
162
156mkdir $_ 163mkdir $_
157 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 164 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
158 165
159our $EMERGENCY_POSITION; 166our $EMERGENCY_POSITION;
160 167
161sub cf::map::normalise; 168sub cf::map::normalise;
169
170#############################################################################
171
172%REFLECT = ();
173for (@REFLECT) {
174 my $reflect = JSON::XS::decode_json $_;
175 $REFLECT{$reflect->{class}} = $reflect;
176}
177
178# this is decidedly evil
179$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
162 180
163############################################################################# 181#############################################################################
164 182
165=head2 GLOBAL VARIABLES 183=head2 GLOBAL VARIABLES
166 184
213returns directly I<after> the tick processing (and consequently, can only wake one process 231returns directly I<after> the tick processing (and consequently, can only wake one process
214per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 232per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
215 233
216=item @cf::INVOKE_RESULTS 234=item @cf::INVOKE_RESULTS
217 235
218This array contains the results of the last C<invoke ()> call. When 236This array contains the results of the last C<invoke ()> call. When
219C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 237C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
220that call. 238that call.
221 239
240=item %cf::REFLECT
241
242Contains, for each (C++) class name, a hash reference with information
243about object members (methods, scalars, arrays and flags) and other
244metadata, which is useful for introspection.
245
222=back 246=back
223 247
224=cut 248=cut
225 249
226BEGIN { 250$Coro::State::WARNHOOK = sub {
227 *CORE::GLOBAL::warn = sub {
228 my $msg = join "", @_; 251 my $msg = join "", @_;
229 252
230 $msg .= "\n" 253 $msg .= "\n"
231 unless $msg =~ /\n$/; 254 unless $msg =~ /\n$/;
232 255
233 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 256 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
234 257
235 LOG llevError, $msg; 258 LOG llevError, $msg;
236 }; 259};
237}
238 260
239$Coro::State::DIEHOOK = sub { 261$Coro::State::DIEHOOK = sub {
240 return unless $^S eq 0; # "eq", not "==" 262 return unless $^S eq 0; # "eq", not "=="
263
264 warn Carp::longmess $_[0];
241 265
242 if ($Coro::current == $Coro::main) {#d# 266 if ($Coro::current == $Coro::main) {#d#
243 warn "DIEHOOK called in main context, Coro bug?\n";#d# 267 warn "DIEHOOK called in main context, Coro bug?\n";#d#
244 return;#d# 268 return;#d#
245 }#d# 269 }#d#
246 270
247 # kill coroutine otherwise 271 # kill coroutine otherwise
248 warn Carp::longmess $_[0];
249 Coro::terminate 272 Coro::terminate
250}; 273};
251
252$SIG{__DIE__} = sub { }; #d#?
253 274
254@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 275@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
255@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 276@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
256@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 277@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
257@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 278@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
271)) { 292)) {
272 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 293 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
273} 294}
274 295
275$EV::DIED = sub { 296$EV::DIED = sub {
276 warn "error in event callback: @_"; 297 Carp::cluck "error in event callback: @_";
277}; 298};
278 299
279############################################################################# 300#############################################################################
280 301
281=head2 UTILITY FUNCTIONS 302=head2 UTILITY FUNCTIONS
318our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 339our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
319 340
320sub encode_json($) { $json_coder->encode ($_[0]) } 341sub encode_json($) { $json_coder->encode ($_[0]) }
321sub decode_json($) { $json_coder->decode ($_[0]) } 342sub decode_json($) { $json_coder->decode ($_[0]) }
322 343
344=item cf::post_init { BLOCK }
345
346Execute the given codeblock, I<after> all extensions have been (re-)loaded,
347but I<before> the server starts ticking again.
348
349The cdoeblock will have a single boolean argument to indicate whether this
350is a reload or not.
351
352=cut
353
354sub post_init(&) {
355 push @POST_INIT, shift;
356}
357
323=item cf::lock_wait $string 358=item cf::lock_wait $string
324 359
325Wait until the given lock is available. See cf::lock_acquire. 360Wait until the given lock is available. See cf::lock_acquire.
326 361
327=item my $lock = cf::lock_acquire $string 362=item my $lock = cf::lock_acquire $string
328 363
329Wait until the given lock is available and then acquires it and returns 364Wait until the given lock is available and then acquires it and returns
330a Coro::guard object. If the guard object gets destroyed (goes out of scope, 365a L<Guard> object. If the guard object gets destroyed (goes out of scope,
331for example when the coroutine gets canceled), the lock is automatically 366for example when the coroutine gets canceled), the lock is automatically
332returned. 367returned.
333 368
334Locks are *not* recursive, locking from the same coro twice results in a 369Locks are *not* recursive, locking from the same coro twice results in a
335deadlocked coro. 370deadlocked coro.
341 376
342Return true if the lock is currently active, i.e. somebody has locked it. 377Return true if the lock is currently active, i.e. somebody has locked it.
343 378
344=cut 379=cut
345 380
346our %LOCK; 381our $LOCKS = new Coro::SemaphoreSet;
347our %LOCKER;#d#
348 382
349sub lock_wait($) { 383sub lock_wait($) {
350 my ($key) = @_; 384 $LOCKS->wait ($_[0]);
351
352 if ($LOCKER{$key} == $Coro::current) {#d#
353 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
354 return;#d#
355 }#d#
356
357 # wait for lock, if any
358 while ($LOCK{$key}) {
359 push @{ $LOCK{$key} }, $Coro::current;
360 Coro::schedule;
361 }
362} 385}
363 386
364sub lock_acquire($) { 387sub lock_acquire($) {
365 my ($key) = @_; 388 $LOCKS->guard ($_[0])
366
367 # wait, to be sure we are not locked
368 lock_wait $key;
369
370 $LOCK{$key} = [];
371 $LOCKER{$key} = $Coro::current;#d#
372
373 Coro::guard {
374 delete $LOCKER{$key};#d#
375 # wake up all waiters, to be on the safe side
376 $_->ready for @{ delete $LOCK{$key} };
377 }
378} 389}
379 390
380sub lock_active($) { 391sub lock_active($) {
381 my ($key) = @_; 392 $LOCKS->count ($_[0]) < 1
382
383 ! ! $LOCK{$key}
384} 393}
385 394
386sub freeze_mainloop { 395sub freeze_mainloop {
387 tick_inhibit_inc; 396 tick_inhibit_inc;
388 397
389 Coro::guard \&tick_inhibit_dec; 398 &Guard::guard (\&tick_inhibit_dec);
390} 399}
391 400
392=item cf::periodic $interval, $cb 401=item cf::periodic $interval, $cb
393 402
394Like EV::periodic, but randomly selects a starting point so that the actions 403Like EV::periodic, but randomly selects a starting point so that the actions
395get spread over timer. 404get spread over time.
396 405
397=cut 406=cut
398 407
399sub periodic($$) { 408sub periodic($$) {
400 my ($interval, $cb) = @_; 409 my ($interval, $cb) = @_;
417 426
418=cut 427=cut
419 428
420our @SLOT_QUEUE; 429our @SLOT_QUEUE;
421our $SLOT_QUEUE; 430our $SLOT_QUEUE;
431our $SLOT_DECAY = 0.9;
422 432
423$SLOT_QUEUE->cancel if $SLOT_QUEUE; 433$SLOT_QUEUE->cancel if $SLOT_QUEUE;
424$SLOT_QUEUE = Coro::async { 434$SLOT_QUEUE = Coro::async {
425 $Coro::current->desc ("timeslot manager"); 435 $Coro::current->desc ("timeslot manager");
426 436
427 my $signal = new Coro::Signal; 437 my $signal = new Coro::Signal;
438 my $busy;
428 439
429 while () { 440 while () {
430 next_job: 441 next_job:
442
431 my $avail = cf::till_tick; 443 my $avail = cf::till_tick;
432 if ($avail > 0.01) { 444
433 for (0 .. $#SLOT_QUEUE) { 445 for (0 .. $#SLOT_QUEUE) {
434 if ($SLOT_QUEUE[$_][0] < $avail) { 446 if ($SLOT_QUEUE[$_][0] <= $avail) {
447 $busy = 0;
435 my $job = splice @SLOT_QUEUE, $_, 1, (); 448 my $job = splice @SLOT_QUEUE, $_, 1, ();
436 $job->[2]->send; 449 $job->[2]->send;
437 Coro::cede; 450 Coro::cede;
438 goto next_job; 451 goto next_job;
439 } 452 } else {
453 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
440 } 454 }
441 } 455 }
442 456
443 if (@SLOT_QUEUE) { 457 if (@SLOT_QUEUE) {
444 # we do not use wait_for_tick() as it returns immediately when tick is inactive 458 # we do not use wait_for_tick() as it returns immediately when tick is inactive
445 push @cf::WAIT_FOR_TICK, $signal; 459 push @cf::WAIT_FOR_TICK, $signal;
446 $signal->wait; 460 $signal->wait;
447 } else { 461 } else {
462 $busy = 0;
448 Coro::schedule; 463 Coro::schedule;
449 } 464 }
450 } 465 }
451}; 466};
452 467
453sub get_slot($;$$) { 468sub get_slot($;$$) {
454 return if tick_inhibit || $Coro::current == $Coro::main; 469 return if tick_inhibit || $Coro::current == $Coro::main;
455 470
456 my ($time, $pri, $name) = @_; 471 my ($time, $pri, $name) = @_;
457 472
458 $time = $TICK * .6 if $time > $TICK * .6; 473 $time = clamp $time, 0.01, $TICK * .6;
474
459 my $sig = new Coro::Signal; 475 my $sig = new Coro::Signal;
460 476
461 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 477 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
462 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 478 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
463 $SLOT_QUEUE->ready; 479 $SLOT_QUEUE->ready;
490 506
491sub sync_job(&) { 507sub sync_job(&) {
492 my ($job) = @_; 508 my ($job) = @_;
493 509
494 if ($Coro::current == $Coro::main) { 510 if ($Coro::current == $Coro::main) {
495 my $time = EV::time; 511 my $time = AE::time;
496 512
497 # this is the main coro, too bad, we have to block 513 # this is the main coro, too bad, we have to block
498 # till the operation succeeds, freezing the server :/ 514 # till the operation succeeds, freezing the server :/
499 515
500 LOG llevError, Carp::longmess "sync job";#d# 516 LOG llevError, Carp::longmess "sync job";#d#
517 } else { 533 } else {
518 EV::loop EV::LOOP_ONESHOT; 534 EV::loop EV::LOOP_ONESHOT;
519 } 535 }
520 } 536 }
521 537
522 my $time = EV::time - $time; 538 my $time = AE::time - $time;
523 539
524 $TICK_START += $time; # do not account sync jobs to server load 540 $TICK_START += $time; # do not account sync jobs to server load
525 541
526 wantarray ? @res : $res[0] 542 wantarray ? @res : $res[0]
527 } else { 543 } else {
571 reset_signals; 587 reset_signals;
572 &$cb 588 &$cb
573 }, @args; 589 }, @args;
574 590
575 wantarray ? @res : $res[-1] 591 wantarray ? @res : $res[-1]
592}
593
594sub objinfo {
595 (
596 "counter value" => cf::object::object_count,
597 "objects created" => cf::object::create_count,
598 "objects destroyed" => cf::object::destroy_count,
599 "freelist size" => cf::object::free_count,
600 "allocated objects" => cf::object::objects_size,
601 "active objects" => cf::object::actives_size,
602 )
576} 603}
577 604
578=item $coin = coin_from_name $name 605=item $coin = coin_from_name $name
579 606
580=cut 607=cut
1166 $decname, length $$rdata, scalar @$objs; 1193 $decname, length $$rdata, scalar @$objs;
1167 1194
1168 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1195 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1169 aio_chmod $fh, SAVE_MODE; 1196 aio_chmod $fh, SAVE_MODE;
1170 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1197 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1171 aio_fsync $fh if $cf::USE_FSYNC; 1198 if ($cf::USE_FSYNC) {
1199 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;
1200 aio_fsync $fh;
1201 }
1172 aio_close $fh; 1202 aio_close $fh;
1173 1203
1174 if (@$objs) { 1204 if (@$objs) {
1175 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1205 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1176 aio_chmod $fh, SAVE_MODE; 1206 aio_chmod $fh, SAVE_MODE;
1177 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1207 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1178 aio_write $fh, 0, (length $data), $data, 0; 1208 aio_write $fh, 0, (length $data), $data, 0;
1179 aio_fsync $fh if $cf::USE_FSYNC; 1209 if ($cf::USE_FSYNC) {
1210 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;
1211 aio_fsync $fh;
1212 }
1180 aio_close $fh; 1213 aio_close $fh;
1181 aio_rename "$filename.pst~", "$filename.pst"; 1214 aio_rename "$filename.pst~", "$filename.pst";
1182 } 1215 }
1183 } else { 1216 } else {
1184 aio_unlink "$filename.pst"; 1217 aio_unlink "$filename.pst";
1185 } 1218 }
1186 1219
1187 aio_rename "$filename~", $filename; 1220 aio_rename "$filename~", $filename;
1221
1222 $filename =~ s%/[^/]+$%%;
1223 aio_pathsync $filename if $cf::USE_FSYNC;
1188 } else { 1224 } else {
1189 warn "FATAL: $filename~: $!\n"; 1225 warn "unable to save objects: $filename~: $!\n";
1190 } 1226 }
1191 } else { 1227 } else {
1192 aio_unlink $filename; 1228 aio_unlink $filename;
1193 aio_unlink "$filename.pst"; 1229 aio_unlink "$filename.pst";
1194 } 1230 }
1285 my ($name, $cb) = @_; 1321 my ($name, $cb) = @_;
1286 1322
1287 $EXTICMD{$name} = $cb; 1323 $EXTICMD{$name} = $cb;
1288} 1324}
1289 1325
1326use File::Glob ();
1327
1290cf::player->attach ( 1328cf::player->attach (
1291 on_command => sub { 1329 on_unknown_command => sub {
1292 my ($pl, $name, $params) = @_; 1330 my ($pl, $name, $params) = @_;
1293 1331
1294 my $cb = $COMMAND{$name} 1332 my $cb = $COMMAND{$name}
1295 or return; 1333 or return;
1296 1334
1326 1364
1327 cf::override; 1365 cf::override;
1328 }, 1366 },
1329); 1367);
1330 1368
1369# "readahead" all extensions
1370sub cache_extensions {
1371 my $grp = IO::AIO::aio_group;
1372
1373 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1374 for (grep /\.ext$/, @{$_[0]}) {
1375 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1376 }
1377 };
1378
1379 $grp
1380}
1381
1331sub load_extensions { 1382sub load_extensions {
1332 cf::sync_job { 1383 cf::sync_job {
1333 my %todo; 1384 my %todo;
1334 1385
1335 for my $path (<$LIBDIR/*.ext>) { 1386 for my $path (<$LIBDIR/*.ext>) {
1362 . "\n};\n1"; 1413 . "\n};\n1";
1363 1414
1364 $todo{$base} = \%ext; 1415 $todo{$base} = \%ext;
1365 } 1416 }
1366 1417
1418 my $pass = 0;
1367 my %done; 1419 my %done;
1368 while (%todo) { 1420 while (%todo) {
1369 my $progress; 1421 my $progress;
1370 1422
1423 ++$pass;
1424
1425 ext:
1371 while (my ($k, $v) = each %todo) { 1426 while (my ($k, $v) = each %todo) {
1372 for (split /,\s*/, $v->{meta}{depends}) { 1427 for (split /,\s*/, $v->{meta}{depends}) {
1373 goto skip 1428 next ext
1374 unless exists $done{$_}; 1429 unless exists $done{$_};
1375 } 1430 }
1376 1431
1377 warn "... loading '$k' into '$v->{pkg}'\n"; 1432 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1378 1433
1379 unless (eval $v->{source}) { 1434 my $active = eval $v->{source};
1435
1436 if (length $@) {
1380 my $msg = $@ ? "$v->{path}: $@\n" 1437 warn "$v->{path}: $@\n";
1381 : "$v->{base}: extension inactive.\n";
1382 1438
1383 if (exists $v->{meta}{mandatory}) {
1384 warn $msg;
1385 cf::cleanup "mandatory extension failed to load, exiting."; 1439 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1386 } 1440 if exists $v->{meta}{mandatory};
1387 1441 } else {
1388 warn $msg; 1442 $done{$k} = delete $todo{$k};
1443 push @EXTS, $v->{pkg};
1444 $progress = 1;
1445
1446 warn "$v->{base}: extension inactive.\n"
1447 unless $active;
1389 } 1448 }
1390
1391 $done{$k} = delete $todo{$k};
1392 push @EXTS, $v->{pkg};
1393 $progress = 1;
1394 } 1449 }
1395 1450
1396 skip: 1451 unless ($progress) {
1397 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1452 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1398 unless $progress; 1453
1454 while (my ($k, $v) = each %todo) {
1455 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1456 if exists $v->{meta}{mandatory};
1457 }
1458 }
1399 } 1459 }
1400 }; 1460 };
1401} 1461}
1402 1462
1403############################################################################# 1463#############################################################################
1457 1517
1458sub exists($) { 1518sub exists($) {
1459 my ($login) = @_; 1519 my ($login) = @_;
1460 1520
1461 $cf::PLAYER{$login} 1521 $cf::PLAYER{$login}
1462 or cf::sync_job { !aio_stat path $login } 1522 or !aio_stat path $login
1463} 1523}
1464 1524
1465sub find($) { 1525sub find($) {
1466 return $cf::PLAYER{$_[0]} || do { 1526 return $cf::PLAYER{$_[0]} || do {
1467 my $login = $_[0]; 1527 my $login = $_[0];
1487 $cf::PLAYER{$login} = $pl 1547 $cf::PLAYER{$login} = $pl
1488 } 1548 }
1489 } 1549 }
1490} 1550}
1491 1551
1552cf::player->attach (
1553 on_load => sub {
1554 my ($pl, $path) = @_;
1555
1556 # restore slots saved in save, below
1557 my $slots = delete $pl->{_slots};
1558
1559 $pl->ob->current_weapon ($slots->[0]);
1560 $pl->combat_ob ($slots->[1]);
1561 $pl->ranged_ob ($slots->[2]);
1562 },
1563);
1564
1492sub save($) { 1565sub save($) {
1493 my ($pl) = @_; 1566 my ($pl) = @_;
1494 1567
1495 return if $pl->{deny_save}; 1568 return if $pl->{deny_save};
1496 1569
1501 1574
1502 aio_mkdir playerdir $pl, 0770; 1575 aio_mkdir playerdir $pl, 0770;
1503 $pl->{last_save} = $cf::RUNTIME; 1576 $pl->{last_save} = $cf::RUNTIME;
1504 1577
1505 cf::get_slot 0.01; 1578 cf::get_slot 0.01;
1579
1580 # save slots, to be restored later
1581 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1506 1582
1507 $pl->save_pl ($path); 1583 $pl->save_pl ($path);
1508 cf::cede_to_tick; 1584 cf::cede_to_tick;
1509} 1585}
1510 1586
1723 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1799 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1724 1800
1725 # mit "rum" bekleckern, nicht 1801 # mit "rum" bekleckern, nicht
1726 $self->_create_random_map ( 1802 $self->_create_random_map (
1727 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1803 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1728 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1804 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1729 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1805 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1730 $rmp->{exit_on_final_map}, 1806 $rmp->{exit_on_final_map},
1731 $rmp->{xsize}, $rmp->{ysize}, 1807 $rmp->{xsize}, $rmp->{ysize},
1732 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1808 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1733 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1809 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1863 1939
1864 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1940 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1865 "$UNIQUEDIR/$path" 1941 "$UNIQUEDIR/$path"
1866} 1942}
1867 1943
1868# and all this just because we cannot iterate over
1869# all maps in C++...
1870sub change_all_map_light {
1871 my ($change) = @_;
1872
1873 $_->change_map_light ($change)
1874 for grep $_->outdoor, values %cf::MAP;
1875}
1876
1877sub decay_objects { 1944sub decay_objects {
1878 my ($self) = @_; 1945 my ($self) = @_;
1879 1946
1880 return if $self->{deny_reset}; 1947 return if $self->{deny_reset};
1881 1948
1963sub find { 2030sub find {
1964 my ($path, $origin) = @_; 2031 my ($path, $origin) = @_;
1965 2032
1966 $path = normalise $path, $origin && $origin->path; 2033 $path = normalise $path, $origin && $origin->path;
1967 2034
1968 cf::lock_wait "map_data:$path";#d#remove 2035 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1969 cf::lock_wait "map_find:$path"; 2036 my $guard2 = cf::lock_acquire "map_find:$path";
1970 2037
1971 $cf::MAP{$path} || do { 2038 $cf::MAP{$path} || do {
1972 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1973 my $guard2 = cf::lock_acquire "map_find:$path";
1974
1975 my $map = new_from_path cf::map $path 2039 my $map = new_from_path cf::map $path
1976 or return; 2040 or return;
1977 2041
1978 $map->{last_save} = $cf::RUNTIME; 2042 $map->{last_save} = $cf::RUNTIME;
1979 2043
1991 2055
1992 $cf::MAP{$path} = $map 2056 $cf::MAP{$path} = $map
1993 } 2057 }
1994} 2058}
1995 2059
1996sub pre_load { } 2060sub pre_load { }
1997sub post_load { } 2061#sub post_load { } # XS
1998 2062
1999sub load { 2063sub load {
2000 my ($self) = @_; 2064 my ($self) = @_;
2001 2065
2002 local $self->{deny_reset} = 1; # loading can take a long time 2066 local $self->{deny_reset} = 1; # loading can take a long time
2047 unless ($self->{deny_activate}) { 2111 unless ($self->{deny_activate}) {
2048 $self->decay_objects; 2112 $self->decay_objects;
2049 $self->fix_auto_apply; 2113 $self->fix_auto_apply;
2050 $self->update_buttons; 2114 $self->update_buttons;
2051 cf::cede_to_tick; 2115 cf::cede_to_tick;
2052 $self->set_darkness_map;
2053 cf::cede_to_tick;
2054 $self->activate; 2116 $self->activate;
2055 } 2117 }
2056 2118
2057 $self->{last_save} = $cf::RUNTIME; 2119 $self->{last_save} = $cf::RUNTIME;
2058 $self->last_access ($cf::RUNTIME); 2120 $self->last_access ($cf::RUNTIME);
2061 } 2123 }
2062 2124
2063 $self->post_load; 2125 $self->post_load;
2064} 2126}
2065 2127
2128# customize the map for a given player, i.e.
2129# return the _real_ map. used by e.g. per-player
2130# maps to change the path to ~playername/mappath
2066sub customise_for { 2131sub customise_for {
2067 my ($self, $ob) = @_; 2132 my ($self, $ob) = @_;
2068 2133
2069 return find "~" . $ob->name . "/" . $self->{path} 2134 return find "~" . $ob->name . "/" . $self->{path}
2070 if $self->per_player; 2135 if $self->per_player;
2224 2289
2225 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2290 my $lock = cf::lock_acquire "map_data:$self->{path}";
2226 2291
2227 return if $self->players; 2292 return if $self->players;
2228 2293
2229 warn "resetting map ", $self->path; 2294 warn "resetting map ", $self->path, "\n";
2230 2295
2231 $self->in_memory (cf::MAP_SWAPPED); 2296 $self->in_memory (cf::MAP_SWAPPED);
2232 2297
2233 # need to save uniques path 2298 # need to save uniques path
2234 unless ($self->{deny_save}) { 2299 unless ($self->{deny_save}) {
2325 : normalise $_ 2390 : normalise $_
2326 } @{ aio_readdir $UNIQUEDIR or [] } 2391 } @{ aio_readdir $UNIQUEDIR or [] }
2327 ] 2392 ]
2328} 2393}
2329 2394
2395=item cf::map::static_maps
2396
2397Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2398file in the shared directory excluding F</styles> and F</editor>). May
2399block.
2400
2401=cut
2402
2403sub static_maps() {
2404 my @dirs = "";
2405 my @maps;
2406
2407 while (@dirs) {
2408 my $dir = shift @dirs;
2409
2410 next if $dir eq "/styles" || $dir eq "/editor";
2411
2412 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2413 or return;
2414
2415 for (@$files) {
2416 s/\.map$// or next;
2417 utf8::decode $_;
2418 push @maps, "$dir/$_";
2419 }
2420
2421 push @dirs, map "$dir/$_", @$dirs;
2422 }
2423
2424 \@maps
2425}
2426
2330=back 2427=back
2331 2428
2332=head3 cf::object 2429=head3 cf::object
2333 2430
2334=cut 2431=cut
2399 2496
2400our $SAY_CHANNEL = { 2497our $SAY_CHANNEL = {
2401 id => "say", 2498 id => "say",
2402 title => "Map", 2499 title => "Map",
2403 reply => "say ", 2500 reply => "say ",
2404 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2501 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2405}; 2502};
2406 2503
2407our $CHAT_CHANNEL = { 2504our $CHAT_CHANNEL = {
2408 id => "chat", 2505 id => "chat",
2409 title => "Chat", 2506 title => "Chat",
2529 ($x, $y) = (-1, -1) 2626 ($x, $y) = (-1, -1)
2530 unless (defined $x) && (defined $y); 2627 unless (defined $x) && (defined $y);
2531 2628
2532 # use -1 or undef as default coordinates, not 0, 0 2629 # use -1 or undef as default coordinates, not 0, 0
2533 ($x, $y) = ($map->enter_x, $map->enter_y) 2630 ($x, $y) = ($map->enter_x, $map->enter_y)
2534 if $x <=0 && $y <= 0; 2631 if $x <= 0 && $y <= 0;
2535 2632
2536 $map->load; 2633 $map->load;
2537 $map->load_neighbours; 2634 $map->load_neighbours;
2538 2635
2539 return unless $self->contr->active; 2636 return unless $self->contr->active;
2540 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2541 $self->activate_recursive;
2542 2637
2543 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2638 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2544 $self->enter_map ($map, $x, $y); 2639 $self->enter_map ($map, $x, $y);
2640
2641 # only activate afterwards, to support waiting in hooks
2642 $self->activate_recursive;
2545} 2643}
2546 2644
2547=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2645=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2548 2646
2549Moves the player to the given map-path and coordinates by first freezing 2647Moves the player to the given map-path and coordinates by first freezing
2737 2835
2738 utf8::encode $text; 2836 utf8::encode $text;
2739 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2837 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2740} 2838}
2741 2839
2840=item $client->send_big_packet ($pkt)
2841
2842Like C<send_packet>, but tries to compress large packets, and fragments
2843them as required.
2844
2845=cut
2846
2847our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2848
2849sub cf::client::send_big_packet {
2850 my ($self, $pkt) = @_;
2851
2852 # try lzf for large packets
2853 $pkt = "lzf " . Compress::LZF::compress $pkt
2854 if 1024 <= length $pkt and $self->{can_lzf};
2855
2856 # split very large packets
2857 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2858 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2859 $pkt = "frag";
2860 }
2861
2862 $self->send_packet ($pkt);
2863}
2864
2742=item $client->send_msg ($channel, $msg, $color, [extra...]) 2865=item $client->send_msg ($channel, $msg, $color, [extra...])
2743 2866
2744Send a drawinfo or msg packet to the client, formatting the msg for the 2867Send a drawinfo or msg packet to the client, formatting the msg for the
2745client if neccessary. C<$type> should be a string identifying the type of 2868client if neccessary. C<$type> should be a string identifying the type of
2746the message, with C<log> being the default. If C<$color> is negative, suppress 2869the message, with C<log> being the default. If C<$color> is negative, suppress
2748 2871
2749=cut 2872=cut
2750 2873
2751# non-persistent channels (usually the info channel) 2874# non-persistent channels (usually the info channel)
2752our %CHANNEL = ( 2875our %CHANNEL = (
2876 "c/motd" => {
2877 id => "infobox",
2878 title => "MOTD",
2879 reply => undef,
2880 tooltip => "The message of the day",
2881 },
2753 "c/identify" => { 2882 "c/identify" => {
2754 id => "infobox", 2883 id => "infobox",
2755 title => "Identify", 2884 title => "Identify",
2756 reply => undef, 2885 reply => undef,
2757 tooltip => "Items recently identified", 2886 tooltip => "Items recently identified",
2759 "c/examine" => { 2888 "c/examine" => {
2760 id => "infobox", 2889 id => "infobox",
2761 title => "Examine", 2890 title => "Examine",
2762 reply => undef, 2891 reply => undef,
2763 tooltip => "Signs and other items you examined", 2892 tooltip => "Signs and other items you examined",
2893 },
2894 "c/shopinfo" => {
2895 id => "infobox",
2896 title => "Shop Info",
2897 reply => undef,
2898 tooltip => "What your bargaining skill tells you about the shop",
2764 }, 2899 },
2765 "c/book" => { 2900 "c/book" => {
2766 id => "infobox", 2901 id => "infobox",
2767 title => "Book", 2902 title => "Book",
2768 reply => undef, 2903 reply => undef,
2784 id => "infobox", 2919 id => "infobox",
2785 title => "Body Parts", 2920 title => "Body Parts",
2786 reply => undef, 2921 reply => undef,
2787 tooltip => "Shows which body parts you posess and are available", 2922 tooltip => "Shows which body parts you posess and are available",
2788 }, 2923 },
2924 "c/statistics" => {
2925 id => "infobox",
2926 title => "Statistics",
2927 reply => undef,
2928 tooltip => "Shows your primary statistics",
2929 },
2930 "c/skills" => {
2931 id => "infobox",
2932 title => "Skills",
2933 reply => undef,
2934 tooltip => "Shows your experience per skill and item power",
2935 },
2936 "c/shopitems" => {
2937 id => "infobox",
2938 title => "Shop Items",
2939 reply => undef,
2940 tooltip => "Shows the items currently for sale in this shop",
2941 },
2942 "c/resistances" => {
2943 id => "infobox",
2944 title => "Resistances",
2945 reply => undef,
2946 tooltip => "Shows your resistances",
2947 },
2948 "c/pets" => {
2949 id => "infobox",
2950 title => "Pets",
2951 reply => undef,
2952 tooltip => "Shows information abotu your pets/a specific pet",
2953 },
2954 "c/perceiveself" => {
2955 id => "infobox",
2956 title => "Perceive Self",
2957 reply => undef,
2958 tooltip => "You gained detailed knowledge about yourself",
2959 },
2789 "c/uptime" => { 2960 "c/uptime" => {
2790 id => "infobox", 2961 id => "infobox",
2791 title => "Uptime", 2962 title => "Uptime",
2792 reply => undef, 2963 reply => undef,
2793 tooltip => "How long the server has been running since last restart", 2964 tooltip => "How long the server has been running since last restart",
2802 id => "party", 2973 id => "party",
2803 title => "Party", 2974 title => "Party",
2804 reply => "gsay ", 2975 reply => "gsay ",
2805 tooltip => "Messages and chat related to your party", 2976 tooltip => "Messages and chat related to your party",
2806 }, 2977 },
2978 "c/death" => {
2979 id => "death",
2980 title => "Death",
2981 reply => undef,
2982 tooltip => "Reason for and more info about your most recent death",
2983 },
2984 "c/say" => $SAY_CHANNEL,
2985 "c/chat" => $CHAT_CHANNEL,
2807); 2986);
2808 2987
2809sub cf::client::send_msg { 2988sub cf::client::send_msg {
2810 my ($self, $channel, $msg, $color, @extra) = @_; 2989 my ($self, $channel, $msg, $color, @extra) = @_;
2811 2990
2816 2995
2817 # check predefined channels, for the benefit of C 2996 # check predefined channels, for the benefit of C
2818 if ($CHANNEL{$channel}) { 2997 if ($CHANNEL{$channel}) {
2819 $channel = $CHANNEL{$channel}; 2998 $channel = $CHANNEL{$channel};
2820 2999
2821 $self->ext_msg (channel_info => $channel) 3000 $self->ext_msg (channel_info => $channel);
2822 if $self->can_msg;
2823
2824 $channel = $channel->{id}; 3001 $channel = $channel->{id};
2825 3002
2826 } elsif (ref $channel) { 3003 } elsif (ref $channel) {
2827 # send meta info to client, if not yet sent 3004 # send meta info to client, if not yet sent
2828 unless (exists $self->{channel}{$channel->{id}}) { 3005 unless (exists $self->{channel}{$channel->{id}}) {
2829 $self->{channel}{$channel->{id}} = $channel; 3006 $self->{channel}{$channel->{id}} = $channel;
2830 $self->ext_msg (channel_info => $channel) 3007 $self->ext_msg (channel_info => $channel);
2831 if $self->can_msg;
2832 } 3008 }
2833 3009
2834 $channel = $channel->{id}; 3010 $channel = $channel->{id};
2835 } 3011 }
2836 3012
2837 return unless @extra || length $msg; 3013 return unless @extra || length $msg;
2838 3014
2839 if ($self->can_msg) {
2840 # default colour, mask it out 3015 # default colour, mask it out
2841 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3016 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2842 if $color & cf::NDI_DEF; 3017 if $color & cf::NDI_DEF;
2843 3018
2844 my $pkt = "msg " 3019 my $pkt = "msg "
2845 . $self->{json_coder}->encode ( 3020 . $self->{json_coder}->encode (
2846 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3021 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2847 ); 3022 );
2848 3023
2849 # try lzf for large packets
2850 $pkt = "lzf " . Compress::LZF::compress $pkt
2851 if 1024 <= length $pkt and $self->{can_lzf};
2852
2853 # split very large packets
2854 if (8192 < length $pkt and $self->{can_lzf}) {
2855 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2856 $pkt = "frag";
2857 }
2858
2859 $self->send_packet ($pkt); 3024 $self->send_big_packet ($pkt);
2860 } else {
2861 if ($color >= 0) {
2862 # replace some tags by gcfclient-compatible ones
2863 for ($msg) {
2864 1 while
2865 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2866 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2867 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2868 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2869 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2870 }
2871
2872 $color &= cf::NDI_COLOR_MASK;
2873
2874 utf8::encode $msg;
2875
2876 if (0 && $msg =~ /\[/) {
2877 # COMMAND/INFO
2878 $self->send_packet ("drawextinfo $color 10 8 $msg")
2879 } else {
2880 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2881 $self->send_packet ("drawinfo $color $msg")
2882 }
2883 }
2884 }
2885} 3025}
2886 3026
2887=item $client->ext_msg ($type, @msg) 3027=item $client->ext_msg ($type, @msg)
2888 3028
2889Sends an ext event to the client. 3029Sends an ext event to the client.
2892 3032
2893sub cf::client::ext_msg($$@) { 3033sub cf::client::ext_msg($$@) {
2894 my ($self, $type, @msg) = @_; 3034 my ($self, $type, @msg) = @_;
2895 3035
2896 if ($self->extcmd == 2) { 3036 if ($self->extcmd == 2) {
2897 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3037 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2898 } elsif ($self->extcmd == 1) { # TODO: remove 3038 } elsif ($self->extcmd == 1) { # TODO: remove
2899 push @msg, msgtype => "event_$type"; 3039 push @msg, msgtype => "event_$type";
2900 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3040 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2901 } 3041 }
2902} 3042}
2903 3043
2904=item $client->ext_reply ($msgid, @msg) 3044=item $client->ext_reply ($msgid, @msg)
2905 3045
2909 3049
2910sub cf::client::ext_reply($$@) { 3050sub cf::client::ext_reply($$@) {
2911 my ($self, $id, @msg) = @_; 3051 my ($self, $id, @msg) = @_;
2912 3052
2913 if ($self->extcmd == 2) { 3053 if ($self->extcmd == 2) {
2914 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3054 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2915 } elsif ($self->extcmd == 1) { 3055 } elsif ($self->extcmd == 1) {
2916 #TODO: version 1, remove 3056 #TODO: version 1, remove
2917 unshift @msg, msgtype => "reply", msgid => $id; 3057 unshift @msg, msgtype => "reply", msgid => $id;
2918 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3058 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2919 } 3059 }
2920} 3060}
2921 3061
2922=item $success = $client->query ($flags, "text", \&cb) 3062=item $success = $client->query ($flags, "text", \&cb)
2923 3063
3024 3164
3025 $coro 3165 $coro
3026} 3166}
3027 3167
3028cf::client->attach ( 3168cf::client->attach (
3029 on_destroy => sub { 3169 on_client_destroy => sub {
3030 my ($ns) = @_; 3170 my ($ns) = @_;
3031 3171
3032 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3172 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3033 }, 3173 },
3034); 3174);
3050our $safe_hole = new Safe::Hole; 3190our $safe_hole = new Safe::Hole;
3051 3191
3052$SIG{FPE} = 'IGNORE'; 3192$SIG{FPE} = 'IGNORE';
3053 3193
3054$safe->permit_only (Opcode::opset qw( 3194$safe->permit_only (Opcode::opset qw(
3055 :base_core :base_mem :base_orig :base_math 3195 :base_core :base_mem :base_orig :base_math :base_loop
3056 grepstart grepwhile mapstart mapwhile 3196 grepstart grepwhile mapstart mapwhile
3057 sort time 3197 sort time
3058)); 3198));
3059 3199
3060# here we export the classes and methods available to script code 3200# here we export the classes and methods available to script code
3064The following functions and methods are available within a safe environment: 3204The following functions and methods are available within a safe environment:
3065 3205
3066 cf::object 3206 cf::object
3067 contr pay_amount pay_player map x y force_find force_add destroy 3207 contr pay_amount pay_player map x y force_find force_add destroy
3068 insert remove name archname title slaying race decrease split 3208 insert remove name archname title slaying race decrease split
3209 value
3069 3210
3070 cf::object::player 3211 cf::object::player
3071 player 3212 player
3072 3213
3073 cf::player 3214 cf::player
3079=cut 3220=cut
3080 3221
3081for ( 3222for (
3082 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3223 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3083 insert remove inv nrof name archname title slaying race 3224 insert remove inv nrof name archname title slaying race
3084 decrease split destroy change_exp)], 3225 decrease split destroy change_exp value msg lore send_msg)],
3085 ["cf::object::player" => qw(player)], 3226 ["cf::object::player" => qw(player)],
3086 ["cf::player" => qw(peaceful)], 3227 ["cf::player" => qw(peaceful send_msg)],
3087 ["cf::map" => qw(trigger)], 3228 ["cf::map" => qw(trigger)],
3088) { 3229) {
3089 no strict 'refs'; 3230 no strict 'refs';
3090 my ($pkg, @funs) = @$_; 3231 my ($pkg, @funs) = @$_;
3091 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3232 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3109 3250
3110 my $qcode = $code; 3251 my $qcode = $code;
3111 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3252 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3112 $qcode =~ s/\n/\\n/g; 3253 $qcode =~ s/\n/\\n/g;
3113 3254
3255 %vars = (_dummy => 0) unless %vars;
3256
3257 my @res;
3114 local $_; 3258 local $_;
3115 local @safe::cf::_safe_eval_args = values %vars;
3116 3259
3117 my $eval = 3260 my $eval =
3118 "do {\n" 3261 "do {\n"
3119 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3262 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3120 . "#line 0 \"{$qcode}\"\n" 3263 . "#line 0 \"{$qcode}\"\n"
3121 . $code 3264 . $code
3122 . "\n}" 3265 . "\n}"
3123 ; 3266 ;
3124 3267
3268 if ($CFG{safe_eval}) {
3125 sub_generation_inc; 3269 sub_generation_inc;
3270 local @safe::cf::_safe_eval_args = values %vars;
3126 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3271 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3127 sub_generation_inc; 3272 sub_generation_inc;
3273 } else {
3274 local @cf::_safe_eval_args = values %vars;
3275 @res = wantarray ? eval eval : scalar eval $eval;
3276 }
3128 3277
3129 if ($@) { 3278 if ($@) {
3130 warn "$@"; 3279 warn "$@";
3131 warn "while executing safe code '$code'\n"; 3280 warn "while executing safe code '$code'\n";
3132 warn "with arguments " . (join " ", %vars) . "\n"; 3281 warn "with arguments " . (join " ", %vars) . "\n";
3151=cut 3300=cut
3152 3301
3153sub register_script_function { 3302sub register_script_function {
3154 my ($fun, $cb) = @_; 3303 my ($fun, $cb) = @_;
3155 3304
3156 no strict 'refs'; 3305 $fun = "safe::$fun" if $CFG{safe_eval};
3157 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3306 *$fun = $safe_hole->wrap ($cb);
3158} 3307}
3159 3308
3160=back 3309=back
3161 3310
3162=cut 3311=cut
3183 3332
3184 $facedata->{version} == 2 3333 $facedata->{version} == 2
3185 or cf::cleanup "$path: version mismatch, cannot proceed."; 3334 or cf::cleanup "$path: version mismatch, cannot proceed.";
3186 3335
3187 # patch in the exptable 3336 # patch in the exptable
3337 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3188 $facedata->{resource}{"res/exp_table"} = { 3338 $facedata->{resource}{"res/exp_table"} = {
3189 type => FT_RSRC, 3339 type => FT_RSRC,
3190 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3340 data => $exp_table,
3341 hash => (Digest::MD5::md5 $exp_table),
3191 }; 3342 };
3192 cf::cede_to_tick; 3343 cf::cede_to_tick;
3193 3344
3194 { 3345 {
3195 my $faces = $facedata->{faceinfo}; 3346 my $faces = $facedata->{faceinfo};
3197 while (my ($face, $info) = each %$faces) { 3348 while (my ($face, $info) = each %$faces) {
3198 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3349 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3199 3350
3200 cf::face::set_visibility $idx, $info->{visibility}; 3351 cf::face::set_visibility $idx, $info->{visibility};
3201 cf::face::set_magicmap $idx, $info->{magicmap}; 3352 cf::face::set_magicmap $idx, $info->{magicmap};
3202 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3353 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3203 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3354 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3204 3355
3205 cf::cede_to_tick; 3356 cf::cede_to_tick;
3206 } 3357 }
3207 3358
3208 while (my ($face, $info) = each %$faces) { 3359 while (my ($face, $info) = each %$faces) {
3232 3383
3233 cf::anim::invalidate_all; # d'oh 3384 cf::anim::invalidate_all; # d'oh
3234 } 3385 }
3235 3386
3236 { 3387 {
3237 # TODO: for gcfclient pleasure, we should give resources
3238 # that gcfclient doesn't grok a >10000 face index.
3239 my $res = $facedata->{resource}; 3388 my $res = $facedata->{resource};
3240 3389
3241 while (my ($name, $info) = each %$res) { 3390 while (my ($name, $info) = each %$res) {
3242 if (defined $info->{type}) { 3391 if (defined $info->{type}) {
3243 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3392 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3244 my $data;
3245 3393
3246 if ($info->{type} & 1) { 3394 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3247 # prepend meta info
3248
3249 my $meta = $enc->encode ({
3250 name => $name,
3251 %{ $info->{meta} || {} },
3252 });
3253
3254 $data = pack "(w/a*)*", $meta, $info->{data};
3255 } else {
3256 $data = $info->{data};
3257 }
3258
3259 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3260 cf::face::set_type $idx, $info->{type}; 3395 cf::face::set_type $idx, $info->{type};
3261 } else { 3396 } else {
3262 $RESOURCE{$name} = $info; 3397 $RESOURCE{$name} = $info;
3263 } 3398 }
3264 3399
3347 reload_treasures; 3482 reload_treasures;
3348 3483
3349 warn "finished reloading resource files\n"; 3484 warn "finished reloading resource files\n";
3350} 3485}
3351 3486
3352sub init {
3353 my $guard = freeze_mainloop;
3354
3355 evthread_start IO::AIO::poll_fileno;
3356
3357 reload_resources;
3358}
3359
3360sub reload_config { 3487sub reload_config {
3488 warn "reloading config file...\n";
3489
3361 open my $fh, "<:utf8", "$CONFDIR/config" 3490 open my $fh, "<:utf8", "$CONFDIR/config"
3362 or return; 3491 or return;
3363 3492
3364 local $/; 3493 local $/;
3365 *CFG = YAML::Load <$fh>; 3494 *CFG = YAML::XS::Load scalar <$fh>;
3366 3495
3367 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3496 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3368 3497
3369 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3498 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3370 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3499 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3374 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3503 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3375 and die "WARNING: m(un)lockall failed: $!\n"; 3504 and die "WARNING: m(un)lockall failed: $!\n";
3376 }; 3505 };
3377 warn $@ if $@; 3506 warn $@ if $@;
3378 } 3507 }
3508
3509 warn "finished reloading resource files\n";
3379} 3510}
3380 3511
3381sub pidfile() { 3512sub pidfile() {
3382 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3513 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3383 or die "$PIDFILE: $!"; 3514 or die "$PIDFILE: $!";
3395 3526
3396 seek $fh, 0, 0; 3527 seek $fh, 0, 0;
3397 print $fh $$; 3528 print $fh $$;
3398} 3529}
3399 3530
3531sub main_loop {
3532 warn "EV::loop starting\n";
3533 if (1) {
3534 EV::loop;
3535 }
3536 warn "EV::loop returned\n";
3537 goto &main_loop unless $REALLY_UNLOOP;
3538}
3539
3400sub main { 3540sub main {
3401 atomic; 3541 cf::init_globals; # initialise logging
3542
3543 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3544 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3545 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3546 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3547
3548 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3402 3549
3403 # we must not ever block the main coroutine 3550 # we must not ever block the main coroutine
3404 local $Coro::idle = sub { 3551 local $Coro::idle = sub {
3405 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3552 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3406 (async { 3553 (async {
3407 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3554 $Coro::current->{desc} = "IDLE BUG HANDLER";
3408 EV::loop EV::LOOP_ONESHOT; 3555 EV::loop EV::LOOP_ONESHOT;
3409 })->prio (Coro::PRIO_MAX); 3556 })->prio (Coro::PRIO_MAX);
3410 }; 3557 };
3411 3558
3412 { 3559 evthread_start IO::AIO::poll_fileno;
3413 my $guard = freeze_mainloop; 3560
3561 cf::sync_job {
3562 cf::init_experience;
3563 cf::init_anim;
3564 cf::init_attackmess;
3565 cf::init_dynamic;
3566
3567 cf::load_settings;
3568 cf::load_materials;
3569
3570 reload_resources;
3414 reload_config; 3571 reload_config;
3415 db_init; 3572 db_init;
3573
3574 cf::init_uuid;
3575 cf::init_signals;
3576 cf::init_skills;
3577
3578 cf::init_beforeplay;
3579
3580 atomic;
3581
3416 load_extensions; 3582 load_extensions;
3417 3583
3418 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3419 }
3420
3421 utime time, time, $RUNTIMEFILE; 3584 utime time, time, $RUNTIMEFILE;
3422 3585
3423 # no (long-running) fork's whatsoever before this point(!) 3586 # no (long-running) fork's whatsoever before this point(!)
3587 use POSIX ();
3424 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3588 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3425 3589
3426 EV::loop; 3590 (pop @POST_INIT)->(0) while @POST_INIT;
3591 };
3592
3593 cf::object::thawer::errors_are_fatal 0;
3594
3595 main_loop;
3427} 3596}
3428 3597
3429############################################################################# 3598#############################################################################
3430# initialisation and cleanup 3599# initialisation and cleanup
3431 3600
3432# install some emergency cleanup handlers 3601# install some emergency cleanup handlers
3433BEGIN { 3602BEGIN {
3434 our %SIGWATCHER = (); 3603 our %SIGWATCHER = ();
3435 for my $signal (qw(INT HUP TERM)) { 3604 for my $signal (qw(INT HUP TERM)) {
3436 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3605 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3437 cf::cleanup "SIG$signal"; 3606 cf::cleanup "SIG$signal";
3438 }; 3607 };
3439 } 3608 }
3440} 3609}
3441 3610
3442sub write_runtime_sync { 3611sub write_runtime_sync {
3612 my $t0 = AE::time;
3613
3443 # first touch the runtime file to show we are still running: 3614 # first touch the runtime file to show we are still running:
3444 # the fsync below can take a very very long time. 3615 # the fsync below can take a very very long time.
3445 3616
3446 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3617 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3447 3618
3448 my $guard = cf::lock_acquire "write_runtime"; 3619 my $guard = cf::lock_acquire "write_runtime";
3449 3620
3450 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3621 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3451 or return; 3622 or return;
3452 3623
3453 my $value = $cf::RUNTIME + 90 + 10; 3624 my $value = $cf::RUNTIME + 90 + 10;
3454 # 10 is the runtime save interval, for a monotonic clock 3625 # 10 is the runtime save interval, for a monotonic clock
3455 # 60 allows for the watchdog to kill the server. 3626 # 60 allows for the watchdog to kill the server.
3468 or return; 3639 or return;
3469 3640
3470 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3641 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3471 and return; 3642 and return;
3472 3643
3473 warn "runtime file written.\n"; 3644 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3474 3645
3475 1 3646 1
3476} 3647}
3477 3648
3478our $uuid_lock; 3649our $uuid_lock;
3487 my $uuid = "$LOCALDIR/uuid"; 3658 my $uuid = "$LOCALDIR/uuid";
3488 3659
3489 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3660 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3490 or return; 3661 or return;
3491 3662
3492 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3663 my $value = uuid_seq uuid_cur;
3664
3665 unless ($value) {
3666 warn "cowardly refusing to write zero uuid value!\n";
3667 return;
3668 }
3669
3670 my $value = uuid_str $value + $uuid_skip;
3493 $uuid_skip = 0; 3671 $uuid_skip = 0;
3494 3672
3495 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3673 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3496 and return; 3674 and return;
3497 3675
3519} 3697}
3520 3698
3521sub emergency_save() { 3699sub emergency_save() {
3522 my $freeze_guard = cf::freeze_mainloop; 3700 my $freeze_guard = cf::freeze_mainloop;
3523 3701
3524 warn "enter emergency perl save\n"; 3702 warn "emergency_perl_save: enter\n";
3525 3703
3526 cf::sync_job { 3704 cf::sync_job {
3705 # this is a trade-off: we want to be very quick here, so
3706 # save all maps without fsync, and later call a global sync
3707 # (which in turn might be very very slow)
3708 local $USE_FSYNC = 0;
3709
3527 # use a peculiar iteration method to avoid tripping on perl 3710 # use a peculiar iteration method to avoid tripping on perl
3528 # refcount bugs in for. also avoids problems with players 3711 # refcount bugs in for. also avoids problems with players
3529 # and maps saved/destroyed asynchronously. 3712 # and maps saved/destroyed asynchronously.
3530 warn "begin emergency player save\n"; 3713 warn "emergency_perl_save: begin player save\n";
3531 for my $login (keys %cf::PLAYER) { 3714 for my $login (keys %cf::PLAYER) {
3532 my $pl = $cf::PLAYER{$login} or next; 3715 my $pl = $cf::PLAYER{$login} or next;
3533 $pl->valid or next; 3716 $pl->valid or next;
3534 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3717 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3535 $pl->save; 3718 $pl->save;
3536 } 3719 }
3537 warn "end emergency player save\n"; 3720 warn "emergency_perl_save: end player save\n";
3538 3721
3539 warn "begin emergency map save\n"; 3722 warn "emergency_perl_save: begin map save\n";
3540 for my $path (keys %cf::MAP) { 3723 for my $path (keys %cf::MAP) {
3541 my $map = $cf::MAP{$path} or next; 3724 my $map = $cf::MAP{$path} or next;
3542 $map->valid or next; 3725 $map->valid or next;
3543 $map->save; 3726 $map->save;
3544 } 3727 }
3545 warn "end emergency map save\n"; 3728 warn "emergency_perl_save: end map save\n";
3546 3729
3547 warn "begin emergency database checkpoint\n"; 3730 warn "emergency_perl_save: begin database checkpoint\n";
3548 BDB::db_env_txn_checkpoint $DB_ENV; 3731 BDB::db_env_txn_checkpoint $DB_ENV;
3549 warn "end emergency database checkpoint\n"; 3732 warn "emergency_perl_save: end database checkpoint\n";
3550 3733
3551 warn "begin write uuid\n"; 3734 warn "emergency_perl_save: begin write uuid\n";
3552 write_uuid_sync 1; 3735 write_uuid_sync 1;
3553 warn "end write uuid\n"; 3736 warn "emergency_perl_save: end write uuid\n";
3554 }; 3737 };
3555 3738
3739 warn "emergency_perl_save: starting sync()\n";
3740 IO::AIO::aio_sync sub {
3741 warn "emergency_perl_save: finished sync()\n";
3742 };
3743
3556 warn "leave emergency perl save\n"; 3744 warn "emergency_perl_save: leave\n";
3557} 3745}
3558 3746
3559sub post_cleanup { 3747sub post_cleanup {
3560 my ($make_core) = @_; 3748 my ($make_core) = @_;
3561 3749
3587 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3775 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3588 for my $name (keys %$leaf_symtab) { 3776 for my $name (keys %$leaf_symtab) {
3589 _gv_clear *{"$pkg$name"}; 3777 _gv_clear *{"$pkg$name"};
3590# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3778# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3591 } 3779 }
3592 warn "cleared package #$pkg\n";#d# 3780 warn "cleared package $pkg\n";#d#
3593} 3781}
3594
3595our $RELOAD; # how many times to reload
3596 3782
3597sub do_reload_perl() { 3783sub do_reload_perl() {
3598 # can/must only be called in main 3784 # can/must only be called in main
3599 if ($Coro::current != $Coro::main) { 3785 if ($Coro::current != $Coro::main) {
3600 warn "can only reload from main coroutine"; 3786 warn "can only reload from main coroutine";
3601 return; 3787 return;
3602 } 3788 }
3603 3789
3604 return if $RELOAD++; 3790 return if $RELOAD++;
3791
3792 my $t1 = AE::time;
3605 3793
3606 while ($RELOAD) { 3794 while ($RELOAD) {
3607 warn "reloading..."; 3795 warn "reloading...";
3608 3796
3609 warn "entering sync_job"; 3797 warn "entering sync_job";
3670 clear_package "safe::$_" 3858 clear_package "safe::$_"
3671 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3859 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3672 3860
3673 warn "unloading cf.pm \"a bit\""; 3861 warn "unloading cf.pm \"a bit\"";
3674 delete $INC{"cf.pm"}; 3862 delete $INC{"cf.pm"};
3675 delete $INC{"cf/pod.pm"}; 3863 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3676 3864
3677 # don't, removes xs symbols, too, 3865 # don't, removes xs symbols, too,
3678 # and global variables created in xs 3866 # and global variables created in xs
3679 #clear_package __PACKAGE__; 3867 #clear_package __PACKAGE__;
3680 3868
3681 warn "unload completed, starting to reload now"; 3869 warn "unload completed, starting to reload now";
3682 3870
3683 warn "reloading cf.pm"; 3871 warn "reloading cf.pm";
3684 require cf; 3872 require cf;
3685 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3873 cf::_connect_to_perl_1;
3686 3874
3687 warn "loading config and database again"; 3875 warn "loading config and database again";
3688 cf::reload_config; 3876 cf::reload_config;
3689 3877
3690 warn "loading extensions"; 3878 warn "loading extensions";
3691 cf::load_extensions; 3879 cf::load_extensions;
3692 3880
3881 if ($REATTACH_ON_RELOAD) {
3693 warn "reattaching attachments to objects/players"; 3882 warn "reattaching attachments to objects/players";
3694 _global_reattach; # objects, sockets 3883 _global_reattach; # objects, sockets
3695 warn "reattaching attachments to maps"; 3884 warn "reattaching attachments to maps";
3696 reattach $_ for values %MAP; 3885 reattach $_ for values %MAP;
3697 warn "reattaching attachments to players"; 3886 warn "reattaching attachments to players";
3698 reattach $_ for values %PLAYER; 3887 reattach $_ for values %PLAYER;
3888 }
3889
3890 warn "running post_init jobs";
3891 (pop @POST_INIT)->(1) while @POST_INIT;
3699 3892
3700 warn "leaving sync_job"; 3893 warn "leaving sync_job";
3701 3894
3702 1 3895 1
3703 } or do { 3896 } or do {
3706 }; 3899 };
3707 3900
3708 warn "reloaded"; 3901 warn "reloaded";
3709 --$RELOAD; 3902 --$RELOAD;
3710 } 3903 }
3904
3905 $t1 = AE::time - $t1;
3906 warn "reload completed in ${t1}s\n";
3711}; 3907};
3712 3908
3713our $RELOAD_WATCHER; # used only during reload 3909our $RELOAD_WATCHER; # used only during reload
3714 3910
3715sub reload_perl() { 3911sub reload_perl() {
3716 # doing reload synchronously and two reloads happen back-to-back, 3912 # doing reload synchronously and two reloads happen back-to-back,
3717 # coro crashes during coro_state_free->destroy here. 3913 # coro crashes during coro_state_free->destroy here.
3718 3914
3915 $RELOAD_WATCHER ||= cf::async {
3916 Coro::AIO::aio_wait cache_extensions;
3917
3719 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3918 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3720 do_reload_perl; 3919 do_reload_perl;
3721 undef $RELOAD_WATCHER; 3920 undef $RELOAD_WATCHER;
3921 };
3722 }; 3922 };
3723} 3923}
3724 3924
3725register_command "reload" => sub { 3925register_command "reload" => sub {
3726 my ($who, $arg) = @_; 3926 my ($who, $arg) = @_;
3740 3940
3741our @WAIT_FOR_TICK; 3941our @WAIT_FOR_TICK;
3742our @WAIT_FOR_TICK_BEGIN; 3942our @WAIT_FOR_TICK_BEGIN;
3743 3943
3744sub wait_for_tick { 3944sub wait_for_tick {
3745 return if tick_inhibit || $Coro::current == $Coro::main; 3945 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3746 3946
3747 my $signal = new Coro::Signal; 3947 my $signal = new Coro::Signal;
3748 push @WAIT_FOR_TICK, $signal; 3948 push @WAIT_FOR_TICK, $signal;
3749 $signal->wait; 3949 $signal->wait;
3750} 3950}
3751 3951
3752sub wait_for_tick_begin { 3952sub wait_for_tick_begin {
3753 return if tick_inhibit || $Coro::current == $Coro::main; 3953 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3754 3954
3755 my $signal = new Coro::Signal; 3955 my $signal = new Coro::Signal;
3756 push @WAIT_FOR_TICK_BEGIN, $signal; 3956 push @WAIT_FOR_TICK_BEGIN, $signal;
3757 $signal->wait; 3957 $signal->wait;
3758} 3958}
3763 unless ++$bug_warning > 10; 3963 unless ++$bug_warning > 10;
3764 return; 3964 return;
3765 } 3965 }
3766 3966
3767 cf::server_tick; # one server iteration 3967 cf::server_tick; # one server iteration
3968
3969 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3768 3970
3769 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3971 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3770 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3972 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3771 Coro::async_pool { 3973 Coro::async_pool {
3772 $Coro::current->{desc} = "runtime saver"; 3974 $Coro::current->{desc} = "runtime saver";
3795} 3997}
3796 3998
3797{ 3999{
3798 # configure BDB 4000 # configure BDB
3799 4001
3800 BDB::min_parallel 8; 4002 BDB::min_parallel 16;
3801 BDB::max_poll_reqs $TICK * 0.1; 4003 BDB::max_poll_reqs $TICK * 0.1;
3802 $AnyEvent::BDB::WATCHER->priority (1); 4004 $AnyEvent::BDB::WATCHER->priority (1);
3803 4005
3804 unless ($DB_ENV) { 4006 unless ($DB_ENV) {
3805 $DB_ENV = BDB::db_env_create; 4007 $DB_ENV = BDB::db_env_create;
3885 LOG llevInfo, "[ABT] [suppressed]\n"; 4087 LOG llevInfo, "[ABT] [suppressed]\n";
3886 } 4088 }
3887} 4089}
3888 4090
3889# load additional modules 4091# load additional modules
3890use cf::pod; 4092require "cf/$_.pm" for @EXTRA_MODULES;
4093cf::_connect_to_perl_2;
3891 4094
3892END { cf::emergency_save } 4095END { cf::emergency_save }
3893 4096
38941 40971
3895 4098

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines