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.453 by root, Tue Sep 23 04:29:11 2008 UTC vs.
Revision 1.511 by root, Wed Apr 7 18:35:56 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";
… …
103our %RESOURCE; 111our %RESOURCE;
104 112
105our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 113our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
106our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 114our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
107our $NEXT_TICK; 115our $NEXT_TICK;
108our $USE_FSYNC = 1; # use fsync to write maps - default off 116our $USE_FSYNC = 1; # use fsync to write maps - default on
109 117
110our $BDB_DEADLOCK_WATCHER; 118our $BDB_DEADLOCK_WATCHER;
111our $BDB_CHECKPOINT_WATCHER; 119our $BDB_CHECKPOINT_WATCHER;
112our $BDB_TRICKLE_WATCHER; 120our $BDB_TRICKLE_WATCHER;
113our $DB_ENV; 121our $DB_ENV;
114 122
123our @EXTRA_MODULES = qw(pod match mapscript);
124
115our %CFG; 125our %CFG;
116 126
117our $UPTIME; $UPTIME ||= time; 127our $UPTIME; $UPTIME ||= time;
118our $RUNTIME; 128our $RUNTIME;
119our $NOW; 129our $NOW;
… …
129our $LOADAVG; # same thing, but with alpha-smoothing 139our $LOADAVG; # same thing, but with alpha-smoothing
130our $JITTER; # average jitter 140our $JITTER; # average jitter
131our $TICK_START; # for load detecting purposes 141our $TICK_START; # for load detecting purposes
132 142
133our @POST_INIT; 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 :)
134 147
135binmode STDOUT; 148binmode STDOUT;
136binmode STDERR; 149binmode STDERR;
137 150
138# read virtual server time, if available 151# read virtual server time, if available
… …
140 open my $fh, "<", $RUNTIMEFILE 153 open my $fh, "<", $RUNTIMEFILE
141 or die "unable to read $RUNTIMEFILE file: $!"; 154 or die "unable to read $RUNTIMEFILE file: $!";
142 $RUNTIME = <$fh> + 0.; 155 $RUNTIME = <$fh> + 0.;
143} 156}
144 157
158eval "sub TICK() { $TICK } 1" or die;
159
145mkdir $_ 160mkdir $_
146 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 161 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
147 162
148our $EMERGENCY_POSITION; 163our $EMERGENCY_POSITION;
149 164
150sub 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::"} };
151 177
152############################################################################# 178#############################################################################
153 179
154=head2 GLOBAL VARIABLES 180=head2 GLOBAL VARIABLES
155 181
… …
202returns 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
203per 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.
204 230
205=item @cf::INVOKE_RESULTS 231=item @cf::INVOKE_RESULTS
206 232
207This array contains the results of the last C<invoke ()> call. When 233This 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 234C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
209that call. 235that call.
210 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
211=back 243=back
212 244
213=cut 245=cut
214 246
215BEGIN { 247$Coro::State::WARNHOOK = sub {
216 *CORE::GLOBAL::warn = sub {
217 my $msg = join "", @_; 248 my $msg = join "", @_;
218 249
219 $msg .= "\n" 250 $msg .= "\n"
220 unless $msg =~ /\n$/; 251 unless $msg =~ /\n$/;
221 252
222 $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;
223 254
224 LOG llevError, $msg; 255 LOG llevError, $msg;
225 }; 256};
226}
227 257
228$Coro::State::DIEHOOK = sub { 258$Coro::State::DIEHOOK = sub {
229 return unless $^S eq 0; # "eq", not "==" 259 return unless $^S eq 0; # "eq", not "=="
260
261 warn Carp::longmess $_[0];
230 262
231 if ($Coro::current == $Coro::main) {#d# 263 if ($Coro::current == $Coro::main) {#d#
232 warn "DIEHOOK called in main context, Coro bug?\n";#d# 264 warn "DIEHOOK called in main context, Coro bug?\n";#d#
233 return;#d# 265 return;#d#
234 }#d# 266 }#d#
235 267
236 # kill coroutine otherwise 268 # kill coroutine otherwise
237 warn Carp::longmess $_[0];
238 Coro::terminate 269 Coro::terminate
239}; 270};
240
241$SIG{__DIE__} = sub { }; #d#?
242 271
243@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 272@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
244@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 273@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
245@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 274@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
246@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 275@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
260)) { 289)) {
261 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 290 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
262} 291}
263 292
264$EV::DIED = sub { 293$EV::DIED = sub {
265 warn "error in event callback: @_"; 294 Carp::cluck "error in event callback: @_";
266}; 295};
267 296
268############################################################################# 297#############################################################################
269 298
270=head2 UTILITY FUNCTIONS 299=head2 UTILITY FUNCTIONS
… …
328Wait until the given lock is available. See cf::lock_acquire. 357Wait until the given lock is available. See cf::lock_acquire.
329 358
330=item my $lock = cf::lock_acquire $string 359=item my $lock = cf::lock_acquire $string
331 360
332Wait 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
333a 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,
334for example when the coroutine gets canceled), the lock is automatically 363for example when the coroutine gets canceled), the lock is automatically
335returned. 364returned.
336 365
337Locks 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
338deadlocked coro. 367deadlocked coro.
… …
344 373
345Return 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.
346 375
347=cut 376=cut
348 377
349our %LOCK; 378our $LOCKS = new Coro::SemaphoreSet;
350our %LOCKER;#d#
351 379
352sub lock_wait($) { 380sub lock_wait($) {
353 my ($key) = @_; 381 $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} 382}
367 383
368sub lock_acquire($) { 384sub lock_acquire($) {
369 my ($key) = @_; 385 $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} 386}
383 387
384sub lock_active($) { 388sub lock_active($) {
385 my ($key) = @_; 389 $LOCKS->count ($_[0]) < 1
386
387 ! ! $LOCK{$key}
388} 390}
389 391
390sub freeze_mainloop { 392sub freeze_mainloop {
391 tick_inhibit_inc; 393 tick_inhibit_inc;
392 394
393 Coro::guard \&tick_inhibit_dec; 395 &Guard::guard (\&tick_inhibit_dec);
394} 396}
395 397
396=item cf::periodic $interval, $cb 398=item cf::periodic $interval, $cb
397 399
398Like 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
… …
421 423
422=cut 424=cut
423 425
424our @SLOT_QUEUE; 426our @SLOT_QUEUE;
425our $SLOT_QUEUE; 427our $SLOT_QUEUE;
428our $SLOT_DECAY = 0.9;
426 429
427$SLOT_QUEUE->cancel if $SLOT_QUEUE; 430$SLOT_QUEUE->cancel if $SLOT_QUEUE;
428$SLOT_QUEUE = Coro::async { 431$SLOT_QUEUE = Coro::async {
429 $Coro::current->desc ("timeslot manager"); 432 $Coro::current->desc ("timeslot manager");
430 433
431 my $signal = new Coro::Signal; 434 my $signal = new Coro::Signal;
435 my $busy;
432 436
433 while () { 437 while () {
434 next_job: 438 next_job:
439
435 my $avail = cf::till_tick; 440 my $avail = cf::till_tick;
436 if ($avail > 0.01) { 441
437 for (0 .. $#SLOT_QUEUE) { 442 for (0 .. $#SLOT_QUEUE) {
438 if ($SLOT_QUEUE[$_][0] < $avail) { 443 if ($SLOT_QUEUE[$_][0] <= $avail) {
444 $busy = 0;
439 my $job = splice @SLOT_QUEUE, $_, 1, (); 445 my $job = splice @SLOT_QUEUE, $_, 1, ();
440 $job->[2]->send; 446 $job->[2]->send;
441 Coro::cede; 447 Coro::cede;
442 goto next_job; 448 goto next_job;
443 } 449 } else {
450 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
444 } 451 }
445 } 452 }
446 453
447 if (@SLOT_QUEUE) { 454 if (@SLOT_QUEUE) {
448 # 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
449 push @cf::WAIT_FOR_TICK, $signal; 456 push @cf::WAIT_FOR_TICK, $signal;
450 $signal->wait; 457 $signal->wait;
451 } else { 458 } else {
459 $busy = 0;
452 Coro::schedule; 460 Coro::schedule;
453 } 461 }
454 } 462 }
455}; 463};
456 464
457sub get_slot($;$$) { 465sub get_slot($;$$) {
458 return if tick_inhibit || $Coro::current == $Coro::main; 466 return if tick_inhibit || $Coro::current == $Coro::main;
459 467
460 my ($time, $pri, $name) = @_; 468 my ($time, $pri, $name) = @_;
461 469
462 $time = $TICK * .6 if $time > $TICK * .6; 470 $time = clamp $time, 0.01, $TICK * .6;
471
463 my $sig = new Coro::Signal; 472 my $sig = new Coro::Signal;
464 473
465 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 474 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
466 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 475 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
467 $SLOT_QUEUE->ready; 476 $SLOT_QUEUE->ready;
… …
1170 $decname, length $$rdata, scalar @$objs; 1179 $decname, length $$rdata, scalar @$objs;
1171 1180
1172 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1181 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1173 aio_chmod $fh, SAVE_MODE; 1182 aio_chmod $fh, SAVE_MODE;
1174 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1183 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1175 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 }
1176 aio_close $fh; 1188 aio_close $fh;
1177 1189
1178 if (@$objs) { 1190 if (@$objs) {
1179 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) {
1180 aio_chmod $fh, SAVE_MODE; 1192 aio_chmod $fh, SAVE_MODE;
1181 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1193 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1182 aio_write $fh, 0, (length $data), $data, 0; 1194 aio_write $fh, 0, (length $data), $data, 0;
1183 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 }
1184 aio_close $fh; 1199 aio_close $fh;
1185 aio_rename "$filename.pst~", "$filename.pst"; 1200 aio_rename "$filename.pst~", "$filename.pst";
1186 } 1201 }
1187 } else { 1202 } else {
1188 aio_unlink "$filename.pst"; 1203 aio_unlink "$filename.pst";
1189 } 1204 }
1190 1205
1191 aio_rename "$filename~", $filename; 1206 aio_rename "$filename~", $filename;
1207
1208 $filename =~ s%/[^/]+$%%;
1209 aio_pathsync $filename if $cf::USE_FSYNC;
1192 } else { 1210 } else {
1193 warn "FATAL: $filename~: $!\n"; 1211 warn "unable to save objects: $filename~: $!\n";
1194 } 1212 }
1195 } else { 1213 } else {
1196 aio_unlink $filename; 1214 aio_unlink $filename;
1197 aio_unlink "$filename.pst"; 1215 aio_unlink "$filename.pst";
1198 } 1216 }
… …
1289 my ($name, $cb) = @_; 1307 my ($name, $cb) = @_;
1290 1308
1291 $EXTICMD{$name} = $cb; 1309 $EXTICMD{$name} = $cb;
1292} 1310}
1293 1311
1312use File::Glob ();
1313
1294cf::player->attach ( 1314cf::player->attach (
1295 on_command => sub { 1315 on_unknown_command => sub {
1296 my ($pl, $name, $params) = @_; 1316 my ($pl, $name, $params) = @_;
1297 1317
1298 my $cb = $COMMAND{$name} 1318 my $cb = $COMMAND{$name}
1299 or return; 1319 or return;
1300 1320
… …
1330 1350
1331 cf::override; 1351 cf::override;
1332 }, 1352 },
1333); 1353);
1334 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
1335sub load_extensions { 1368sub load_extensions {
1336 cf::sync_job { 1369 cf::sync_job {
1337 my %todo; 1370 my %todo;
1338 1371
1339 for my $path (<$LIBDIR/*.ext>) { 1372 for my $path (<$LIBDIR/*.ext>) {
… …
1366 . "\n};\n1"; 1399 . "\n};\n1";
1367 1400
1368 $todo{$base} = \%ext; 1401 $todo{$base} = \%ext;
1369 } 1402 }
1370 1403
1404 my $pass = 0;
1371 my %done; 1405 my %done;
1372 while (%todo) { 1406 while (%todo) {
1373 my $progress; 1407 my $progress;
1374 1408
1409 ++$pass;
1410
1411 ext:
1375 while (my ($k, $v) = each %todo) { 1412 while (my ($k, $v) = each %todo) {
1376 for (split /,\s*/, $v->{meta}{depends}) { 1413 for (split /,\s*/, $v->{meta}{depends}) {
1377 goto skip 1414 next ext
1378 unless exists $done{$_}; 1415 unless exists $done{$_};
1379 } 1416 }
1380 1417
1381 warn "... loading '$k' into '$v->{pkg}'\n"; 1418 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1382 1419
1383 unless (eval $v->{source}) { 1420 my $active = eval $v->{source};
1421
1422 if (length $@) {
1384 my $msg = $@ ? "$v->{path}: $@\n" 1423 warn "$v->{path}: $@\n";
1385 : "$v->{base}: extension inactive.\n";
1386 1424
1387 if (exists $v->{meta}{mandatory}) {
1388 warn $msg;
1389 cf::cleanup "mandatory extension failed to load, exiting."; 1425 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1390 } 1426 if exists $v->{meta}{mandatory};
1391 1427 } else {
1392 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;
1393 } 1434 }
1394
1395 $done{$k} = delete $todo{$k};
1396 push @EXTS, $v->{pkg};
1397 $progress = 1;
1398 } 1435 }
1399 1436
1400 skip: 1437 unless ($progress) {
1401 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1438 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1402 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 }
1403 } 1445 }
1404 }; 1446 };
1405} 1447}
1406 1448
1407############################################################################# 1449#############################################################################
… …
1491 $cf::PLAYER{$login} = $pl 1533 $cf::PLAYER{$login} = $pl
1492 } 1534 }
1493 } 1535 }
1494} 1536}
1495 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
1496sub save($) { 1551sub save($) {
1497 my ($pl) = @_; 1552 my ($pl) = @_;
1498 1553
1499 return if $pl->{deny_save}; 1554 return if $pl->{deny_save};
1500 1555
… …
1505 1560
1506 aio_mkdir playerdir $pl, 0770; 1561 aio_mkdir playerdir $pl, 0770;
1507 $pl->{last_save} = $cf::RUNTIME; 1562 $pl->{last_save} = $cf::RUNTIME;
1508 1563
1509 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];
1510 1568
1511 $pl->save_pl ($path); 1569 $pl->save_pl ($path);
1512 cf::cede_to_tick; 1570 cf::cede_to_tick;
1513} 1571}
1514 1572
… …
1727 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
1728 1786
1729 # mit "rum" bekleckern, nicht 1787 # mit "rum" bekleckern, nicht
1730 $self->_create_random_map ( 1788 $self->_create_random_map (
1731 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1789 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1732 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1790 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1733 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1791 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1734 $rmp->{exit_on_final_map}, 1792 $rmp->{exit_on_final_map},
1735 $rmp->{xsize}, $rmp->{ysize}, 1793 $rmp->{xsize}, $rmp->{ysize},
1736 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1794 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1737 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1795 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
1867 1925
1868 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1926 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1869 "$UNIQUEDIR/$path" 1927 "$UNIQUEDIR/$path"
1870} 1928}
1871 1929
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 { 1930sub decay_objects {
1882 my ($self) = @_; 1931 my ($self) = @_;
1883 1932
1884 return if $self->{deny_reset}; 1933 return if $self->{deny_reset};
1885 1934
… …
1967sub find { 2016sub find {
1968 my ($path, $origin) = @_; 2017 my ($path, $origin) = @_;
1969 2018
1970 $path = normalise $path, $origin && $origin->path; 2019 $path = normalise $path, $origin && $origin->path;
1971 2020
1972 cf::lock_wait "map_data:$path";#d#remove 2021 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1973 cf::lock_wait "map_find:$path"; 2022 my $guard2 = cf::lock_acquire "map_find:$path";
1974 2023
1975 $cf::MAP{$path} || do { 2024 $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 2025 my $map = new_from_path cf::map $path
1980 or return; 2026 or return;
1981 2027
1982 $map->{last_save} = $cf::RUNTIME; 2028 $map->{last_save} = $cf::RUNTIME;
1983 2029
… …
1995 2041
1996 $cf::MAP{$path} = $map 2042 $cf::MAP{$path} = $map
1997 } 2043 }
1998} 2044}
1999 2045
2000sub pre_load { } 2046sub pre_load { }
2001sub post_load { } 2047#sub post_load { } # XS
2002 2048
2003sub load { 2049sub load {
2004 my ($self) = @_; 2050 my ($self) = @_;
2005 2051
2006 local $self->{deny_reset} = 1; # loading can take a long time 2052 local $self->{deny_reset} = 1; # loading can take a long time
… …
2051 unless ($self->{deny_activate}) { 2097 unless ($self->{deny_activate}) {
2052 $self->decay_objects; 2098 $self->decay_objects;
2053 $self->fix_auto_apply; 2099 $self->fix_auto_apply;
2054 $self->update_buttons; 2100 $self->update_buttons;
2055 cf::cede_to_tick; 2101 cf::cede_to_tick;
2056 $self->set_darkness_map;
2057 cf::cede_to_tick;
2058 $self->activate; 2102 $self->activate;
2059 } 2103 }
2060 2104
2061 $self->{last_save} = $cf::RUNTIME; 2105 $self->{last_save} = $cf::RUNTIME;
2062 $self->last_access ($cf::RUNTIME); 2106 $self->last_access ($cf::RUNTIME);
… …
2065 } 2109 }
2066 2110
2067 $self->post_load; 2111 $self->post_load;
2068} 2112}
2069 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
2070sub customise_for { 2117sub customise_for {
2071 my ($self, $ob) = @_; 2118 my ($self, $ob) = @_;
2072 2119
2073 return find "~" . $ob->name . "/" . $self->{path} 2120 return find "~" . $ob->name . "/" . $self->{path}
2074 if $self->per_player; 2121 if $self->per_player;
… …
2228 2275
2229 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2276 my $lock = cf::lock_acquire "map_data:$self->{path}";
2230 2277
2231 return if $self->players; 2278 return if $self->players;
2232 2279
2233 warn "resetting map ", $self->path; 2280 warn "resetting map ", $self->path, "\n";
2234 2281
2235 $self->in_memory (cf::MAP_SWAPPED); 2282 $self->in_memory (cf::MAP_SWAPPED);
2236 2283
2237 # need to save uniques path 2284 # need to save uniques path
2238 unless ($self->{deny_save}) { 2285 unless ($self->{deny_save}) {
… …
2329 : normalise $_ 2376 : normalise $_
2330 } @{ aio_readdir $UNIQUEDIR or [] } 2377 } @{ aio_readdir $UNIQUEDIR or [] }
2331 ] 2378 ]
2332} 2379}
2333 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
2334=back 2413=back
2335 2414
2336=head3 cf::object 2415=head3 cf::object
2337 2416
2338=cut 2417=cut
… …
2403 2482
2404our $SAY_CHANNEL = { 2483our $SAY_CHANNEL = {
2405 id => "say", 2484 id => "say",
2406 title => "Map", 2485 title => "Map",
2407 reply => "say ", 2486 reply => "say ",
2408 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.",
2409}; 2488};
2410 2489
2411our $CHAT_CHANNEL = { 2490our $CHAT_CHANNEL = {
2412 id => "chat", 2491 id => "chat",
2413 title => "Chat", 2492 title => "Chat",
… …
2533 ($x, $y) = (-1, -1) 2612 ($x, $y) = (-1, -1)
2534 unless (defined $x) && (defined $y); 2613 unless (defined $x) && (defined $y);
2535 2614
2536 # use -1 or undef as default coordinates, not 0, 0 2615 # use -1 or undef as default coordinates, not 0, 0
2537 ($x, $y) = ($map->enter_x, $map->enter_y) 2616 ($x, $y) = ($map->enter_x, $map->enter_y)
2538 if $x <=0 && $y <= 0; 2617 if $x <= 0 && $y <= 0;
2539 2618
2540 $map->load; 2619 $map->load;
2541 $map->load_neighbours; 2620 $map->load_neighbours;
2542 2621
2543 return unless $self->contr->active; 2622 return unless $self->contr->active;
2544 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2545 $self->activate_recursive;
2546 2623
2547 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2624 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2548 $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;
2549} 2629}
2550 2630
2551=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2631=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2552 2632
2553Moves 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
… …
2741 2821
2742 utf8::encode $text; 2822 utf8::encode $text;
2743 $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);
2744} 2824}
2745 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
2746=item $client->send_msg ($channel, $msg, $color, [extra...]) 2851=item $client->send_msg ($channel, $msg, $color, [extra...])
2747 2852
2748Send 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
2749client 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
2750the 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
… …
2752 2857
2753=cut 2858=cut
2754 2859
2755# non-persistent channels (usually the info channel) 2860# non-persistent channels (usually the info channel)
2756our %CHANNEL = ( 2861our %CHANNEL = (
2862 "c/motd" => {
2863 id => "infobox",
2864 title => "MOTD",
2865 reply => undef,
2866 tooltip => "The message of the day",
2867 },
2757 "c/identify" => { 2868 "c/identify" => {
2758 id => "infobox", 2869 id => "infobox",
2759 title => "Identify", 2870 title => "Identify",
2760 reply => undef, 2871 reply => undef,
2761 tooltip => "Items recently identified", 2872 tooltip => "Items recently identified",
… …
2763 "c/examine" => { 2874 "c/examine" => {
2764 id => "infobox", 2875 id => "infobox",
2765 title => "Examine", 2876 title => "Examine",
2766 reply => undef, 2877 reply => undef,
2767 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",
2768 }, 2885 },
2769 "c/book" => { 2886 "c/book" => {
2770 id => "infobox", 2887 id => "infobox",
2771 title => "Book", 2888 title => "Book",
2772 reply => undef, 2889 reply => undef,
… …
2788 id => "infobox", 2905 id => "infobox",
2789 title => "Body Parts", 2906 title => "Body Parts",
2790 reply => undef, 2907 reply => undef,
2791 tooltip => "Shows which body parts you posess and are available", 2908 tooltip => "Shows which body parts you posess and are available",
2792 }, 2909 },
2910 "c/statistics" => {
2911 id => "infobox",
2912 title => "Statistics",
2913 reply => undef,
2914 tooltip => "Shows your primary statistics",
2915 },
2793 "c/skills" => { 2916 "c/skills" => {
2794 id => "infobox", 2917 id => "infobox",
2795 title => "Skills", 2918 title => "Skills",
2796 reply => undef, 2919 reply => undef,
2797 tooltip => "Shows your experience per skill and item power", 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",
2798 }, 2945 },
2799 "c/uptime" => { 2946 "c/uptime" => {
2800 id => "infobox", 2947 id => "infobox",
2801 title => "Uptime", 2948 title => "Uptime",
2802 reply => undef, 2949 reply => undef,
… …
2812 id => "party", 2959 id => "party",
2813 title => "Party", 2960 title => "Party",
2814 reply => "gsay ", 2961 reply => "gsay ",
2815 tooltip => "Messages and chat related to your party", 2962 tooltip => "Messages and chat related to your party",
2816 }, 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,
2817); 2972);
2818 2973
2819sub cf::client::send_msg { 2974sub cf::client::send_msg {
2820 my ($self, $channel, $msg, $color, @extra) = @_; 2975 my ($self, $channel, $msg, $color, @extra) = @_;
2821 2976
… …
2826 2981
2827 # check predefined channels, for the benefit of C 2982 # check predefined channels, for the benefit of C
2828 if ($CHANNEL{$channel}) { 2983 if ($CHANNEL{$channel}) {
2829 $channel = $CHANNEL{$channel}; 2984 $channel = $CHANNEL{$channel};
2830 2985
2831 $self->ext_msg (channel_info => $channel) 2986 $self->ext_msg (channel_info => $channel);
2832 if $self->can_msg;
2833
2834 $channel = $channel->{id}; 2987 $channel = $channel->{id};
2835 2988
2836 } elsif (ref $channel) { 2989 } elsif (ref $channel) {
2837 # send meta info to client, if not yet sent 2990 # send meta info to client, if not yet sent
2838 unless (exists $self->{channel}{$channel->{id}}) { 2991 unless (exists $self->{channel}{$channel->{id}}) {
2839 $self->{channel}{$channel->{id}} = $channel; 2992 $self->{channel}{$channel->{id}} = $channel;
2840 $self->ext_msg (channel_info => $channel) 2993 $self->ext_msg (channel_info => $channel);
2841 if $self->can_msg;
2842 } 2994 }
2843 2995
2844 $channel = $channel->{id}; 2996 $channel = $channel->{id};
2845 } 2997 }
2846 2998
2847 return unless @extra || length $msg; 2999 return unless @extra || length $msg;
2848 3000
2849 if ($self->can_msg) {
2850 # default colour, mask it out 3001 # default colour, mask it out
2851 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3002 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2852 if $color & cf::NDI_DEF; 3003 if $color & cf::NDI_DEF;
2853 3004
2854 my $pkt = "msg " 3005 my $pkt = "msg "
2855 . $self->{json_coder}->encode ( 3006 . $self->{json_coder}->encode (
2856 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3007 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2857 ); 3008 );
2858 3009
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); 3010 $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} 3011}
2896 3012
2897=item $client->ext_msg ($type, @msg) 3013=item $client->ext_msg ($type, @msg)
2898 3014
2899Sends an ext event to the client. 3015Sends an ext event to the client.
… …
2902 3018
2903sub cf::client::ext_msg($$@) { 3019sub cf::client::ext_msg($$@) {
2904 my ($self, $type, @msg) = @_; 3020 my ($self, $type, @msg) = @_;
2905 3021
2906 if ($self->extcmd == 2) { 3022 if ($self->extcmd == 2) {
2907 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3023 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2908 } elsif ($self->extcmd == 1) { # TODO: remove 3024 } elsif ($self->extcmd == 1) { # TODO: remove
2909 push @msg, msgtype => "event_$type"; 3025 push @msg, msgtype => "event_$type";
2910 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3026 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2911 } 3027 }
2912} 3028}
2913 3029
2914=item $client->ext_reply ($msgid, @msg) 3030=item $client->ext_reply ($msgid, @msg)
2915 3031
… …
2919 3035
2920sub cf::client::ext_reply($$@) { 3036sub cf::client::ext_reply($$@) {
2921 my ($self, $id, @msg) = @_; 3037 my ($self, $id, @msg) = @_;
2922 3038
2923 if ($self->extcmd == 2) { 3039 if ($self->extcmd == 2) {
2924 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3040 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2925 } elsif ($self->extcmd == 1) { 3041 } elsif ($self->extcmd == 1) {
2926 #TODO: version 1, remove 3042 #TODO: version 1, remove
2927 unshift @msg, msgtype => "reply", msgid => $id; 3043 unshift @msg, msgtype => "reply", msgid => $id;
2928 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3044 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2929 } 3045 }
2930} 3046}
2931 3047
2932=item $success = $client->query ($flags, "text", \&cb) 3048=item $success = $client->query ($flags, "text", \&cb)
2933 3049
… …
3034 3150
3035 $coro 3151 $coro
3036} 3152}
3037 3153
3038cf::client->attach ( 3154cf::client->attach (
3039 on_destroy => sub { 3155 on_client_destroy => sub {
3040 my ($ns) = @_; 3156 my ($ns) = @_;
3041 3157
3042 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3158 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3043 }, 3159 },
3044); 3160);
… …
3060our $safe_hole = new Safe::Hole; 3176our $safe_hole = new Safe::Hole;
3061 3177
3062$SIG{FPE} = 'IGNORE'; 3178$SIG{FPE} = 'IGNORE';
3063 3179
3064$safe->permit_only (Opcode::opset qw( 3180$safe->permit_only (Opcode::opset qw(
3065 :base_core :base_mem :base_orig :base_math 3181 :base_core :base_mem :base_orig :base_math :base_loop
3066 grepstart grepwhile mapstart mapwhile 3182 grepstart grepwhile mapstart mapwhile
3067 sort time 3183 sort time
3068)); 3184));
3069 3185
3070# here we export the classes and methods available to script code 3186# here we export the classes and methods available to script code
… …
3074The following functions and methods are available within a safe environment: 3190The following functions and methods are available within a safe environment:
3075 3191
3076 cf::object 3192 cf::object
3077 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
3078 insert remove name archname title slaying race decrease split 3194 insert remove name archname title slaying race decrease split
3195 value
3079 3196
3080 cf::object::player 3197 cf::object::player
3081 player 3198 player
3082 3199
3083 cf::player 3200 cf::player
… …
3089=cut 3206=cut
3090 3207
3091for ( 3208for (
3092 ["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
3093 insert remove inv nrof name archname title slaying race 3210 insert remove inv nrof name archname title slaying race
3094 decrease split destroy change_exp)], 3211 decrease split destroy change_exp value msg lore send_msg)],
3095 ["cf::object::player" => qw(player)], 3212 ["cf::object::player" => qw(player)],
3096 ["cf::player" => qw(peaceful)], 3213 ["cf::player" => qw(peaceful send_msg)],
3097 ["cf::map" => qw(trigger)], 3214 ["cf::map" => qw(trigger)],
3098) { 3215) {
3099 no strict 'refs'; 3216 no strict 'refs';
3100 my ($pkg, @funs) = @$_; 3217 my ($pkg, @funs) = @$_;
3101 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3218 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
3119 3236
3120 my $qcode = $code; 3237 my $qcode = $code;
3121 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3238 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3122 $qcode =~ s/\n/\\n/g; 3239 $qcode =~ s/\n/\\n/g;
3123 3240
3241 %vars = (_dummy => 0) unless %vars;
3242
3243 my @res;
3124 local $_; 3244 local $_;
3125 local @safe::cf::_safe_eval_args = values %vars;
3126 3245
3127 my $eval = 3246 my $eval =
3128 "do {\n" 3247 "do {\n"
3129 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3248 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3130 . "#line 0 \"{$qcode}\"\n" 3249 . "#line 0 \"{$qcode}\"\n"
3131 . $code 3250 . $code
3132 . "\n}" 3251 . "\n}"
3133 ; 3252 ;
3134 3253
3254 if ($CFG{safe_eval}) {
3135 sub_generation_inc; 3255 sub_generation_inc;
3256 local @safe::cf::_safe_eval_args = values %vars;
3136 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3257 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3137 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 }
3138 3263
3139 if ($@) { 3264 if ($@) {
3140 warn "$@"; 3265 warn "$@";
3141 warn "while executing safe code '$code'\n"; 3266 warn "while executing safe code '$code'\n";
3142 warn "with arguments " . (join " ", %vars) . "\n"; 3267 warn "with arguments " . (join " ", %vars) . "\n";
… …
3161=cut 3286=cut
3162 3287
3163sub register_script_function { 3288sub register_script_function {
3164 my ($fun, $cb) = @_; 3289 my ($fun, $cb) = @_;
3165 3290
3166 no strict 'refs'; 3291 $fun = "safe::$fun" if $CFG{safe_eval};
3167 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3292 *$fun = $safe_hole->wrap ($cb);
3168} 3293}
3169 3294
3170=back 3295=back
3171 3296
3172=cut 3297=cut
… …
3193 3318
3194 $facedata->{version} == 2 3319 $facedata->{version} == 2
3195 or cf::cleanup "$path: version mismatch, cannot proceed."; 3320 or cf::cleanup "$path: version mismatch, cannot proceed.";
3196 3321
3197 # 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]);
3198 $facedata->{resource}{"res/exp_table"} = { 3324 $facedata->{resource}{"res/exp_table"} = {
3199 type => FT_RSRC, 3325 type => FT_RSRC,
3200 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),
3201 }; 3328 };
3202 cf::cede_to_tick; 3329 cf::cede_to_tick;
3203 3330
3204 { 3331 {
3205 my $faces = $facedata->{faceinfo}; 3332 my $faces = $facedata->{faceinfo};
… …
3207 while (my ($face, $info) = each %$faces) { 3334 while (my ($face, $info) = each %$faces) {
3208 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3335 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3209 3336
3210 cf::face::set_visibility $idx, $info->{visibility}; 3337 cf::face::set_visibility $idx, $info->{visibility};
3211 cf::face::set_magicmap $idx, $info->{magicmap}; 3338 cf::face::set_magicmap $idx, $info->{magicmap};
3212 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3339 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3213 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3340 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3214 3341
3215 cf::cede_to_tick; 3342 cf::cede_to_tick;
3216 } 3343 }
3217 3344
3218 while (my ($face, $info) = each %$faces) { 3345 while (my ($face, $info) = each %$faces) {
… …
3242 3369
3243 cf::anim::invalidate_all; # d'oh 3370 cf::anim::invalidate_all; # d'oh
3244 } 3371 }
3245 3372
3246 { 3373 {
3247 # TODO: for gcfclient pleasure, we should give resources
3248 # that gcfclient doesn't grok a >10000 face index.
3249 my $res = $facedata->{resource}; 3374 my $res = $facedata->{resource};
3250 3375
3251 while (my ($name, $info) = each %$res) { 3376 while (my ($name, $info) = each %$res) {
3252 if (defined $info->{type}) { 3377 if (defined $info->{type}) {
3253 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3378 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3254 my $data;
3255 3379
3256 if ($info->{type} & 1) { 3380 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}; 3381 cf::face::set_type $idx, $info->{type};
3271 } else { 3382 } else {
3272 $RESOURCE{$name} = $info; 3383 $RESOURCE{$name} = $info;
3273 } 3384 }
3274 3385
… …
3358 3469
3359 warn "finished reloading resource files\n"; 3470 warn "finished reloading resource files\n";
3360} 3471}
3361 3472
3362sub reload_config { 3473sub reload_config {
3474 warn "reloading config file...\n";
3475
3363 open my $fh, "<:utf8", "$CONFDIR/config" 3476 open my $fh, "<:utf8", "$CONFDIR/config"
3364 or return; 3477 or return;
3365 3478
3366 local $/; 3479 local $/;
3367 *CFG = YAML::Load <$fh>; 3480 *CFG = YAML::XS::Load scalar <$fh>;
3368 3481
3369 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3482 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3370 3483
3371 $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};
3372 $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};
… …
3376 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3489 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3377 and die "WARNING: m(un)lockall failed: $!\n"; 3490 and die "WARNING: m(un)lockall failed: $!\n";
3378 }; 3491 };
3379 warn $@ if $@; 3492 warn $@ if $@;
3380 } 3493 }
3494
3495 warn "finished reloading resource files\n";
3381} 3496}
3382 3497
3383sub pidfile() { 3498sub pidfile() {
3384 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3499 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3385 or die "$PIDFILE: $!"; 3500 or die "$PIDFILE: $!";
… …
3397 3512
3398 seek $fh, 0, 0; 3513 seek $fh, 0, 0;
3399 print $fh $$; 3514 print $fh $$;
3400} 3515}
3401 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
3402sub main { 3526sub main {
3403 cf::init_globals; # initialise logging 3527 cf::init_globals; # initialise logging
3404 3528
3405 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3529 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3406 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3530 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
… …
3409 3533
3410 cf::init_experience; 3534 cf::init_experience;
3411 cf::init_anim; 3535 cf::init_anim;
3412 cf::init_attackmess; 3536 cf::init_attackmess;
3413 cf::init_dynamic; 3537 cf::init_dynamic;
3414 cf::init_block;
3415 3538
3416 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3539 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3417 3540
3418 # we must not ever block the main coroutine 3541 # we must not ever block the main coroutine
3419 local $Coro::idle = sub { 3542 local $Coro::idle = sub {
… …
3425 }; 3548 };
3426 3549
3427 evthread_start IO::AIO::poll_fileno; 3550 evthread_start IO::AIO::poll_fileno;
3428 3551
3429 cf::sync_job { 3552 cf::sync_job {
3553 cf::load_settings;
3554 cf::load_materials;
3555
3430 reload_resources; 3556 reload_resources;
3431 reload_config; 3557 reload_config;
3432 db_init; 3558 db_init;
3433 3559
3434 cf::load_settings;
3435 cf::load_materials;
3436 cf::init_uuid; 3560 cf::init_uuid;
3437 cf::init_signals; 3561 cf::init_signals;
3438 cf::init_commands;
3439 cf::init_skills; 3562 cf::init_skills;
3440 3563
3441 cf::init_beforeplay; 3564 cf::init_beforeplay;
3442 3565
3443 atomic; 3566 atomic;
… …
3445 load_extensions; 3568 load_extensions;
3446 3569
3447 utime time, time, $RUNTIMEFILE; 3570 utime time, time, $RUNTIMEFILE;
3448 3571
3449 # no (long-running) fork's whatsoever before this point(!) 3572 # no (long-running) fork's whatsoever before this point(!)
3573 use POSIX ();
3450 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};
3451 3575
3452 (pop @POST_INIT)->(0) while @POST_INIT; 3576 (pop @POST_INIT)->(0) while @POST_INIT;
3453 }; 3577 };
3454 3578
3455 EV::loop; 3579 main_loop;
3456} 3580}
3457 3581
3458############################################################################# 3582#############################################################################
3459# initialisation and cleanup 3583# initialisation and cleanup
3460 3584
… …
3467 }; 3591 };
3468 } 3592 }
3469} 3593}
3470 3594
3471sub write_runtime_sync { 3595sub write_runtime_sync {
3596 my $t0 = EV::time;
3597
3472 # first touch the runtime file to show we are still running: 3598 # first touch the runtime file to show we are still running:
3473 # the fsync below can take a very very long time. 3599 # the fsync below can take a very very long time.
3474 3600
3475 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3601 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3476 3602
3477 my $guard = cf::lock_acquire "write_runtime"; 3603 my $guard = cf::lock_acquire "write_runtime";
3478 3604
3479 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3605 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3480 or return; 3606 or return;
3481 3607
3482 my $value = $cf::RUNTIME + 90 + 10; 3608 my $value = $cf::RUNTIME + 90 + 10;
3483 # 10 is the runtime save interval, for a monotonic clock 3609 # 10 is the runtime save interval, for a monotonic clock
3484 # 60 allows for the watchdog to kill the server. 3610 # 60 allows for the watchdog to kill the server.
… …
3497 or return; 3623 or return;
3498 3624
3499 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3625 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3500 and return; 3626 and return;
3501 3627
3502 warn "runtime file written.\n"; 3628 warn sprintf "runtime file written (%gs).\n", EV::time - $t0;
3503 3629
3504 1 3630 1
3505} 3631}
3506 3632
3507our $uuid_lock; 3633our $uuid_lock;
… …
3516 my $uuid = "$LOCALDIR/uuid"; 3642 my $uuid = "$LOCALDIR/uuid";
3517 3643
3518 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3644 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3519 or return; 3645 or return;
3520 3646
3521 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;
3522 $uuid_skip = 0; 3655 $uuid_skip = 0;
3523 3656
3524 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3657 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3525 and return; 3658 and return;
3526 3659
… …
3548} 3681}
3549 3682
3550sub emergency_save() { 3683sub emergency_save() {
3551 my $freeze_guard = cf::freeze_mainloop; 3684 my $freeze_guard = cf::freeze_mainloop;
3552 3685
3553 warn "enter emergency perl save\n"; 3686 warn "emergency_perl_save: enter\n";
3554 3687
3555 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
3556 # use a peculiar iteration method to avoid tripping on perl 3694 # use a peculiar iteration method to avoid tripping on perl
3557 # refcount bugs in for. also avoids problems with players 3695 # refcount bugs in for. also avoids problems with players
3558 # and maps saved/destroyed asynchronously. 3696 # and maps saved/destroyed asynchronously.
3559 warn "begin emergency player save\n"; 3697 warn "emergency_perl_save: begin player save\n";
3560 for my $login (keys %cf::PLAYER) { 3698 for my $login (keys %cf::PLAYER) {
3561 my $pl = $cf::PLAYER{$login} or next; 3699 my $pl = $cf::PLAYER{$login} or next;
3562 $pl->valid or next; 3700 $pl->valid or next;
3563 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3701 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3564 $pl->save; 3702 $pl->save;
3565 } 3703 }
3566 warn "end emergency player save\n"; 3704 warn "emergency_perl_save: end player save\n";
3567 3705
3568 warn "begin emergency map save\n"; 3706 warn "emergency_perl_save: begin map save\n";
3569 for my $path (keys %cf::MAP) { 3707 for my $path (keys %cf::MAP) {
3570 my $map = $cf::MAP{$path} or next; 3708 my $map = $cf::MAP{$path} or next;
3571 $map->valid or next; 3709 $map->valid or next;
3572 $map->save; 3710 $map->save;
3573 } 3711 }
3574 warn "end emergency map save\n"; 3712 warn "emergency_perl_save: end map save\n";
3575 3713
3576 warn "begin emergency database checkpoint\n"; 3714 warn "emergency_perl_save: begin database checkpoint\n";
3577 BDB::db_env_txn_checkpoint $DB_ENV; 3715 BDB::db_env_txn_checkpoint $DB_ENV;
3578 warn "end emergency database checkpoint\n"; 3716 warn "emergency_perl_save: end database checkpoint\n";
3579 3717
3580 warn "begin write uuid\n"; 3718 warn "emergency_perl_save: begin write uuid\n";
3581 write_uuid_sync 1; 3719 write_uuid_sync 1;
3582 warn "end write uuid\n"; 3720 warn "emergency_perl_save: end write uuid\n";
3583 }; 3721 };
3584 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
3585 warn "leave emergency perl save\n"; 3728 warn "emergency_perl_save: leave\n";
3586} 3729}
3587 3730
3588sub post_cleanup { 3731sub post_cleanup {
3589 my ($make_core) = @_; 3732 my ($make_core) = @_;
3590 3733
… …
3627 warn "can only reload from main coroutine"; 3770 warn "can only reload from main coroutine";
3628 return; 3771 return;
3629 } 3772 }
3630 3773
3631 return if $RELOAD++; 3774 return if $RELOAD++;
3775
3776 my $t1 = EV::time;
3632 3777
3633 while ($RELOAD) { 3778 while ($RELOAD) {
3634 warn "reloading..."; 3779 warn "reloading...";
3635 3780
3636 warn "entering sync_job"; 3781 warn "entering sync_job";
… …
3697 clear_package "safe::$_" 3842 clear_package "safe::$_"
3698 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);
3699 3844
3700 warn "unloading cf.pm \"a bit\""; 3845 warn "unloading cf.pm \"a bit\"";
3701 delete $INC{"cf.pm"}; 3846 delete $INC{"cf.pm"};
3702 delete $INC{"cf/pod.pm"}; 3847 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3703 3848
3704 # don't, removes xs symbols, too, 3849 # don't, removes xs symbols, too,
3705 # and global variables created in xs 3850 # and global variables created in xs
3706 #clear_package __PACKAGE__; 3851 #clear_package __PACKAGE__;
3707 3852
3708 warn "unload completed, starting to reload now"; 3853 warn "unload completed, starting to reload now";
3709 3854
3710 warn "reloading cf.pm"; 3855 warn "reloading cf.pm";
3711 require cf; 3856 require cf;
3712 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3857 cf::_connect_to_perl_1;
3713 3858
3714 warn "loading config and database again"; 3859 warn "loading config and database again";
3715 cf::reload_config; 3860 cf::reload_config;
3716 3861
3717 warn "loading extensions"; 3862 warn "loading extensions";
3718 cf::load_extensions; 3863 cf::load_extensions;
3719 3864
3865 if ($REATTACH_ON_RELOAD) {
3720 warn "reattaching attachments to objects/players"; 3866 warn "reattaching attachments to objects/players";
3721 _global_reattach; # objects, sockets 3867 _global_reattach; # objects, sockets
3722 warn "reattaching attachments to maps"; 3868 warn "reattaching attachments to maps";
3723 reattach $_ for values %MAP; 3869 reattach $_ for values %MAP;
3724 warn "reattaching attachments to players"; 3870 warn "reattaching attachments to players";
3725 reattach $_ for values %PLAYER; 3871 reattach $_ for values %PLAYER;
3872 }
3726 3873
3727 warn "running post_load"; 3874 warn "running post_init jobs";
3728 (pop @POST_INIT)->(1) while @POST_INIT; 3875 (pop @POST_INIT)->(1) while @POST_INIT;
3729 3876
3730 warn "leaving sync_job"; 3877 warn "leaving sync_job";
3731 3878
3732 1 3879 1
… …
3736 }; 3883 };
3737 3884
3738 warn "reloaded"; 3885 warn "reloaded";
3739 --$RELOAD; 3886 --$RELOAD;
3740 } 3887 }
3888
3889 $t1 = EV::time - $t1;
3890 warn "reload completed in ${t1}s\n";
3741}; 3891};
3742 3892
3743our $RELOAD_WATCHER; # used only during reload 3893our $RELOAD_WATCHER; # used only during reload
3744 3894
3745sub reload_perl() { 3895sub reload_perl() {
3746 # doing reload synchronously and two reloads happen back-to-back, 3896 # doing reload synchronously and two reloads happen back-to-back,
3747 # coro crashes during coro_state_free->destroy here. 3897 # coro crashes during coro_state_free->destroy here.
3748 3898
3899 $RELOAD_WATCHER ||= cf::async {
3900 Coro::AIO::aio_wait cache_extensions;
3901
3749 $RELOAD_WATCHER ||= EV::timer $TICK * 1.5, 0, sub { 3902 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3750 do_reload_perl; 3903 do_reload_perl;
3751 undef $RELOAD_WATCHER; 3904 undef $RELOAD_WATCHER;
3905 };
3752 }; 3906 };
3753} 3907}
3754 3908
3755register_command "reload" => sub { 3909register_command "reload" => sub {
3756 my ($who, $arg) = @_; 3910 my ($who, $arg) = @_;
… …
3770 3924
3771our @WAIT_FOR_TICK; 3925our @WAIT_FOR_TICK;
3772our @WAIT_FOR_TICK_BEGIN; 3926our @WAIT_FOR_TICK_BEGIN;
3773 3927
3774sub wait_for_tick { 3928sub wait_for_tick {
3775 return if tick_inhibit || $Coro::current == $Coro::main; 3929 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3776 3930
3777 my $signal = new Coro::Signal; 3931 my $signal = new Coro::Signal;
3778 push @WAIT_FOR_TICK, $signal; 3932 push @WAIT_FOR_TICK, $signal;
3779 $signal->wait; 3933 $signal->wait;
3780} 3934}
3781 3935
3782sub wait_for_tick_begin { 3936sub wait_for_tick_begin {
3783 return if tick_inhibit || $Coro::current == $Coro::main; 3937 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3784 3938
3785 my $signal = new Coro::Signal; 3939 my $signal = new Coro::Signal;
3786 push @WAIT_FOR_TICK_BEGIN, $signal; 3940 push @WAIT_FOR_TICK_BEGIN, $signal;
3787 $signal->wait; 3941 $signal->wait;
3788} 3942}
… …
3793 unless ++$bug_warning > 10; 3947 unless ++$bug_warning > 10;
3794 return; 3948 return;
3795 } 3949 }
3796 3950
3797 cf::server_tick; # one server iteration 3951 cf::server_tick; # one server iteration
3952
3953 #for(1..3e6){} EV::now_update; $NOW=EV::now; # generate load #d#
3798 3954
3799 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3955 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3800 $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.;
3801 Coro::async_pool { 3957 Coro::async_pool {
3802 $Coro::current->{desc} = "runtime saver"; 3958 $Coro::current->{desc} = "runtime saver";
… …
3825} 3981}
3826 3982
3827{ 3983{
3828 # configure BDB 3984 # configure BDB
3829 3985
3830 BDB::min_parallel 8; 3986 BDB::min_parallel 16;
3831 BDB::max_poll_reqs $TICK * 0.1; 3987 BDB::max_poll_reqs $TICK * 0.1;
3832 $AnyEvent::BDB::WATCHER->priority (1); 3988 $AnyEvent::BDB::WATCHER->priority (1);
3833 3989
3834 unless ($DB_ENV) { 3990 unless ($DB_ENV) {
3835 $DB_ENV = BDB::db_env_create; 3991 $DB_ENV = BDB::db_env_create;
… …
3915 LOG llevInfo, "[ABT] [suppressed]\n"; 4071 LOG llevInfo, "[ABT] [suppressed]\n";
3916 } 4072 }
3917} 4073}
3918 4074
3919# load additional modules 4075# load additional modules
3920use cf::pod; 4076require "cf/$_.pm" for @EXTRA_MODULES;
4077cf::_connect_to_perl_2;
3921 4078
3922END { cf::emergency_save } 4079END { cf::emergency_save }
3923 4080
39241 40811
3925 4082

Diff Legend

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