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.450 by root, Mon Sep 22 01:33:09 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
69$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 72$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
70 73
71# make sure c-lzf reinitialises itself 74# make sure c-lzf reinitialises itself
72Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve"; 75Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
73Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 76Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
77
78# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
74 80
75sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
76 82
77our %COMMAND = (); 83our %COMMAND = ();
78our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
81our %EXTCMD = (); 87our %EXTCMD = ();
82our %EXTICMD = (); 88our %EXTICMD = ();
83our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
84our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
85 91
86our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
87our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
88 96
89our $CONFDIR = confdir; 97our $CONFDIR = confdir;
90our $DATADIR = datadir; 98our $DATADIR = datadir;
91our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
92our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
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
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::"} };
149 180
150############################################################################# 181#############################################################################
151 182
152=head2 GLOBAL VARIABLES 183=head2 GLOBAL VARIABLES
153 184
200returns 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
201per 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.
202 233
203=item @cf::INVOKE_RESULTS 234=item @cf::INVOKE_RESULTS
204 235
205This array contains the results of the last C<invoke ()> call. When 236This 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 237C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
207that call. 238that call.
208 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
209=back 246=back
210 247
211=cut 248=cut
212 249
213BEGIN { 250$Coro::State::WARNHOOK = sub {
214 *CORE::GLOBAL::warn = sub {
215 my $msg = join "", @_; 251 my $msg = join "", @_;
216 252
217 $msg .= "\n" 253 $msg .= "\n"
218 unless $msg =~ /\n$/; 254 unless $msg =~ /\n$/;
219 255
220 $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;
221 257
222 LOG llevError, $msg; 258 LOG llevError, $msg;
223 }; 259};
224}
225 260
226$Coro::State::DIEHOOK = sub { 261$Coro::State::DIEHOOK = sub {
227 return unless $^S eq 0; # "eq", not "==" 262 return unless $^S eq 0; # "eq", not "=="
263
264 warn Carp::longmess $_[0];
228 265
229 if ($Coro::current == $Coro::main) {#d# 266 if ($Coro::current == $Coro::main) {#d#
230 warn "DIEHOOK called in main context, Coro bug?\n";#d# 267 warn "DIEHOOK called in main context, Coro bug?\n";#d#
231 return;#d# 268 return;#d#
232 }#d# 269 }#d#
233 270
234 # kill coroutine otherwise 271 # kill coroutine otherwise
235 warn Carp::longmess $_[0];
236 Coro::terminate 272 Coro::terminate
237}; 273};
238
239$SIG{__DIE__} = sub { }; #d#?
240 274
241@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 275@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
242@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 276@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
243@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 277@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
244@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 278@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
258)) { 292)) {
259 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 293 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
260} 294}
261 295
262$EV::DIED = sub { 296$EV::DIED = sub {
263 warn "error in event callback: @_"; 297 Carp::cluck "error in event callback: @_";
264}; 298};
265 299
266############################################################################# 300#############################################################################
267 301
268=head2 UTILITY FUNCTIONS 302=head2 UTILITY FUNCTIONS
305our $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
306 340
307sub encode_json($) { $json_coder->encode ($_[0]) } 341sub encode_json($) { $json_coder->encode ($_[0]) }
308sub decode_json($) { $json_coder->decode ($_[0]) } 342sub decode_json($) { $json_coder->decode ($_[0]) }
309 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
310=item cf::lock_wait $string 358=item cf::lock_wait $string
311 359
312Wait until the given lock is available. See cf::lock_acquire. 360Wait until the given lock is available. See cf::lock_acquire.
313 361
314=item my $lock = cf::lock_acquire $string 362=item my $lock = cf::lock_acquire $string
315 363
316Wait 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
317a 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,
318for example when the coroutine gets canceled), the lock is automatically 366for example when the coroutine gets canceled), the lock is automatically
319returned. 367returned.
320 368
321Locks 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
322deadlocked coro. 370deadlocked coro.
328 376
329Return 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.
330 378
331=cut 379=cut
332 380
333our %LOCK; 381our $LOCKS = new Coro::SemaphoreSet;
334our %LOCKER;#d#
335 382
336sub lock_wait($) { 383sub lock_wait($) {
337 my ($key) = @_; 384 $LOCKS->wait ($_[0]);
338
339 if ($LOCKER{$key} == $Coro::current) {#d#
340 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
341 return;#d#
342 }#d#
343
344 # wait for lock, if any
345 while ($LOCK{$key}) {
346 push @{ $LOCK{$key} }, $Coro::current;
347 Coro::schedule;
348 }
349} 385}
350 386
351sub lock_acquire($) { 387sub lock_acquire($) {
352 my ($key) = @_; 388 $LOCKS->guard ($_[0])
353
354 # wait, to be sure we are not locked
355 lock_wait $key;
356
357 $LOCK{$key} = [];
358 $LOCKER{$key} = $Coro::current;#d#
359
360 Coro::guard {
361 delete $LOCKER{$key};#d#
362 # wake up all waiters, to be on the safe side
363 $_->ready for @{ delete $LOCK{$key} };
364 }
365} 389}
366 390
367sub lock_active($) { 391sub lock_active($) {
368 my ($key) = @_; 392 $LOCKS->count ($_[0]) < 1
369
370 ! ! $LOCK{$key}
371} 393}
372 394
373sub freeze_mainloop { 395sub freeze_mainloop {
374 tick_inhibit_inc; 396 tick_inhibit_inc;
375 397
376 Coro::guard \&tick_inhibit_dec; 398 &Guard::guard (\&tick_inhibit_dec);
377} 399}
378 400
379=item cf::periodic $interval, $cb 401=item cf::periodic $interval, $cb
380 402
381Like 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
382get spread over timer. 404get spread over time.
383 405
384=cut 406=cut
385 407
386sub periodic($$) { 408sub periodic($$) {
387 my ($interval, $cb) = @_; 409 my ($interval, $cb) = @_;
404 426
405=cut 427=cut
406 428
407our @SLOT_QUEUE; 429our @SLOT_QUEUE;
408our $SLOT_QUEUE; 430our $SLOT_QUEUE;
431our $SLOT_DECAY = 0.9;
409 432
410$SLOT_QUEUE->cancel if $SLOT_QUEUE; 433$SLOT_QUEUE->cancel if $SLOT_QUEUE;
411$SLOT_QUEUE = Coro::async { 434$SLOT_QUEUE = Coro::async {
412 $Coro::current->desc ("timeslot manager"); 435 $Coro::current->desc ("timeslot manager");
413 436
414 my $signal = new Coro::Signal; 437 my $signal = new Coro::Signal;
438 my $busy;
415 439
416 while () { 440 while () {
417 next_job: 441 next_job:
442
418 my $avail = cf::till_tick; 443 my $avail = cf::till_tick;
419 if ($avail > 0.01) { 444
420 for (0 .. $#SLOT_QUEUE) { 445 for (0 .. $#SLOT_QUEUE) {
421 if ($SLOT_QUEUE[$_][0] < $avail) { 446 if ($SLOT_QUEUE[$_][0] <= $avail) {
447 $busy = 0;
422 my $job = splice @SLOT_QUEUE, $_, 1, (); 448 my $job = splice @SLOT_QUEUE, $_, 1, ();
423 $job->[2]->send; 449 $job->[2]->send;
424 Coro::cede; 450 Coro::cede;
425 goto next_job; 451 goto next_job;
426 } 452 } else {
453 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
427 } 454 }
428 } 455 }
429 456
430 if (@SLOT_QUEUE) { 457 if (@SLOT_QUEUE) {
431 # 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
432 push @cf::WAIT_FOR_TICK, $signal; 459 push @cf::WAIT_FOR_TICK, $signal;
433 $signal->wait; 460 $signal->wait;
434 } else { 461 } else {
462 $busy = 0;
435 Coro::schedule; 463 Coro::schedule;
436 } 464 }
437 } 465 }
438}; 466};
439 467
440sub get_slot($;$$) { 468sub get_slot($;$$) {
441 return if tick_inhibit || $Coro::current == $Coro::main; 469 return if tick_inhibit || $Coro::current == $Coro::main;
442 470
443 my ($time, $pri, $name) = @_; 471 my ($time, $pri, $name) = @_;
444 472
445 $time = $TICK * .6 if $time > $TICK * .6; 473 $time = clamp $time, 0.01, $TICK * .6;
474
446 my $sig = new Coro::Signal; 475 my $sig = new Coro::Signal;
447 476
448 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 477 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
449 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 478 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
450 $SLOT_QUEUE->ready; 479 $SLOT_QUEUE->ready;
477 506
478sub sync_job(&) { 507sub sync_job(&) {
479 my ($job) = @_; 508 my ($job) = @_;
480 509
481 if ($Coro::current == $Coro::main) { 510 if ($Coro::current == $Coro::main) {
482 my $time = EV::time; 511 my $time = AE::time;
483 512
484 # this is the main coro, too bad, we have to block 513 # this is the main coro, too bad, we have to block
485 # till the operation succeeds, freezing the server :/ 514 # till the operation succeeds, freezing the server :/
486 515
487 LOG llevError, Carp::longmess "sync job";#d# 516 LOG llevError, Carp::longmess "sync job";#d#
504 } else { 533 } else {
505 EV::loop EV::LOOP_ONESHOT; 534 EV::loop EV::LOOP_ONESHOT;
506 } 535 }
507 } 536 }
508 537
509 my $time = EV::time - $time; 538 my $time = AE::time - $time;
510 539
511 $TICK_START += $time; # do not account sync jobs to server load 540 $TICK_START += $time; # do not account sync jobs to server load
512 541
513 wantarray ? @res : $res[0] 542 wantarray ? @res : $res[0]
514 } else { 543 } else {
558 reset_signals; 587 reset_signals;
559 &$cb 588 &$cb
560 }, @args; 589 }, @args;
561 590
562 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 )
563} 603}
564 604
565=item $coin = coin_from_name $name 605=item $coin = coin_from_name $name
566 606
567=cut 607=cut
1153 $decname, length $$rdata, scalar @$objs; 1193 $decname, length $$rdata, scalar @$objs;
1154 1194
1155 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1195 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1156 aio_chmod $fh, SAVE_MODE; 1196 aio_chmod $fh, SAVE_MODE;
1157 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1197 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1158 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 }
1159 aio_close $fh; 1202 aio_close $fh;
1160 1203
1161 if (@$objs) { 1204 if (@$objs) {
1162 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) {
1163 aio_chmod $fh, SAVE_MODE; 1206 aio_chmod $fh, SAVE_MODE;
1164 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1207 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1165 aio_write $fh, 0, (length $data), $data, 0; 1208 aio_write $fh, 0, (length $data), $data, 0;
1166 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 }
1167 aio_close $fh; 1213 aio_close $fh;
1168 aio_rename "$filename.pst~", "$filename.pst"; 1214 aio_rename "$filename.pst~", "$filename.pst";
1169 } 1215 }
1170 } else { 1216 } else {
1171 aio_unlink "$filename.pst"; 1217 aio_unlink "$filename.pst";
1172 } 1218 }
1173 1219
1174 aio_rename "$filename~", $filename; 1220 aio_rename "$filename~", $filename;
1221
1222 $filename =~ s%/[^/]+$%%;
1223 aio_pathsync $filename if $cf::USE_FSYNC;
1175 } else { 1224 } else {
1176 warn "FATAL: $filename~: $!\n"; 1225 warn "unable to save objects: $filename~: $!\n";
1177 } 1226 }
1178 } else { 1227 } else {
1179 aio_unlink $filename; 1228 aio_unlink $filename;
1180 aio_unlink "$filename.pst"; 1229 aio_unlink "$filename.pst";
1181 } 1230 }
1272 my ($name, $cb) = @_; 1321 my ($name, $cb) = @_;
1273 1322
1274 $EXTICMD{$name} = $cb; 1323 $EXTICMD{$name} = $cb;
1275} 1324}
1276 1325
1326use File::Glob ();
1327
1277cf::player->attach ( 1328cf::player->attach (
1278 on_command => sub { 1329 on_unknown_command => sub {
1279 my ($pl, $name, $params) = @_; 1330 my ($pl, $name, $params) = @_;
1280 1331
1281 my $cb = $COMMAND{$name} 1332 my $cb = $COMMAND{$name}
1282 or return; 1333 or return;
1283 1334
1313 1364
1314 cf::override; 1365 cf::override;
1315 }, 1366 },
1316); 1367);
1317 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
1318sub load_extensions { 1382sub load_extensions {
1319 cf::sync_job { 1383 cf::sync_job {
1320 my %todo; 1384 my %todo;
1321 1385
1322 for my $path (<$LIBDIR/*.ext>) { 1386 for my $path (<$LIBDIR/*.ext>) {
1349 . "\n};\n1"; 1413 . "\n};\n1";
1350 1414
1351 $todo{$base} = \%ext; 1415 $todo{$base} = \%ext;
1352 } 1416 }
1353 1417
1418 my $pass = 0;
1354 my %done; 1419 my %done;
1355 while (%todo) { 1420 while (%todo) {
1356 my $progress; 1421 my $progress;
1357 1422
1423 ++$pass;
1424
1425 ext:
1358 while (my ($k, $v) = each %todo) { 1426 while (my ($k, $v) = each %todo) {
1359 for (split /,\s*/, $v->{meta}{depends}) { 1427 for (split /,\s*/, $v->{meta}{depends}) {
1360 goto skip 1428 next ext
1361 unless exists $done{$_}; 1429 unless exists $done{$_};
1362 } 1430 }
1363 1431
1364 warn "... loading '$k' into '$v->{pkg}'\n"; 1432 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1365 1433
1366 unless (eval $v->{source}) { 1434 my $active = eval $v->{source};
1435
1436 if (length $@) {
1367 my $msg = $@ ? "$v->{path}: $@\n" 1437 warn "$v->{path}: $@\n";
1368 : "$v->{base}: extension inactive.\n";
1369 1438
1370 if (exists $v->{meta}{mandatory}) {
1371 warn $msg;
1372 cf::cleanup "mandatory extension failed to load, exiting."; 1439 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1373 } 1440 if exists $v->{meta}{mandatory};
1374 1441 } else {
1375 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;
1376 } 1448 }
1377
1378 $done{$k} = delete $todo{$k};
1379 push @EXTS, $v->{pkg};
1380 $progress = 1;
1381 } 1449 }
1382 1450
1383 skip: 1451 unless ($progress) {
1384 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1452 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1385 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 }
1386 } 1459 }
1387 }; 1460 };
1388} 1461}
1389 1462
1390############################################################################# 1463#############################################################################
1444 1517
1445sub exists($) { 1518sub exists($) {
1446 my ($login) = @_; 1519 my ($login) = @_;
1447 1520
1448 $cf::PLAYER{$login} 1521 $cf::PLAYER{$login}
1449 or cf::sync_job { !aio_stat path $login } 1522 or !aio_stat path $login
1450} 1523}
1451 1524
1452sub find($) { 1525sub find($) {
1453 return $cf::PLAYER{$_[0]} || do { 1526 return $cf::PLAYER{$_[0]} || do {
1454 my $login = $_[0]; 1527 my $login = $_[0];
1474 $cf::PLAYER{$login} = $pl 1547 $cf::PLAYER{$login} = $pl
1475 } 1548 }
1476 } 1549 }
1477} 1550}
1478 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
1479sub save($) { 1565sub save($) {
1480 my ($pl) = @_; 1566 my ($pl) = @_;
1481 1567
1482 return if $pl->{deny_save}; 1568 return if $pl->{deny_save};
1483 1569
1488 1574
1489 aio_mkdir playerdir $pl, 0770; 1575 aio_mkdir playerdir $pl, 0770;
1490 $pl->{last_save} = $cf::RUNTIME; 1576 $pl->{last_save} = $cf::RUNTIME;
1491 1577
1492 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];
1493 1582
1494 $pl->save_pl ($path); 1583 $pl->save_pl ($path);
1495 cf::cede_to_tick; 1584 cf::cede_to_tick;
1496} 1585}
1497 1586
1710 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
1711 1800
1712 # mit "rum" bekleckern, nicht 1801 # mit "rum" bekleckern, nicht
1713 $self->_create_random_map ( 1802 $self->_create_random_map (
1714 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1803 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1715 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1804 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1716 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1805 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1717 $rmp->{exit_on_final_map}, 1806 $rmp->{exit_on_final_map},
1718 $rmp->{xsize}, $rmp->{ysize}, 1807 $rmp->{xsize}, $rmp->{ysize},
1719 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1808 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1720 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1809 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1850 1939
1851 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1940 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1852 "$UNIQUEDIR/$path" 1941 "$UNIQUEDIR/$path"
1853} 1942}
1854 1943
1855# and all this just because we cannot iterate over
1856# all maps in C++...
1857sub change_all_map_light {
1858 my ($change) = @_;
1859
1860 $_->change_map_light ($change)
1861 for grep $_->outdoor, values %cf::MAP;
1862}
1863
1864sub decay_objects { 1944sub decay_objects {
1865 my ($self) = @_; 1945 my ($self) = @_;
1866 1946
1867 return if $self->{deny_reset}; 1947 return if $self->{deny_reset};
1868 1948
1950sub find { 2030sub find {
1951 my ($path, $origin) = @_; 2031 my ($path, $origin) = @_;
1952 2032
1953 $path = normalise $path, $origin && $origin->path; 2033 $path = normalise $path, $origin && $origin->path;
1954 2034
1955 cf::lock_wait "map_data:$path";#d#remove 2035 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1956 cf::lock_wait "map_find:$path"; 2036 my $guard2 = cf::lock_acquire "map_find:$path";
1957 2037
1958 $cf::MAP{$path} || do { 2038 $cf::MAP{$path} || do {
1959 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1960 my $guard2 = cf::lock_acquire "map_find:$path";
1961
1962 my $map = new_from_path cf::map $path 2039 my $map = new_from_path cf::map $path
1963 or return; 2040 or return;
1964 2041
1965 $map->{last_save} = $cf::RUNTIME; 2042 $map->{last_save} = $cf::RUNTIME;
1966 2043
1978 2055
1979 $cf::MAP{$path} = $map 2056 $cf::MAP{$path} = $map
1980 } 2057 }
1981} 2058}
1982 2059
1983sub pre_load { } 2060sub pre_load { }
1984sub post_load { } 2061#sub post_load { } # XS
1985 2062
1986sub load { 2063sub load {
1987 my ($self) = @_; 2064 my ($self) = @_;
1988 2065
1989 local $self->{deny_reset} = 1; # loading can take a long time 2066 local $self->{deny_reset} = 1; # loading can take a long time
2034 unless ($self->{deny_activate}) { 2111 unless ($self->{deny_activate}) {
2035 $self->decay_objects; 2112 $self->decay_objects;
2036 $self->fix_auto_apply; 2113 $self->fix_auto_apply;
2037 $self->update_buttons; 2114 $self->update_buttons;
2038 cf::cede_to_tick; 2115 cf::cede_to_tick;
2039 $self->set_darkness_map;
2040 cf::cede_to_tick;
2041 $self->activate; 2116 $self->activate;
2042 } 2117 }
2043 2118
2044 $self->{last_save} = $cf::RUNTIME; 2119 $self->{last_save} = $cf::RUNTIME;
2045 $self->last_access ($cf::RUNTIME); 2120 $self->last_access ($cf::RUNTIME);
2048 } 2123 }
2049 2124
2050 $self->post_load; 2125 $self->post_load;
2051} 2126}
2052 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
2053sub customise_for { 2131sub customise_for {
2054 my ($self, $ob) = @_; 2132 my ($self, $ob) = @_;
2055 2133
2056 return find "~" . $ob->name . "/" . $self->{path} 2134 return find "~" . $ob->name . "/" . $self->{path}
2057 if $self->per_player; 2135 if $self->per_player;
2211 2289
2212 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2290 my $lock = cf::lock_acquire "map_data:$self->{path}";
2213 2291
2214 return if $self->players; 2292 return if $self->players;
2215 2293
2216 warn "resetting map ", $self->path; 2294 warn "resetting map ", $self->path, "\n";
2217 2295
2218 $self->in_memory (cf::MAP_SWAPPED); 2296 $self->in_memory (cf::MAP_SWAPPED);
2219 2297
2220 # need to save uniques path 2298 # need to save uniques path
2221 unless ($self->{deny_save}) { 2299 unless ($self->{deny_save}) {
2312 : normalise $_ 2390 : normalise $_
2313 } @{ aio_readdir $UNIQUEDIR or [] } 2391 } @{ aio_readdir $UNIQUEDIR or [] }
2314 ] 2392 ]
2315} 2393}
2316 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
2317=back 2427=back
2318 2428
2319=head3 cf::object 2429=head3 cf::object
2320 2430
2321=cut 2431=cut
2386 2496
2387our $SAY_CHANNEL = { 2497our $SAY_CHANNEL = {
2388 id => "say", 2498 id => "say",
2389 title => "Map", 2499 title => "Map",
2390 reply => "say ", 2500 reply => "say ",
2391 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.",
2392}; 2502};
2393 2503
2394our $CHAT_CHANNEL = { 2504our $CHAT_CHANNEL = {
2395 id => "chat", 2505 id => "chat",
2396 title => "Chat", 2506 title => "Chat",
2516 ($x, $y) = (-1, -1) 2626 ($x, $y) = (-1, -1)
2517 unless (defined $x) && (defined $y); 2627 unless (defined $x) && (defined $y);
2518 2628
2519 # use -1 or undef as default coordinates, not 0, 0 2629 # use -1 or undef as default coordinates, not 0, 0
2520 ($x, $y) = ($map->enter_x, $map->enter_y) 2630 ($x, $y) = ($map->enter_x, $map->enter_y)
2521 if $x <=0 && $y <= 0; 2631 if $x <= 0 && $y <= 0;
2522 2632
2523 $map->load; 2633 $map->load;
2524 $map->load_neighbours; 2634 $map->load_neighbours;
2525 2635
2526 return unless $self->contr->active; 2636 return unless $self->contr->active;
2527 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2528 $self->activate_recursive;
2529 2637
2530 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2638 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2531 $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;
2532} 2643}
2533 2644
2534=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2645=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2535 2646
2536Moves 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
2724 2835
2725 utf8::encode $text; 2836 utf8::encode $text;
2726 $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);
2727} 2838}
2728 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
2729=item $client->send_msg ($channel, $msg, $color, [extra...]) 2865=item $client->send_msg ($channel, $msg, $color, [extra...])
2730 2866
2731Send 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
2732client 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
2733the 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
2735 2871
2736=cut 2872=cut
2737 2873
2738# non-persistent channels (usually the info channel) 2874# non-persistent channels (usually the info channel)
2739our %CHANNEL = ( 2875our %CHANNEL = (
2876 "c/motd" => {
2877 id => "infobox",
2878 title => "MOTD",
2879 reply => undef,
2880 tooltip => "The message of the day",
2881 },
2740 "c/identify" => { 2882 "c/identify" => {
2741 id => "infobox", 2883 id => "infobox",
2742 title => "Identify", 2884 title => "Identify",
2743 reply => undef, 2885 reply => undef,
2744 tooltip => "Items recently identified", 2886 tooltip => "Items recently identified",
2746 "c/examine" => { 2888 "c/examine" => {
2747 id => "infobox", 2889 id => "infobox",
2748 title => "Examine", 2890 title => "Examine",
2749 reply => undef, 2891 reply => undef,
2750 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",
2751 }, 2899 },
2752 "c/book" => { 2900 "c/book" => {
2753 id => "infobox", 2901 id => "infobox",
2754 title => "Book", 2902 title => "Book",
2755 reply => undef, 2903 reply => undef,
2771 id => "infobox", 2919 id => "infobox",
2772 title => "Body Parts", 2920 title => "Body Parts",
2773 reply => undef, 2921 reply => undef,
2774 tooltip => "Shows which body parts you posess and are available", 2922 tooltip => "Shows which body parts you posess and are available",
2775 }, 2923 },
2924 "c/statistics" => {
2925 id => "infobox",
2926 title => "Statistics",
2927 reply => undef,
2928 tooltip => "Shows your primary statistics",
2929 },
2776 "c/skills" => { 2930 "c/skills" => {
2777 id => "infobox", 2931 id => "infobox",
2778 title => "Skills", 2932 title => "Skills",
2779 reply => undef, 2933 reply => undef,
2780 tooltip => "Shows your experience per skill and item power", 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",
2781 }, 2959 },
2782 "c/uptime" => { 2960 "c/uptime" => {
2783 id => "infobox", 2961 id => "infobox",
2784 title => "Uptime", 2962 title => "Uptime",
2785 reply => undef, 2963 reply => undef,
2795 id => "party", 2973 id => "party",
2796 title => "Party", 2974 title => "Party",
2797 reply => "gsay ", 2975 reply => "gsay ",
2798 tooltip => "Messages and chat related to your party", 2976 tooltip => "Messages and chat related to your party",
2799 }, 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,
2800); 2986);
2801 2987
2802sub cf::client::send_msg { 2988sub cf::client::send_msg {
2803 my ($self, $channel, $msg, $color, @extra) = @_; 2989 my ($self, $channel, $msg, $color, @extra) = @_;
2804 2990
2809 2995
2810 # check predefined channels, for the benefit of C 2996 # check predefined channels, for the benefit of C
2811 if ($CHANNEL{$channel}) { 2997 if ($CHANNEL{$channel}) {
2812 $channel = $CHANNEL{$channel}; 2998 $channel = $CHANNEL{$channel};
2813 2999
2814 $self->ext_msg (channel_info => $channel) 3000 $self->ext_msg (channel_info => $channel);
2815 if $self->can_msg;
2816
2817 $channel = $channel->{id}; 3001 $channel = $channel->{id};
2818 3002
2819 } elsif (ref $channel) { 3003 } elsif (ref $channel) {
2820 # send meta info to client, if not yet sent 3004 # send meta info to client, if not yet sent
2821 unless (exists $self->{channel}{$channel->{id}}) { 3005 unless (exists $self->{channel}{$channel->{id}}) {
2822 $self->{channel}{$channel->{id}} = $channel; 3006 $self->{channel}{$channel->{id}} = $channel;
2823 $self->ext_msg (channel_info => $channel) 3007 $self->ext_msg (channel_info => $channel);
2824 if $self->can_msg;
2825 } 3008 }
2826 3009
2827 $channel = $channel->{id}; 3010 $channel = $channel->{id};
2828 } 3011 }
2829 3012
2830 return unless @extra || length $msg; 3013 return unless @extra || length $msg;
2831 3014
2832 if ($self->can_msg) {
2833 # default colour, mask it out 3015 # default colour, mask it out
2834 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3016 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2835 if $color & cf::NDI_DEF; 3017 if $color & cf::NDI_DEF;
2836 3018
2837 my $pkt = "msg " 3019 my $pkt = "msg "
2838 . $self->{json_coder}->encode ( 3020 . $self->{json_coder}->encode (
2839 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3021 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2840 ); 3022 );
2841 3023
2842 # try lzf for large packets
2843 $pkt = "lzf " . Compress::LZF::compress $pkt
2844 if 1024 <= length $pkt and $self->{can_lzf};
2845
2846 # split very large packets
2847 if (8192 < length $pkt and $self->{can_lzf}) {
2848 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2849 $pkt = "frag";
2850 }
2851
2852 $self->send_packet ($pkt); 3024 $self->send_big_packet ($pkt);
2853 } else {
2854 if ($color >= 0) {
2855 # replace some tags by gcfclient-compatible ones
2856 for ($msg) {
2857 1 while
2858 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2859 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2860 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2861 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2862 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2863 }
2864
2865 $color &= cf::NDI_COLOR_MASK;
2866
2867 utf8::encode $msg;
2868
2869 if (0 && $msg =~ /\[/) {
2870 # COMMAND/INFO
2871 $self->send_packet ("drawextinfo $color 10 8 $msg")
2872 } else {
2873 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2874 $self->send_packet ("drawinfo $color $msg")
2875 }
2876 }
2877 }
2878} 3025}
2879 3026
2880=item $client->ext_msg ($type, @msg) 3027=item $client->ext_msg ($type, @msg)
2881 3028
2882Sends an ext event to the client. 3029Sends an ext event to the client.
2885 3032
2886sub cf::client::ext_msg($$@) { 3033sub cf::client::ext_msg($$@) {
2887 my ($self, $type, @msg) = @_; 3034 my ($self, $type, @msg) = @_;
2888 3035
2889 if ($self->extcmd == 2) { 3036 if ($self->extcmd == 2) {
2890 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3037 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2891 } elsif ($self->extcmd == 1) { # TODO: remove 3038 } elsif ($self->extcmd == 1) { # TODO: remove
2892 push @msg, msgtype => "event_$type"; 3039 push @msg, msgtype => "event_$type";
2893 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3040 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2894 } 3041 }
2895} 3042}
2896 3043
2897=item $client->ext_reply ($msgid, @msg) 3044=item $client->ext_reply ($msgid, @msg)
2898 3045
2902 3049
2903sub cf::client::ext_reply($$@) { 3050sub cf::client::ext_reply($$@) {
2904 my ($self, $id, @msg) = @_; 3051 my ($self, $id, @msg) = @_;
2905 3052
2906 if ($self->extcmd == 2) { 3053 if ($self->extcmd == 2) {
2907 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3054 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2908 } elsif ($self->extcmd == 1) { 3055 } elsif ($self->extcmd == 1) {
2909 #TODO: version 1, remove 3056 #TODO: version 1, remove
2910 unshift @msg, msgtype => "reply", msgid => $id; 3057 unshift @msg, msgtype => "reply", msgid => $id;
2911 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3058 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2912 } 3059 }
2913} 3060}
2914 3061
2915=item $success = $client->query ($flags, "text", \&cb) 3062=item $success = $client->query ($flags, "text", \&cb)
2916 3063
3017 3164
3018 $coro 3165 $coro
3019} 3166}
3020 3167
3021cf::client->attach ( 3168cf::client->attach (
3022 on_destroy => sub { 3169 on_client_destroy => sub {
3023 my ($ns) = @_; 3170 my ($ns) = @_;
3024 3171
3025 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3172 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3026 }, 3173 },
3027); 3174);
3043our $safe_hole = new Safe::Hole; 3190our $safe_hole = new Safe::Hole;
3044 3191
3045$SIG{FPE} = 'IGNORE'; 3192$SIG{FPE} = 'IGNORE';
3046 3193
3047$safe->permit_only (Opcode::opset qw( 3194$safe->permit_only (Opcode::opset qw(
3048 :base_core :base_mem :base_orig :base_math 3195 :base_core :base_mem :base_orig :base_math :base_loop
3049 grepstart grepwhile mapstart mapwhile 3196 grepstart grepwhile mapstart mapwhile
3050 sort time 3197 sort time
3051)); 3198));
3052 3199
3053# here we export the classes and methods available to script code 3200# here we export the classes and methods available to script code
3057The following functions and methods are available within a safe environment: 3204The following functions and methods are available within a safe environment:
3058 3205
3059 cf::object 3206 cf::object
3060 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
3061 insert remove name archname title slaying race decrease split 3208 insert remove name archname title slaying race decrease split
3209 value
3062 3210
3063 cf::object::player 3211 cf::object::player
3064 player 3212 player
3065 3213
3066 cf::player 3214 cf::player
3072=cut 3220=cut
3073 3221
3074for ( 3222for (
3075 ["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
3076 insert remove inv nrof name archname title slaying race 3224 insert remove inv nrof name archname title slaying race
3077 decrease split destroy change_exp)], 3225 decrease split destroy change_exp value msg lore send_msg)],
3078 ["cf::object::player" => qw(player)], 3226 ["cf::object::player" => qw(player)],
3079 ["cf::player" => qw(peaceful)], 3227 ["cf::player" => qw(peaceful send_msg)],
3080 ["cf::map" => qw(trigger)], 3228 ["cf::map" => qw(trigger)],
3081) { 3229) {
3082 no strict 'refs'; 3230 no strict 'refs';
3083 my ($pkg, @funs) = @$_; 3231 my ($pkg, @funs) = @$_;
3084 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3232 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3102 3250
3103 my $qcode = $code; 3251 my $qcode = $code;
3104 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3252 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3105 $qcode =~ s/\n/\\n/g; 3253 $qcode =~ s/\n/\\n/g;
3106 3254
3255 %vars = (_dummy => 0) unless %vars;
3256
3257 my @res;
3107 local $_; 3258 local $_;
3108 local @safe::cf::_safe_eval_args = values %vars;
3109 3259
3110 my $eval = 3260 my $eval =
3111 "do {\n" 3261 "do {\n"
3112 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3262 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3113 . "#line 0 \"{$qcode}\"\n" 3263 . "#line 0 \"{$qcode}\"\n"
3114 . $code 3264 . $code
3115 . "\n}" 3265 . "\n}"
3116 ; 3266 ;
3117 3267
3268 if ($CFG{safe_eval}) {
3118 sub_generation_inc; 3269 sub_generation_inc;
3270 local @safe::cf::_safe_eval_args = values %vars;
3119 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3271 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3120 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 }
3121 3277
3122 if ($@) { 3278 if ($@) {
3123 warn "$@"; 3279 warn "$@";
3124 warn "while executing safe code '$code'\n"; 3280 warn "while executing safe code '$code'\n";
3125 warn "with arguments " . (join " ", %vars) . "\n"; 3281 warn "with arguments " . (join " ", %vars) . "\n";
3144=cut 3300=cut
3145 3301
3146sub register_script_function { 3302sub register_script_function {
3147 my ($fun, $cb) = @_; 3303 my ($fun, $cb) = @_;
3148 3304
3149 no strict 'refs'; 3305 $fun = "safe::$fun" if $CFG{safe_eval};
3150 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3306 *$fun = $safe_hole->wrap ($cb);
3151} 3307}
3152 3308
3153=back 3309=back
3154 3310
3155=cut 3311=cut
3176 3332
3177 $facedata->{version} == 2 3333 $facedata->{version} == 2
3178 or cf::cleanup "$path: version mismatch, cannot proceed."; 3334 or cf::cleanup "$path: version mismatch, cannot proceed.";
3179 3335
3180 # 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]);
3181 $facedata->{resource}{"res/exp_table"} = { 3338 $facedata->{resource}{"res/exp_table"} = {
3182 type => FT_RSRC, 3339 type => FT_RSRC,
3183 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),
3184 }; 3342 };
3185 cf::cede_to_tick; 3343 cf::cede_to_tick;
3186 3344
3187 { 3345 {
3188 my $faces = $facedata->{faceinfo}; 3346 my $faces = $facedata->{faceinfo};
3190 while (my ($face, $info) = each %$faces) { 3348 while (my ($face, $info) = each %$faces) {
3191 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3349 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3192 3350
3193 cf::face::set_visibility $idx, $info->{visibility}; 3351 cf::face::set_visibility $idx, $info->{visibility};
3194 cf::face::set_magicmap $idx, $info->{magicmap}; 3352 cf::face::set_magicmap $idx, $info->{magicmap};
3195 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3353 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3196 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3354 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3197 3355
3198 cf::cede_to_tick; 3356 cf::cede_to_tick;
3199 } 3357 }
3200 3358
3201 while (my ($face, $info) = each %$faces) { 3359 while (my ($face, $info) = each %$faces) {
3225 3383
3226 cf::anim::invalidate_all; # d'oh 3384 cf::anim::invalidate_all; # d'oh
3227 } 3385 }
3228 3386
3229 { 3387 {
3230 # TODO: for gcfclient pleasure, we should give resources
3231 # that gcfclient doesn't grok a >10000 face index.
3232 my $res = $facedata->{resource}; 3388 my $res = $facedata->{resource};
3233 3389
3234 while (my ($name, $info) = each %$res) { 3390 while (my ($name, $info) = each %$res) {
3235 if (defined $info->{type}) { 3391 if (defined $info->{type}) {
3236 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3392 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3237 my $data;
3238 3393
3239 if ($info->{type} & 1) { 3394 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3240 # prepend meta info
3241
3242 my $meta = $enc->encode ({
3243 name => $name,
3244 %{ $info->{meta} || {} },
3245 });
3246
3247 $data = pack "(w/a*)*", $meta, $info->{data};
3248 } else {
3249 $data = $info->{data};
3250 }
3251
3252 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3253 cf::face::set_type $idx, $info->{type}; 3395 cf::face::set_type $idx, $info->{type};
3254 } else { 3396 } else {
3255 $RESOURCE{$name} = $info; 3397 $RESOURCE{$name} = $info;
3256 } 3398 }
3257 3399
3340 reload_treasures; 3482 reload_treasures;
3341 3483
3342 warn "finished reloading resource files\n"; 3484 warn "finished reloading resource files\n";
3343} 3485}
3344 3486
3345sub init {
3346 my $guard = freeze_mainloop;
3347
3348 evthread_start IO::AIO::poll_fileno;
3349
3350 reload_resources;
3351}
3352
3353sub reload_config { 3487sub reload_config {
3488 warn "reloading config file...\n";
3489
3354 open my $fh, "<:utf8", "$CONFDIR/config" 3490 open my $fh, "<:utf8", "$CONFDIR/config"
3355 or return; 3491 or return;
3356 3492
3357 local $/; 3493 local $/;
3358 *CFG = YAML::Load <$fh>; 3494 *CFG = YAML::XS::Load scalar <$fh>;
3359 3495
3360 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3496 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3361 3497
3362 $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};
3363 $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};
3367 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3503 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3368 and die "WARNING: m(un)lockall failed: $!\n"; 3504 and die "WARNING: m(un)lockall failed: $!\n";
3369 }; 3505 };
3370 warn $@ if $@; 3506 warn $@ if $@;
3371 } 3507 }
3508
3509 warn "finished reloading resource files\n";
3372} 3510}
3373 3511
3374sub pidfile() { 3512sub pidfile() {
3375 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3513 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3376 or die "$PIDFILE: $!"; 3514 or die "$PIDFILE: $!";
3388 3526
3389 seek $fh, 0, 0; 3527 seek $fh, 0, 0;
3390 print $fh $$; 3528 print $fh $$;
3391} 3529}
3392 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
3393sub main { 3540sub main {
3394 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
3395 3549
3396 # we must not ever block the main coroutine 3550 # we must not ever block the main coroutine
3397 local $Coro::idle = sub { 3551 local $Coro::idle = sub {
3398 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#
3399 (async { 3553 (async {
3400 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3554 $Coro::current->{desc} = "IDLE BUG HANDLER";
3401 EV::loop EV::LOOP_ONESHOT; 3555 EV::loop EV::LOOP_ONESHOT;
3402 })->prio (Coro::PRIO_MAX); 3556 })->prio (Coro::PRIO_MAX);
3403 }; 3557 };
3404 3558
3405 { 3559 evthread_start IO::AIO::poll_fileno;
3406 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;
3407 reload_config; 3571 reload_config;
3408 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
3409 load_extensions; 3582 load_extensions;
3410 3583
3411 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3412 }
3413
3414 utime time, time, $RUNTIMEFILE; 3584 utime time, time, $RUNTIMEFILE;
3415 3585
3416 # no (long-running) fork's whatsoever before this point(!) 3586 # no (long-running) fork's whatsoever before this point(!)
3587 use POSIX ();
3417 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};
3418 3589
3419 EV::loop; 3590 (pop @POST_INIT)->(0) while @POST_INIT;
3591 };
3592
3593 cf::object::thawer::errors_are_fatal 0;
3594
3595 main_loop;
3420} 3596}
3421 3597
3422############################################################################# 3598#############################################################################
3423# initialisation and cleanup 3599# initialisation and cleanup
3424 3600
3425# install some emergency cleanup handlers 3601# install some emergency cleanup handlers
3426BEGIN { 3602BEGIN {
3427 our %SIGWATCHER = (); 3603 our %SIGWATCHER = ();
3428 for my $signal (qw(INT HUP TERM)) { 3604 for my $signal (qw(INT HUP TERM)) {
3429 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3605 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3430 cf::cleanup "SIG$signal"; 3606 cf::cleanup "SIG$signal";
3431 }; 3607 };
3432 } 3608 }
3433} 3609}
3434 3610
3435sub write_runtime_sync { 3611sub write_runtime_sync {
3612 my $t0 = AE::time;
3613
3436 # first touch the runtime file to show we are still running: 3614 # first touch the runtime file to show we are still running:
3437 # the fsync below can take a very very long time. 3615 # the fsync below can take a very very long time.
3438 3616
3439 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3617 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3440 3618
3441 my $guard = cf::lock_acquire "write_runtime"; 3619 my $guard = cf::lock_acquire "write_runtime";
3442 3620
3443 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3621 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3444 or return; 3622 or return;
3445 3623
3446 my $value = $cf::RUNTIME + 90 + 10; 3624 my $value = $cf::RUNTIME + 90 + 10;
3447 # 10 is the runtime save interval, for a monotonic clock 3625 # 10 is the runtime save interval, for a monotonic clock
3448 # 60 allows for the watchdog to kill the server. 3626 # 60 allows for the watchdog to kill the server.
3461 or return; 3639 or return;
3462 3640
3463 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3641 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3464 and return; 3642 and return;
3465 3643
3466 warn "runtime file written.\n"; 3644 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3467 3645
3468 1 3646 1
3469} 3647}
3470 3648
3471our $uuid_lock; 3649our $uuid_lock;
3480 my $uuid = "$LOCALDIR/uuid"; 3658 my $uuid = "$LOCALDIR/uuid";
3481 3659
3482 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3660 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3483 or return; 3661 or return;
3484 3662
3485 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;
3486 $uuid_skip = 0; 3671 $uuid_skip = 0;
3487 3672
3488 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3673 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3489 and return; 3674 and return;
3490 3675
3512} 3697}
3513 3698
3514sub emergency_save() { 3699sub emergency_save() {
3515 my $freeze_guard = cf::freeze_mainloop; 3700 my $freeze_guard = cf::freeze_mainloop;
3516 3701
3517 warn "enter emergency perl save\n"; 3702 warn "emergency_perl_save: enter\n";
3518 3703
3519 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
3520 # use a peculiar iteration method to avoid tripping on perl 3710 # use a peculiar iteration method to avoid tripping on perl
3521 # refcount bugs in for. also avoids problems with players 3711 # refcount bugs in for. also avoids problems with players
3522 # and maps saved/destroyed asynchronously. 3712 # and maps saved/destroyed asynchronously.
3523 warn "begin emergency player save\n"; 3713 warn "emergency_perl_save: begin player save\n";
3524 for my $login (keys %cf::PLAYER) { 3714 for my $login (keys %cf::PLAYER) {
3525 my $pl = $cf::PLAYER{$login} or next; 3715 my $pl = $cf::PLAYER{$login} or next;
3526 $pl->valid or next; 3716 $pl->valid or next;
3527 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3717 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3528 $pl->save; 3718 $pl->save;
3529 } 3719 }
3530 warn "end emergency player save\n"; 3720 warn "emergency_perl_save: end player save\n";
3531 3721
3532 warn "begin emergency map save\n"; 3722 warn "emergency_perl_save: begin map save\n";
3533 for my $path (keys %cf::MAP) { 3723 for my $path (keys %cf::MAP) {
3534 my $map = $cf::MAP{$path} or next; 3724 my $map = $cf::MAP{$path} or next;
3535 $map->valid or next; 3725 $map->valid or next;
3536 $map->save; 3726 $map->save;
3537 } 3727 }
3538 warn "end emergency map save\n"; 3728 warn "emergency_perl_save: end map save\n";
3539 3729
3540 warn "begin emergency database checkpoint\n"; 3730 warn "emergency_perl_save: begin database checkpoint\n";
3541 BDB::db_env_txn_checkpoint $DB_ENV; 3731 BDB::db_env_txn_checkpoint $DB_ENV;
3542 warn "end emergency database checkpoint\n"; 3732 warn "emergency_perl_save: end database checkpoint\n";
3543 3733
3544 warn "begin write uuid\n"; 3734 warn "emergency_perl_save: begin write uuid\n";
3545 write_uuid_sync 1; 3735 write_uuid_sync 1;
3546 warn "end write uuid\n"; 3736 warn "emergency_perl_save: end write uuid\n";
3547 }; 3737 };
3548 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
3549 warn "leave emergency perl save\n"; 3744 warn "emergency_perl_save: leave\n";
3550} 3745}
3551 3746
3552sub post_cleanup { 3747sub post_cleanup {
3553 my ($make_core) = @_; 3748 my ($make_core) = @_;
3554 3749
3580 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3775 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3581 for my $name (keys %$leaf_symtab) { 3776 for my $name (keys %$leaf_symtab) {
3582 _gv_clear *{"$pkg$name"}; 3777 _gv_clear *{"$pkg$name"};
3583# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3778# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3584 } 3779 }
3585 warn "cleared package #$pkg\n";#d# 3780 warn "cleared package $pkg\n";#d#
3586} 3781}
3587
3588our $RELOAD; # how many times to reload
3589 3782
3590sub do_reload_perl() { 3783sub do_reload_perl() {
3591 # can/must only be called in main 3784 # can/must only be called in main
3592 if ($Coro::current != $Coro::main) { 3785 if ($Coro::current != $Coro::main) {
3593 warn "can only reload from main coroutine"; 3786 warn "can only reload from main coroutine";
3594 return; 3787 return;
3595 } 3788 }
3596 3789
3597 return if $RELOAD++; 3790 return if $RELOAD++;
3791
3792 my $t1 = AE::time;
3598 3793
3599 while ($RELOAD) { 3794 while ($RELOAD) {
3600 warn "reloading..."; 3795 warn "reloading...";
3601 3796
3602 warn "entering sync_job"; 3797 warn "entering sync_job";
3663 clear_package "safe::$_" 3858 clear_package "safe::$_"
3664 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);
3665 3860
3666 warn "unloading cf.pm \"a bit\""; 3861 warn "unloading cf.pm \"a bit\"";
3667 delete $INC{"cf.pm"}; 3862 delete $INC{"cf.pm"};
3668 delete $INC{"cf/pod.pm"}; 3863 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3669 3864
3670 # don't, removes xs symbols, too, 3865 # don't, removes xs symbols, too,
3671 # and global variables created in xs 3866 # and global variables created in xs
3672 #clear_package __PACKAGE__; 3867 #clear_package __PACKAGE__;
3673 3868
3674 warn "unload completed, starting to reload now"; 3869 warn "unload completed, starting to reload now";
3675 3870
3676 warn "reloading cf.pm"; 3871 warn "reloading cf.pm";
3677 require cf; 3872 require cf;
3678 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3873 cf::_connect_to_perl_1;
3679 3874
3680 warn "loading config and database again"; 3875 warn "loading config and database again";
3681 cf::reload_config; 3876 cf::reload_config;
3682 3877
3683 warn "loading extensions"; 3878 warn "loading extensions";
3684 cf::load_extensions; 3879 cf::load_extensions;
3685 3880
3881 if ($REATTACH_ON_RELOAD) {
3686 warn "reattaching attachments to objects/players"; 3882 warn "reattaching attachments to objects/players";
3687 _global_reattach; # objects, sockets 3883 _global_reattach; # objects, sockets
3688 warn "reattaching attachments to maps"; 3884 warn "reattaching attachments to maps";
3689 reattach $_ for values %MAP; 3885 reattach $_ for values %MAP;
3690 warn "reattaching attachments to players"; 3886 warn "reattaching attachments to players";
3691 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;
3692 3892
3693 warn "leaving sync_job"; 3893 warn "leaving sync_job";
3694 3894
3695 1 3895 1
3696 } or do { 3896 } or do {
3699 }; 3899 };
3700 3900
3701 warn "reloaded"; 3901 warn "reloaded";
3702 --$RELOAD; 3902 --$RELOAD;
3703 } 3903 }
3904
3905 $t1 = AE::time - $t1;
3906 warn "reload completed in ${t1}s\n";
3704}; 3907};
3705 3908
3706our $RELOAD_WATCHER; # used only during reload 3909our $RELOAD_WATCHER; # used only during reload
3707 3910
3708sub reload_perl() { 3911sub reload_perl() {
3709 # doing reload synchronously and two reloads happen back-to-back, 3912 # doing reload synchronously and two reloads happen back-to-back,
3710 # coro crashes during coro_state_free->destroy here. 3913 # coro crashes during coro_state_free->destroy here.
3711 3914
3915 $RELOAD_WATCHER ||= cf::async {
3916 Coro::AIO::aio_wait cache_extensions;
3917
3712 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3918 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3713 do_reload_perl; 3919 do_reload_perl;
3714 undef $RELOAD_WATCHER; 3920 undef $RELOAD_WATCHER;
3921 };
3715 }; 3922 };
3716} 3923}
3717 3924
3718register_command "reload" => sub { 3925register_command "reload" => sub {
3719 my ($who, $arg) = @_; 3926 my ($who, $arg) = @_;
3733 3940
3734our @WAIT_FOR_TICK; 3941our @WAIT_FOR_TICK;
3735our @WAIT_FOR_TICK_BEGIN; 3942our @WAIT_FOR_TICK_BEGIN;
3736 3943
3737sub wait_for_tick { 3944sub wait_for_tick {
3738 return if tick_inhibit || $Coro::current == $Coro::main; 3945 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3739 3946
3740 my $signal = new Coro::Signal; 3947 my $signal = new Coro::Signal;
3741 push @WAIT_FOR_TICK, $signal; 3948 push @WAIT_FOR_TICK, $signal;
3742 $signal->wait; 3949 $signal->wait;
3743} 3950}
3744 3951
3745sub wait_for_tick_begin { 3952sub wait_for_tick_begin {
3746 return if tick_inhibit || $Coro::current == $Coro::main; 3953 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3747 3954
3748 my $signal = new Coro::Signal; 3955 my $signal = new Coro::Signal;
3749 push @WAIT_FOR_TICK_BEGIN, $signal; 3956 push @WAIT_FOR_TICK_BEGIN, $signal;
3750 $signal->wait; 3957 $signal->wait;
3751} 3958}
3756 unless ++$bug_warning > 10; 3963 unless ++$bug_warning > 10;
3757 return; 3964 return;
3758 } 3965 }
3759 3966
3760 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#
3761 3970
3762 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3971 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3763 $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.;
3764 Coro::async_pool { 3973 Coro::async_pool {
3765 $Coro::current->{desc} = "runtime saver"; 3974 $Coro::current->{desc} = "runtime saver";
3788} 3997}
3789 3998
3790{ 3999{
3791 # configure BDB 4000 # configure BDB
3792 4001
3793 BDB::min_parallel 8; 4002 BDB::min_parallel 16;
3794 BDB::max_poll_reqs $TICK * 0.1; 4003 BDB::max_poll_reqs $TICK * 0.1;
3795 $AnyEvent::BDB::WATCHER->priority (1); 4004 $AnyEvent::BDB::WATCHER->priority (1);
3796 4005
3797 unless ($DB_ENV) { 4006 unless ($DB_ENV) {
3798 $DB_ENV = BDB::db_env_create; 4007 $DB_ENV = BDB::db_env_create;
3878 LOG llevInfo, "[ABT] [suppressed]\n"; 4087 LOG llevInfo, "[ABT] [suppressed]\n";
3879 } 4088 }
3880} 4089}
3881 4090
3882# load additional modules 4091# load additional modules
3883use cf::pod; 4092require "cf/$_.pm" for @EXTRA_MODULES;
4093cf::_connect_to_perl_2;
3884 4094
3885END { cf::emergency_save } 4095END { cf::emergency_save }
3886 4096
38871 40971
3888 4098

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines