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.476 by root, Wed Sep 2 16:54:20 2009 UTC vs.
Revision 1.522 by root, Sat Apr 17 02:22:14 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;
… …
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
37use Guard (); 39use Guard ();
38use Coro (); 40use Coro ();
39use Coro::State; 41use Coro::State;
40use Coro::Handle; 42use Coro::Handle;
… …
51use Coro::Util (); 53use Coro::Util ();
52 54
53use JSON::XS 2.01 (); 55use JSON::XS 2.01 ();
54use BDB (); 56use BDB ();
55use Data::Dumper; 57use Data::Dumper;
56use Digest::MD5;
57use Fcntl; 58use Fcntl;
58use YAML (); 59use YAML::XS ();
59use IO::AIO (); 60use IO::AIO ();
60use Time::HiRes; 61use Time::HiRes;
61use Compress::LZF; 62use Compress::LZF;
62use Digest::MD5 (); 63use Digest::MD5 ();
63 64
… …
88our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
89our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
90 91
91our $RELOAD; # number of reloads so far, non-zero while in reload 92our $RELOAD; # number of reloads so far, non-zero while in reload
92our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
93 96
94our $CONFDIR = confdir; 97our $CONFDIR = confdir;
95our $DATADIR = datadir; 98our $DATADIR = datadir;
96our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
97our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
… …
105our $PIDFILE = "$LOCALDIR/pid"; 108our $PIDFILE = "$LOCALDIR/pid";
106our $RUNTIMEFILE = "$LOCALDIR/runtime"; 109our $RUNTIMEFILE = "$LOCALDIR/runtime";
107 110
108our %RESOURCE; 111our %RESOURCE;
109 112
113our $OUTPUT_RATE_MIN = 4000;
114our $OUTPUT_RATE_MAX = 100000;
115
110our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 116our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
111our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 117our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
112our $NEXT_TICK; 118our $NEXT_TICK;
113our $USE_FSYNC = 1; # use fsync to write maps - default on 119our $USE_FSYNC = 1; # use fsync to write maps - default on
114 120
115our $BDB_DEADLOCK_WATCHER; 121our $BDB_DEADLOCK_WATCHER;
116our $BDB_CHECKPOINT_WATCHER; 122our $BDB_CHECKPOINT_WATCHER;
117our $BDB_TRICKLE_WATCHER; 123our $BDB_TRICKLE_WATCHER;
118our $DB_ENV; 124our $DB_ENV;
119 125
120our @EXTRA_MODULES = qw(pod mapscript); 126our @EXTRA_MODULES = qw(pod match mapscript);
121 127
122our %CFG; 128our %CFG;
123 129
124our $UPTIME; $UPTIME ||= time; 130our $UPTIME; $UPTIME ||= time;
125our $RUNTIME; 131our $RUNTIME;
… …
159 165
160our $EMERGENCY_POSITION; 166our $EMERGENCY_POSITION;
161 167
162sub cf::map::normalise; 168sub cf::map::normalise;
163 169
170sub in_main() {
171 $Coro::current == $Coro::main
172}
173
174#############################################################################
175
176%REFLECT = ();
177for (@REFLECT) {
178 my $reflect = JSON::XS::decode_json $_;
179 $REFLECT{$reflect->{class}} = $reflect;
180}
181
182# this is decidedly evil
183$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
184
164############################################################################# 185#############################################################################
165 186
166=head2 GLOBAL VARIABLES 187=head2 GLOBAL VARIABLES
167 188
168=over 4 189=over 4
… …
214returns directly I<after> the tick processing (and consequently, can only wake one process 235returns directly I<after> the tick processing (and consequently, can only wake one process
215per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 236per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
216 237
217=item @cf::INVOKE_RESULTS 238=item @cf::INVOKE_RESULTS
218 239
219This array contains the results of the last C<invoke ()> call. When 240This array contains the results of the last C<invoke ()> call. When
220C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 241C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
221that call. 242that call.
222 243
244=item %cf::REFLECT
245
246Contains, for each (C++) class name, a hash reference with information
247about object members (methods, scalars, arrays and flags) and other
248metadata, which is useful for introspection.
249
223=back 250=back
224 251
225=cut 252=cut
226 253
227BEGIN { 254$Coro::State::WARNHOOK = sub {
228 *CORE::GLOBAL::warn = sub {
229 my $msg = join "", @_; 255 my $msg = join "", @_;
230 256
231 $msg .= "\n" 257 $msg .= "\n"
232 unless $msg =~ /\n$/; 258 unless $msg =~ /\n$/;
233 259
234 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 260 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
235 261
236 LOG llevError, $msg; 262 LOG llevError, $msg;
237 }; 263};
238}
239 264
240$Coro::State::DIEHOOK = sub { 265$Coro::State::DIEHOOK = sub {
241 return unless $^S eq 0; # "eq", not "==" 266 return unless $^S eq 0; # "eq", not "=="
242 267
243 if ($Coro::current == $Coro::main) {#d# 268 warn Carp::longmess $_[0];
269
270 if (in_main) {#d#
244 warn "DIEHOOK called in main context, Coro bug?\n";#d# 271 warn "DIEHOOK called in main context, Coro bug?\n";#d#
245 return;#d# 272 return;#d#
246 }#d# 273 }#d#
247 274
248 # kill coroutine otherwise 275 # kill coroutine otherwise
249 warn Carp::longmess $_[0];
250 Coro::terminate 276 Coro::terminate
251}; 277};
252
253$SIG{__DIE__} = sub { }; #d#?
254 278
255@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 279@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
256@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 280@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
257@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 281@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
258@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 282@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
272)) { 296)) {
273 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 297 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
274} 298}
275 299
276$EV::DIED = sub { 300$EV::DIED = sub {
277 warn "error in event callback: @_"; 301 Carp::cluck "error in event callback: @_";
278}; 302};
279 303
280############################################################################# 304#############################################################################
281 305
282=head2 UTILITY FUNCTIONS 306=head2 UTILITY FUNCTIONS
… …
379} 403}
380 404
381=item cf::periodic $interval, $cb 405=item cf::periodic $interval, $cb
382 406
383Like EV::periodic, but randomly selects a starting point so that the actions 407Like EV::periodic, but randomly selects a starting point so that the actions
384get spread over timer. 408get spread over time.
385 409
386=cut 410=cut
387 411
388sub periodic($$) { 412sub periodic($$) {
389 my ($interval, $cb) = @_; 413 my ($interval, $cb) = @_;
… …
406 430
407=cut 431=cut
408 432
409our @SLOT_QUEUE; 433our @SLOT_QUEUE;
410our $SLOT_QUEUE; 434our $SLOT_QUEUE;
435our $SLOT_DECAY = 0.9;
411 436
412$SLOT_QUEUE->cancel if $SLOT_QUEUE; 437$SLOT_QUEUE->cancel if $SLOT_QUEUE;
413$SLOT_QUEUE = Coro::async { 438$SLOT_QUEUE = Coro::async {
414 $Coro::current->desc ("timeslot manager"); 439 $Coro::current->desc ("timeslot manager");
415 440
416 my $signal = new Coro::Signal; 441 my $signal = new Coro::Signal;
442 my $busy;
417 443
418 while () { 444 while () {
419 next_job: 445 next_job:
446
420 my $avail = cf::till_tick; 447 my $avail = cf::till_tick;
421 if ($avail > 0.01) { 448
422 for (0 .. $#SLOT_QUEUE) { 449 for (0 .. $#SLOT_QUEUE) {
423 if ($SLOT_QUEUE[$_][0] < $avail) { 450 if ($SLOT_QUEUE[$_][0] <= $avail) {
451 $busy = 0;
424 my $job = splice @SLOT_QUEUE, $_, 1, (); 452 my $job = splice @SLOT_QUEUE, $_, 1, ();
425 $job->[2]->send; 453 $job->[2]->send;
426 Coro::cede; 454 Coro::cede;
427 goto next_job; 455 goto next_job;
428 } 456 } else {
457 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
429 } 458 }
430 } 459 }
431 460
432 if (@SLOT_QUEUE) { 461 if (@SLOT_QUEUE) {
433 # we do not use wait_for_tick() as it returns immediately when tick is inactive 462 # we do not use wait_for_tick() as it returns immediately when tick is inactive
434 push @cf::WAIT_FOR_TICK, $signal; 463 push @cf::WAIT_FOR_TICK, $signal;
435 $signal->wait; 464 $signal->wait;
436 } else { 465 } else {
466 $busy = 0;
437 Coro::schedule; 467 Coro::schedule;
438 } 468 }
439 } 469 }
440}; 470};
441 471
442sub get_slot($;$$) { 472sub get_slot($;$$) {
443 return if tick_inhibit || $Coro::current == $Coro::main; 473 return if tick_inhibit || $Coro::current == $Coro::main;
444 474
445 my ($time, $pri, $name) = @_; 475 my ($time, $pri, $name) = @_;
446 476
447 $time = $TICK * .6 if $time > $TICK * .6; 477 $time = clamp $time, 0.01, $TICK * .6;
478
448 my $sig = new Coro::Signal; 479 my $sig = new Coro::Signal;
449 480
450 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 481 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
451 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 482 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
452 $SLOT_QUEUE->ready; 483 $SLOT_QUEUE->ready;
… …
479 510
480sub sync_job(&) { 511sub sync_job(&) {
481 my ($job) = @_; 512 my ($job) = @_;
482 513
483 if ($Coro::current == $Coro::main) { 514 if ($Coro::current == $Coro::main) {
484 my $time = EV::time; 515 my $time = AE::time;
485 516
486 # this is the main coro, too bad, we have to block 517 # this is the main coro, too bad, we have to block
487 # till the operation succeeds, freezing the server :/ 518 # till the operation succeeds, freezing the server :/
488 519
489 LOG llevError, Carp::longmess "sync job";#d# 520 LOG llevError, Carp::longmess "sync job";#d#
… …
506 } else { 537 } else {
507 EV::loop EV::LOOP_ONESHOT; 538 EV::loop EV::LOOP_ONESHOT;
508 } 539 }
509 } 540 }
510 541
511 my $time = EV::time - $time; 542 my $time = AE::time - $time;
512 543
513 $TICK_START += $time; # do not account sync jobs to server load 544 $TICK_START += $time; # do not account sync jobs to server load
514 545
515 wantarray ? @res : $res[0] 546 wantarray ? @res : $res[0]
516 } else { 547 } else {
… …
560 reset_signals; 591 reset_signals;
561 &$cb 592 &$cb
562 }, @args; 593 }, @args;
563 594
564 wantarray ? @res : $res[-1] 595 wantarray ? @res : $res[-1]
596}
597
598sub objinfo {
599 (
600 "counter value" => cf::object::object_count,
601 "objects created" => cf::object::create_count,
602 "objects destroyed" => cf::object::destroy_count,
603 "freelist size" => cf::object::free_count,
604 "allocated objects" => cf::object::objects_size,
605 "active objects" => cf::object::actives_size,
606 )
565} 607}
566 608
567=item $coin = coin_from_name $name 609=item $coin = coin_from_name $name
568 610
569=cut 611=cut
… …
1286} 1328}
1287 1329
1288use File::Glob (); 1330use File::Glob ();
1289 1331
1290cf::player->attach ( 1332cf::player->attach (
1291 on_command => sub { 1333 on_unknown_command => sub {
1292 my ($pl, $name, $params) = @_; 1334 my ($pl, $name, $params) = @_;
1293 1335
1294 my $cb = $COMMAND{$name} 1336 my $cb = $COMMAND{$name}
1295 or return; 1337 or return;
1296 1338
… …
1375 . "\n};\n1"; 1417 . "\n};\n1";
1376 1418
1377 $todo{$base} = \%ext; 1419 $todo{$base} = \%ext;
1378 } 1420 }
1379 1421
1422 my $pass = 0;
1380 my %done; 1423 my %done;
1381 while (%todo) { 1424 while (%todo) {
1382 my $progress; 1425 my $progress;
1383 1426
1427 ++$pass;
1428
1429 ext:
1384 while (my ($k, $v) = each %todo) { 1430 while (my ($k, $v) = each %todo) {
1385 for (split /,\s*/, $v->{meta}{depends}) { 1431 for (split /,\s*/, $v->{meta}{depends}) {
1386 goto skip 1432 next ext
1387 unless exists $done{$_}; 1433 unless exists $done{$_};
1388 } 1434 }
1389 1435
1390 warn "... loading '$k' into '$v->{pkg}'\n"; 1436 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1391 1437
1392 unless (eval $v->{source}) { 1438 my $active = eval $v->{source};
1439
1440 if (length $@) {
1393 my $msg = $@ ? "$v->{path}: $@\n" 1441 warn "$v->{path}: $@\n";
1394 : "$v->{base}: extension inactive.\n";
1395 1442
1396 if (exists $v->{meta}{mandatory}) {
1397 warn $msg;
1398 cf::cleanup "mandatory extension failed to load, exiting."; 1443 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1399 } 1444 if exists $v->{meta}{mandatory};
1400 1445
1401 warn $msg; 1446 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1447 delete $todo{$k};
1448 } else {
1449 $done{$k} = delete $todo{$k};
1450 push @EXTS, $v->{pkg};
1451 $progress = 1;
1452
1453 warn "$v->{base}: extension inactive.\n"
1454 unless $active;
1402 } 1455 }
1403
1404 $done{$k} = delete $todo{$k};
1405 push @EXTS, $v->{pkg};
1406 $progress = 1;
1407 } 1456 }
1408 1457
1409 skip: 1458 unless ($progress) {
1410 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1459 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1411 unless $progress; 1460
1461 while (my ($k, $v) = each %todo) {
1462 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1463 if exists $v->{meta}{mandatory};
1464 }
1465 }
1412 } 1466 }
1413 }; 1467 };
1414} 1468}
1415 1469
1416############################################################################# 1470#############################################################################
… …
1500 $cf::PLAYER{$login} = $pl 1554 $cf::PLAYER{$login} = $pl
1501 } 1555 }
1502 } 1556 }
1503} 1557}
1504 1558
1559cf::player->attach (
1560 on_load => sub {
1561 my ($pl, $path) = @_;
1562
1563 # restore slots saved in save, below
1564 my $slots = delete $pl->{_slots};
1565
1566 $pl->ob->current_weapon ($slots->[0]);
1567 $pl->combat_ob ($slots->[1]);
1568 $pl->ranged_ob ($slots->[2]);
1569 },
1570);
1571
1505sub save($) { 1572sub save($) {
1506 my ($pl) = @_; 1573 my ($pl) = @_;
1507 1574
1508 return if $pl->{deny_save}; 1575 return if $pl->{deny_save};
1509 1576
… …
1514 1581
1515 aio_mkdir playerdir $pl, 0770; 1582 aio_mkdir playerdir $pl, 0770;
1516 $pl->{last_save} = $cf::RUNTIME; 1583 $pl->{last_save} = $cf::RUNTIME;
1517 1584
1518 cf::get_slot 0.01; 1585 cf::get_slot 0.01;
1586
1587 # save slots, to be restored later
1588 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1519 1589
1520 $pl->save_pl ($path); 1590 $pl->save_pl ($path);
1521 cf::cede_to_tick; 1591 cf::cede_to_tick;
1522} 1592}
1523 1593
… …
1736 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1806 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1737 1807
1738 # mit "rum" bekleckern, nicht 1808 # mit "rum" bekleckern, nicht
1739 $self->_create_random_map ( 1809 $self->_create_random_map (
1740 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1810 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1741 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1811 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1742 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1812 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1743 $rmp->{exit_on_final_map}, 1813 $rmp->{exit_on_final_map},
1744 $rmp->{xsize}, $rmp->{ysize}, 1814 $rmp->{xsize}, $rmp->{ysize},
1745 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1815 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1746 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1816 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
1992 2062
1993 $cf::MAP{$path} = $map 2063 $cf::MAP{$path} = $map
1994 } 2064 }
1995} 2065}
1996 2066
1997sub pre_load { } 2067sub pre_load { }
1998sub post_load { } 2068#sub post_load { } # XS
1999 2069
2000sub load { 2070sub load {
2001 my ($self) = @_; 2071 my ($self) = @_;
2002 2072
2003 local $self->{deny_reset} = 1; # loading can take a long time 2073 local $self->{deny_reset} = 1; # loading can take a long time
… …
2060 } 2130 }
2061 2131
2062 $self->post_load; 2132 $self->post_load;
2063} 2133}
2064 2134
2135# customize the map for a given player, i.e.
2136# return the _real_ map. used by e.g. per-player
2137# maps to change the path to ~playername/mappath
2065sub customise_for { 2138sub customise_for {
2066 my ($self, $ob) = @_; 2139 my ($self, $ob) = @_;
2067 2140
2068 return find "~" . $ob->name . "/" . $self->{path} 2141 return find "~" . $ob->name . "/" . $self->{path}
2069 if $self->per_player; 2142 if $self->per_player;
… …
2146 $MAP_PREFETCHER->prio (6); 2219 $MAP_PREFETCHER->prio (6);
2147 2220
2148 () 2221 ()
2149} 2222}
2150 2223
2224# common code, used by both ->save and ->swapout
2151sub save { 2225sub _save {
2152 my ($self) = @_; 2226 my ($self) = @_;
2153
2154 my $lock = cf::lock_acquire "map_data:$self->{path}";
2155 2227
2156 $self->{last_save} = $cf::RUNTIME; 2228 $self->{last_save} = $cf::RUNTIME;
2157 2229
2158 return unless $self->dirty; 2230 return unless $self->dirty;
2159 2231
… …
2179 } else { 2251 } else {
2180 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2252 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2181 } 2253 }
2182} 2254}
2183 2255
2256sub save {
2257 my ($self) = @_;
2258
2259 my $lock = cf::lock_acquire "map_data:$self->{path}";
2260
2261 $self->_save;
2262}
2263
2184sub swap_out { 2264sub swap_out {
2185 my ($self) = @_; 2265 my ($self) = @_;
2186 2266
2187 # save first because save cedes
2188 $self->save;
2189
2190 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2267 my $lock = cf::lock_acquire "map_data:$self->{path}";
2191 2268
2192 return if $self->players;
2193 return if $self->in_memory != cf::MAP_ACTIVE; 2269 return if $self->in_memory != cf::MAP_ACTIVE;
2194 return if $self->{deny_save}; 2270 return if $self->{deny_save};
2271 return if $self->players;
2195 2272
2196 $self->in_memory (cf::MAP_SWAPPED); 2273 # first deactivate the map and "unlink" it from the core
2197
2198 $self->deactivate; 2274 $self->deactivate;
2199 $_->clear_links_to ($self) for values %cf::MAP; 2275 $_->clear_links_to ($self) for values %cf::MAP;
2276 $self->in_memory (cf::MAP_SWAPPED);
2277
2278 # then atomically save
2279 $self->_save;
2280
2281 # then free the map
2200 $self->clear; 2282 $self->clear;
2201} 2283}
2202 2284
2203sub reset_at { 2285sub reset_at {
2204 my ($self) = @_; 2286 my ($self) = @_;
… …
2223 2305
2224 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2306 my $lock = cf::lock_acquire "map_data:$self->{path}";
2225 2307
2226 return if $self->players; 2308 return if $self->players;
2227 2309
2228 warn "resetting map ", $self->path; 2310 warn "resetting map ", $self->path, "\n";
2229 2311
2230 $self->in_memory (cf::MAP_SWAPPED); 2312 $self->in_memory (cf::MAP_SWAPPED);
2231 2313
2232 # need to save uniques path 2314 # need to save uniques path
2233 unless ($self->{deny_save}) { 2315 unless ($self->{deny_save}) {
… …
2324 : normalise $_ 2406 : normalise $_
2325 } @{ aio_readdir $UNIQUEDIR or [] } 2407 } @{ aio_readdir $UNIQUEDIR or [] }
2326 ] 2408 ]
2327} 2409}
2328 2410
2411=item cf::map::static_maps
2412
2413Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2414file in the shared directory excluding F</styles> and F</editor>). May
2415block.
2416
2417=cut
2418
2419sub static_maps() {
2420 my @dirs = "";
2421 my @maps;
2422
2423 while (@dirs) {
2424 my $dir = shift @dirs;
2425
2426 next if $dir eq "/styles" || $dir eq "/editor";
2427
2428 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2429 or return;
2430
2431 for (@$files) {
2432 s/\.map$// or next;
2433 utf8::decode $_;
2434 push @maps, "$dir/$_";
2435 }
2436
2437 push @dirs, map "$dir/$_", @$dirs;
2438 }
2439
2440 \@maps
2441}
2442
2329=back 2443=back
2330 2444
2331=head3 cf::object 2445=head3 cf::object
2332 2446
2333=cut 2447=cut
… …
2501 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2615 return if UNIVERSAL::isa $self->map, "ext::map_link";
2502 2616
2503 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2617 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2504 if $self->map && $self->map->{path} ne "{link}"; 2618 if $self->map && $self->map->{path} ne "{link}";
2505 2619
2506 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2620 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2507} 2621}
2508 2622
2509sub cf::object::player::leave_link { 2623sub cf::object::player::leave_link {
2510 my ($self, $map, $x, $y) = @_; 2624 my ($self, $map, $x, $y) = @_;
2511 2625
… …
2528 ($x, $y) = (-1, -1) 2642 ($x, $y) = (-1, -1)
2529 unless (defined $x) && (defined $y); 2643 unless (defined $x) && (defined $y);
2530 2644
2531 # use -1 or undef as default coordinates, not 0, 0 2645 # use -1 or undef as default coordinates, not 0, 0
2532 ($x, $y) = ($map->enter_x, $map->enter_y) 2646 ($x, $y) = ($map->enter_x, $map->enter_y)
2533 if $x <=0 && $y <= 0; 2647 if $x <= 0 && $y <= 0;
2534 2648
2535 $map->load; 2649 $map->load;
2536 $map->load_neighbours; 2650 $map->load_neighbours;
2537 2651
2538 return unless $self->contr->active; 2652 return unless $self->contr->active;
… …
2737 2851
2738 utf8::encode $text; 2852 utf8::encode $text;
2739 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2853 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2740} 2854}
2741 2855
2856=item $client->send_big_packet ($pkt)
2857
2858Like C<send_packet>, but tries to compress large packets, and fragments
2859them as required.
2860
2861=cut
2862
2863our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2864
2865sub cf::client::send_big_packet {
2866 my ($self, $pkt) = @_;
2867
2868 # try lzf for large packets
2869 $pkt = "lzf " . Compress::LZF::compress $pkt
2870 if 1024 <= length $pkt and $self->{can_lzf};
2871
2872 # split very large packets
2873 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2874 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2875 $pkt = "frag";
2876 }
2877
2878 $self->send_packet ($pkt);
2879}
2880
2742=item $client->send_msg ($channel, $msg, $color, [extra...]) 2881=item $client->send_msg ($channel, $msg, $color, [extra...])
2743 2882
2744Send a drawinfo or msg packet to the client, formatting the msg for the 2883Send 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 2884client 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 2885the message, with C<log> being the default. If C<$color> is negative, suppress
… …
2748 2887
2749=cut 2888=cut
2750 2889
2751# non-persistent channels (usually the info channel) 2890# non-persistent channels (usually the info channel)
2752our %CHANNEL = ( 2891our %CHANNEL = (
2892 "c/motd" => {
2893 id => "infobox",
2894 title => "MOTD",
2895 reply => undef,
2896 tooltip => "The message of the day",
2897 },
2753 "c/identify" => { 2898 "c/identify" => {
2754 id => "infobox", 2899 id => "infobox",
2755 title => "Identify", 2900 title => "Identify",
2756 reply => undef, 2901 reply => undef,
2757 tooltip => "Items recently identified", 2902 tooltip => "Items recently identified",
… …
2759 "c/examine" => { 2904 "c/examine" => {
2760 id => "infobox", 2905 id => "infobox",
2761 title => "Examine", 2906 title => "Examine",
2762 reply => undef, 2907 reply => undef,
2763 tooltip => "Signs and other items you examined", 2908 tooltip => "Signs and other items you examined",
2909 },
2910 "c/shopinfo" => {
2911 id => "infobox",
2912 title => "Shop Info",
2913 reply => undef,
2914 tooltip => "What your bargaining skill tells you about the shop",
2764 }, 2915 },
2765 "c/book" => { 2916 "c/book" => {
2766 id => "infobox", 2917 id => "infobox",
2767 title => "Book", 2918 title => "Book",
2768 reply => undef, 2919 reply => undef,
… …
2884 my $pkt = "msg " 3035 my $pkt = "msg "
2885 . $self->{json_coder}->encode ( 3036 . $self->{json_coder}->encode (
2886 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3037 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2887 ); 3038 );
2888 3039
2889 # try lzf for large packets
2890 $pkt = "lzf " . Compress::LZF::compress $pkt
2891 if 1024 <= length $pkt and $self->{can_lzf};
2892
2893 # split very large packets
2894 if (8192 < length $pkt and $self->{can_lzf}) {
2895 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2896 $pkt = "frag";
2897 }
2898
2899 $self->send_packet ($pkt); 3040 $self->send_big_packet ($pkt);
2900} 3041}
2901 3042
2902=item $client->ext_msg ($type, @msg) 3043=item $client->ext_msg ($type, @msg)
2903 3044
2904Sends an ext event to the client. 3045Sends an ext event to the client.
… …
2907 3048
2908sub cf::client::ext_msg($$@) { 3049sub cf::client::ext_msg($$@) {
2909 my ($self, $type, @msg) = @_; 3050 my ($self, $type, @msg) = @_;
2910 3051
2911 if ($self->extcmd == 2) { 3052 if ($self->extcmd == 2) {
2912 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3053 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2913 } elsif ($self->extcmd == 1) { # TODO: remove 3054 } elsif ($self->extcmd == 1) { # TODO: remove
2914 push @msg, msgtype => "event_$type"; 3055 push @msg, msgtype => "event_$type";
2915 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3056 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2916 } 3057 }
2917} 3058}
2918 3059
2919=item $client->ext_reply ($msgid, @msg) 3060=item $client->ext_reply ($msgid, @msg)
2920 3061
… …
2924 3065
2925sub cf::client::ext_reply($$@) { 3066sub cf::client::ext_reply($$@) {
2926 my ($self, $id, @msg) = @_; 3067 my ($self, $id, @msg) = @_;
2927 3068
2928 if ($self->extcmd == 2) { 3069 if ($self->extcmd == 2) {
2929 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3070 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2930 } elsif ($self->extcmd == 1) { 3071 } elsif ($self->extcmd == 1) {
2931 #TODO: version 1, remove 3072 #TODO: version 1, remove
2932 unshift @msg, msgtype => "reply", msgid => $id; 3073 unshift @msg, msgtype => "reply", msgid => $id;
2933 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3074 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2934 } 3075 }
2935} 3076}
2936 3077
2937=item $success = $client->query ($flags, "text", \&cb) 3078=item $success = $client->query ($flags, "text", \&cb)
2938 3079
… …
3039 3180
3040 $coro 3181 $coro
3041} 3182}
3042 3183
3043cf::client->attach ( 3184cf::client->attach (
3044 on_destroy => sub { 3185 on_client_destroy => sub {
3045 my ($ns) = @_; 3186 my ($ns) = @_;
3046 3187
3047 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3188 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3048 }, 3189 },
3049); 3190);
… …
3065our $safe_hole = new Safe::Hole; 3206our $safe_hole = new Safe::Hole;
3066 3207
3067$SIG{FPE} = 'IGNORE'; 3208$SIG{FPE} = 'IGNORE';
3068 3209
3069$safe->permit_only (Opcode::opset qw( 3210$safe->permit_only (Opcode::opset qw(
3070 :base_core :base_mem :base_orig :base_math 3211 :base_core :base_mem :base_orig :base_math :base_loop
3071 grepstart grepwhile mapstart mapwhile 3212 grepstart grepwhile mapstart mapwhile
3072 sort time 3213 sort time
3073)); 3214));
3074 3215
3075# here we export the classes and methods available to script code 3216# here we export the classes and methods available to script code
… …
3127 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3268 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3128 $qcode =~ s/\n/\\n/g; 3269 $qcode =~ s/\n/\\n/g;
3129 3270
3130 %vars = (_dummy => 0) unless %vars; 3271 %vars = (_dummy => 0) unless %vars;
3131 3272
3273 my @res;
3132 local $_; 3274 local $_;
3133 local @safe::cf::_safe_eval_args = values %vars;
3134 3275
3135 my $eval = 3276 my $eval =
3136 "do {\n" 3277 "do {\n"
3137 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3278 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3138 . "#line 0 \"{$qcode}\"\n" 3279 . "#line 0 \"{$qcode}\"\n"
3139 . $code 3280 . $code
3140 . "\n}" 3281 . "\n}"
3141 ; 3282 ;
3142 3283
3284 if ($CFG{safe_eval}) {
3143 sub_generation_inc; 3285 sub_generation_inc;
3286 local @safe::cf::_safe_eval_args = values %vars;
3144 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3287 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3145 sub_generation_inc; 3288 sub_generation_inc;
3289 } else {
3290 local @cf::_safe_eval_args = values %vars;
3291 @res = wantarray ? eval eval : scalar eval $eval;
3292 }
3146 3293
3147 if ($@) { 3294 if ($@) {
3148 warn "$@"; 3295 warn "$@";
3149 warn "while executing safe code '$code'\n"; 3296 warn "while executing safe code '$code'\n";
3150 warn "with arguments " . (join " ", %vars) . "\n"; 3297 warn "with arguments " . (join " ", %vars) . "\n";
… …
3169=cut 3316=cut
3170 3317
3171sub register_script_function { 3318sub register_script_function {
3172 my ($fun, $cb) = @_; 3319 my ($fun, $cb) = @_;
3173 3320
3174 no strict 'refs'; 3321 $fun = "safe::$fun" if $CFG{safe_eval};
3175 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3322 *$fun = $safe_hole->wrap ($cb);
3176} 3323}
3177 3324
3178=back 3325=back
3179 3326
3180=cut 3327=cut
… …
3201 3348
3202 $facedata->{version} == 2 3349 $facedata->{version} == 2
3203 or cf::cleanup "$path: version mismatch, cannot proceed."; 3350 or cf::cleanup "$path: version mismatch, cannot proceed.";
3204 3351
3205 # patch in the exptable 3352 # patch in the exptable
3353 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3206 $facedata->{resource}{"res/exp_table"} = { 3354 $facedata->{resource}{"res/exp_table"} = {
3207 type => FT_RSRC, 3355 type => FT_RSRC,
3208 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3356 data => $exp_table,
3357 hash => (Digest::MD5::md5 $exp_table),
3209 }; 3358 };
3210 cf::cede_to_tick; 3359 cf::cede_to_tick;
3211 3360
3212 { 3361 {
3213 my $faces = $facedata->{faceinfo}; 3362 my $faces = $facedata->{faceinfo};
… …
3215 while (my ($face, $info) = each %$faces) { 3364 while (my ($face, $info) = each %$faces) {
3216 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3365 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3217 3366
3218 cf::face::set_visibility $idx, $info->{visibility}; 3367 cf::face::set_visibility $idx, $info->{visibility};
3219 cf::face::set_magicmap $idx, $info->{magicmap}; 3368 cf::face::set_magicmap $idx, $info->{magicmap};
3220 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3369 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3221 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3370 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3222 3371
3223 cf::cede_to_tick; 3372 cf::cede_to_tick;
3224 } 3373 }
3225 3374
3226 while (my ($face, $info) = each %$faces) { 3375 while (my ($face, $info) = each %$faces) {
… …
3250 3399
3251 cf::anim::invalidate_all; # d'oh 3400 cf::anim::invalidate_all; # d'oh
3252 } 3401 }
3253 3402
3254 { 3403 {
3255 # TODO: for gcfclient pleasure, we should give resources
3256 # that gcfclient doesn't grok a >10000 face index.
3257 my $res = $facedata->{resource}; 3404 my $res = $facedata->{resource};
3258 3405
3259 while (my ($name, $info) = each %$res) { 3406 while (my ($name, $info) = each %$res) {
3260 if (defined $info->{type}) { 3407 if (defined $info->{type}) {
3261 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3408 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3262 my $data;
3263 3409
3264 if ($info->{type} & 1) { 3410 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3265 # prepend meta info
3266
3267 my $meta = $enc->encode ({
3268 name => $name,
3269 %{ $info->{meta} || {} },
3270 });
3271
3272 $data = pack "(w/a*)*", $meta, $info->{data};
3273 } else {
3274 $data = $info->{data};
3275 }
3276
3277 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3278 cf::face::set_type $idx, $info->{type}; 3411 cf::face::set_type $idx, $info->{type};
3279 } else { 3412 } else {
3280 $RESOURCE{$name} = $info; 3413 $RESOURCE{$name} = $info;
3281 } 3414 }
3282 3415
… …
3366 3499
3367 warn "finished reloading resource files\n"; 3500 warn "finished reloading resource files\n";
3368} 3501}
3369 3502
3370sub reload_config { 3503sub reload_config {
3504 warn "reloading config file...\n";
3505
3371 open my $fh, "<:utf8", "$CONFDIR/config" 3506 open my $fh, "<:utf8", "$CONFDIR/config"
3372 or return; 3507 or return;
3373 3508
3374 local $/; 3509 local $/;
3375 *CFG = YAML::Load <$fh>; 3510 *CFG = YAML::XS::Load scalar <$fh>;
3376 3511
3377 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3512 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3378 3513
3379 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3514 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3380 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3515 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3384 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3519 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3385 and die "WARNING: m(un)lockall failed: $!\n"; 3520 and die "WARNING: m(un)lockall failed: $!\n";
3386 }; 3521 };
3387 warn $@ if $@; 3522 warn $@ if $@;
3388 } 3523 }
3524
3525 warn "finished reloading resource files\n";
3389} 3526}
3390 3527
3391sub pidfile() { 3528sub pidfile() {
3392 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3529 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3393 or die "$PIDFILE: $!"; 3530 or die "$PIDFILE: $!";
… …
3421 3558
3422 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3559 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3423 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3560 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3424 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3561 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3425 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3562 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3426
3427 cf::init_experience;
3428 cf::init_anim;
3429 cf::init_attackmess;
3430 cf::init_dynamic;
3431 3563
3432 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3564 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3433 3565
3434 # we must not ever block the main coroutine 3566 # we must not ever block the main coroutine
3435 local $Coro::idle = sub { 3567 local $Coro::idle = sub {
… …
3441 }; 3573 };
3442 3574
3443 evthread_start IO::AIO::poll_fileno; 3575 evthread_start IO::AIO::poll_fileno;
3444 3576
3445 cf::sync_job { 3577 cf::sync_job {
3578 cf::init_experience;
3579 cf::init_anim;
3580 cf::init_attackmess;
3581 cf::init_dynamic;
3582
3583 cf::load_settings;
3584 cf::load_materials;
3585
3446 reload_resources; 3586 reload_resources;
3447 reload_config; 3587 reload_config;
3448 db_init; 3588 db_init;
3449 3589
3450 cf::load_settings;
3451 cf::load_materials;
3452 cf::init_uuid; 3590 cf::init_uuid;
3453 cf::init_signals; 3591 cf::init_signals;
3454 cf::init_commands;
3455 cf::init_skills; 3592 cf::init_skills;
3456 3593
3457 cf::init_beforeplay; 3594 cf::init_beforeplay;
3458 3595
3459 atomic; 3596 atomic;
… …
3466 use POSIX (); 3603 use POSIX ();
3467 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3604 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3468 3605
3469 (pop @POST_INIT)->(0) while @POST_INIT; 3606 (pop @POST_INIT)->(0) while @POST_INIT;
3470 }; 3607 };
3608
3609 cf::object::thawer::errors_are_fatal 0;
3610 warn "parse errors in files are no longer fatal from this point on.\n";
3471 3611
3472 main_loop; 3612 main_loop;
3473} 3613}
3474 3614
3475############################################################################# 3615#############################################################################
… …
3477 3617
3478# install some emergency cleanup handlers 3618# install some emergency cleanup handlers
3479BEGIN { 3619BEGIN {
3480 our %SIGWATCHER = (); 3620 our %SIGWATCHER = ();
3481 for my $signal (qw(INT HUP TERM)) { 3621 for my $signal (qw(INT HUP TERM)) {
3482 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3622 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3483 cf::cleanup "SIG$signal"; 3623 cf::cleanup "SIG$signal";
3484 }; 3624 };
3485 } 3625 }
3486} 3626}
3487 3627
3488sub write_runtime_sync { 3628sub write_runtime_sync {
3629 my $t0 = AE::time;
3630
3489 # first touch the runtime file to show we are still running: 3631 # first touch the runtime file to show we are still running:
3490 # the fsync below can take a very very long time. 3632 # the fsync below can take a very very long time.
3491 3633
3492 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3634 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3493 3635
3494 my $guard = cf::lock_acquire "write_runtime"; 3636 my $guard = cf::lock_acquire "write_runtime";
3495 3637
3496 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3638 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3497 or return; 3639 or return;
3498 3640
3499 my $value = $cf::RUNTIME + 90 + 10; 3641 my $value = $cf::RUNTIME + 90 + 10;
3500 # 10 is the runtime save interval, for a monotonic clock 3642 # 10 is the runtime save interval, for a monotonic clock
3501 # 60 allows for the watchdog to kill the server. 3643 # 60 allows for the watchdog to kill the server.
… …
3514 or return; 3656 or return;
3515 3657
3516 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3658 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3517 and return; 3659 and return;
3518 3660
3519 warn "runtime file written.\n"; 3661 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3520 3662
3521 1 3663 1
3522} 3664}
3523 3665
3524our $uuid_lock; 3666our $uuid_lock;
… …
3650 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3792 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3651 for my $name (keys %$leaf_symtab) { 3793 for my $name (keys %$leaf_symtab) {
3652 _gv_clear *{"$pkg$name"}; 3794 _gv_clear *{"$pkg$name"};
3653# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3795# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3654 } 3796 }
3655 warn "cleared package $pkg\n";#d#
3656} 3797}
3657 3798
3658sub do_reload_perl() { 3799sub do_reload_perl() {
3659 # can/must only be called in main 3800 # can/must only be called in main
3660 if ($Coro::current != $Coro::main) { 3801 if (in_main) {
3661 warn "can only reload from main coroutine"; 3802 warn "can only reload from main coroutine";
3662 return; 3803 return;
3663 } 3804 }
3664 3805
3665 return if $RELOAD++; 3806 return if $RELOAD++;
3666 3807
3667 my $t1 = EV::time; 3808 my $t1 = AE::time;
3668 3809
3669 while ($RELOAD) { 3810 while ($RELOAD) {
3670 warn "reloading..."; 3811 warn "reloading...";
3671 3812
3672 warn "entering sync_job"; 3813 warn "entering sync_job";
… …
3743 3884
3744 warn "unload completed, starting to reload now"; 3885 warn "unload completed, starting to reload now";
3745 3886
3746 warn "reloading cf.pm"; 3887 warn "reloading cf.pm";
3747 require cf; 3888 require cf;
3748 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3889 cf::_connect_to_perl_1;
3749 3890
3750 warn "loading config and database again"; 3891 warn "loading config and database again";
3751 cf::reload_config; 3892 cf::reload_config;
3752 3893
3753 warn "loading extensions"; 3894 warn "loading extensions";
… …
3775 3916
3776 warn "reloaded"; 3917 warn "reloaded";
3777 --$RELOAD; 3918 --$RELOAD;
3778 } 3919 }
3779 3920
3780 $t1 = EV::time - $t1; 3921 $t1 = AE::time - $t1;
3781 warn "reload completed in ${t1}s\n"; 3922 warn "reload completed in ${t1}s\n";
3782}; 3923};
3783 3924
3784our $RELOAD_WATCHER; # used only during reload 3925our $RELOAD_WATCHER; # used only during reload
3785 3926
… …
3788 # coro crashes during coro_state_free->destroy here. 3929 # coro crashes during coro_state_free->destroy here.
3789 3930
3790 $RELOAD_WATCHER ||= cf::async { 3931 $RELOAD_WATCHER ||= cf::async {
3791 Coro::AIO::aio_wait cache_extensions; 3932 Coro::AIO::aio_wait cache_extensions;
3792 3933
3793 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 3934 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3794 do_reload_perl; 3935 do_reload_perl;
3795 undef $RELOAD_WATCHER; 3936 undef $RELOAD_WATCHER;
3796 }; 3937 };
3797 }; 3938 };
3798} 3939}
… …
3815 3956
3816our @WAIT_FOR_TICK; 3957our @WAIT_FOR_TICK;
3817our @WAIT_FOR_TICK_BEGIN; 3958our @WAIT_FOR_TICK_BEGIN;
3818 3959
3819sub wait_for_tick { 3960sub wait_for_tick {
3820 return if tick_inhibit || $Coro::current == $Coro::main; 3961 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3821 3962
3822 my $signal = new Coro::Signal; 3963 my $signal = new Coro::Signal;
3823 push @WAIT_FOR_TICK, $signal; 3964 push @WAIT_FOR_TICK, $signal;
3824 $signal->wait; 3965 $signal->wait;
3825} 3966}
3826 3967
3827sub wait_for_tick_begin { 3968sub wait_for_tick_begin {
3828 return if tick_inhibit || $Coro::current == $Coro::main; 3969 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3829 3970
3830 my $signal = new Coro::Signal; 3971 my $signal = new Coro::Signal;
3831 push @WAIT_FOR_TICK_BEGIN, $signal; 3972 push @WAIT_FOR_TICK_BEGIN, $signal;
3832 $signal->wait; 3973 $signal->wait;
3833} 3974}
… …
3838 unless ++$bug_warning > 10; 3979 unless ++$bug_warning > 10;
3839 return; 3980 return;
3840 } 3981 }
3841 3982
3842 cf::server_tick; # one server iteration 3983 cf::server_tick; # one server iteration
3984
3985 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3843 3986
3844 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3987 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3845 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3988 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3846 Coro::async_pool { 3989 Coro::async_pool {
3847 $Coro::current->{desc} = "runtime saver"; 3990 $Coro::current->{desc} = "runtime saver";
… …
3870} 4013}
3871 4014
3872{ 4015{
3873 # configure BDB 4016 # configure BDB
3874 4017
3875 BDB::min_parallel 8; 4018 BDB::min_parallel 16;
3876 BDB::max_poll_reqs $TICK * 0.1; 4019 BDB::max_poll_reqs $TICK * 0.1;
3877 $AnyEvent::BDB::WATCHER->priority (1); 4020 $AnyEvent::BDB::WATCHER->priority (1);
3878 4021
3879 unless ($DB_ENV) { 4022 unless ($DB_ENV) {
3880 $DB_ENV = BDB::db_env_create; 4023 $DB_ENV = BDB::db_env_create;
… …
3961 } 4104 }
3962} 4105}
3963 4106
3964# load additional modules 4107# load additional modules
3965require "cf/$_.pm" for @EXTRA_MODULES; 4108require "cf/$_.pm" for @EXTRA_MODULES;
4109cf::_connect_to_perl_2;
3966 4110
3967END { cf::emergency_save } 4111END { cf::emergency_save }
3968 4112
39691 41131
3970 4114

Diff Legend

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