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.454 by root, Thu Sep 25 12:14:32 2008 UTC vs.
Revision 1.518 by root, Fri Apr 16 02:21:26 2010 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
18# 19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use 5.10.0; 25use 5.10.0;
25use utf8; 26use utf8;
26use strict "vars", "subs"; 27use strict qw(vars subs);
27 28
28use Symbol; 29use Symbol;
29use List::Util; 30use List::Util;
30use Socket; 31use Socket;
31use EV; 32use EV;
32use Opcode; 33use Opcode;
33use Safe; 34use Safe;
34use Safe::Hole; 35use Safe::Hole;
35use Storable (); 36use Storable ();
37use Carp ();
36 38
39use Guard ();
37use Coro (); 40use Coro ();
38use Coro::State; 41use Coro::State;
39use Coro::Handle; 42use Coro::Handle;
40use Coro::EV; 43use Coro::EV;
41use Coro::AnyEvent; 44use Coro::AnyEvent;
42use Coro::Timer; 45use Coro::Timer;
43use Coro::Signal; 46use Coro::Signal;
44use Coro::Semaphore; 47use Coro::Semaphore;
48use Coro::SemaphoreSet;
45use Coro::AnyEvent; 49use Coro::AnyEvent;
46use Coro::AIO; 50use Coro::AIO;
47use Coro::BDB 1.6; 51use Coro::BDB 1.6;
48use Coro::Storable; 52use Coro::Storable;
49use Coro::Util (); 53use Coro::Util ();
50 54
51use JSON::XS 2.01 (); 55use JSON::XS 2.01 ();
52use BDB (); 56use BDB ();
53use Data::Dumper; 57use Data::Dumper;
54use Digest::MD5;
55use Fcntl; 58use Fcntl;
56use YAML (); 59use YAML::XS ();
57use IO::AIO (); 60use IO::AIO ();
58use Time::HiRes; 61use Time::HiRes;
59use Compress::LZF; 62use Compress::LZF;
60use Digest::MD5 (); 63use Digest::MD5 ();
61 64
… …
69$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 72$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
70 73
71# make sure c-lzf reinitialises itself 74# make sure c-lzf reinitialises itself
72Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve"; 75Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
73Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 76Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
77
78# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
74 80
75sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
76 82
77our %COMMAND = (); 83our %COMMAND = ();
78our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
… …
83our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
84our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
85 91
86our $RELOAD; # number of reloads so far, non-zero while in reload 92our $RELOAD; # number of reloads so far, non-zero while in reload
87our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
88 96
89our $CONFDIR = confdir; 97our $CONFDIR = confdir;
90our $DATADIR = datadir; 98our $DATADIR = datadir;
91our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
92our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
… …
100our $PIDFILE = "$LOCALDIR/pid"; 108our $PIDFILE = "$LOCALDIR/pid";
101our $RUNTIMEFILE = "$LOCALDIR/runtime"; 109our $RUNTIMEFILE = "$LOCALDIR/runtime";
102 110
103our %RESOURCE; 111our %RESOURCE;
104 112
113our $OUTPUT_RATE_MIN = 4000;
114our $OUTPUT_RATE_MAX = 100000;
115
105our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 116our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
106our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 117our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
107our $NEXT_TICK; 118our $NEXT_TICK;
108our $USE_FSYNC = 1; # use fsync to write maps - default off 119our $USE_FSYNC = 1; # use fsync to write maps - default on
109 120
110our $BDB_DEADLOCK_WATCHER; 121our $BDB_DEADLOCK_WATCHER;
111our $BDB_CHECKPOINT_WATCHER; 122our $BDB_CHECKPOINT_WATCHER;
112our $BDB_TRICKLE_WATCHER; 123our $BDB_TRICKLE_WATCHER;
113our $DB_ENV; 124our $DB_ENV;
114 125
126our @EXTRA_MODULES = qw(pod match mapscript);
127
115our %CFG; 128our %CFG;
116 129
117our $UPTIME; $UPTIME ||= time; 130our $UPTIME; $UPTIME ||= time;
118our $RUNTIME; 131our $RUNTIME;
119our $NOW; 132our $NOW;
… …
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
132 145
133our @POST_INIT; 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 :)
134 150
135binmode STDOUT; 151binmode STDOUT;
136binmode STDERR; 152binmode STDERR;
137 153
138# read virtual server time, if available 154# read virtual server time, if available
… …
140 open my $fh, "<", $RUNTIMEFILE 156 open my $fh, "<", $RUNTIMEFILE
141 or die "unable to read $RUNTIMEFILE file: $!"; 157 or die "unable to read $RUNTIMEFILE file: $!";
142 $RUNTIME = <$fh> + 0.; 158 $RUNTIME = <$fh> + 0.;
143} 159}
144 160
161eval "sub TICK() { $TICK } 1" or die;
162
145mkdir $_ 163mkdir $_
146 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 164 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
147 165
148our $EMERGENCY_POSITION; 166our $EMERGENCY_POSITION;
149 167
150sub 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::"} };
151 180
152############################################################################# 181#############################################################################
153 182
154=head2 GLOBAL VARIABLES 183=head2 GLOBAL VARIABLES
155 184
… …
202returns 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
203per 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.
204 233
205=item @cf::INVOKE_RESULTS 234=item @cf::INVOKE_RESULTS
206 235
207This array contains the results of the last C<invoke ()> call. When 236This array contains the results of the last C<invoke ()> call. When
208C<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
209that call. 238that call.
210 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
211=back 246=back
212 247
213=cut 248=cut
214 249
215BEGIN { 250$Coro::State::WARNHOOK = sub {
216 *CORE::GLOBAL::warn = sub {
217 my $msg = join "", @_; 251 my $msg = join "", @_;
218 252
219 $msg .= "\n" 253 $msg .= "\n"
220 unless $msg =~ /\n$/; 254 unless $msg =~ /\n$/;
221 255
222 $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;
223 257
224 LOG llevError, $msg; 258 LOG llevError, $msg;
225 }; 259};
226}
227 260
228$Coro::State::DIEHOOK = sub { 261$Coro::State::DIEHOOK = sub {
229 return unless $^S eq 0; # "eq", not "==" 262 return unless $^S eq 0; # "eq", not "=="
263
264 warn Carp::longmess $_[0];
230 265
231 if ($Coro::current == $Coro::main) {#d# 266 if ($Coro::current == $Coro::main) {#d#
232 warn "DIEHOOK called in main context, Coro bug?\n";#d# 267 warn "DIEHOOK called in main context, Coro bug?\n";#d#
233 return;#d# 268 return;#d#
234 }#d# 269 }#d#
235 270
236 # kill coroutine otherwise 271 # kill coroutine otherwise
237 warn Carp::longmess $_[0];
238 Coro::terminate 272 Coro::terminate
239}; 273};
240
241$SIG{__DIE__} = sub { }; #d#?
242 274
243@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 275@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
244@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 276@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
245@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 277@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
246@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 278@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
260)) { 292)) {
261 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 293 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
262} 294}
263 295
264$EV::DIED = sub { 296$EV::DIED = sub {
265 warn "error in event callback: @_"; 297 Carp::cluck "error in event callback: @_";
266}; 298};
267 299
268############################################################################# 300#############################################################################
269 301
270=head2 UTILITY FUNCTIONS 302=head2 UTILITY FUNCTIONS
… …
328Wait until the given lock is available. See cf::lock_acquire. 360Wait until the given lock is available. See cf::lock_acquire.
329 361
330=item my $lock = cf::lock_acquire $string 362=item my $lock = cf::lock_acquire $string
331 363
332Wait 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
333a 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,
334for example when the coroutine gets canceled), the lock is automatically 366for example when the coroutine gets canceled), the lock is automatically
335returned. 367returned.
336 368
337Locks 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
338deadlocked coro. 370deadlocked coro.
… …
344 376
345Return 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.
346 378
347=cut 379=cut
348 380
349our %LOCK; 381our $LOCKS = new Coro::SemaphoreSet;
350our %LOCKER;#d#
351 382
352sub lock_wait($) { 383sub lock_wait($) {
353 my ($key) = @_; 384 $LOCKS->wait ($_[0]);
354
355 if ($LOCKER{$key} == $Coro::current) {#d#
356 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
357 return;#d#
358 }#d#
359
360 # wait for lock, if any
361 while ($LOCK{$key}) {
362 #local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
363 push @{ $LOCK{$key} }, $Coro::current;
364 Coro::schedule;
365 }
366} 385}
367 386
368sub lock_acquire($) { 387sub lock_acquire($) {
369 my ($key) = @_; 388 $LOCKS->guard ($_[0])
370
371 # wait, to be sure we are not locked
372 lock_wait $key;
373
374 $LOCK{$key} = [];
375 $LOCKER{$key} = $Coro::current;#d#
376
377 Coro::guard {
378 delete $LOCKER{$key};#d#
379 # wake up all waiters, to be on the safe side
380 $_->ready for @{ delete $LOCK{$key} };
381 }
382} 389}
383 390
384sub lock_active($) { 391sub lock_active($) {
385 my ($key) = @_; 392 $LOCKS->count ($_[0]) < 1
386
387 ! ! $LOCK{$key}
388} 393}
389 394
390sub freeze_mainloop { 395sub freeze_mainloop {
391 tick_inhibit_inc; 396 tick_inhibit_inc;
392 397
393 Coro::guard \&tick_inhibit_dec; 398 &Guard::guard (\&tick_inhibit_dec);
394} 399}
395 400
396=item cf::periodic $interval, $cb 401=item cf::periodic $interval, $cb
397 402
398Like 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
399get spread over timer. 404get spread over time.
400 405
401=cut 406=cut
402 407
403sub periodic($$) { 408sub periodic($$) {
404 my ($interval, $cb) = @_; 409 my ($interval, $cb) = @_;
… …
421 426
422=cut 427=cut
423 428
424our @SLOT_QUEUE; 429our @SLOT_QUEUE;
425our $SLOT_QUEUE; 430our $SLOT_QUEUE;
431our $SLOT_DECAY = 0.9;
426 432
427$SLOT_QUEUE->cancel if $SLOT_QUEUE; 433$SLOT_QUEUE->cancel if $SLOT_QUEUE;
428$SLOT_QUEUE = Coro::async { 434$SLOT_QUEUE = Coro::async {
429 $Coro::current->desc ("timeslot manager"); 435 $Coro::current->desc ("timeslot manager");
430 436
431 my $signal = new Coro::Signal; 437 my $signal = new Coro::Signal;
438 my $busy;
432 439
433 while () { 440 while () {
434 next_job: 441 next_job:
442
435 my $avail = cf::till_tick; 443 my $avail = cf::till_tick;
436 if ($avail > 0.01) { 444
437 for (0 .. $#SLOT_QUEUE) { 445 for (0 .. $#SLOT_QUEUE) {
438 if ($SLOT_QUEUE[$_][0] < $avail) { 446 if ($SLOT_QUEUE[$_][0] <= $avail) {
447 $busy = 0;
439 my $job = splice @SLOT_QUEUE, $_, 1, (); 448 my $job = splice @SLOT_QUEUE, $_, 1, ();
440 $job->[2]->send; 449 $job->[2]->send;
441 Coro::cede; 450 Coro::cede;
442 goto next_job; 451 goto next_job;
443 } 452 } else {
453 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
444 } 454 }
445 } 455 }
446 456
447 if (@SLOT_QUEUE) { 457 if (@SLOT_QUEUE) {
448 # 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
449 push @cf::WAIT_FOR_TICK, $signal; 459 push @cf::WAIT_FOR_TICK, $signal;
450 $signal->wait; 460 $signal->wait;
451 } else { 461 } else {
462 $busy = 0;
452 Coro::schedule; 463 Coro::schedule;
453 } 464 }
454 } 465 }
455}; 466};
456 467
457sub get_slot($;$$) { 468sub get_slot($;$$) {
458 return if tick_inhibit || $Coro::current == $Coro::main; 469 return if tick_inhibit || $Coro::current == $Coro::main;
459 470
460 my ($time, $pri, $name) = @_; 471 my ($time, $pri, $name) = @_;
461 472
462 $time = $TICK * .6 if $time > $TICK * .6; 473 $time = clamp $time, 0.01, $TICK * .6;
474
463 my $sig = new Coro::Signal; 475 my $sig = new Coro::Signal;
464 476
465 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 477 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
466 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 478 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
467 $SLOT_QUEUE->ready; 479 $SLOT_QUEUE->ready;
… …
494 506
495sub sync_job(&) { 507sub sync_job(&) {
496 my ($job) = @_; 508 my ($job) = @_;
497 509
498 if ($Coro::current == $Coro::main) { 510 if ($Coro::current == $Coro::main) {
499 my $time = EV::time; 511 my $time = AE::time;
500 512
501 # this is the main coro, too bad, we have to block 513 # this is the main coro, too bad, we have to block
502 # till the operation succeeds, freezing the server :/ 514 # till the operation succeeds, freezing the server :/
503 515
504 LOG llevError, Carp::longmess "sync job";#d# 516 LOG llevError, Carp::longmess "sync job";#d#
… …
521 } else { 533 } else {
522 EV::loop EV::LOOP_ONESHOT; 534 EV::loop EV::LOOP_ONESHOT;
523 } 535 }
524 } 536 }
525 537
526 my $time = EV::time - $time; 538 my $time = AE::time - $time;
527 539
528 $TICK_START += $time; # do not account sync jobs to server load 540 $TICK_START += $time; # do not account sync jobs to server load
529 541
530 wantarray ? @res : $res[0] 542 wantarray ? @res : $res[0]
531 } else { 543 } else {
… …
575 reset_signals; 587 reset_signals;
576 &$cb 588 &$cb
577 }, @args; 589 }, @args;
578 590
579 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 )
580} 603}
581 604
582=item $coin = coin_from_name $name 605=item $coin = coin_from_name $name
583 606
584=cut 607=cut
… …
1170 $decname, length $$rdata, scalar @$objs; 1193 $decname, length $$rdata, scalar @$objs;
1171 1194
1172 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1195 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1173 aio_chmod $fh, SAVE_MODE; 1196 aio_chmod $fh, SAVE_MODE;
1174 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1197 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1175 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 }
1176 aio_close $fh; 1202 aio_close $fh;
1177 1203
1178 if (@$objs) { 1204 if (@$objs) {
1179 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) {
1180 aio_chmod $fh, SAVE_MODE; 1206 aio_chmod $fh, SAVE_MODE;
1181 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1207 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1182 aio_write $fh, 0, (length $data), $data, 0; 1208 aio_write $fh, 0, (length $data), $data, 0;
1183 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 }
1184 aio_close $fh; 1213 aio_close $fh;
1185 aio_rename "$filename.pst~", "$filename.pst"; 1214 aio_rename "$filename.pst~", "$filename.pst";
1186 } 1215 }
1187 } else { 1216 } else {
1188 aio_unlink "$filename.pst"; 1217 aio_unlink "$filename.pst";
1189 } 1218 }
1190 1219
1191 aio_rename "$filename~", $filename; 1220 aio_rename "$filename~", $filename;
1221
1222 $filename =~ s%/[^/]+$%%;
1223 aio_pathsync $filename if $cf::USE_FSYNC;
1192 } else { 1224 } else {
1193 warn "FATAL: $filename~: $!\n"; 1225 warn "unable to save objects: $filename~: $!\n";
1194 } 1226 }
1195 } else { 1227 } else {
1196 aio_unlink $filename; 1228 aio_unlink $filename;
1197 aio_unlink "$filename.pst"; 1229 aio_unlink "$filename.pst";
1198 } 1230 }
… …
1289 my ($name, $cb) = @_; 1321 my ($name, $cb) = @_;
1290 1322
1291 $EXTICMD{$name} = $cb; 1323 $EXTICMD{$name} = $cb;
1292} 1324}
1293 1325
1326use File::Glob ();
1327
1294cf::player->attach ( 1328cf::player->attach (
1295 on_command => sub { 1329 on_unknown_command => sub {
1296 my ($pl, $name, $params) = @_; 1330 my ($pl, $name, $params) = @_;
1297 1331
1298 my $cb = $COMMAND{$name} 1332 my $cb = $COMMAND{$name}
1299 or return; 1333 or return;
1300 1334
… …
1330 1364
1331 cf::override; 1365 cf::override;
1332 }, 1366 },
1333); 1367);
1334 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
1335sub load_extensions { 1382sub load_extensions {
1336 cf::sync_job { 1383 cf::sync_job {
1337 my %todo; 1384 my %todo;
1338 1385
1339 for my $path (<$LIBDIR/*.ext>) { 1386 for my $path (<$LIBDIR/*.ext>) {
… …
1366 . "\n};\n1"; 1413 . "\n};\n1";
1367 1414
1368 $todo{$base} = \%ext; 1415 $todo{$base} = \%ext;
1369 } 1416 }
1370 1417
1418 my $pass = 0;
1371 my %done; 1419 my %done;
1372 while (%todo) { 1420 while (%todo) {
1373 my $progress; 1421 my $progress;
1374 1422
1423 ++$pass;
1424
1425 ext:
1375 while (my ($k, $v) = each %todo) { 1426 while (my ($k, $v) = each %todo) {
1376 for (split /,\s*/, $v->{meta}{depends}) { 1427 for (split /,\s*/, $v->{meta}{depends}) {
1377 goto skip 1428 next ext
1378 unless exists $done{$_}; 1429 unless exists $done{$_};
1379 } 1430 }
1380 1431
1381 warn "... loading '$k' into '$v->{pkg}'\n"; 1432 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1382 1433
1383 unless (eval $v->{source}) { 1434 my $active = eval $v->{source};
1435
1436 if (length $@) {
1384 my $msg = $@ ? "$v->{path}: $@\n" 1437 warn "$v->{path}: $@\n";
1385 : "$v->{base}: extension inactive.\n";
1386 1438
1387 if (exists $v->{meta}{mandatory}) {
1388 warn $msg;
1389 cf::cleanup "mandatory extension failed to load, exiting."; 1439 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1390 } 1440 if exists $v->{meta}{mandatory};
1391 1441 } else {
1392 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;
1393 } 1448 }
1394
1395 $done{$k} = delete $todo{$k};
1396 push @EXTS, $v->{pkg};
1397 $progress = 1;
1398 } 1449 }
1399 1450
1400 skip: 1451 unless ($progress) {
1401 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1452 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1402 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 }
1403 } 1459 }
1404 }; 1460 };
1405} 1461}
1406 1462
1407############################################################################# 1463#############################################################################
… …
1491 $cf::PLAYER{$login} = $pl 1547 $cf::PLAYER{$login} = $pl
1492 } 1548 }
1493 } 1549 }
1494} 1550}
1495 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
1496sub save($) { 1565sub save($) {
1497 my ($pl) = @_; 1566 my ($pl) = @_;
1498 1567
1499 return if $pl->{deny_save}; 1568 return if $pl->{deny_save};
1500 1569
… …
1505 1574
1506 aio_mkdir playerdir $pl, 0770; 1575 aio_mkdir playerdir $pl, 0770;
1507 $pl->{last_save} = $cf::RUNTIME; 1576 $pl->{last_save} = $cf::RUNTIME;
1508 1577
1509 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];
1510 1582
1511 $pl->save_pl ($path); 1583 $pl->save_pl ($path);
1512 cf::cede_to_tick; 1584 cf::cede_to_tick;
1513} 1585}
1514 1586
… …
1727 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
1728 1800
1729 # mit "rum" bekleckern, nicht 1801 # mit "rum" bekleckern, nicht
1730 $self->_create_random_map ( 1802 $self->_create_random_map (
1731 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1803 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1732 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1804 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1733 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1805 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1734 $rmp->{exit_on_final_map}, 1806 $rmp->{exit_on_final_map},
1735 $rmp->{xsize}, $rmp->{ysize}, 1807 $rmp->{xsize}, $rmp->{ysize},
1736 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1808 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1737 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1809 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
1867 1939
1868 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1940 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1869 "$UNIQUEDIR/$path" 1941 "$UNIQUEDIR/$path"
1870} 1942}
1871 1943
1872# and all this just because we cannot iterate over
1873# all maps in C++...
1874sub change_all_map_light {
1875 my ($change) = @_;
1876
1877 $_->change_map_light ($change)
1878 for grep $_->outdoor, values %cf::MAP;
1879}
1880
1881sub decay_objects { 1944sub decay_objects {
1882 my ($self) = @_; 1945 my ($self) = @_;
1883 1946
1884 return if $self->{deny_reset}; 1947 return if $self->{deny_reset};
1885 1948
… …
1967sub find { 2030sub find {
1968 my ($path, $origin) = @_; 2031 my ($path, $origin) = @_;
1969 2032
1970 $path = normalise $path, $origin && $origin->path; 2033 $path = normalise $path, $origin && $origin->path;
1971 2034
1972 cf::lock_wait "map_data:$path";#d#remove 2035 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1973 cf::lock_wait "map_find:$path"; 2036 my $guard2 = cf::lock_acquire "map_find:$path";
1974 2037
1975 $cf::MAP{$path} || do { 2038 $cf::MAP{$path} || do {
1976 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1977 my $guard2 = cf::lock_acquire "map_find:$path";
1978
1979 my $map = new_from_path cf::map $path 2039 my $map = new_from_path cf::map $path
1980 or return; 2040 or return;
1981 2041
1982 $map->{last_save} = $cf::RUNTIME; 2042 $map->{last_save} = $cf::RUNTIME;
1983 2043
… …
1995 2055
1996 $cf::MAP{$path} = $map 2056 $cf::MAP{$path} = $map
1997 } 2057 }
1998} 2058}
1999 2059
2000sub pre_load { } 2060sub pre_load { }
2001sub post_load { } 2061#sub post_load { } # XS
2002 2062
2003sub load { 2063sub load {
2004 my ($self) = @_; 2064 my ($self) = @_;
2005 2065
2006 local $self->{deny_reset} = 1; # loading can take a long time 2066 local $self->{deny_reset} = 1; # loading can take a long time
… …
2051 unless ($self->{deny_activate}) { 2111 unless ($self->{deny_activate}) {
2052 $self->decay_objects; 2112 $self->decay_objects;
2053 $self->fix_auto_apply; 2113 $self->fix_auto_apply;
2054 $self->update_buttons; 2114 $self->update_buttons;
2055 cf::cede_to_tick; 2115 cf::cede_to_tick;
2056 $self->set_darkness_map;
2057 cf::cede_to_tick;
2058 $self->activate; 2116 $self->activate;
2059 } 2117 }
2060 2118
2061 $self->{last_save} = $cf::RUNTIME; 2119 $self->{last_save} = $cf::RUNTIME;
2062 $self->last_access ($cf::RUNTIME); 2120 $self->last_access ($cf::RUNTIME);
… …
2065 } 2123 }
2066 2124
2067 $self->post_load; 2125 $self->post_load;
2068} 2126}
2069 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
2070sub customise_for { 2131sub customise_for {
2071 my ($self, $ob) = @_; 2132 my ($self, $ob) = @_;
2072 2133
2073 return find "~" . $ob->name . "/" . $self->{path} 2134 return find "~" . $ob->name . "/" . $self->{path}
2074 if $self->per_player; 2135 if $self->per_player;
… …
2151 $MAP_PREFETCHER->prio (6); 2212 $MAP_PREFETCHER->prio (6);
2152 2213
2153 () 2214 ()
2154} 2215}
2155 2216
2217# common code, used by both ->save and ->swapout
2156sub save { 2218sub _save {
2157 my ($self) = @_; 2219 my ($self) = @_;
2158
2159 my $lock = cf::lock_acquire "map_data:$self->{path}";
2160 2220
2161 $self->{last_save} = $cf::RUNTIME; 2221 $self->{last_save} = $cf::RUNTIME;
2162 2222
2163 return unless $self->dirty; 2223 return unless $self->dirty;
2164 2224
… …
2184 } else { 2244 } else {
2185 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2245 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2186 } 2246 }
2187} 2247}
2188 2248
2249sub save {
2250 my ($self) = @_;
2251
2252 my $lock = cf::lock_acquire "map_data:$self->{path}";
2253
2254 $self->_save;
2255}
2256
2189sub swap_out { 2257sub swap_out {
2190 my ($self) = @_; 2258 my ($self) = @_;
2191 2259
2192 # save first because save cedes
2193 $self->save;
2194
2195 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2260 my $lock = cf::lock_acquire "map_data:$self->{path}";
2196 2261
2197 return if $self->players;
2198 return if $self->in_memory != cf::MAP_ACTIVE; 2262 return if $self->in_memory != cf::MAP_ACTIVE;
2199 return if $self->{deny_save}; 2263 return if $self->{deny_save};
2264 return if $self->players;
2200 2265
2201 $self->in_memory (cf::MAP_SWAPPED); 2266 # first deactivate the map and "unlink" it from the core
2202
2203 $self->deactivate; 2267 $self->deactivate;
2204 $_->clear_links_to ($self) for values %cf::MAP; 2268 $_->clear_links_to ($self) for values %cf::MAP;
2269 $self->in_memory (cf::MAP_SWAPPED);
2270
2271 # then atomically save
2272 $self->_save;
2273
2274 # then free the map
2205 $self->clear; 2275 $self->clear;
2206} 2276}
2207 2277
2208sub reset_at { 2278sub reset_at {
2209 my ($self) = @_; 2279 my ($self) = @_;
… …
2228 2298
2229 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2299 my $lock = cf::lock_acquire "map_data:$self->{path}";
2230 2300
2231 return if $self->players; 2301 return if $self->players;
2232 2302
2233 warn "resetting map ", $self->path; 2303 warn "resetting map ", $self->path, "\n";
2234 2304
2235 $self->in_memory (cf::MAP_SWAPPED); 2305 $self->in_memory (cf::MAP_SWAPPED);
2236 2306
2237 # need to save uniques path 2307 # need to save uniques path
2238 unless ($self->{deny_save}) { 2308 unless ($self->{deny_save}) {
… …
2329 : normalise $_ 2399 : normalise $_
2330 } @{ aio_readdir $UNIQUEDIR or [] } 2400 } @{ aio_readdir $UNIQUEDIR or [] }
2331 ] 2401 ]
2332} 2402}
2333 2403
2404=item cf::map::static_maps
2405
2406Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2407file in the shared directory excluding F</styles> and F</editor>). May
2408block.
2409
2410=cut
2411
2412sub static_maps() {
2413 my @dirs = "";
2414 my @maps;
2415
2416 while (@dirs) {
2417 my $dir = shift @dirs;
2418
2419 next if $dir eq "/styles" || $dir eq "/editor";
2420
2421 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2422 or return;
2423
2424 for (@$files) {
2425 s/\.map$// or next;
2426 utf8::decode $_;
2427 push @maps, "$dir/$_";
2428 }
2429
2430 push @dirs, map "$dir/$_", @$dirs;
2431 }
2432
2433 \@maps
2434}
2435
2334=back 2436=back
2335 2437
2336=head3 cf::object 2438=head3 cf::object
2337 2439
2338=cut 2440=cut
… …
2403 2505
2404our $SAY_CHANNEL = { 2506our $SAY_CHANNEL = {
2405 id => "say", 2507 id => "say",
2406 title => "Map", 2508 title => "Map",
2407 reply => "say ", 2509 reply => "say ",
2408 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2510 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2409}; 2511};
2410 2512
2411our $CHAT_CHANNEL = { 2513our $CHAT_CHANNEL = {
2412 id => "chat", 2514 id => "chat",
2413 title => "Chat", 2515 title => "Chat",
… …
2533 ($x, $y) = (-1, -1) 2635 ($x, $y) = (-1, -1)
2534 unless (defined $x) && (defined $y); 2636 unless (defined $x) && (defined $y);
2535 2637
2536 # use -1 or undef as default coordinates, not 0, 0 2638 # use -1 or undef as default coordinates, not 0, 0
2537 ($x, $y) = ($map->enter_x, $map->enter_y) 2639 ($x, $y) = ($map->enter_x, $map->enter_y)
2538 if $x <=0 && $y <= 0; 2640 if $x <= 0 && $y <= 0;
2539 2641
2540 $map->load; 2642 $map->load;
2541 $map->load_neighbours; 2643 $map->load_neighbours;
2542 2644
2543 return unless $self->contr->active; 2645 return unless $self->contr->active;
2544 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2545 $self->activate_recursive;
2546 2646
2547 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2647 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2548 $self->enter_map ($map, $x, $y); 2648 $self->enter_map ($map, $x, $y);
2649
2650 # only activate afterwards, to support waiting in hooks
2651 $self->activate_recursive;
2549} 2652}
2550 2653
2551=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2654=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2552 2655
2553Moves the player to the given map-path and coordinates by first freezing 2656Moves the player to the given map-path and coordinates by first freezing
… …
2741 2844
2742 utf8::encode $text; 2845 utf8::encode $text;
2743 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2846 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2744} 2847}
2745 2848
2849=item $client->send_big_packet ($pkt)
2850
2851Like C<send_packet>, but tries to compress large packets, and fragments
2852them as required.
2853
2854=cut
2855
2856our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2857
2858sub cf::client::send_big_packet {
2859 my ($self, $pkt) = @_;
2860
2861 # try lzf for large packets
2862 $pkt = "lzf " . Compress::LZF::compress $pkt
2863 if 1024 <= length $pkt and $self->{can_lzf};
2864
2865 # split very large packets
2866 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2867 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2868 $pkt = "frag";
2869 }
2870
2871 $self->send_packet ($pkt);
2872}
2873
2746=item $client->send_msg ($channel, $msg, $color, [extra...]) 2874=item $client->send_msg ($channel, $msg, $color, [extra...])
2747 2875
2748Send a drawinfo or msg packet to the client, formatting the msg for the 2876Send a drawinfo or msg packet to the client, formatting the msg for the
2749client if neccessary. C<$type> should be a string identifying the type of 2877client if neccessary. C<$type> should be a string identifying the type of
2750the message, with C<log> being the default. If C<$color> is negative, suppress 2878the message, with C<log> being the default. If C<$color> is negative, suppress
… …
2752 2880
2753=cut 2881=cut
2754 2882
2755# non-persistent channels (usually the info channel) 2883# non-persistent channels (usually the info channel)
2756our %CHANNEL = ( 2884our %CHANNEL = (
2885 "c/motd" => {
2886 id => "infobox",
2887 title => "MOTD",
2888 reply => undef,
2889 tooltip => "The message of the day",
2890 },
2757 "c/identify" => { 2891 "c/identify" => {
2758 id => "infobox", 2892 id => "infobox",
2759 title => "Identify", 2893 title => "Identify",
2760 reply => undef, 2894 reply => undef,
2761 tooltip => "Items recently identified", 2895 tooltip => "Items recently identified",
… …
2763 "c/examine" => { 2897 "c/examine" => {
2764 id => "infobox", 2898 id => "infobox",
2765 title => "Examine", 2899 title => "Examine",
2766 reply => undef, 2900 reply => undef,
2767 tooltip => "Signs and other items you examined", 2901 tooltip => "Signs and other items you examined",
2902 },
2903 "c/shopinfo" => {
2904 id => "infobox",
2905 title => "Shop Info",
2906 reply => undef,
2907 tooltip => "What your bargaining skill tells you about the shop",
2768 }, 2908 },
2769 "c/book" => { 2909 "c/book" => {
2770 id => "infobox", 2910 id => "infobox",
2771 title => "Book", 2911 title => "Book",
2772 reply => undef, 2912 reply => undef,
… …
2788 id => "infobox", 2928 id => "infobox",
2789 title => "Body Parts", 2929 title => "Body Parts",
2790 reply => undef, 2930 reply => undef,
2791 tooltip => "Shows which body parts you posess and are available", 2931 tooltip => "Shows which body parts you posess and are available",
2792 }, 2932 },
2933 "c/statistics" => {
2934 id => "infobox",
2935 title => "Statistics",
2936 reply => undef,
2937 tooltip => "Shows your primary statistics",
2938 },
2793 "c/skills" => { 2939 "c/skills" => {
2794 id => "infobox", 2940 id => "infobox",
2795 title => "Skills", 2941 title => "Skills",
2796 reply => undef, 2942 reply => undef,
2797 tooltip => "Shows your experience per skill and item power", 2943 tooltip => "Shows your experience per skill and item power",
2944 },
2945 "c/shopitems" => {
2946 id => "infobox",
2947 title => "Shop Items",
2948 reply => undef,
2949 tooltip => "Shows the items currently for sale in this shop",
2950 },
2951 "c/resistances" => {
2952 id => "infobox",
2953 title => "Resistances",
2954 reply => undef,
2955 tooltip => "Shows your resistances",
2956 },
2957 "c/pets" => {
2958 id => "infobox",
2959 title => "Pets",
2960 reply => undef,
2961 tooltip => "Shows information abotu your pets/a specific pet",
2962 },
2963 "c/perceiveself" => {
2964 id => "infobox",
2965 title => "Perceive Self",
2966 reply => undef,
2967 tooltip => "You gained detailed knowledge about yourself",
2798 }, 2968 },
2799 "c/uptime" => { 2969 "c/uptime" => {
2800 id => "infobox", 2970 id => "infobox",
2801 title => "Uptime", 2971 title => "Uptime",
2802 reply => undef, 2972 reply => undef,
… …
2812 id => "party", 2982 id => "party",
2813 title => "Party", 2983 title => "Party",
2814 reply => "gsay ", 2984 reply => "gsay ",
2815 tooltip => "Messages and chat related to your party", 2985 tooltip => "Messages and chat related to your party",
2816 }, 2986 },
2987 "c/death" => {
2988 id => "death",
2989 title => "Death",
2990 reply => undef,
2991 tooltip => "Reason for and more info about your most recent death",
2992 },
2993 "c/say" => $SAY_CHANNEL,
2994 "c/chat" => $CHAT_CHANNEL,
2817); 2995);
2818 2996
2819sub cf::client::send_msg { 2997sub cf::client::send_msg {
2820 my ($self, $channel, $msg, $color, @extra) = @_; 2998 my ($self, $channel, $msg, $color, @extra) = @_;
2821 2999
… …
2826 3004
2827 # check predefined channels, for the benefit of C 3005 # check predefined channels, for the benefit of C
2828 if ($CHANNEL{$channel}) { 3006 if ($CHANNEL{$channel}) {
2829 $channel = $CHANNEL{$channel}; 3007 $channel = $CHANNEL{$channel};
2830 3008
2831 $self->ext_msg (channel_info => $channel) 3009 $self->ext_msg (channel_info => $channel);
2832 if $self->can_msg;
2833
2834 $channel = $channel->{id}; 3010 $channel = $channel->{id};
2835 3011
2836 } elsif (ref $channel) { 3012 } elsif (ref $channel) {
2837 # send meta info to client, if not yet sent 3013 # send meta info to client, if not yet sent
2838 unless (exists $self->{channel}{$channel->{id}}) { 3014 unless (exists $self->{channel}{$channel->{id}}) {
2839 $self->{channel}{$channel->{id}} = $channel; 3015 $self->{channel}{$channel->{id}} = $channel;
2840 $self->ext_msg (channel_info => $channel) 3016 $self->ext_msg (channel_info => $channel);
2841 if $self->can_msg;
2842 } 3017 }
2843 3018
2844 $channel = $channel->{id}; 3019 $channel = $channel->{id};
2845 } 3020 }
2846 3021
2847 return unless @extra || length $msg; 3022 return unless @extra || length $msg;
2848 3023
2849 if ($self->can_msg) {
2850 # default colour, mask it out 3024 # default colour, mask it out
2851 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3025 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2852 if $color & cf::NDI_DEF; 3026 if $color & cf::NDI_DEF;
2853 3027
2854 my $pkt = "msg " 3028 my $pkt = "msg "
2855 . $self->{json_coder}->encode ( 3029 . $self->{json_coder}->encode (
2856 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3030 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2857 ); 3031 );
2858 3032
2859 # try lzf for large packets
2860 $pkt = "lzf " . Compress::LZF::compress $pkt
2861 if 1024 <= length $pkt and $self->{can_lzf};
2862
2863 # split very large packets
2864 if (8192 < length $pkt and $self->{can_lzf}) {
2865 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2866 $pkt = "frag";
2867 }
2868
2869 $self->send_packet ($pkt); 3033 $self->send_big_packet ($pkt);
2870 } else {
2871 if ($color >= 0) {
2872 # replace some tags by gcfclient-compatible ones
2873 for ($msg) {
2874 1 while
2875 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2876 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2877 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2878 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2879 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2880 }
2881
2882 $color &= cf::NDI_COLOR_MASK;
2883
2884 utf8::encode $msg;
2885
2886 if (0 && $msg =~ /\[/) {
2887 # COMMAND/INFO
2888 $self->send_packet ("drawextinfo $color 10 8 $msg")
2889 } else {
2890 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2891 $self->send_packet ("drawinfo $color $msg")
2892 }
2893 }
2894 }
2895} 3034}
2896 3035
2897=item $client->ext_msg ($type, @msg) 3036=item $client->ext_msg ($type, @msg)
2898 3037
2899Sends an ext event to the client. 3038Sends an ext event to the client.
… …
2902 3041
2903sub cf::client::ext_msg($$@) { 3042sub cf::client::ext_msg($$@) {
2904 my ($self, $type, @msg) = @_; 3043 my ($self, $type, @msg) = @_;
2905 3044
2906 if ($self->extcmd == 2) { 3045 if ($self->extcmd == 2) {
2907 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3046 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2908 } elsif ($self->extcmd == 1) { # TODO: remove 3047 } elsif ($self->extcmd == 1) { # TODO: remove
2909 push @msg, msgtype => "event_$type"; 3048 push @msg, msgtype => "event_$type";
2910 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3049 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2911 } 3050 }
2912} 3051}
2913 3052
2914=item $client->ext_reply ($msgid, @msg) 3053=item $client->ext_reply ($msgid, @msg)
2915 3054
… …
2919 3058
2920sub cf::client::ext_reply($$@) { 3059sub cf::client::ext_reply($$@) {
2921 my ($self, $id, @msg) = @_; 3060 my ($self, $id, @msg) = @_;
2922 3061
2923 if ($self->extcmd == 2) { 3062 if ($self->extcmd == 2) {
2924 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3063 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2925 } elsif ($self->extcmd == 1) { 3064 } elsif ($self->extcmd == 1) {
2926 #TODO: version 1, remove 3065 #TODO: version 1, remove
2927 unshift @msg, msgtype => "reply", msgid => $id; 3066 unshift @msg, msgtype => "reply", msgid => $id;
2928 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3067 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2929 } 3068 }
2930} 3069}
2931 3070
2932=item $success = $client->query ($flags, "text", \&cb) 3071=item $success = $client->query ($flags, "text", \&cb)
2933 3072
… …
3034 3173
3035 $coro 3174 $coro
3036} 3175}
3037 3176
3038cf::client->attach ( 3177cf::client->attach (
3039 on_destroy => sub { 3178 on_client_destroy => sub {
3040 my ($ns) = @_; 3179 my ($ns) = @_;
3041 3180
3042 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3181 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3043 }, 3182 },
3044); 3183);
… …
3060our $safe_hole = new Safe::Hole; 3199our $safe_hole = new Safe::Hole;
3061 3200
3062$SIG{FPE} = 'IGNORE'; 3201$SIG{FPE} = 'IGNORE';
3063 3202
3064$safe->permit_only (Opcode::opset qw( 3203$safe->permit_only (Opcode::opset qw(
3065 :base_core :base_mem :base_orig :base_math 3204 :base_core :base_mem :base_orig :base_math :base_loop
3066 grepstart grepwhile mapstart mapwhile 3205 grepstart grepwhile mapstart mapwhile
3067 sort time 3206 sort time
3068)); 3207));
3069 3208
3070# here we export the classes and methods available to script code 3209# here we export the classes and methods available to script code
… …
3074The following functions and methods are available within a safe environment: 3213The following functions and methods are available within a safe environment:
3075 3214
3076 cf::object 3215 cf::object
3077 contr pay_amount pay_player map x y force_find force_add destroy 3216 contr pay_amount pay_player map x y force_find force_add destroy
3078 insert remove name archname title slaying race decrease split 3217 insert remove name archname title slaying race decrease split
3218 value
3079 3219
3080 cf::object::player 3220 cf::object::player
3081 player 3221 player
3082 3222
3083 cf::player 3223 cf::player
… …
3089=cut 3229=cut
3090 3230
3091for ( 3231for (
3092 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3232 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3093 insert remove inv nrof name archname title slaying race 3233 insert remove inv nrof name archname title slaying race
3094 decrease split destroy change_exp)], 3234 decrease split destroy change_exp value msg lore send_msg)],
3095 ["cf::object::player" => qw(player)], 3235 ["cf::object::player" => qw(player)],
3096 ["cf::player" => qw(peaceful)], 3236 ["cf::player" => qw(peaceful send_msg)],
3097 ["cf::map" => qw(trigger)], 3237 ["cf::map" => qw(trigger)],
3098) { 3238) {
3099 no strict 'refs'; 3239 no strict 'refs';
3100 my ($pkg, @funs) = @$_; 3240 my ($pkg, @funs) = @$_;
3101 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3241 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
3119 3259
3120 my $qcode = $code; 3260 my $qcode = $code;
3121 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3261 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3122 $qcode =~ s/\n/\\n/g; 3262 $qcode =~ s/\n/\\n/g;
3123 3263
3264 %vars = (_dummy => 0) unless %vars;
3265
3266 my @res;
3124 local $_; 3267 local $_;
3125 local @safe::cf::_safe_eval_args = values %vars;
3126 3268
3127 my $eval = 3269 my $eval =
3128 "do {\n" 3270 "do {\n"
3129 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3271 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3130 . "#line 0 \"{$qcode}\"\n" 3272 . "#line 0 \"{$qcode}\"\n"
3131 . $code 3273 . $code
3132 . "\n}" 3274 . "\n}"
3133 ; 3275 ;
3134 3276
3277 if ($CFG{safe_eval}) {
3135 sub_generation_inc; 3278 sub_generation_inc;
3279 local @safe::cf::_safe_eval_args = values %vars;
3136 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3280 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3137 sub_generation_inc; 3281 sub_generation_inc;
3282 } else {
3283 local @cf::_safe_eval_args = values %vars;
3284 @res = wantarray ? eval eval : scalar eval $eval;
3285 }
3138 3286
3139 if ($@) { 3287 if ($@) {
3140 warn "$@"; 3288 warn "$@";
3141 warn "while executing safe code '$code'\n"; 3289 warn "while executing safe code '$code'\n";
3142 warn "with arguments " . (join " ", %vars) . "\n"; 3290 warn "with arguments " . (join " ", %vars) . "\n";
… …
3161=cut 3309=cut
3162 3310
3163sub register_script_function { 3311sub register_script_function {
3164 my ($fun, $cb) = @_; 3312 my ($fun, $cb) = @_;
3165 3313
3166 no strict 'refs'; 3314 $fun = "safe::$fun" if $CFG{safe_eval};
3167 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3315 *$fun = $safe_hole->wrap ($cb);
3168} 3316}
3169 3317
3170=back 3318=back
3171 3319
3172=cut 3320=cut
… …
3193 3341
3194 $facedata->{version} == 2 3342 $facedata->{version} == 2
3195 or cf::cleanup "$path: version mismatch, cannot proceed."; 3343 or cf::cleanup "$path: version mismatch, cannot proceed.";
3196 3344
3197 # patch in the exptable 3345 # patch in the exptable
3346 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3198 $facedata->{resource}{"res/exp_table"} = { 3347 $facedata->{resource}{"res/exp_table"} = {
3199 type => FT_RSRC, 3348 type => FT_RSRC,
3200 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3349 data => $exp_table,
3350 hash => (Digest::MD5::md5 $exp_table),
3201 }; 3351 };
3202 cf::cede_to_tick; 3352 cf::cede_to_tick;
3203 3353
3204 { 3354 {
3205 my $faces = $facedata->{faceinfo}; 3355 my $faces = $facedata->{faceinfo};
… …
3207 while (my ($face, $info) = each %$faces) { 3357 while (my ($face, $info) = each %$faces) {
3208 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3358 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3209 3359
3210 cf::face::set_visibility $idx, $info->{visibility}; 3360 cf::face::set_visibility $idx, $info->{visibility};
3211 cf::face::set_magicmap $idx, $info->{magicmap}; 3361 cf::face::set_magicmap $idx, $info->{magicmap};
3212 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3362 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3213 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3363 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3214 3364
3215 cf::cede_to_tick; 3365 cf::cede_to_tick;
3216 } 3366 }
3217 3367
3218 while (my ($face, $info) = each %$faces) { 3368 while (my ($face, $info) = each %$faces) {
… …
3242 3392
3243 cf::anim::invalidate_all; # d'oh 3393 cf::anim::invalidate_all; # d'oh
3244 } 3394 }
3245 3395
3246 { 3396 {
3247 # TODO: for gcfclient pleasure, we should give resources
3248 # that gcfclient doesn't grok a >10000 face index.
3249 my $res = $facedata->{resource}; 3397 my $res = $facedata->{resource};
3250 3398
3251 while (my ($name, $info) = each %$res) { 3399 while (my ($name, $info) = each %$res) {
3252 if (defined $info->{type}) { 3400 if (defined $info->{type}) {
3253 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3401 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3254 my $data;
3255 3402
3256 if ($info->{type} & 1) { 3403 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3257 # prepend meta info
3258
3259 my $meta = $enc->encode ({
3260 name => $name,
3261 %{ $info->{meta} || {} },
3262 });
3263
3264 $data = pack "(w/a*)*", $meta, $info->{data};
3265 } else {
3266 $data = $info->{data};
3267 }
3268
3269 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3270 cf::face::set_type $idx, $info->{type}; 3404 cf::face::set_type $idx, $info->{type};
3271 } else { 3405 } else {
3272 $RESOURCE{$name} = $info; 3406 $RESOURCE{$name} = $info;
3273 } 3407 }
3274 3408
… …
3358 3492
3359 warn "finished reloading resource files\n"; 3493 warn "finished reloading resource files\n";
3360} 3494}
3361 3495
3362sub reload_config { 3496sub reload_config {
3497 warn "reloading config file...\n";
3498
3363 open my $fh, "<:utf8", "$CONFDIR/config" 3499 open my $fh, "<:utf8", "$CONFDIR/config"
3364 or return; 3500 or return;
3365 3501
3366 local $/; 3502 local $/;
3367 *CFG = YAML::Load <$fh>; 3503 *CFG = YAML::XS::Load scalar <$fh>;
3368 3504
3369 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3505 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3370 3506
3371 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3507 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3372 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3508 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3376 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3512 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3377 and die "WARNING: m(un)lockall failed: $!\n"; 3513 and die "WARNING: m(un)lockall failed: $!\n";
3378 }; 3514 };
3379 warn $@ if $@; 3515 warn $@ if $@;
3380 } 3516 }
3517
3518 warn "finished reloading resource files\n";
3381} 3519}
3382 3520
3383sub pidfile() { 3521sub pidfile() {
3384 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3522 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3385 or die "$PIDFILE: $!"; 3523 or die "$PIDFILE: $!";
… …
3397 3535
3398 seek $fh, 0, 0; 3536 seek $fh, 0, 0;
3399 print $fh $$; 3537 print $fh $$;
3400} 3538}
3401 3539
3540sub main_loop {
3541 warn "EV::loop starting\n";
3542 if (1) {
3543 EV::loop;
3544 }
3545 warn "EV::loop returned\n";
3546 goto &main_loop unless $REALLY_UNLOOP;
3547}
3548
3402sub main { 3549sub main {
3403 cf::init_globals; # initialise logging 3550 cf::init_globals; # initialise logging
3404 3551
3405 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3552 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3406 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3553 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3407 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3554 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3408 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3555 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3409
3410 cf::init_experience;
3411 cf::init_anim;
3412 cf::init_attackmess;
3413 cf::init_dynamic;
3414 cf::init_block;
3415 3556
3416 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3557 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3417 3558
3418 # we must not ever block the main coroutine 3559 # we must not ever block the main coroutine
3419 local $Coro::idle = sub { 3560 local $Coro::idle = sub {
… …
3425 }; 3566 };
3426 3567
3427 evthread_start IO::AIO::poll_fileno; 3568 evthread_start IO::AIO::poll_fileno;
3428 3569
3429 cf::sync_job { 3570 cf::sync_job {
3571 cf::init_experience;
3572 cf::init_anim;
3573 cf::init_attackmess;
3574 cf::init_dynamic;
3575
3576 cf::load_settings;
3577 cf::load_materials;
3578
3430 reload_resources; 3579 reload_resources;
3431 reload_config; 3580 reload_config;
3432 db_init; 3581 db_init;
3433 3582
3434 cf::load_settings;
3435 cf::load_materials;
3436 cf::init_uuid; 3583 cf::init_uuid;
3437 cf::init_signals; 3584 cf::init_signals;
3438 cf::init_commands;
3439 cf::init_skills; 3585 cf::init_skills;
3440 3586
3441 cf::init_beforeplay; 3587 cf::init_beforeplay;
3442 3588
3443 atomic; 3589 atomic;
… …
3445 load_extensions; 3591 load_extensions;
3446 3592
3447 utime time, time, $RUNTIMEFILE; 3593 utime time, time, $RUNTIMEFILE;
3448 3594
3449 # no (long-running) fork's whatsoever before this point(!) 3595 # no (long-running) fork's whatsoever before this point(!)
3596 use POSIX ();
3450 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3597 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3451 3598
3452 (pop @POST_INIT)->(0) while @POST_INIT; 3599 (pop @POST_INIT)->(0) while @POST_INIT;
3453 }; 3600 };
3454 3601
3455 EV::loop; 3602 cf::object::thawer::errors_are_fatal 0;
3603 warn "parse errors in files are no longer fatal from this point on.\n";
3604
3605 main_loop;
3456} 3606}
3457 3607
3458############################################################################# 3608#############################################################################
3459# initialisation and cleanup 3609# initialisation and cleanup
3460 3610
3461# install some emergency cleanup handlers 3611# install some emergency cleanup handlers
3462BEGIN { 3612BEGIN {
3463 our %SIGWATCHER = (); 3613 our %SIGWATCHER = ();
3464 for my $signal (qw(INT HUP TERM)) { 3614 for my $signal (qw(INT HUP TERM)) {
3465 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3615 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3466 cf::cleanup "SIG$signal"; 3616 cf::cleanup "SIG$signal";
3467 }; 3617 };
3468 } 3618 }
3469} 3619}
3470 3620
3471sub write_runtime_sync { 3621sub write_runtime_sync {
3622 my $t0 = AE::time;
3623
3472 # first touch the runtime file to show we are still running: 3624 # first touch the runtime file to show we are still running:
3473 # the fsync below can take a very very long time. 3625 # the fsync below can take a very very long time.
3474 3626
3475 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3627 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3476 3628
3477 my $guard = cf::lock_acquire "write_runtime"; 3629 my $guard = cf::lock_acquire "write_runtime";
3478 3630
3479 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3631 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3480 or return; 3632 or return;
3481 3633
3482 my $value = $cf::RUNTIME + 90 + 10; 3634 my $value = $cf::RUNTIME + 90 + 10;
3483 # 10 is the runtime save interval, for a monotonic clock 3635 # 10 is the runtime save interval, for a monotonic clock
3484 # 60 allows for the watchdog to kill the server. 3636 # 60 allows for the watchdog to kill the server.
… …
3497 or return; 3649 or return;
3498 3650
3499 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3651 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3500 and return; 3652 and return;
3501 3653
3502 warn "runtime file written.\n"; 3654 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3503 3655
3504 1 3656 1
3505} 3657}
3506 3658
3507our $uuid_lock; 3659our $uuid_lock;
… …
3518 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3670 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3519 or return; 3671 or return;
3520 3672
3521 my $value = uuid_seq uuid_cur; 3673 my $value = uuid_seq uuid_cur;
3522 3674
3523 if ($value < 1024) { 3675 unless ($value) {
3524 warn "cowardly refusing to write low uuid value ($value)!\n"; 3676 warn "cowardly refusing to write zero uuid value!\n";
3525 return; 3677 return;
3526 } 3678 }
3527 3679
3528 my $value = uuid_str $value + $uuid_skip; 3680 my $value = uuid_str $value + $uuid_skip;
3529 $uuid_skip = 0; 3681 $uuid_skip = 0;
… …
3555} 3707}
3556 3708
3557sub emergency_save() { 3709sub emergency_save() {
3558 my $freeze_guard = cf::freeze_mainloop; 3710 my $freeze_guard = cf::freeze_mainloop;
3559 3711
3560 warn "enter emergency perl save\n"; 3712 warn "emergency_perl_save: enter\n";
3561 3713
3562 cf::sync_job { 3714 cf::sync_job {
3715 # this is a trade-off: we want to be very quick here, so
3716 # save all maps without fsync, and later call a global sync
3717 # (which in turn might be very very slow)
3718 local $USE_FSYNC = 0;
3719
3563 # use a peculiar iteration method to avoid tripping on perl 3720 # use a peculiar iteration method to avoid tripping on perl
3564 # refcount bugs in for. also avoids problems with players 3721 # refcount bugs in for. also avoids problems with players
3565 # and maps saved/destroyed asynchronously. 3722 # and maps saved/destroyed asynchronously.
3566 warn "begin emergency player save\n"; 3723 warn "emergency_perl_save: begin player save\n";
3567 for my $login (keys %cf::PLAYER) { 3724 for my $login (keys %cf::PLAYER) {
3568 my $pl = $cf::PLAYER{$login} or next; 3725 my $pl = $cf::PLAYER{$login} or next;
3569 $pl->valid or next; 3726 $pl->valid or next;
3570 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3727 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3571 $pl->save; 3728 $pl->save;
3572 } 3729 }
3573 warn "end emergency player save\n"; 3730 warn "emergency_perl_save: end player save\n";
3574 3731
3575 warn "begin emergency map save\n"; 3732 warn "emergency_perl_save: begin map save\n";
3576 for my $path (keys %cf::MAP) { 3733 for my $path (keys %cf::MAP) {
3577 my $map = $cf::MAP{$path} or next; 3734 my $map = $cf::MAP{$path} or next;
3578 $map->valid or next; 3735 $map->valid or next;
3579 $map->save; 3736 $map->save;
3580 } 3737 }
3581 warn "end emergency map save\n"; 3738 warn "emergency_perl_save: end map save\n";
3582 3739
3583 warn "begin emergency database checkpoint\n"; 3740 warn "emergency_perl_save: begin database checkpoint\n";
3584 BDB::db_env_txn_checkpoint $DB_ENV; 3741 BDB::db_env_txn_checkpoint $DB_ENV;
3585 warn "end emergency database checkpoint\n"; 3742 warn "emergency_perl_save: end database checkpoint\n";
3586 3743
3587 warn "begin write uuid\n"; 3744 warn "emergency_perl_save: begin write uuid\n";
3588 write_uuid_sync 1; 3745 write_uuid_sync 1;
3589 warn "end write uuid\n"; 3746 warn "emergency_perl_save: end write uuid\n";
3590 }; 3747 };
3591 3748
3749 warn "emergency_perl_save: starting sync()\n";
3750 IO::AIO::aio_sync sub {
3751 warn "emergency_perl_save: finished sync()\n";
3752 };
3753
3592 warn "leave emergency perl save\n"; 3754 warn "emergency_perl_save: leave\n";
3593} 3755}
3594 3756
3595sub post_cleanup { 3757sub post_cleanup {
3596 my ($make_core) = @_; 3758 my ($make_core) = @_;
3597 3759
… …
3634 warn "can only reload from main coroutine"; 3796 warn "can only reload from main coroutine";
3635 return; 3797 return;
3636 } 3798 }
3637 3799
3638 return if $RELOAD++; 3800 return if $RELOAD++;
3801
3802 my $t1 = AE::time;
3639 3803
3640 while ($RELOAD) { 3804 while ($RELOAD) {
3641 warn "reloading..."; 3805 warn "reloading...";
3642 3806
3643 warn "entering sync_job"; 3807 warn "entering sync_job";
… …
3704 clear_package "safe::$_" 3868 clear_package "safe::$_"
3705 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3869 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3706 3870
3707 warn "unloading cf.pm \"a bit\""; 3871 warn "unloading cf.pm \"a bit\"";
3708 delete $INC{"cf.pm"}; 3872 delete $INC{"cf.pm"};
3709 delete $INC{"cf/pod.pm"}; 3873 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3710 3874
3711 # don't, removes xs symbols, too, 3875 # don't, removes xs symbols, too,
3712 # and global variables created in xs 3876 # and global variables created in xs
3713 #clear_package __PACKAGE__; 3877 #clear_package __PACKAGE__;
3714 3878
3715 warn "unload completed, starting to reload now"; 3879 warn "unload completed, starting to reload now";
3716 3880
3717 warn "reloading cf.pm"; 3881 warn "reloading cf.pm";
3718 require cf; 3882 require cf;
3719 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3883 cf::_connect_to_perl_1;
3720 3884
3721 warn "loading config and database again"; 3885 warn "loading config and database again";
3722 cf::reload_config; 3886 cf::reload_config;
3723 3887
3724 warn "loading extensions"; 3888 warn "loading extensions";
3725 cf::load_extensions; 3889 cf::load_extensions;
3726 3890
3891 if ($REATTACH_ON_RELOAD) {
3727 warn "reattaching attachments to objects/players"; 3892 warn "reattaching attachments to objects/players";
3728 _global_reattach; # objects, sockets 3893 _global_reattach; # objects, sockets
3729 warn "reattaching attachments to maps"; 3894 warn "reattaching attachments to maps";
3730 reattach $_ for values %MAP; 3895 reattach $_ for values %MAP;
3731 warn "reattaching attachments to players"; 3896 warn "reattaching attachments to players";
3732 reattach $_ for values %PLAYER; 3897 reattach $_ for values %PLAYER;
3898 }
3733 3899
3734 warn "running post_load"; 3900 warn "running post_init jobs";
3735 (pop @POST_INIT)->(1) while @POST_INIT; 3901 (pop @POST_INIT)->(1) while @POST_INIT;
3736 3902
3737 warn "leaving sync_job"; 3903 warn "leaving sync_job";
3738 3904
3739 1 3905 1
… …
3743 }; 3909 };
3744 3910
3745 warn "reloaded"; 3911 warn "reloaded";
3746 --$RELOAD; 3912 --$RELOAD;
3747 } 3913 }
3914
3915 $t1 = AE::time - $t1;
3916 warn "reload completed in ${t1}s\n";
3748}; 3917};
3749 3918
3750our $RELOAD_WATCHER; # used only during reload 3919our $RELOAD_WATCHER; # used only during reload
3751 3920
3752sub reload_perl() { 3921sub reload_perl() {
3753 # doing reload synchronously and two reloads happen back-to-back, 3922 # doing reload synchronously and two reloads happen back-to-back,
3754 # coro crashes during coro_state_free->destroy here. 3923 # coro crashes during coro_state_free->destroy here.
3755 3924
3925 $RELOAD_WATCHER ||= cf::async {
3926 Coro::AIO::aio_wait cache_extensions;
3927
3756 $RELOAD_WATCHER ||= EV::timer $TICK * 1.5, 0, sub { 3928 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3757 do_reload_perl; 3929 do_reload_perl;
3758 undef $RELOAD_WATCHER; 3930 undef $RELOAD_WATCHER;
3931 };
3759 }; 3932 };
3760} 3933}
3761 3934
3762register_command "reload" => sub { 3935register_command "reload" => sub {
3763 my ($who, $arg) = @_; 3936 my ($who, $arg) = @_;
… …
3777 3950
3778our @WAIT_FOR_TICK; 3951our @WAIT_FOR_TICK;
3779our @WAIT_FOR_TICK_BEGIN; 3952our @WAIT_FOR_TICK_BEGIN;
3780 3953
3781sub wait_for_tick { 3954sub wait_for_tick {
3782 return if tick_inhibit || $Coro::current == $Coro::main; 3955 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3783 3956
3784 my $signal = new Coro::Signal; 3957 my $signal = new Coro::Signal;
3785 push @WAIT_FOR_TICK, $signal; 3958 push @WAIT_FOR_TICK, $signal;
3786 $signal->wait; 3959 $signal->wait;
3787} 3960}
3788 3961
3789sub wait_for_tick_begin { 3962sub wait_for_tick_begin {
3790 return if tick_inhibit || $Coro::current == $Coro::main; 3963 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3791 3964
3792 my $signal = new Coro::Signal; 3965 my $signal = new Coro::Signal;
3793 push @WAIT_FOR_TICK_BEGIN, $signal; 3966 push @WAIT_FOR_TICK_BEGIN, $signal;
3794 $signal->wait; 3967 $signal->wait;
3795} 3968}
… …
3800 unless ++$bug_warning > 10; 3973 unless ++$bug_warning > 10;
3801 return; 3974 return;
3802 } 3975 }
3803 3976
3804 cf::server_tick; # one server iteration 3977 cf::server_tick; # one server iteration
3978
3979 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3805 3980
3806 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3981 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3807 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3982 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3808 Coro::async_pool { 3983 Coro::async_pool {
3809 $Coro::current->{desc} = "runtime saver"; 3984 $Coro::current->{desc} = "runtime saver";
… …
3832} 4007}
3833 4008
3834{ 4009{
3835 # configure BDB 4010 # configure BDB
3836 4011
3837 BDB::min_parallel 8; 4012 BDB::min_parallel 16;
3838 BDB::max_poll_reqs $TICK * 0.1; 4013 BDB::max_poll_reqs $TICK * 0.1;
3839 $AnyEvent::BDB::WATCHER->priority (1); 4014 $AnyEvent::BDB::WATCHER->priority (1);
3840 4015
3841 unless ($DB_ENV) { 4016 unless ($DB_ENV) {
3842 $DB_ENV = BDB::db_env_create; 4017 $DB_ENV = BDB::db_env_create;
… …
3922 LOG llevInfo, "[ABT] [suppressed]\n"; 4097 LOG llevInfo, "[ABT] [suppressed]\n";
3923 } 4098 }
3924} 4099}
3925 4100
3926# load additional modules 4101# load additional modules
3927use cf::pod; 4102require "cf/$_.pm" for @EXTRA_MODULES;
4103cf::_connect_to_perl_2;
3928 4104
3929END { cf::emergency_save } 4105END { cf::emergency_save }
3930 4106
39311 41071
3932 4108

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines