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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.448 by root, Fri Sep 19 05:30:23 2008 UTC vs.
Revision 1.512 by root, Sun Apr 11 04:52:07 2010 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
18# 19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use 5.10.0; 25use 5.10.0;
25use utf8; 26use utf8;
26use strict "vars", "subs"; 27use strict qw(vars subs);
27 28
28use Symbol; 29use Symbol;
29use List::Util; 30use List::Util;
30use Socket; 31use Socket;
31use EV; 32use EV;
32use Opcode; 33use Opcode;
33use Safe; 34use Safe;
34use Safe::Hole; 35use Safe::Hole;
35use Storable (); 36use Storable ();
37use Carp ();
36 38
39use Guard ();
37use Coro (); 40use Coro ();
38use Coro::State; 41use Coro::State;
39use Coro::Handle; 42use Coro::Handle;
40use Coro::EV; 43use Coro::EV;
41use Coro::AnyEvent; 44use Coro::AnyEvent;
42use Coro::Timer; 45use Coro::Timer;
43use Coro::Signal; 46use Coro::Signal;
44use Coro::Semaphore; 47use Coro::Semaphore;
48use Coro::SemaphoreSet;
45use Coro::AnyEvent; 49use Coro::AnyEvent;
46use Coro::AIO; 50use Coro::AIO;
47use Coro::BDB 1.6; 51use Coro::BDB 1.6;
48use Coro::Storable; 52use Coro::Storable;
49use Coro::Util (); 53use Coro::Util ();
50 54
51use JSON::XS 2.01 (); 55use JSON::XS 2.01 ();
52use BDB (); 56use BDB ();
53use Data::Dumper; 57use Data::Dumper;
54use Digest::MD5;
55use Fcntl; 58use Fcntl;
56use YAML (); 59use YAML::XS ();
57use IO::AIO (); 60use IO::AIO ();
58use Time::HiRes; 61use Time::HiRes;
59use Compress::LZF; 62use Compress::LZF;
60use Digest::MD5 (); 63use Digest::MD5 ();
61 64
66$Storable::canonical = 1; # reduce rsync transfers 69$Storable::canonical = 1; # reduce rsync transfers
67Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 70Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
68 71
69$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 72$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
70 73
71{ 74# make sure c-lzf reinitialises itself
72 # very ugly, but ensure we acquire the storable lock
73
74 sub net_mstore {
75 my $guard = Coro::Storable::guard;
76 &Storable::net_mstore
77 }
78
79 sub mretrieve {
80 my $guard = Coro::Storable::guard;
81 &Storable::mretrieve
82 }
83
84 Compress::LZF::set_serializer "Coro::Storable", "cf::net_mstore", "cf::mretrieve"; 75Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
85 Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 76Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
86} 77
78# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
87 80
88sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
89 82
90our %COMMAND = (); 83our %COMMAND = ();
91our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
94our %EXTCMD = (); 87our %EXTCMD = ();
95our %EXTICMD = (); 88our %EXTICMD = ();
96our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
97our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
98 91
99our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
100our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
101 96
102our $CONFDIR = confdir; 97our $CONFDIR = confdir;
103our $DATADIR = datadir; 98our $DATADIR = datadir;
104our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
105our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
116our %RESOURCE; 111our %RESOURCE;
117 112
118our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 113our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
119our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 114our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
120our $NEXT_TICK; 115our $NEXT_TICK;
121our $USE_FSYNC = 1; # use fsync to write maps - default off 116our $USE_FSYNC = 1; # use fsync to write maps - default on
122 117
123our $BDB_DEADLOCK_WATCHER; 118our $BDB_DEADLOCK_WATCHER;
124our $BDB_CHECKPOINT_WATCHER; 119our $BDB_CHECKPOINT_WATCHER;
125our $BDB_TRICKLE_WATCHER; 120our $BDB_TRICKLE_WATCHER;
126our $DB_ENV; 121our $DB_ENV;
127 122
123our @EXTRA_MODULES = qw(pod match mapscript);
124
128our %CFG; 125our %CFG;
129 126
130our $UPTIME; $UPTIME ||= time; 127our $UPTIME; $UPTIME ||= time;
131our $RUNTIME; 128our $RUNTIME;
132our $NOW; 129our $NOW;
140 137
141our $LOAD; # a number between 0 (idle) and 1 (too many objects) 138our $LOAD; # a number between 0 (idle) and 1 (too many objects)
142our $LOADAVG; # same thing, but with alpha-smoothing 139our $LOADAVG; # same thing, but with alpha-smoothing
143our $JITTER; # average jitter 140our $JITTER; # average jitter
144our $TICK_START; # for load detecting purposes 141our $TICK_START; # for load detecting purposes
142
143our @POST_INIT;
144
145our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
146our $REALLY_UNLOOP; # never set to true, please :)
145 147
146binmode STDOUT; 148binmode STDOUT;
147binmode STDERR; 149binmode STDERR;
148 150
149# read virtual server time, if available 151# read virtual server time, if available
151 open my $fh, "<", $RUNTIMEFILE 153 open my $fh, "<", $RUNTIMEFILE
152 or die "unable to read $RUNTIMEFILE file: $!"; 154 or die "unable to read $RUNTIMEFILE file: $!";
153 $RUNTIME = <$fh> + 0.; 155 $RUNTIME = <$fh> + 0.;
154} 156}
155 157
158eval "sub TICK() { $TICK } 1" or die;
159
156mkdir $_ 160mkdir $_
157 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 161 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
158 162
159our $EMERGENCY_POSITION; 163our $EMERGENCY_POSITION;
160 164
161sub cf::map::normalise; 165sub cf::map::normalise;
166
167#############################################################################
168
169%REFLECT = ();
170for (@REFLECT) {
171 my $reflect = JSON::XS::decode_json $_;
172 $REFLECT{$reflect->{class}} = $reflect;
173}
174
175# this is decidedly evil
176$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
162 177
163############################################################################# 178#############################################################################
164 179
165=head2 GLOBAL VARIABLES 180=head2 GLOBAL VARIABLES
166 181
213returns directly I<after> the tick processing (and consequently, can only wake one process 228returns directly I<after> the tick processing (and consequently, can only wake one process
214per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 229per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
215 230
216=item @cf::INVOKE_RESULTS 231=item @cf::INVOKE_RESULTS
217 232
218This array contains the results of the last C<invoke ()> call. When 233This array contains the results of the last C<invoke ()> call. When
219C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 234C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
220that call. 235that call.
221 236
237=item %cf::REFLECT
238
239Contains, for each (C++) class name, a hash reference with information
240about object members (methods, scalars, arrays and flags) and other
241metadata, which is useful for introspection.
242
222=back 243=back
223 244
224=cut 245=cut
225 246
226BEGIN { 247$Coro::State::WARNHOOK = sub {
227 *CORE::GLOBAL::warn = sub {
228 my $msg = join "", @_; 248 my $msg = join "", @_;
229 249
230 $msg .= "\n" 250 $msg .= "\n"
231 unless $msg =~ /\n$/; 251 unless $msg =~ /\n$/;
232 252
233 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 253 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
234 254
235 LOG llevError, $msg; 255 LOG llevError, $msg;
236 }; 256};
237}
238 257
239$Coro::State::DIEHOOK = sub { 258$Coro::State::DIEHOOK = sub {
240 return unless $^S eq 0; # "eq", not "==" 259 return unless $^S eq 0; # "eq", not "=="
260
261 warn Carp::longmess $_[0];
241 262
242 if ($Coro::current == $Coro::main) {#d# 263 if ($Coro::current == $Coro::main) {#d#
243 warn "DIEHOOK called in main context, Coro bug?\n";#d# 264 warn "DIEHOOK called in main context, Coro bug?\n";#d#
244 return;#d# 265 return;#d#
245 }#d# 266 }#d#
246 267
247 # kill coroutine otherwise 268 # kill coroutine otherwise
248 warn Carp::longmess $_[0];
249 Coro::terminate 269 Coro::terminate
250}; 270};
251
252$SIG{__DIE__} = sub { }; #d#?
253 271
254@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 272@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
255@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 273@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
256@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 274@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
257@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 275@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
271)) { 289)) {
272 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 290 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
273} 291}
274 292
275$EV::DIED = sub { 293$EV::DIED = sub {
276 warn "error in event callback: @_"; 294 Carp::cluck "error in event callback: @_";
277}; 295};
278 296
279############################################################################# 297#############################################################################
280 298
281=head2 UTILITY FUNCTIONS 299=head2 UTILITY FUNCTIONS
318our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 336our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
319 337
320sub encode_json($) { $json_coder->encode ($_[0]) } 338sub encode_json($) { $json_coder->encode ($_[0]) }
321sub decode_json($) { $json_coder->decode ($_[0]) } 339sub decode_json($) { $json_coder->decode ($_[0]) }
322 340
341=item cf::post_init { BLOCK }
342
343Execute the given codeblock, I<after> all extensions have been (re-)loaded,
344but I<before> the server starts ticking again.
345
346The cdoeblock will have a single boolean argument to indicate whether this
347is a reload or not.
348
349=cut
350
351sub post_init(&) {
352 push @POST_INIT, shift;
353}
354
323=item cf::lock_wait $string 355=item cf::lock_wait $string
324 356
325Wait until the given lock is available. See cf::lock_acquire. 357Wait until the given lock is available. See cf::lock_acquire.
326 358
327=item my $lock = cf::lock_acquire $string 359=item my $lock = cf::lock_acquire $string
328 360
329Wait until the given lock is available and then acquires it and returns 361Wait until the given lock is available and then acquires it and returns
330a Coro::guard object. If the guard object gets destroyed (goes out of scope, 362a L<Guard> object. If the guard object gets destroyed (goes out of scope,
331for example when the coroutine gets canceled), the lock is automatically 363for example when the coroutine gets canceled), the lock is automatically
332returned. 364returned.
333 365
334Locks are *not* recursive, locking from the same coro twice results in a 366Locks are *not* recursive, locking from the same coro twice results in a
335deadlocked coro. 367deadlocked coro.
341 373
342Return true if the lock is currently active, i.e. somebody has locked it. 374Return true if the lock is currently active, i.e. somebody has locked it.
343 375
344=cut 376=cut
345 377
346our %LOCK; 378our $LOCKS = new Coro::SemaphoreSet;
347our %LOCKER;#d#
348 379
349sub lock_wait($) { 380sub lock_wait($) {
350 my ($key) = @_; 381 $LOCKS->wait ($_[0]);
351
352 if ($LOCKER{$key} == $Coro::current) {#d#
353 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
354 return;#d#
355 }#d#
356
357 # wait for lock, if any
358 while ($LOCK{$key}) {
359 push @{ $LOCK{$key} }, $Coro::current;
360 Coro::schedule;
361 }
362} 382}
363 383
364sub lock_acquire($) { 384sub lock_acquire($) {
365 my ($key) = @_; 385 $LOCKS->guard ($_[0])
366
367 # wait, to be sure we are not locked
368 lock_wait $key;
369
370 $LOCK{$key} = [];
371 $LOCKER{$key} = $Coro::current;#d#
372
373 Coro::guard {
374 delete $LOCKER{$key};#d#
375 # wake up all waiters, to be on the safe side
376 $_->ready for @{ delete $LOCK{$key} };
377 }
378} 386}
379 387
380sub lock_active($) { 388sub lock_active($) {
381 my ($key) = @_; 389 $LOCKS->count ($_[0]) < 1
382
383 ! ! $LOCK{$key}
384} 390}
385 391
386sub freeze_mainloop { 392sub freeze_mainloop {
387 tick_inhibit_inc; 393 tick_inhibit_inc;
388 394
389 Coro::guard \&tick_inhibit_dec; 395 &Guard::guard (\&tick_inhibit_dec);
390} 396}
391 397
392=item cf::periodic $interval, $cb 398=item cf::periodic $interval, $cb
393 399
394Like EV::periodic, but randomly selects a starting point so that the actions 400Like EV::periodic, but randomly selects a starting point so that the actions
417 423
418=cut 424=cut
419 425
420our @SLOT_QUEUE; 426our @SLOT_QUEUE;
421our $SLOT_QUEUE; 427our $SLOT_QUEUE;
428our $SLOT_DECAY = 0.9;
422 429
423$SLOT_QUEUE->cancel if $SLOT_QUEUE; 430$SLOT_QUEUE->cancel if $SLOT_QUEUE;
424$SLOT_QUEUE = Coro::async { 431$SLOT_QUEUE = Coro::async {
425 $Coro::current->desc ("timeslot manager"); 432 $Coro::current->desc ("timeslot manager");
426 433
427 my $signal = new Coro::Signal; 434 my $signal = new Coro::Signal;
435 my $busy;
428 436
429 while () { 437 while () {
430 next_job: 438 next_job:
439
431 my $avail = cf::till_tick; 440 my $avail = cf::till_tick;
432 if ($avail > 0.01) { 441
433 for (0 .. $#SLOT_QUEUE) { 442 for (0 .. $#SLOT_QUEUE) {
434 if ($SLOT_QUEUE[$_][0] < $avail) { 443 if ($SLOT_QUEUE[$_][0] <= $avail) {
444 $busy = 0;
435 my $job = splice @SLOT_QUEUE, $_, 1, (); 445 my $job = splice @SLOT_QUEUE, $_, 1, ();
436 $job->[2]->send; 446 $job->[2]->send;
437 Coro::cede; 447 Coro::cede;
438 goto next_job; 448 goto next_job;
439 } 449 } else {
450 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
440 } 451 }
441 } 452 }
442 453
443 if (@SLOT_QUEUE) { 454 if (@SLOT_QUEUE) {
444 # we do not use wait_for_tick() as it returns immediately when tick is inactive 455 # we do not use wait_for_tick() as it returns immediately when tick is inactive
445 push @cf::WAIT_FOR_TICK, $signal; 456 push @cf::WAIT_FOR_TICK, $signal;
446 $signal->wait; 457 $signal->wait;
447 } else { 458 } else {
459 $busy = 0;
448 Coro::schedule; 460 Coro::schedule;
449 } 461 }
450 } 462 }
451}; 463};
452 464
453sub get_slot($;$$) { 465sub get_slot($;$$) {
454 return if tick_inhibit || $Coro::current == $Coro::main; 466 return if tick_inhibit || $Coro::current == $Coro::main;
455 467
456 my ($time, $pri, $name) = @_; 468 my ($time, $pri, $name) = @_;
457 469
458 $time = $TICK * .6 if $time > $TICK * .6; 470 $time = clamp $time, 0.01, $TICK * .6;
471
459 my $sig = new Coro::Signal; 472 my $sig = new Coro::Signal;
460 473
461 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 474 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
462 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 475 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
463 $SLOT_QUEUE->ready; 476 $SLOT_QUEUE->ready;
490 503
491sub sync_job(&) { 504sub sync_job(&) {
492 my ($job) = @_; 505 my ($job) = @_;
493 506
494 if ($Coro::current == $Coro::main) { 507 if ($Coro::current == $Coro::main) {
495 my $time = EV::time; 508 my $time = AE::time;
496 509
497 # this is the main coro, too bad, we have to block 510 # this is the main coro, too bad, we have to block
498 # till the operation succeeds, freezing the server :/ 511 # till the operation succeeds, freezing the server :/
499 512
500 LOG llevError, Carp::longmess "sync job";#d# 513 LOG llevError, Carp::longmess "sync job";#d#
517 } else { 530 } else {
518 EV::loop EV::LOOP_ONESHOT; 531 EV::loop EV::LOOP_ONESHOT;
519 } 532 }
520 } 533 }
521 534
522 my $time = EV::time - $time; 535 my $time = AE::time - $time;
523 536
524 $TICK_START += $time; # do not account sync jobs to server load 537 $TICK_START += $time; # do not account sync jobs to server load
525 538
526 wantarray ? @res : $res[0] 539 wantarray ? @res : $res[0]
527 } else { 540 } else {
1166 $decname, length $$rdata, scalar @$objs; 1179 $decname, length $$rdata, scalar @$objs;
1167 1180
1168 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1181 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1169 aio_chmod $fh, SAVE_MODE; 1182 aio_chmod $fh, SAVE_MODE;
1170 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1183 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1171 aio_fsync $fh if $cf::USE_FSYNC; 1184 if ($cf::USE_FSYNC) {
1185 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;
1186 aio_fsync $fh;
1187 }
1172 aio_close $fh; 1188 aio_close $fh;
1173 1189
1174 if (@$objs) { 1190 if (@$objs) {
1175 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1191 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1176 aio_chmod $fh, SAVE_MODE; 1192 aio_chmod $fh, SAVE_MODE;
1177 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1193 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1178 aio_write $fh, 0, (length $data), $data, 0; 1194 aio_write $fh, 0, (length $data), $data, 0;
1179 aio_fsync $fh if $cf::USE_FSYNC; 1195 if ($cf::USE_FSYNC) {
1196 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;
1197 aio_fsync $fh;
1198 }
1180 aio_close $fh; 1199 aio_close $fh;
1181 aio_rename "$filename.pst~", "$filename.pst"; 1200 aio_rename "$filename.pst~", "$filename.pst";
1182 } 1201 }
1183 } else { 1202 } else {
1184 aio_unlink "$filename.pst"; 1203 aio_unlink "$filename.pst";
1185 } 1204 }
1186 1205
1187 aio_rename "$filename~", $filename; 1206 aio_rename "$filename~", $filename;
1207
1208 $filename =~ s%/[^/]+$%%;
1209 aio_pathsync $filename if $cf::USE_FSYNC;
1188 } else { 1210 } else {
1189 warn "FATAL: $filename~: $!\n"; 1211 warn "unable to save objects: $filename~: $!\n";
1190 } 1212 }
1191 } else { 1213 } else {
1192 aio_unlink $filename; 1214 aio_unlink $filename;
1193 aio_unlink "$filename.pst"; 1215 aio_unlink "$filename.pst";
1194 } 1216 }
1285 my ($name, $cb) = @_; 1307 my ($name, $cb) = @_;
1286 1308
1287 $EXTICMD{$name} = $cb; 1309 $EXTICMD{$name} = $cb;
1288} 1310}
1289 1311
1312use File::Glob ();
1313
1290cf::player->attach ( 1314cf::player->attach (
1291 on_command => sub { 1315 on_unknown_command => sub {
1292 my ($pl, $name, $params) = @_; 1316 my ($pl, $name, $params) = @_;
1293 1317
1294 my $cb = $COMMAND{$name} 1318 my $cb = $COMMAND{$name}
1295 or return; 1319 or return;
1296 1320
1326 1350
1327 cf::override; 1351 cf::override;
1328 }, 1352 },
1329); 1353);
1330 1354
1355# "readahead" all extensions
1356sub cache_extensions {
1357 my $grp = IO::AIO::aio_group;
1358
1359 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1360 for (grep /\.ext$/, @{$_[0]}) {
1361 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1362 }
1363 };
1364
1365 $grp
1366}
1367
1331sub load_extensions { 1368sub load_extensions {
1332 cf::sync_job { 1369 cf::sync_job {
1333 my %todo; 1370 my %todo;
1334 1371
1335 for my $path (<$LIBDIR/*.ext>) { 1372 for my $path (<$LIBDIR/*.ext>) {
1362 . "\n};\n1"; 1399 . "\n};\n1";
1363 1400
1364 $todo{$base} = \%ext; 1401 $todo{$base} = \%ext;
1365 } 1402 }
1366 1403
1404 my $pass = 0;
1367 my %done; 1405 my %done;
1368 while (%todo) { 1406 while (%todo) {
1369 my $progress; 1407 my $progress;
1370 1408
1409 ++$pass;
1410
1411 ext:
1371 while (my ($k, $v) = each %todo) { 1412 while (my ($k, $v) = each %todo) {
1372 for (split /,\s*/, $v->{meta}{depends}) { 1413 for (split /,\s*/, $v->{meta}{depends}) {
1373 goto skip 1414 next ext
1374 unless exists $done{$_}; 1415 unless exists $done{$_};
1375 } 1416 }
1376 1417
1377 warn "... loading '$k' into '$v->{pkg}'\n"; 1418 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1378 1419
1379 unless (eval $v->{source}) { 1420 my $active = eval $v->{source};
1421
1422 if (length $@) {
1380 my $msg = $@ ? "$v->{path}: $@\n" 1423 warn "$v->{path}: $@\n";
1381 : "$v->{base}: extension inactive.\n";
1382 1424
1383 if (exists $v->{meta}{mandatory}) {
1384 warn $msg;
1385 cf::cleanup "mandatory extension failed to load, exiting."; 1425 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1386 } 1426 if exists $v->{meta}{mandatory};
1387 1427 } else {
1388 warn $msg; 1428 $done{$k} = delete $todo{$k};
1429 push @EXTS, $v->{pkg};
1430 $progress = 1;
1431
1432 warn "$v->{base}: extension inactive.\n"
1433 unless $active;
1389 } 1434 }
1390
1391 $done{$k} = delete $todo{$k};
1392 push @EXTS, $v->{pkg};
1393 $progress = 1;
1394 } 1435 }
1395 1436
1396 skip: 1437 unless ($progress) {
1397 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1438 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1398 unless $progress; 1439
1440 while (my ($k, $v) = each %todo) {
1441 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1442 if exists $v->{meta}{mandatory};
1443 }
1444 }
1399 } 1445 }
1400 }; 1446 };
1401} 1447}
1402 1448
1403############################################################################# 1449#############################################################################
1457 1503
1458sub exists($) { 1504sub exists($) {
1459 my ($login) = @_; 1505 my ($login) = @_;
1460 1506
1461 $cf::PLAYER{$login} 1507 $cf::PLAYER{$login}
1462 or cf::sync_job { !aio_stat path $login } 1508 or !aio_stat path $login
1463} 1509}
1464 1510
1465sub find($) { 1511sub find($) {
1466 return $cf::PLAYER{$_[0]} || do { 1512 return $cf::PLAYER{$_[0]} || do {
1467 my $login = $_[0]; 1513 my $login = $_[0];
1487 $cf::PLAYER{$login} = $pl 1533 $cf::PLAYER{$login} = $pl
1488 } 1534 }
1489 } 1535 }
1490} 1536}
1491 1537
1538cf::player->attach (
1539 on_load => sub {
1540 my ($pl, $path) = @_;
1541
1542 # restore slots saved in save, below
1543 my $slots = delete $pl->{_slots};
1544
1545 $pl->ob->current_weapon ($slots->[0]);
1546 $pl->combat_ob ($slots->[1]);
1547 $pl->ranged_ob ($slots->[2]);
1548 },
1549);
1550
1492sub save($) { 1551sub save($) {
1493 my ($pl) = @_; 1552 my ($pl) = @_;
1494 1553
1495 return if $pl->{deny_save}; 1554 return if $pl->{deny_save};
1496 1555
1501 1560
1502 aio_mkdir playerdir $pl, 0770; 1561 aio_mkdir playerdir $pl, 0770;
1503 $pl->{last_save} = $cf::RUNTIME; 1562 $pl->{last_save} = $cf::RUNTIME;
1504 1563
1505 cf::get_slot 0.01; 1564 cf::get_slot 0.01;
1565
1566 # save slots, to be restored later
1567 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1506 1568
1507 $pl->save_pl ($path); 1569 $pl->save_pl ($path);
1508 cf::cede_to_tick; 1570 cf::cede_to_tick;
1509} 1571}
1510 1572
1723 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1785 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1724 1786
1725 # mit "rum" bekleckern, nicht 1787 # mit "rum" bekleckern, nicht
1726 $self->_create_random_map ( 1788 $self->_create_random_map (
1727 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1789 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1728 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1790 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1729 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1791 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1730 $rmp->{exit_on_final_map}, 1792 $rmp->{exit_on_final_map},
1731 $rmp->{xsize}, $rmp->{ysize}, 1793 $rmp->{xsize}, $rmp->{ysize},
1732 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1794 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1733 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1795 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1863 1925
1864 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1926 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1865 "$UNIQUEDIR/$path" 1927 "$UNIQUEDIR/$path"
1866} 1928}
1867 1929
1868# and all this just because we cannot iterate over
1869# all maps in C++...
1870sub change_all_map_light {
1871 my ($change) = @_;
1872
1873 $_->change_map_light ($change)
1874 for grep $_->outdoor, values %cf::MAP;
1875}
1876
1877sub decay_objects { 1930sub decay_objects {
1878 my ($self) = @_; 1931 my ($self) = @_;
1879 1932
1880 return if $self->{deny_reset}; 1933 return if $self->{deny_reset};
1881 1934
1963sub find { 2016sub find {
1964 my ($path, $origin) = @_; 2017 my ($path, $origin) = @_;
1965 2018
1966 $path = normalise $path, $origin && $origin->path; 2019 $path = normalise $path, $origin && $origin->path;
1967 2020
1968 cf::lock_wait "map_data:$path";#d#remove 2021 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1969 cf::lock_wait "map_find:$path"; 2022 my $guard2 = cf::lock_acquire "map_find:$path";
1970 2023
1971 $cf::MAP{$path} || do { 2024 $cf::MAP{$path} || do {
1972 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1973 my $guard2 = cf::lock_acquire "map_find:$path";
1974
1975 my $map = new_from_path cf::map $path 2025 my $map = new_from_path cf::map $path
1976 or return; 2026 or return;
1977 2027
1978 $map->{last_save} = $cf::RUNTIME; 2028 $map->{last_save} = $cf::RUNTIME;
1979 2029
1991 2041
1992 $cf::MAP{$path} = $map 2042 $cf::MAP{$path} = $map
1993 } 2043 }
1994} 2044}
1995 2045
1996sub pre_load { } 2046sub pre_load { }
1997sub post_load { } 2047#sub post_load { } # XS
1998 2048
1999sub load { 2049sub load {
2000 my ($self) = @_; 2050 my ($self) = @_;
2001 2051
2002 local $self->{deny_reset} = 1; # loading can take a long time 2052 local $self->{deny_reset} = 1; # loading can take a long time
2047 unless ($self->{deny_activate}) { 2097 unless ($self->{deny_activate}) {
2048 $self->decay_objects; 2098 $self->decay_objects;
2049 $self->fix_auto_apply; 2099 $self->fix_auto_apply;
2050 $self->update_buttons; 2100 $self->update_buttons;
2051 cf::cede_to_tick; 2101 cf::cede_to_tick;
2052 $self->set_darkness_map;
2053 cf::cede_to_tick;
2054 $self->activate; 2102 $self->activate;
2055 } 2103 }
2056 2104
2057 $self->{last_save} = $cf::RUNTIME; 2105 $self->{last_save} = $cf::RUNTIME;
2058 $self->last_access ($cf::RUNTIME); 2106 $self->last_access ($cf::RUNTIME);
2061 } 2109 }
2062 2110
2063 $self->post_load; 2111 $self->post_load;
2064} 2112}
2065 2113
2114# customize the map for a given player, i.e.
2115# return the _real_ map. used by e.g. per-player
2116# maps to change the path to ~playername/mappath
2066sub customise_for { 2117sub customise_for {
2067 my ($self, $ob) = @_; 2118 my ($self, $ob) = @_;
2068 2119
2069 return find "~" . $ob->name . "/" . $self->{path} 2120 return find "~" . $ob->name . "/" . $self->{path}
2070 if $self->per_player; 2121 if $self->per_player;
2224 2275
2225 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2276 my $lock = cf::lock_acquire "map_data:$self->{path}";
2226 2277
2227 return if $self->players; 2278 return if $self->players;
2228 2279
2229 warn "resetting map ", $self->path; 2280 warn "resetting map ", $self->path, "\n";
2230 2281
2231 $self->in_memory (cf::MAP_SWAPPED); 2282 $self->in_memory (cf::MAP_SWAPPED);
2232 2283
2233 # need to save uniques path 2284 # need to save uniques path
2234 unless ($self->{deny_save}) { 2285 unless ($self->{deny_save}) {
2325 : normalise $_ 2376 : normalise $_
2326 } @{ aio_readdir $UNIQUEDIR or [] } 2377 } @{ aio_readdir $UNIQUEDIR or [] }
2327 ] 2378 ]
2328} 2379}
2329 2380
2381=item cf::map::static_maps
2382
2383Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2384file in the shared directory excluding F</styles> and F</editor>). May
2385block.
2386
2387=cut
2388
2389sub static_maps() {
2390 my @dirs = "";
2391 my @maps;
2392
2393 while (@dirs) {
2394 my $dir = shift @dirs;
2395
2396 next if $dir eq "/styles" || $dir eq "/editor";
2397
2398 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2399 or return;
2400
2401 for (@$files) {
2402 s/\.map$// or next;
2403 utf8::decode $_;
2404 push @maps, "$dir/$_";
2405 }
2406
2407 push @dirs, map "$dir/$_", @$dirs;
2408 }
2409
2410 \@maps
2411}
2412
2330=back 2413=back
2331 2414
2332=head3 cf::object 2415=head3 cf::object
2333 2416
2334=cut 2417=cut
2399 2482
2400our $SAY_CHANNEL = { 2483our $SAY_CHANNEL = {
2401 id => "say", 2484 id => "say",
2402 title => "Map", 2485 title => "Map",
2403 reply => "say ", 2486 reply => "say ",
2404 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2487 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2405}; 2488};
2406 2489
2407our $CHAT_CHANNEL = { 2490our $CHAT_CHANNEL = {
2408 id => "chat", 2491 id => "chat",
2409 title => "Chat", 2492 title => "Chat",
2529 ($x, $y) = (-1, -1) 2612 ($x, $y) = (-1, -1)
2530 unless (defined $x) && (defined $y); 2613 unless (defined $x) && (defined $y);
2531 2614
2532 # use -1 or undef as default coordinates, not 0, 0 2615 # use -1 or undef as default coordinates, not 0, 0
2533 ($x, $y) = ($map->enter_x, $map->enter_y) 2616 ($x, $y) = ($map->enter_x, $map->enter_y)
2534 if $x <=0 && $y <= 0; 2617 if $x <= 0 && $y <= 0;
2535 2618
2536 $map->load; 2619 $map->load;
2537 $map->load_neighbours; 2620 $map->load_neighbours;
2538 2621
2539 return unless $self->contr->active; 2622 return unless $self->contr->active;
2540 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2541 $self->activate_recursive;
2542 2623
2543 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2624 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2544 $self->enter_map ($map, $x, $y); 2625 $self->enter_map ($map, $x, $y);
2626
2627 # only activate afterwards, to support waiting in hooks
2628 $self->activate_recursive;
2545} 2629}
2546 2630
2547=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2631=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2548 2632
2549Moves the player to the given map-path and coordinates by first freezing 2633Moves the player to the given map-path and coordinates by first freezing
2737 2821
2738 utf8::encode $text; 2822 utf8::encode $text;
2739 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2823 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2740} 2824}
2741 2825
2826=item $client->send_big_packet ($pkt)
2827
2828Like C<send_packet>, but tries to compress large packets, and fragments
2829them as required.
2830
2831=cut
2832
2833our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2834
2835sub cf::client::send_big_packet {
2836 my ($self, $pkt) = @_;
2837
2838 # try lzf for large packets
2839 $pkt = "lzf " . Compress::LZF::compress $pkt
2840 if 1024 <= length $pkt and $self->{can_lzf};
2841
2842 # split very large packets
2843 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2844 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2845 $pkt = "frag";
2846 }
2847
2848 $self->send_packet ($pkt);
2849}
2850
2742=item $client->send_msg ($channel, $msg, $color, [extra...]) 2851=item $client->send_msg ($channel, $msg, $color, [extra...])
2743 2852
2744Send a drawinfo or msg packet to the client, formatting the msg for the 2853Send a drawinfo or msg packet to the client, formatting the msg for the
2745client if neccessary. C<$type> should be a string identifying the type of 2854client if neccessary. C<$type> should be a string identifying the type of
2746the message, with C<log> being the default. If C<$color> is negative, suppress 2855the message, with C<log> being the default. If C<$color> is negative, suppress
2748 2857
2749=cut 2858=cut
2750 2859
2751# non-persistent channels (usually the info channel) 2860# non-persistent channels (usually the info channel)
2752our %CHANNEL = ( 2861our %CHANNEL = (
2862 "c/motd" => {
2863 id => "infobox",
2864 title => "MOTD",
2865 reply => undef,
2866 tooltip => "The message of the day",
2867 },
2753 "c/identify" => { 2868 "c/identify" => {
2754 id => "infobox", 2869 id => "infobox",
2755 title => "Identify", 2870 title => "Identify",
2756 reply => undef, 2871 reply => undef,
2757 tooltip => "Items recently identified", 2872 tooltip => "Items recently identified",
2759 "c/examine" => { 2874 "c/examine" => {
2760 id => "infobox", 2875 id => "infobox",
2761 title => "Examine", 2876 title => "Examine",
2762 reply => undef, 2877 reply => undef,
2763 tooltip => "Signs and other items you examined", 2878 tooltip => "Signs and other items you examined",
2879 },
2880 "c/shopinfo" => {
2881 id => "infobox",
2882 title => "Shop Info",
2883 reply => undef,
2884 tooltip => "What your bargaining skill tells you about the shop",
2764 }, 2885 },
2765 "c/book" => { 2886 "c/book" => {
2766 id => "infobox", 2887 id => "infobox",
2767 title => "Book", 2888 title => "Book",
2768 reply => undef, 2889 reply => undef,
2784 id => "infobox", 2905 id => "infobox",
2785 title => "Body Parts", 2906 title => "Body Parts",
2786 reply => undef, 2907 reply => undef,
2787 tooltip => "Shows which body parts you posess and are available", 2908 tooltip => "Shows which body parts you posess and are available",
2788 }, 2909 },
2910 "c/statistics" => {
2911 id => "infobox",
2912 title => "Statistics",
2913 reply => undef,
2914 tooltip => "Shows your primary statistics",
2915 },
2916 "c/skills" => {
2917 id => "infobox",
2918 title => "Skills",
2919 reply => undef,
2920 tooltip => "Shows your experience per skill and item power",
2921 },
2922 "c/shopitems" => {
2923 id => "infobox",
2924 title => "Shop Items",
2925 reply => undef,
2926 tooltip => "Shows the items currently for sale in this shop",
2927 },
2928 "c/resistances" => {
2929 id => "infobox",
2930 title => "Resistances",
2931 reply => undef,
2932 tooltip => "Shows your resistances",
2933 },
2934 "c/pets" => {
2935 id => "infobox",
2936 title => "Pets",
2937 reply => undef,
2938 tooltip => "Shows information abotu your pets/a specific pet",
2939 },
2940 "c/perceiveself" => {
2941 id => "infobox",
2942 title => "Perceive Self",
2943 reply => undef,
2944 tooltip => "You gained detailed knowledge about yourself",
2945 },
2789 "c/uptime" => { 2946 "c/uptime" => {
2790 id => "infobox", 2947 id => "infobox",
2791 title => "Uptime", 2948 title => "Uptime",
2792 reply => undef, 2949 reply => undef,
2793 tooltip => "How long the server has been running since last restart", 2950 tooltip => "How long the server has been running since last restart",
2802 id => "party", 2959 id => "party",
2803 title => "Party", 2960 title => "Party",
2804 reply => "gsay ", 2961 reply => "gsay ",
2805 tooltip => "Messages and chat related to your party", 2962 tooltip => "Messages and chat related to your party",
2806 }, 2963 },
2964 "c/death" => {
2965 id => "death",
2966 title => "Death",
2967 reply => undef,
2968 tooltip => "Reason for and more info about your most recent death",
2969 },
2970 "c/say" => $SAY_CHANNEL,
2971 "c/chat" => $CHAT_CHANNEL,
2807); 2972);
2808 2973
2809sub cf::client::send_msg { 2974sub cf::client::send_msg {
2810 my ($self, $channel, $msg, $color, @extra) = @_; 2975 my ($self, $channel, $msg, $color, @extra) = @_;
2811 2976
2816 2981
2817 # check predefined channels, for the benefit of C 2982 # check predefined channels, for the benefit of C
2818 if ($CHANNEL{$channel}) { 2983 if ($CHANNEL{$channel}) {
2819 $channel = $CHANNEL{$channel}; 2984 $channel = $CHANNEL{$channel};
2820 2985
2821 $self->ext_msg (channel_info => $channel) 2986 $self->ext_msg (channel_info => $channel);
2822 if $self->can_msg;
2823
2824 $channel = $channel->{id}; 2987 $channel = $channel->{id};
2825 2988
2826 } elsif (ref $channel) { 2989 } elsif (ref $channel) {
2827 # send meta info to client, if not yet sent 2990 # send meta info to client, if not yet sent
2828 unless (exists $self->{channel}{$channel->{id}}) { 2991 unless (exists $self->{channel}{$channel->{id}}) {
2829 $self->{channel}{$channel->{id}} = $channel; 2992 $self->{channel}{$channel->{id}} = $channel;
2830 $self->ext_msg (channel_info => $channel) 2993 $self->ext_msg (channel_info => $channel);
2831 if $self->can_msg;
2832 } 2994 }
2833 2995
2834 $channel = $channel->{id}; 2996 $channel = $channel->{id};
2835 } 2997 }
2836 2998
2837 return unless @extra || length $msg; 2999 return unless @extra || length $msg;
2838 3000
2839 if ($self->can_msg) {
2840 # default colour, mask it out 3001 # default colour, mask it out
2841 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3002 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2842 if $color & cf::NDI_DEF; 3003 if $color & cf::NDI_DEF;
2843 3004
2844 my $pkt = "msg " 3005 my $pkt = "msg "
2845 . $self->{json_coder}->encode ( 3006 . $self->{json_coder}->encode (
2846 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3007 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2847 ); 3008 );
2848 3009
2849 # try lzf for large packets
2850 $pkt = "lzf " . Compress::LZF::compress $pkt
2851 if 1024 <= length $pkt and $self->{can_lzf};
2852
2853 # split very large packets
2854 if (8192 < length $pkt and $self->{can_lzf}) {
2855 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2856 $pkt = "frag";
2857 }
2858
2859 $self->send_packet ($pkt); 3010 $self->send_big_packet ($pkt);
2860 } else {
2861 if ($color >= 0) {
2862 # replace some tags by gcfclient-compatible ones
2863 for ($msg) {
2864 1 while
2865 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2866 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2867 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2868 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2869 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2870 }
2871
2872 $color &= cf::NDI_COLOR_MASK;
2873
2874 utf8::encode $msg;
2875
2876 if (0 && $msg =~ /\[/) {
2877 # COMMAND/INFO
2878 $self->send_packet ("drawextinfo $color 10 8 $msg")
2879 } else {
2880 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2881 $self->send_packet ("drawinfo $color $msg")
2882 }
2883 }
2884 }
2885} 3011}
2886 3012
2887=item $client->ext_msg ($type, @msg) 3013=item $client->ext_msg ($type, @msg)
2888 3014
2889Sends an ext event to the client. 3015Sends an ext event to the client.
2892 3018
2893sub cf::client::ext_msg($$@) { 3019sub cf::client::ext_msg($$@) {
2894 my ($self, $type, @msg) = @_; 3020 my ($self, $type, @msg) = @_;
2895 3021
2896 if ($self->extcmd == 2) { 3022 if ($self->extcmd == 2) {
2897 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3023 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2898 } elsif ($self->extcmd == 1) { # TODO: remove 3024 } elsif ($self->extcmd == 1) { # TODO: remove
2899 push @msg, msgtype => "event_$type"; 3025 push @msg, msgtype => "event_$type";
2900 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3026 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2901 } 3027 }
2902} 3028}
2903 3029
2904=item $client->ext_reply ($msgid, @msg) 3030=item $client->ext_reply ($msgid, @msg)
2905 3031
2909 3035
2910sub cf::client::ext_reply($$@) { 3036sub cf::client::ext_reply($$@) {
2911 my ($self, $id, @msg) = @_; 3037 my ($self, $id, @msg) = @_;
2912 3038
2913 if ($self->extcmd == 2) { 3039 if ($self->extcmd == 2) {
2914 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3040 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2915 } elsif ($self->extcmd == 1) { 3041 } elsif ($self->extcmd == 1) {
2916 #TODO: version 1, remove 3042 #TODO: version 1, remove
2917 unshift @msg, msgtype => "reply", msgid => $id; 3043 unshift @msg, msgtype => "reply", msgid => $id;
2918 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3044 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2919 } 3045 }
2920} 3046}
2921 3047
2922=item $success = $client->query ($flags, "text", \&cb) 3048=item $success = $client->query ($flags, "text", \&cb)
2923 3049
3024 3150
3025 $coro 3151 $coro
3026} 3152}
3027 3153
3028cf::client->attach ( 3154cf::client->attach (
3029 on_destroy => sub { 3155 on_client_destroy => sub {
3030 my ($ns) = @_; 3156 my ($ns) = @_;
3031 3157
3032 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3158 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3033 }, 3159 },
3034); 3160);
3050our $safe_hole = new Safe::Hole; 3176our $safe_hole = new Safe::Hole;
3051 3177
3052$SIG{FPE} = 'IGNORE'; 3178$SIG{FPE} = 'IGNORE';
3053 3179
3054$safe->permit_only (Opcode::opset qw( 3180$safe->permit_only (Opcode::opset qw(
3055 :base_core :base_mem :base_orig :base_math 3181 :base_core :base_mem :base_orig :base_math :base_loop
3056 grepstart grepwhile mapstart mapwhile 3182 grepstart grepwhile mapstart mapwhile
3057 sort time 3183 sort time
3058)); 3184));
3059 3185
3060# here we export the classes and methods available to script code 3186# here we export the classes and methods available to script code
3064The following functions and methods are available within a safe environment: 3190The following functions and methods are available within a safe environment:
3065 3191
3066 cf::object 3192 cf::object
3067 contr pay_amount pay_player map x y force_find force_add destroy 3193 contr pay_amount pay_player map x y force_find force_add destroy
3068 insert remove name archname title slaying race decrease split 3194 insert remove name archname title slaying race decrease split
3195 value
3069 3196
3070 cf::object::player 3197 cf::object::player
3071 player 3198 player
3072 3199
3073 cf::player 3200 cf::player
3079=cut 3206=cut
3080 3207
3081for ( 3208for (
3082 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3209 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3083 insert remove inv nrof name archname title slaying race 3210 insert remove inv nrof name archname title slaying race
3084 decrease split destroy change_exp)], 3211 decrease split destroy change_exp value msg lore send_msg)],
3085 ["cf::object::player" => qw(player)], 3212 ["cf::object::player" => qw(player)],
3086 ["cf::player" => qw(peaceful)], 3213 ["cf::player" => qw(peaceful send_msg)],
3087 ["cf::map" => qw(trigger)], 3214 ["cf::map" => qw(trigger)],
3088) { 3215) {
3089 no strict 'refs'; 3216 no strict 'refs';
3090 my ($pkg, @funs) = @$_; 3217 my ($pkg, @funs) = @$_;
3091 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3218 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3109 3236
3110 my $qcode = $code; 3237 my $qcode = $code;
3111 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3238 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3112 $qcode =~ s/\n/\\n/g; 3239 $qcode =~ s/\n/\\n/g;
3113 3240
3241 %vars = (_dummy => 0) unless %vars;
3242
3243 my @res;
3114 local $_; 3244 local $_;
3115 local @safe::cf::_safe_eval_args = values %vars;
3116 3245
3117 my $eval = 3246 my $eval =
3118 "do {\n" 3247 "do {\n"
3119 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3248 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3120 . "#line 0 \"{$qcode}\"\n" 3249 . "#line 0 \"{$qcode}\"\n"
3121 . $code 3250 . $code
3122 . "\n}" 3251 . "\n}"
3123 ; 3252 ;
3124 3253
3254 if ($CFG{safe_eval}) {
3125 sub_generation_inc; 3255 sub_generation_inc;
3256 local @safe::cf::_safe_eval_args = values %vars;
3126 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3257 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3127 sub_generation_inc; 3258 sub_generation_inc;
3259 } else {
3260 local @cf::_safe_eval_args = values %vars;
3261 @res = wantarray ? eval eval : scalar eval $eval;
3262 }
3128 3263
3129 if ($@) { 3264 if ($@) {
3130 warn "$@"; 3265 warn "$@";
3131 warn "while executing safe code '$code'\n"; 3266 warn "while executing safe code '$code'\n";
3132 warn "with arguments " . (join " ", %vars) . "\n"; 3267 warn "with arguments " . (join " ", %vars) . "\n";
3151=cut 3286=cut
3152 3287
3153sub register_script_function { 3288sub register_script_function {
3154 my ($fun, $cb) = @_; 3289 my ($fun, $cb) = @_;
3155 3290
3156 no strict 'refs'; 3291 $fun = "safe::$fun" if $CFG{safe_eval};
3157 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3292 *$fun = $safe_hole->wrap ($cb);
3158} 3293}
3159 3294
3160=back 3295=back
3161 3296
3162=cut 3297=cut
3183 3318
3184 $facedata->{version} == 2 3319 $facedata->{version} == 2
3185 or cf::cleanup "$path: version mismatch, cannot proceed."; 3320 or cf::cleanup "$path: version mismatch, cannot proceed.";
3186 3321
3187 # patch in the exptable 3322 # patch in the exptable
3323 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3188 $facedata->{resource}{"res/exp_table"} = { 3324 $facedata->{resource}{"res/exp_table"} = {
3189 type => FT_RSRC, 3325 type => FT_RSRC,
3190 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3326 data => $exp_table,
3327 hash => (Digest::MD5::md5 $exp_table),
3191 }; 3328 };
3192 cf::cede_to_tick; 3329 cf::cede_to_tick;
3193 3330
3194 { 3331 {
3195 my $faces = $facedata->{faceinfo}; 3332 my $faces = $facedata->{faceinfo};
3197 while (my ($face, $info) = each %$faces) { 3334 while (my ($face, $info) = each %$faces) {
3198 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3335 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3199 3336
3200 cf::face::set_visibility $idx, $info->{visibility}; 3337 cf::face::set_visibility $idx, $info->{visibility};
3201 cf::face::set_magicmap $idx, $info->{magicmap}; 3338 cf::face::set_magicmap $idx, $info->{magicmap};
3202 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3339 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3203 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3340 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3204 3341
3205 cf::cede_to_tick; 3342 cf::cede_to_tick;
3206 } 3343 }
3207 3344
3208 while (my ($face, $info) = each %$faces) { 3345 while (my ($face, $info) = each %$faces) {
3232 3369
3233 cf::anim::invalidate_all; # d'oh 3370 cf::anim::invalidate_all; # d'oh
3234 } 3371 }
3235 3372
3236 { 3373 {
3237 # TODO: for gcfclient pleasure, we should give resources
3238 # that gcfclient doesn't grok a >10000 face index.
3239 my $res = $facedata->{resource}; 3374 my $res = $facedata->{resource};
3240 3375
3241 while (my ($name, $info) = each %$res) { 3376 while (my ($name, $info) = each %$res) {
3242 if (defined $info->{type}) { 3377 if (defined $info->{type}) {
3243 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3378 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3244 my $data;
3245 3379
3246 if ($info->{type} & 1) { 3380 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3247 # prepend meta info
3248
3249 my $meta = $enc->encode ({
3250 name => $name,
3251 %{ $info->{meta} || {} },
3252 });
3253
3254 $data = pack "(w/a*)*", $meta, $info->{data};
3255 } else {
3256 $data = $info->{data};
3257 }
3258
3259 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3260 cf::face::set_type $idx, $info->{type}; 3381 cf::face::set_type $idx, $info->{type};
3261 } else { 3382 } else {
3262 $RESOURCE{$name} = $info; 3383 $RESOURCE{$name} = $info;
3263 } 3384 }
3264 3385
3347 reload_treasures; 3468 reload_treasures;
3348 3469
3349 warn "finished reloading resource files\n"; 3470 warn "finished reloading resource files\n";
3350} 3471}
3351 3472
3352sub init {
3353 my $guard = freeze_mainloop;
3354
3355 evthread_start IO::AIO::poll_fileno;
3356
3357 reload_resources;
3358}
3359
3360sub reload_config { 3473sub reload_config {
3474 warn "reloading config file...\n";
3475
3361 open my $fh, "<:utf8", "$CONFDIR/config" 3476 open my $fh, "<:utf8", "$CONFDIR/config"
3362 or return; 3477 or return;
3363 3478
3364 local $/; 3479 local $/;
3365 *CFG = YAML::Load <$fh>; 3480 *CFG = YAML::XS::Load scalar <$fh>;
3366 3481
3367 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3482 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3368 3483
3369 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3484 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3370 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3485 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3374 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3489 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3375 and die "WARNING: m(un)lockall failed: $!\n"; 3490 and die "WARNING: m(un)lockall failed: $!\n";
3376 }; 3491 };
3377 warn $@ if $@; 3492 warn $@ if $@;
3378 } 3493 }
3494
3495 warn "finished reloading resource files\n";
3379} 3496}
3380 3497
3381sub pidfile() { 3498sub pidfile() {
3382 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3499 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3383 or die "$PIDFILE: $!"; 3500 or die "$PIDFILE: $!";
3395 3512
3396 seek $fh, 0, 0; 3513 seek $fh, 0, 0;
3397 print $fh $$; 3514 print $fh $$;
3398} 3515}
3399 3516
3517sub main_loop {
3518 warn "EV::loop starting\n";
3519 if (1) {
3520 EV::loop;
3521 }
3522 warn "EV::loop returned\n";
3523 goto &main_loop unless $REALLY_UNLOOP;
3524}
3525
3400sub main { 3526sub main {
3401 atomic; 3527 cf::init_globals; # initialise logging
3528
3529 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3530 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3531 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3532 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3533
3534 cf::init_experience;
3535 cf::init_anim;
3536 cf::init_attackmess;
3537 cf::init_dynamic;
3538
3539 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3402 3540
3403 # we must not ever block the main coroutine 3541 # we must not ever block the main coroutine
3404 local $Coro::idle = sub { 3542 local $Coro::idle = sub {
3405 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3543 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3406 (async { 3544 (async {
3407 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3545 $Coro::current->{desc} = "IDLE BUG HANDLER";
3408 EV::loop EV::LOOP_ONESHOT; 3546 EV::loop EV::LOOP_ONESHOT;
3409 })->prio (Coro::PRIO_MAX); 3547 })->prio (Coro::PRIO_MAX);
3410 }; 3548 };
3411 3549
3412 { 3550 evthread_start IO::AIO::poll_fileno;
3413 my $guard = freeze_mainloop; 3551
3552 cf::sync_job {
3553 cf::load_settings;
3554 cf::load_materials;
3555
3556 reload_resources;
3414 reload_config; 3557 reload_config;
3415 db_init; 3558 db_init;
3559
3560 cf::init_uuid;
3561 cf::init_signals;
3562 cf::init_skills;
3563
3564 cf::init_beforeplay;
3565
3566 atomic;
3567
3416 load_extensions; 3568 load_extensions;
3417 3569
3418 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3419 }
3420
3421 utime time, time, $RUNTIMEFILE; 3570 utime time, time, $RUNTIMEFILE;
3422 3571
3423 # no (long-running) fork's whatsoever before this point(!) 3572 # no (long-running) fork's whatsoever before this point(!)
3573 use POSIX ();
3424 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3574 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3425 3575
3426 EV::loop; 3576 (pop @POST_INIT)->(0) while @POST_INIT;
3577 };
3578
3579 main_loop;
3427} 3580}
3428 3581
3429############################################################################# 3582#############################################################################
3430# initialisation and cleanup 3583# initialisation and cleanup
3431 3584
3432# install some emergency cleanup handlers 3585# install some emergency cleanup handlers
3433BEGIN { 3586BEGIN {
3434 our %SIGWATCHER = (); 3587 our %SIGWATCHER = ();
3435 for my $signal (qw(INT HUP TERM)) { 3588 for my $signal (qw(INT HUP TERM)) {
3436 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3589 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3437 cf::cleanup "SIG$signal"; 3590 cf::cleanup "SIG$signal";
3438 }; 3591 };
3439 } 3592 }
3440} 3593}
3441 3594
3442sub write_runtime_sync { 3595sub write_runtime_sync {
3596 my $t0 = AE::time;
3597
3443 # first touch the runtime file to show we are still running: 3598 # first touch the runtime file to show we are still running:
3444 # the fsync below can take a very very long time. 3599 # the fsync below can take a very very long time.
3445 3600
3446 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3601 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3447 3602
3448 my $guard = cf::lock_acquire "write_runtime"; 3603 my $guard = cf::lock_acquire "write_runtime";
3449 3604
3450 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3605 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3451 or return; 3606 or return;
3452 3607
3453 my $value = $cf::RUNTIME + 90 + 10; 3608 my $value = $cf::RUNTIME + 90 + 10;
3454 # 10 is the runtime save interval, for a monotonic clock 3609 # 10 is the runtime save interval, for a monotonic clock
3455 # 60 allows for the watchdog to kill the server. 3610 # 60 allows for the watchdog to kill the server.
3468 or return; 3623 or return;
3469 3624
3470 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3625 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3471 and return; 3626 and return;
3472 3627
3473 warn "runtime file written.\n"; 3628 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3474 3629
3475 1 3630 1
3476} 3631}
3477 3632
3478our $uuid_lock; 3633our $uuid_lock;
3487 my $uuid = "$LOCALDIR/uuid"; 3642 my $uuid = "$LOCALDIR/uuid";
3488 3643
3489 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3644 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3490 or return; 3645 or return;
3491 3646
3492 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3647 my $value = uuid_seq uuid_cur;
3648
3649 unless ($value) {
3650 warn "cowardly refusing to write zero uuid value!\n";
3651 return;
3652 }
3653
3654 my $value = uuid_str $value + $uuid_skip;
3493 $uuid_skip = 0; 3655 $uuid_skip = 0;
3494 3656
3495 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3657 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3496 and return; 3658 and return;
3497 3659
3519} 3681}
3520 3682
3521sub emergency_save() { 3683sub emergency_save() {
3522 my $freeze_guard = cf::freeze_mainloop; 3684 my $freeze_guard = cf::freeze_mainloop;
3523 3685
3524 warn "enter emergency perl save\n"; 3686 warn "emergency_perl_save: enter\n";
3525 3687
3526 cf::sync_job { 3688 cf::sync_job {
3689 # this is a trade-off: we want to be very quick here, so
3690 # save all maps without fsync, and later call a global sync
3691 # (which in turn might be very very slow)
3692 local $USE_FSYNC = 0;
3693
3527 # use a peculiar iteration method to avoid tripping on perl 3694 # use a peculiar iteration method to avoid tripping on perl
3528 # refcount bugs in for. also avoids problems with players 3695 # refcount bugs in for. also avoids problems with players
3529 # and maps saved/destroyed asynchronously. 3696 # and maps saved/destroyed asynchronously.
3530 warn "begin emergency player save\n"; 3697 warn "emergency_perl_save: begin player save\n";
3531 for my $login (keys %cf::PLAYER) { 3698 for my $login (keys %cf::PLAYER) {
3532 my $pl = $cf::PLAYER{$login} or next; 3699 my $pl = $cf::PLAYER{$login} or next;
3533 $pl->valid or next; 3700 $pl->valid or next;
3534 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3701 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3535 $pl->save; 3702 $pl->save;
3536 } 3703 }
3537 warn "end emergency player save\n"; 3704 warn "emergency_perl_save: end player save\n";
3538 3705
3539 warn "begin emergency map save\n"; 3706 warn "emergency_perl_save: begin map save\n";
3540 for my $path (keys %cf::MAP) { 3707 for my $path (keys %cf::MAP) {
3541 my $map = $cf::MAP{$path} or next; 3708 my $map = $cf::MAP{$path} or next;
3542 $map->valid or next; 3709 $map->valid or next;
3543 $map->save; 3710 $map->save;
3544 } 3711 }
3545 warn "end emergency map save\n"; 3712 warn "emergency_perl_save: end map save\n";
3546 3713
3547 warn "begin emergency database checkpoint\n"; 3714 warn "emergency_perl_save: begin database checkpoint\n";
3548 BDB::db_env_txn_checkpoint $DB_ENV; 3715 BDB::db_env_txn_checkpoint $DB_ENV;
3549 warn "end emergency database checkpoint\n"; 3716 warn "emergency_perl_save: end database checkpoint\n";
3550 3717
3551 warn "begin write uuid\n"; 3718 warn "emergency_perl_save: begin write uuid\n";
3552 write_uuid_sync 1; 3719 write_uuid_sync 1;
3553 warn "end write uuid\n"; 3720 warn "emergency_perl_save: end write uuid\n";
3554 }; 3721 };
3555 3722
3723 warn "emergency_perl_save: starting sync()\n";
3724 IO::AIO::aio_sync sub {
3725 warn "emergency_perl_save: finished sync()\n";
3726 };
3727
3556 warn "leave emergency perl save\n"; 3728 warn "emergency_perl_save: leave\n";
3557} 3729}
3558 3730
3559sub post_cleanup { 3731sub post_cleanup {
3560 my ($make_core) = @_; 3732 my ($make_core) = @_;
3561 3733
3587 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3759 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3588 for my $name (keys %$leaf_symtab) { 3760 for my $name (keys %$leaf_symtab) {
3589 _gv_clear *{"$pkg$name"}; 3761 _gv_clear *{"$pkg$name"};
3590# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3762# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3591 } 3763 }
3592 warn "cleared package #$pkg\n";#d# 3764 warn "cleared package $pkg\n";#d#
3593} 3765}
3594
3595our $RELOAD; # how many times to reload
3596 3766
3597sub do_reload_perl() { 3767sub do_reload_perl() {
3598 # can/must only be called in main 3768 # can/must only be called in main
3599 if ($Coro::current != $Coro::main) { 3769 if ($Coro::current != $Coro::main) {
3600 warn "can only reload from main coroutine"; 3770 warn "can only reload from main coroutine";
3601 return; 3771 return;
3602 } 3772 }
3603 3773
3604 return if $RELOAD++; 3774 return if $RELOAD++;
3775
3776 my $t1 = AE::time;
3605 3777
3606 while ($RELOAD) { 3778 while ($RELOAD) {
3607 warn "reloading..."; 3779 warn "reloading...";
3608 3780
3609 warn "entering sync_job"; 3781 warn "entering sync_job";
3670 clear_package "safe::$_" 3842 clear_package "safe::$_"
3671 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3843 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3672 3844
3673 warn "unloading cf.pm \"a bit\""; 3845 warn "unloading cf.pm \"a bit\"";
3674 delete $INC{"cf.pm"}; 3846 delete $INC{"cf.pm"};
3675 delete $INC{"cf/pod.pm"}; 3847 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3676 3848
3677 # don't, removes xs symbols, too, 3849 # don't, removes xs symbols, too,
3678 # and global variables created in xs 3850 # and global variables created in xs
3679 #clear_package __PACKAGE__; 3851 #clear_package __PACKAGE__;
3680 3852
3681 warn "unload completed, starting to reload now"; 3853 warn "unload completed, starting to reload now";
3682 3854
3683 warn "reloading cf.pm"; 3855 warn "reloading cf.pm";
3684 require cf; 3856 require cf;
3685 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3857 cf::_connect_to_perl_1;
3686 3858
3687 warn "loading config and database again"; 3859 warn "loading config and database again";
3688 cf::reload_config; 3860 cf::reload_config;
3689 3861
3690 warn "loading extensions"; 3862 warn "loading extensions";
3691 cf::load_extensions; 3863 cf::load_extensions;
3692 3864
3865 if ($REATTACH_ON_RELOAD) {
3693 warn "reattaching attachments to objects/players"; 3866 warn "reattaching attachments to objects/players";
3694 _global_reattach; # objects, sockets 3867 _global_reattach; # objects, sockets
3695 warn "reattaching attachments to maps"; 3868 warn "reattaching attachments to maps";
3696 reattach $_ for values %MAP; 3869 reattach $_ for values %MAP;
3697 warn "reattaching attachments to players"; 3870 warn "reattaching attachments to players";
3698 reattach $_ for values %PLAYER; 3871 reattach $_ for values %PLAYER;
3872 }
3873
3874 warn "running post_init jobs";
3875 (pop @POST_INIT)->(1) while @POST_INIT;
3699 3876
3700 warn "leaving sync_job"; 3877 warn "leaving sync_job";
3701 3878
3702 1 3879 1
3703 } or do { 3880 } or do {
3706 }; 3883 };
3707 3884
3708 warn "reloaded"; 3885 warn "reloaded";
3709 --$RELOAD; 3886 --$RELOAD;
3710 } 3887 }
3888
3889 $t1 = AE::time - $t1;
3890 warn "reload completed in ${t1}s\n";
3711}; 3891};
3712 3892
3713our $RELOAD_WATCHER; # used only during reload 3893our $RELOAD_WATCHER; # used only during reload
3714 3894
3715sub reload_perl() { 3895sub reload_perl() {
3716 # doing reload synchronously and two reloads happen back-to-back, 3896 # doing reload synchronously and two reloads happen back-to-back,
3717 # coro crashes during coro_state_free->destroy here. 3897 # coro crashes during coro_state_free->destroy here.
3718 3898
3899 $RELOAD_WATCHER ||= cf::async {
3900 Coro::AIO::aio_wait cache_extensions;
3901
3719 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3902 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3720 do_reload_perl; 3903 do_reload_perl;
3721 undef $RELOAD_WATCHER; 3904 undef $RELOAD_WATCHER;
3905 };
3722 }; 3906 };
3723} 3907}
3724 3908
3725register_command "reload" => sub { 3909register_command "reload" => sub {
3726 my ($who, $arg) = @_; 3910 my ($who, $arg) = @_;
3740 3924
3741our @WAIT_FOR_TICK; 3925our @WAIT_FOR_TICK;
3742our @WAIT_FOR_TICK_BEGIN; 3926our @WAIT_FOR_TICK_BEGIN;
3743 3927
3744sub wait_for_tick { 3928sub wait_for_tick {
3745 return if tick_inhibit || $Coro::current == $Coro::main; 3929 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3746 3930
3747 my $signal = new Coro::Signal; 3931 my $signal = new Coro::Signal;
3748 push @WAIT_FOR_TICK, $signal; 3932 push @WAIT_FOR_TICK, $signal;
3749 $signal->wait; 3933 $signal->wait;
3750} 3934}
3751 3935
3752sub wait_for_tick_begin { 3936sub wait_for_tick_begin {
3753 return if tick_inhibit || $Coro::current == $Coro::main; 3937 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3754 3938
3755 my $signal = new Coro::Signal; 3939 my $signal = new Coro::Signal;
3756 push @WAIT_FOR_TICK_BEGIN, $signal; 3940 push @WAIT_FOR_TICK_BEGIN, $signal;
3757 $signal->wait; 3941 $signal->wait;
3758} 3942}
3763 unless ++$bug_warning > 10; 3947 unless ++$bug_warning > 10;
3764 return; 3948 return;
3765 } 3949 }
3766 3950
3767 cf::server_tick; # one server iteration 3951 cf::server_tick; # one server iteration
3952
3953 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3768 3954
3769 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3955 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3770 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3956 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3771 Coro::async_pool { 3957 Coro::async_pool {
3772 $Coro::current->{desc} = "runtime saver"; 3958 $Coro::current->{desc} = "runtime saver";
3795} 3981}
3796 3982
3797{ 3983{
3798 # configure BDB 3984 # configure BDB
3799 3985
3800 BDB::min_parallel 8; 3986 BDB::min_parallel 16;
3801 BDB::max_poll_reqs $TICK * 0.1; 3987 BDB::max_poll_reqs $TICK * 0.1;
3802 $AnyEvent::BDB::WATCHER->priority (1); 3988 $AnyEvent::BDB::WATCHER->priority (1);
3803 3989
3804 unless ($DB_ENV) { 3990 unless ($DB_ENV) {
3805 $DB_ENV = BDB::db_env_create; 3991 $DB_ENV = BDB::db_env_create;
3885 LOG llevInfo, "[ABT] [suppressed]\n"; 4071 LOG llevInfo, "[ABT] [suppressed]\n";
3886 } 4072 }
3887} 4073}
3888 4074
3889# load additional modules 4075# load additional modules
3890use cf::pod; 4076require "cf/$_.pm" for @EXTRA_MODULES;
4077cf::_connect_to_perl_2;
3891 4078
3892END { cf::emergency_save } 4079END { cf::emergency_save }
3893 4080
38941 40811
3895 4082

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines