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.566 by root, Sun May 1 16:58:16 2011 UTC vs.
Revision 1.595 by root, Fri Nov 9 16:27:55 2012 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,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify it under 6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the 7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your 8# Free Software Foundation, either version 3 of the License, or (at your
9# 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 Affero GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# and the GNU General Public License along with this program. If not, see 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>. 18# <http://www.gnu.org/licenses/>.
19# 19#
20# 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>
21# 21#
22 22
23package cf; 23package cf;
24 24
… …
32use Safe; 32use Safe;
33use Safe::Hole; 33use Safe::Hole;
34use Storable (); 34use Storable ();
35use Carp (); 35use Carp ();
36 36
37use Guard (); 37use AnyEvent ();
38use AnyEvent::IO ();
39use AnyEvent::DNS ();
40
38use Coro (); 41use Coro ();
39use Coro::State; 42use Coro::State;
40use Coro::Handle; 43use Coro::Handle;
41use Coro::EV; 44use Coro::EV;
42use Coro::AnyEvent; 45use Coro::AnyEvent;
… …
48use Coro::AIO; 51use Coro::AIO;
49use Coro::BDB 1.6; 52use Coro::BDB 1.6;
50use Coro::Storable; 53use Coro::Storable;
51use Coro::Util (); 54use Coro::Util ();
52 55
56use Guard ();
53use JSON::XS 2.01 (); 57use JSON::XS 2.01 ();
54use BDB (); 58use BDB ();
55use Data::Dumper; 59use Data::Dumper;
56use Fcntl; 60use Fcntl;
57use YAML::XS (); 61use YAML::XS ();
… …
83our %COMMAND = (); 87our %COMMAND = ();
84our %COMMAND_TIME = (); 88our %COMMAND_TIME = ();
85 89
86our @EXTS = (); # list of extension package names 90our @EXTS = (); # list of extension package names
87our %EXTCMD = (); 91our %EXTCMD = ();
92our %EXTACMD = ();
88our %EXTICMD = (); 93our %EXTICMD = ();
94our %EXTIACMD = ();
89our %EXT_CORO = (); # coroutines bound to extensions 95our %EXT_CORO = (); # coroutines bound to extensions
90our %EXT_MAP = (); # pluggable maps 96our %EXT_MAP = (); # pluggable maps
91 97
92our $RELOAD; # number of reloads so far, non-zero while in reload 98our $RELOAD; # number of reloads so far, non-zero while in reload
93our @EVENT; 99our @EVENT;
… …
108our $RANDOMDIR = "$LOCALDIR/random"; 114our $RANDOMDIR = "$LOCALDIR/random";
109our $BDBDIR = "$LOCALDIR/db"; 115our $BDBDIR = "$LOCALDIR/db";
110our $PIDFILE = "$LOCALDIR/pid"; 116our $PIDFILE = "$LOCALDIR/pid";
111our $RUNTIMEFILE = "$LOCALDIR/runtime"; 117our $RUNTIMEFILE = "$LOCALDIR/runtime";
112 118
113our %RESOURCE; # unused 119#our %RESOURCE; # unused
114 120
115our $OUTPUT_RATE_MIN = 3000; 121our $OUTPUT_RATE_MIN = 3000;
116our $OUTPUT_RATE_MAX = 1000000; 122our $OUTPUT_RATE_MAX = 1000000;
117 123
118our $MAX_LINKS = 32; # how many chained exits to follow 124our $MAX_LINKS = 32; # how many chained exits to follow
… …
129our $DB_ENV; 135our $DB_ENV;
130 136
131our @EXTRA_MODULES = qw(pod match mapscript incloader); 137our @EXTRA_MODULES = qw(pod match mapscript incloader);
132 138
133our %CFG; 139our %CFG;
140our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
134 141
135our $UPTIME; $UPTIME ||= time; 142our $UPTIME; $UPTIME ||= time;
136our $RUNTIME; 143our $RUNTIME = 0;
144our $SERVER_TICK = 0;
137our $NOW; 145our $NOW;
138 146
139our (%PLAYER, %PLAYER_LOADING); # all users 147our (%PLAYER, %PLAYER_LOADING); # all users
140our (%MAP, %MAP_LOADING ); # all maps 148our (%MAP, %MAP_LOADING ); # all maps
141our $LINK_MAP; # the special {link} map, which is always available 149our $LINK_MAP; # the special {link} map, which is always available
… …
150 158
151our @POST_INIT; 159our @POST_INIT;
152 160
153our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow) 161our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
154our $REALLY_UNLOOP; # never set to true, please :) 162our $REALLY_UNLOOP; # never set to true, please :)
163
164our $WAIT_FOR_TICK = new Coro::Signal;
165our @WAIT_FOR_TICK_BEGIN;
155 166
156binmode STDOUT; 167binmode STDOUT;
157binmode STDERR; 168binmode STDERR;
158 169
159# read virtual server time, if available 170# read virtual server time, if available
… …
193 204
194=over 4 205=over 4
195 206
196=item $cf::UPTIME 207=item $cf::UPTIME
197 208
198The timestamp of the server start (so not actually an uptime). 209The timestamp of the server start (so not actually an "uptime").
210
211=item $cf::SERVER_TICK
212
213An unsigned integer that starts at zero when the server is started and is
214incremented on every tick.
215
216=item $cf::NOW
217
218The (real) time of the last (current) server tick - updated before and
219after tick processing, so this is useful only as a rough "what time is it
220now" estimate.
221
222=item $cf::TICK
223
224The interval between each server tick, in seconds.
199 225
200=item $cf::RUNTIME 226=item $cf::RUNTIME
201 227
202The time this server has run, starts at 0 and is increased by $cf::TICK on 228The time this server has run, starts at 0 and is increased by $cf::TICK on
203every server tick. 229every server tick.
204 230
205=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR 231=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
206$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR 232$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
207$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR 233$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
208 234
209Various directories - "/etc", read-only install directory, perl-library 235Various directories - "/etc", read-only install directory, perl-library
210directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 236directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
211unique-items directory, player file directory, random maps directory and 237unique-items directory, player file directory, random maps directory and
212database environment. 238database environment.
213 239
214=item $cf::NOW
215
216The time of the last (current) server tick.
217
218=item $cf::TICK
219
220The interval between server ticks, in seconds.
221
222=item $cf::LOADAVG 240=item $cf::LOADAVG
223 241
224The current CPU load on the server (alpha-smoothed), as a value between 0 242The current CPU load on the server (alpha-smoothed), as a value between 0
225(none) and 1 (overloaded), indicating how much time is spent on processing 243(none) and 1 (overloaded), indicating how much time is spent on processing
226objects per tick. Healthy values are < 0.5. 244objects per tick. Healthy values are < 0.5.
… …
237=item cf::wait_for_tick, cf::wait_for_tick_begin 255=item cf::wait_for_tick, cf::wait_for_tick_begin
238 256
239These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 257These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
240returns directly I<after> the tick processing (and consequently, can only wake one thread 258returns directly I<after> the tick processing (and consequently, can only wake one thread
241per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 259per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
260
261Note that cf::Wait_for_tick will immediately return when the server is not
262ticking, making it suitable for small pauses in threads that need to run
263when the server is paused. If that is not applicable (i.e. you I<really>
264want to wait, use C<$cf::WAIT_FOR_TICK>).
265
266=item $cf::WAIT_FOR_TICK
267
268Note that C<cf::wait_for_tick> is probably the correct thing to use. This
269variable contains a L<Coro::Signal> that is broadcats after every server
270tick. Calling C<< ->wait >> on it will suspend the caller until after the
271next server tick.
242 272
243=cut 273=cut
244 274
245sub wait_for_tick(); 275sub wait_for_tick();
246sub wait_for_tick_begin(); 276sub wait_for_tick_begin();
… …
312)) { 342)) {
313 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 343 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
314} 344}
315 345
316$EV::DIED = sub { 346$EV::DIED = sub {
317 Carp::cluck "error in event callback: @_"; 347 warn "error in event callback: $@";
318}; 348};
319 349
320############################################################################# 350#############################################################################
321 351
322sub fork_call(&@); 352sub fork_call(&@);
… …
349 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 379 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
350 $d 380 $d
351 } || "[unable to dump $_[0]: '$@']"; 381 } || "[unable to dump $_[0]: '$@']";
352} 382}
353 383
354=item $scalar = load_file $path 384=item $scalar = cf::load_file $path
355 385
356Loads the given file from path and returns its contents. Croaks on error 386Loads the given file from path and returns its contents. Croaks on error
357and can block. 387and can block.
358 388
359=cut 389=cut
… …
361sub load_file($) { 391sub load_file($) {
362 0 <= aio_load $_[0], my $data 392 0 <= aio_load $_[0], my $data
363 or Carp::croak "$_[0]: $!"; 393 or Carp::croak "$_[0]: $!";
364 394
365 $data 395 $data
396}
397
398=item $success = cf::replace_file $path, $data, $sync
399
400Atomically replaces the file at the given $path with new $data, and
401optionally $sync the data to disk before replacing the file.
402
403=cut
404
405sub replace_file($$;$) {
406 my ($path, $data, $sync) = @_;
407
408 my $lock = cf::lock_acquire ("replace_file:$path");
409
410 my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
411 or return;
412
413 $data = $data->() if ref $data;
414
415 length $data == aio_write $fh, 0, (length $data), $data, 0
416 or return;
417
418 !$sync
419 or !aio_fsync $fh
420 or return;
421
422 aio_close $fh
423 and return;
424
425 aio_rename "$path~", $path
426 and return;
427
428 if ($sync) {
429 $path =~ s%/[^/]*$%%;
430 aio_pathsync $path;
431 }
432
433 1
366} 434}
367 435
368=item $ref = cf::decode_json $json 436=item $ref = cf::decode_json $json
369 437
370Converts a JSON string into the corresponding perl data structure. 438Converts a JSON string into the corresponding perl data structure.
… …
545 } 613 }
546 } 614 }
547 615
548 if (@SLOT_QUEUE) { 616 if (@SLOT_QUEUE) {
549 # we do not use wait_for_tick() as it returns immediately when tick is inactive 617 # we do not use wait_for_tick() as it returns immediately when tick is inactive
550 push @cf::WAIT_FOR_TICK, $signal; 618 $WAIT_FOR_TICK->wait;
551 $signal->wait;
552 } else { 619 } else {
553 $busy = 0; 620 $busy = 0;
554 Coro::schedule; 621 Coro::schedule;
555 } 622 }
556 } 623 }
… …
1366=cut 1433=cut
1367 1434
1368############################################################################# 1435#############################################################################
1369# command handling &c 1436# command handling &c
1370 1437
1371=item cf::register_command $name => \&callback($ob,$args); 1438=item cf::register_command $name => \&callback($ob,$args)
1372 1439
1373Register a callback for execution when the client sends the user command 1440Register a callback for execution when the client sends the user command
1374$name. 1441$name.
1375 1442
1376=cut 1443=cut
… …
1382 #warn "registering command '$name/$time' to '$caller'"; 1449 #warn "registering command '$name/$time' to '$caller'";
1383 1450
1384 push @{ $COMMAND{$name} }, [$caller, $cb]; 1451 push @{ $COMMAND{$name} }, [$caller, $cb];
1385} 1452}
1386 1453
1387=item cf::register_extcmd $name => \&callback($pl,$packet); 1454=item cf::register_extcmd $name => \&callback($pl,@args)
1388 1455
1389Register a callback for execution when the client sends an (synchronous) 1456Register a callback for execution when the client sends an (synchronous)
1390extcmd packet. Ext commands will be processed in the order they are 1457extcmd packet. Ext commands will be processed in the order they are
1391received by the server, like other user commands. The first argument is 1458received by the server, like other user commands. The first argument is
1392the logged-in player. Ext commands can only be processed after a player 1459the logged-in player. Ext commands can only be processed after a player
1393has logged in successfully. 1460has logged in successfully.
1394 1461
1395If the callback returns something, it is sent back as if reply was being 1462The values will be sent back to the client.
1396called.
1397 1463
1464=item cf::register_async_extcmd $name => \&callback($pl,$reply->(...),@args)
1465
1466Same as C<cf::register_extcmd>, but instead of returning values, the
1467callback needs to clal the C<$reply> function.
1468
1398=item cf::register_exticmd $name => \&callback($ns,$packet); 1469=item cf::register_exticmd $name => \&callback($ns,@args)
1399 1470
1400Register a callback for execution when the client sends an (asynchronous) 1471Register a callback for execution when the client sends an (asynchronous)
1401exticmd packet. Exti commands are processed by the server as soon as they 1472exticmd packet. Exti commands are processed by the server as soon as they
1402are received, i.e. out of order w.r.t. other commands. The first argument 1473are received, i.e. out of order w.r.t. other commands. The first argument
1403is a client socket. Exti commands can be received anytime, even before 1474is a client socket. Exti commands can be received anytime, even before
1404log-in. 1475log-in.
1405 1476
1406If the callback returns something, it is sent back as if reply was being 1477The values will be sent back to the client.
1407called.
1408 1478
1409=cut 1479=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1410 1480
1481Same as C<cf::register_extcmd>, but instead of returning values, the
1482callback needs to clal the C<$reply> function.
1483
1484=cut
1485
1411sub register_extcmd { 1486sub register_extcmd($$) {
1412 my ($name, $cb) = @_; 1487 my ($name, $cb) = @_;
1413 1488
1414 $EXTCMD{$name} = $cb; 1489 $EXTCMD{$name} = $cb;
1415} 1490}
1416 1491
1417sub register_exticmd { 1492sub register_async_extcmd($$) {
1418 my ($name, $cb) = @_; 1493 my ($name, $cb) = @_;
1419 1494
1495 $EXTACMD{$name} = $cb;
1496}
1497
1498sub register_exticmd($$) {
1499 my ($name, $cb) = @_;
1500
1420 $EXTICMD{$name} = $cb; 1501 $EXTICMD{$name} = $cb;
1502}
1503
1504sub register_async_exticmd($$) {
1505 my ($name, $cb) = @_;
1506
1507 $EXTIACMD{$name} = $cb;
1421} 1508}
1422 1509
1423use File::Glob (); 1510use File::Glob ();
1424 1511
1425cf::player->attach ( 1512cf::player->attach (
… …
1439 my ($pl, $buf) = @_; 1526 my ($pl, $buf) = @_;
1440 1527
1441 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1528 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1442 1529
1443 if (ref $msg) { 1530 if (ref $msg) {
1444 my ($type, $reply, @payload) = 1531 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1445 "ARRAY" eq ref $msg
1446 ? @$msg
1447 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1448 1532
1449 my @reply;
1450
1451 if (my $cb = $EXTCMD{$type}) { 1533 if (my $cb = $EXTACMD{$type}) {
1534 $cb->(
1535 $pl,
1536 sub {
1537 $pl->ext_msg ("reply-$reply", @_)
1538 if $reply;
1539 },
1540 @payload
1541 );
1542 } else {
1543 my @reply;
1544
1545 if (my $cb = $EXTCMD{$type}) {
1452 @reply = $cb->($pl, @payload); 1546 @reply = $cb->($pl, @payload);
1547 }
1548
1549 $pl->ext_msg ("reply-$reply", @reply)
1550 if $reply;
1453 } 1551 }
1454
1455 $pl->ext_reply ($reply, @reply)
1456 if $reply;
1457 1552
1458 } else { 1553 } else {
1459 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1554 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1460 } 1555 }
1461 1556
… …
1474 }; 1569 };
1475 1570
1476 $grp 1571 $grp
1477} 1572}
1478 1573
1574sub _ext_cfg_reg($$$$) {
1575 my ($rvar, $varname, $cfgname, $default) = @_;
1576
1577 $cfgname = lc $varname
1578 unless length $cfgname;
1579
1580 $EXT_CFG{$cfgname} = [$rvar, $default];
1581
1582 $$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
1583}
1584
1479sub load_extensions { 1585sub load_extensions {
1480 info "loading extensions..."; 1586 info "loading extensions...";
1587
1588 %EXT_CFG = ();
1481 1589
1482 cf::sync_job { 1590 cf::sync_job {
1483 my %todo; 1591 my %todo;
1484 1592
1485 for my $path (<$LIBDIR/*.ext>) { 1593 for my $path (<$LIBDIR/*.ext>) {
… …
1528 unless exists $done{$_}; 1636 unless exists $done{$_};
1529 } 1637 }
1530 1638
1531 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1639 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1532 1640
1641 my $source = $v->{source};
1642
1643 # support "CONF varname :confname = default" pseudo-statements
1644 $source =~ s{
1645 ^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
1646 }{
1647 "our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
1648 }gmxe;
1649
1533 my $active = eval $v->{source}; 1650 my $active = eval $source;
1534 1651
1535 if (length $@) { 1652 if (length $@) {
1536 error "$v->{path}: $@\n"; 1653 error "$v->{path}: $@\n";
1537 1654
1538 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1655 cf::cleanup "mandatory extension '$k' failed to load, exiting."
… …
1825} 1942}
1826 1943
1827=item $protocol_xml = $player->expand_cfpod ($cfpod) 1944=item $protocol_xml = $player->expand_cfpod ($cfpod)
1828 1945
1829Expand deliantra pod fragments into protocol xml. 1946Expand deliantra pod fragments into protocol xml.
1830
1831=item $player->ext_reply ($msgid, @msg)
1832
1833Sends an ext reply to the player.
1834
1835=cut
1836
1837sub ext_reply($$@) {
1838 my ($self, $id, @msg) = @_;
1839
1840 $self->ns->ext_reply ($id, @msg)
1841}
1842 1947
1843=item $player->ext_msg ($type, @msg) 1948=item $player->ext_msg ($type, @msg)
1844 1949
1845Sends an ext event to the client. 1950Sends an ext event to the client.
1846 1951
… …
1954 # {... are special paths that are not being touched 2059 # {... are special paths that are not being touched
1955 # ?xxx/... are special absolute paths 2060 # ?xxx/... are special absolute paths
1956 # ?random/... random maps 2061 # ?random/... random maps
1957 # /... normal maps 2062 # /... normal maps
1958 # ~user/... per-player map of a specific user 2063 # ~user/... per-player map of a specific user
1959 # !up !down for quad maps, or other maps with up/down layers
1960 2064
1961 $path =~ s/$PATH_SEP/\//go; 2065 $path =~ s/$PATH_SEP/\//go;
1962 2066
1963 # treat it as relative path if it starts with 2067 # treat it as relative path if it starts with
1964 # something that looks reasonable 2068 # something that looks reasonable
1965 if ($path =~ m{^(?:\./|\.\./|\w)}) { 2069 if ($path =~ m{^(?:\./|\.\./|\w)}) {
1966 $base or Carp::carp "normalise called with relative path and no base: '$path'"; 2070 $base or Carp::carp "normalise called with relative path and no base: '$path'";
1967 2071
1968 $base =~ s{[^/]+/?$}{}; 2072 $base =~ s{[^/]+/?$}{};
1969 $path = "$base/$path"; 2073 $path = "$base/$path";
1970
1971 } elsif ($path eq '!up') {
1972 $base && ref $base
1973 or Carp::carp "normalise called with relative tile path and no base: '$path'";
1974
1975 my $uppth = $base->tile_path (cf::TILE_UP);
1976 $path = $uppth if $uppth;
1977
1978 } elsif ($path eq '!down') {
1979 $base && ref $base
1980 or Carp::carp "normalise called with relative tile path and no base: '$path'";
1981
1982 my $dpth = $base->tile_path (cf::TILE_DOWN);
1983 $path = $dpth if $dpth;
1984 } 2074 }
1985 2075
1986 for ($path) { 2076 for ($path) {
1987 redo if s{/\.?/}{/}; 2077 redo if s{/\.?/}{/};
1988 redo if s{/[^/]+/\.\./}{/}; 2078 redo if s{/[^/]+/\.\./}{/};
… …
2186 2276
2187 { 2277 {
2188 my $guard = cf::lock_acquire "map_data:$path"; 2278 my $guard = cf::lock_acquire "map_data:$path";
2189 2279
2190 return unless $self->valid; 2280 return unless $self->valid;
2191 return unless $self->in_memory == cf::MAP_SWAPPED; 2281 return unless $self->state == cf::MAP_SWAPPED;
2192
2193 $self->in_memory (cf::MAP_LOADING);
2194 2282
2195 $self->alloc; 2283 $self->alloc;
2196 2284
2197 $self->pre_load; 2285 $self->pre_load;
2198 cf::cede_to_tick; 2286 cf::cede_to_tick;
… …
2221 } else { 2309 } else {
2222 $self->post_load_original 2310 $self->post_load_original
2223 if delete $self->{load_original}; 2311 if delete $self->{load_original};
2224 } 2312 }
2225 2313
2314 $self->state (cf::MAP_INACTIVE);
2315
2226 cf::cede_to_tick; 2316 cf::cede_to_tick;
2227 # now do the right thing for maps 2317 # now do the right thing for maps
2228 $self->link_multipart_objects; 2318 $self->link_multipart_objects;
2229 $self->difficulty ($self->estimate_difficulty) 2319 $self->difficulty ($self->estimate_difficulty)
2230 unless $self->difficulty; 2320 unless $self->difficulty;
… …
2233 unless ($self->{deny_activate}) { 2323 unless ($self->{deny_activate}) {
2234 $self->decay_objects; 2324 $self->decay_objects;
2235 $self->fix_auto_apply; 2325 $self->fix_auto_apply;
2236 $self->update_buttons; 2326 $self->update_buttons;
2237 cf::cede_to_tick; 2327 cf::cede_to_tick;
2238 $self->activate; 2328 #$self->activate; # no longer activate maps automatically
2239 } 2329 }
2240 2330
2241 $self->{last_save} = $cf::RUNTIME; 2331 $self->{last_save} = $cf::RUNTIME;
2242 $self->last_access ($cf::RUNTIME); 2332 $self->last_access ($cf::RUNTIME);
2243
2244 $self->in_memory (cf::MAP_ACTIVE);
2245 } 2333 }
2246 2334
2247 $self->post_load; 2335 $self->post_load;
2248 2336
2249 1 2337 1
… …
2262# if $self->per_party; 2350# if $self->per_party;
2263 2351
2264 $self 2352 $self
2265} 2353}
2266 2354
2267# find and load all maps in the 3x3 area around a map
2268sub load_neighbours {
2269 my ($map) = @_;
2270
2271 my @neigh; # diagonal neighbours
2272
2273 for (0 .. 3) {
2274 my $neigh = $map->tile_path ($_)
2275 or next;
2276 $neigh = find $neigh, $map
2277 or next;
2278 $neigh->load;
2279
2280 # now find the diagonal neighbours
2281 push @neigh,
2282 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2283 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2284 }
2285
2286 for (grep defined $_->[0], @neigh) {
2287 my ($path, $origin) = @$_;
2288 my $neigh = find $path, $origin
2289 or next;
2290 $neigh->load;
2291 }
2292}
2293
2294sub find_sync { 2355sub find_sync {
2295 my ($path, $origin) = @_; 2356 my ($path, $origin) = @_;
2296 2357
2358 # it's a bug to call this from the main context
2297 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync" 2359 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2298 if $Coro::current == $Coro::main; 2360 if $Coro::current == $Coro::main;
2299 2361
2300 find $path, $origin 2362 find $path, $origin
2301} 2363}
2302 2364
2303sub do_load_sync { 2365sub do_load_sync {
2304 my ($map) = @_; 2366 my ($map) = @_;
2305 2367
2368 # it's a bug to call this from the main context
2306 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync" 2369 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2307 if $Coro::current == $Coro::main; 2370 if $Coro::current == $Coro::main;
2308 2371
2309 $map->load; 2372 $map->load;
2310} 2373}
… …
2316 my ($path, $origin, $load) = @_; 2379 my ($path, $origin, $load) = @_;
2317 2380
2318 $path = normalise $path, $origin; 2381 $path = normalise $path, $origin;
2319 2382
2320 if (my $map = $cf::MAP{$path}) { 2383 if (my $map = $cf::MAP{$path}) {
2321 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2384 return $map if !$load || $map->linkable;
2322 } 2385 }
2323 2386
2324 $MAP_PREFETCH{$path} |= $load; 2387 $MAP_PREFETCH{$path} |= $load;
2325 2388
2326 $MAP_PREFETCHER ||= cf::async { 2389 $MAP_PREFETCHER ||= cf::async {
… …
2385sub swap_out { 2448sub swap_out {
2386 my ($self) = @_; 2449 my ($self) = @_;
2387 2450
2388 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2451 my $lock = cf::lock_acquire "map_data:$self->{path}";
2389 2452
2390 return if $self->in_memory != cf::MAP_ACTIVE; 2453 return if !$self->linkable;
2391 return if $self->{deny_save}; 2454 return if $self->{deny_save};
2392 return if $self->players; 2455 return if $self->players;
2393 2456
2394 # first deactivate the map and "unlink" it from the core 2457 # first deactivate the map and "unlink" it from the core
2395 $self->deactivate; 2458 $self->deactivate;
2396 $_->clear_links_to ($self) for values %cf::MAP; 2459 $_->clear_links_to ($self) for values %cf::MAP;
2397 $self->in_memory (cf::MAP_SWAPPED); 2460 $self->state (cf::MAP_SWAPPED);
2398 2461
2399 # then atomically save 2462 # then atomically save
2400 $self->_save; 2463 $self->_save;
2401 2464
2402 # then free the map 2465 # then free the map
… …
2428 2491
2429 return if $self->players; 2492 return if $self->players;
2430 2493
2431 cf::trace "resetting map ", $self->path, "\n"; 2494 cf::trace "resetting map ", $self->path, "\n";
2432 2495
2433 $self->in_memory (cf::MAP_SWAPPED); 2496 $self->state (cf::MAP_SWAPPED);
2434 2497
2435 # need to save uniques path 2498 # need to save uniques path
2436 unless ($self->{deny_save}) { 2499 unless ($self->{deny_save}) {
2437 my $uniq = $self->uniq_path; utf8::encode $uniq; 2500 my $uniq = $self->uniq_path; utf8::encode $uniq;
2438 2501
… …
2768 # use -1 or undef as default coordinates, not 0, 0 2831 # use -1 or undef as default coordinates, not 0, 0
2769 ($x, $y) = ($map->enter_x, $map->enter_y) 2832 ($x, $y) = ($map->enter_x, $map->enter_y)
2770 if $x <= 0 && $y <= 0; 2833 if $x <= 0 && $y <= 0;
2771 2834
2772 $map->load; 2835 $map->load;
2773 $map->load_neighbours;
2774 2836
2775 return unless $self->contr->active; 2837 return unless $self->contr->active;
2776 2838
2777 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2839 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2778 if ($self->enter_map ($map, $x, $y)) { 2840 if ($self->enter_map ($map, $x, $y)) {
… …
2934 $Coro::current->{desc} = "enter_exit"; 2996 $Coro::current->{desc} = "enter_exit";
2935 2997
2936 unless (eval { 2998 unless (eval {
2937 $self->deactivate_recursive; # just to be sure 2999 $self->deactivate_recursive; # just to be sure
2938 3000
2939 # random map handling
2940 {
2941 my $guard = cf::lock_acquire "exit_prepare:$exit";
2942
2943 prepare_random_map $exit
2944 if $exit->slaying eq "/!";
2945 }
2946
2947 my $map = cf::map::normalise $exit->slaying, $exit->map; 3001 my $map = cf::map::normalise $exit->slaying, $exit->map;
2948 my $x = $exit->stats->hp; 3002 my $x = $exit->stats->hp;
2949 my $y = $exit->stats->sp; 3003 my $y = $exit->stats->sp;
3004
3005 # special map handling
3006 my $slaying = $exit->slaying;
3007
3008 # special map handling
3009 if ($slaying eq "/!") {
3010 my $guard = cf::lock_acquire "exit_prepare:$exit";
3011
3012 prepare_random_map $exit
3013 if $exit->slaying eq "/!"; # need to re-check after getting the lock
3014
3015 $map = $exit->slaying;
3016
3017 } elsif ($slaying eq '!up') {
3018 $map = $exit->map->tile_path (cf::TILE_UP);
3019 $x = $exit->x;
3020 $y = $exit->y;
3021
3022 } elsif ($slaying eq '!down') {
3023 $map = $exit->map->tile_path (cf::TILE_DOWN);
3024 $x = $exit->x;
3025 $y = $exit->y;
3026 }
2950 3027
2951 $self->goto ($map, $x, $y); 3028 $self->goto ($map, $x, $y);
2952 3029
2953 # if exit is damned, update players death & WoR home-position 3030 # if exit is damned, update players death & WoR home-position
2954 $self->contr->savebed ($map, $x, $y) 3031 $self->contr->savebed ($map, $x, $y)
… …
3179=cut 3256=cut
3180 3257
3181sub cf::client::ext_msg($$@) { 3258sub cf::client::ext_msg($$@) {
3182 my ($self, $type, @msg) = @_; 3259 my ($self, $type, @msg) = @_;
3183 3260
3184 if ($self->extcmd == 2) {
3185 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3261 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3186 } elsif ($self->extcmd == 1) { # TODO: remove
3187 push @msg, msgtype => "event_$type";
3188 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3189 }
3190}
3191
3192=item $client->ext_reply ($msgid, @msg)
3193
3194Sends an ext reply to the client.
3195
3196=cut
3197
3198sub cf::client::ext_reply($$@) {
3199 my ($self, $id, @msg) = @_;
3200
3201 if ($self->extcmd == 2) {
3202 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3203 } elsif ($self->extcmd == 1) {
3204 #TODO: version 1, remove
3205 unshift @msg, msgtype => "reply", msgid => $id;
3206 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3207 }
3208} 3262}
3209 3263
3210=item $success = $client->query ($flags, "text", \&cb) 3264=item $success = $client->query ($flags, "text", \&cb)
3211 3265
3212Queues a query to the client, calling the given callback with 3266Queues a query to the client, calling the given callback with
… …
3267 my ($ns, $buf) = @_; 3321 my ($ns, $buf) = @_;
3268 3322
3269 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3323 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3270 3324
3271 if (ref $msg) { 3325 if (ref $msg) {
3272 my ($type, $reply, @payload) = 3326 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3273 "ARRAY" eq ref $msg
3274 ? @$msg
3275 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3276 3327
3277 my @reply;
3278
3279 if (my $cb = $EXTICMD{$type}) { 3328 if (my $cb = $EXTIACMD{$type}) {
3329 $cb->(
3330 $ns,
3331 sub {
3332 $ns->ext_msg ("reply-$reply", @_)
3333 if $reply;
3334 },
3335 @payload
3336 );
3337 } else {
3338 my @reply;
3339
3340 if (my $cb = $EXTICMD{$type}) {
3280 @reply = $cb->($ns, @payload); 3341 @reply = $cb->($ns, @payload);
3342 }
3343
3344 $ns->ext_msg ("reply-$reply", @reply)
3345 if $reply;
3281 } 3346 }
3282
3283 $ns->ext_reply ($reply, @reply)
3284 if $reply;
3285
3286 } else { 3347 } else {
3287 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3348 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3288 } 3349 }
3289 3350
3290 cf::override; 3351 cf::override;
… …
3458=cut 3519=cut
3459 3520
3460############################################################################# 3521#############################################################################
3461# the server's init and main functions 3522# the server's init and main functions
3462 3523
3524our %FACEHASH; # hash => idx, #d# HACK for http server
3525
3526# internal api, not fianlised
3527sub add_face {
3528 my ($name, $type, $data) = @_;
3529
3530 my $idx = cf::face::find $name;
3531
3532 if ($idx) {
3533 delete $FACEHASH{cf::face::get_chksum $idx};
3534 } else {
3535 $idx = cf::face::alloc $name;
3536 }
3537
3538 my $hash = cf::face::mangle_chksum Digest::MD5::md5 $data;
3539
3540 cf::face::set_type $idx, $type;
3541 cf::face::set_data $idx, 0, $data, $hash;
3542 cf::face::set_meta $idx, $type & 1 ? undef : undef;
3543 $FACEHASH{$hash} = $idx;#d#
3544
3545 $idx
3546}
3547
3463sub load_facedata($) { 3548sub load_facedata($) {
3464 my ($path) = @_; 3549 my ($path) = @_;
3465 3550
3466 # HACK to clear player env face cache, we need some signal framework 3551 # HACK to clear player env face cache, we need some signal framework
3467 # for this (global event?) 3552 # for this (global event?)
… …
3474 my $facedata = decode_storable load_file $path; 3559 my $facedata = decode_storable load_file $path;
3475 3560
3476 $facedata->{version} == 2 3561 $facedata->{version} == 2
3477 or cf::cleanup "$path: version mismatch, cannot proceed."; 3562 or cf::cleanup "$path: version mismatch, cannot proceed.";
3478 3563
3479 # patch in the exptable
3480 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3481 $facedata->{resource}{"res/exp_table"} = {
3482 type => FT_RSRC,
3483 data => $exp_table,
3484 hash => (Digest::MD5::md5 $exp_table),
3485 };
3486 cf::cede_to_tick; 3564 cf::cede_to_tick;
3487 3565
3488 { 3566 {
3489 my $faces = $facedata->{faceinfo}; 3567 my $faces = $facedata->{faceinfo};
3490 3568
3491 while (my ($face, $info) = each %$faces) { 3569 for my $face (sort keys %$faces) {
3570 my $info = $faces->{$face};
3492 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3571 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3493 3572
3494 cf::face::set_visibility $idx, $info->{visibility}; 3573 cf::face::set_visibility $idx, $info->{visibility};
3495 cf::face::set_magicmap $idx, $info->{magicmap}; 3574 cf::face::set_magicmap $idx, $info->{magicmap};
3496 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3575 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3497 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3576 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3498 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ; 3577 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3578 $FACEHASH{$info->{hash64}} = $idx;#d#
3499 3579
3500 cf::cede_to_tick; 3580 cf::cede_to_tick;
3501 } 3581 }
3502 3582
3503 while (my ($face, $info) = each %$faces) { 3583 while (my ($face, $info) = each %$faces) {
… …
3530 3610
3531 { 3611 {
3532 my $res = $facedata->{resource}; 3612 my $res = $facedata->{resource};
3533 3613
3534 while (my ($name, $info) = each %$res) { 3614 while (my ($name, $info) = each %$res) {
3535 if (defined $info->{type}) { 3615 if (defined (my $type = $info->{type})) {
3616 # TODO: different hash - must free and use new index, or cache ixface data queue
3536 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3617 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3537 3618
3619 cf::face::set_type $idx, $type;
3538 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3620 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3539 cf::face::set_type $idx, $info->{type}; 3621 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3622 $FACEHASH{$info->{hash}} = $idx;#d#
3540 } else { 3623 } else {
3541 $RESOURCE{$name} = $info; # unused 3624# $RESOURCE{$name} = $info; # unused
3542 } 3625 }
3543 3626
3544 cf::cede_to_tick; 3627 cf::cede_to_tick;
3545 } 3628 }
3546 } 3629 }
… …
3564 my $status = load_resource_file_ $_[0]; 3647 my $status = load_resource_file_ $_[0];
3565 get_slot 0.1, 100; 3648 get_slot 0.1, 100;
3566 cf::arch::commit_load; 3649 cf::arch::commit_load;
3567 3650
3568 $status 3651 $status
3652}
3653
3654sub reload_exp_table {
3655 _reload_exp_table;
3656
3657 add_face "res/exp_table" => FT_RSRC,
3658 JSON::XS->new->utf8->canonical->encode (
3659 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3660 );
3661}
3662
3663sub reload_materials {
3664 _reload_materials;
3569} 3665}
3570 3666
3571sub reload_regions { 3667sub reload_regions {
3572 # HACK to clear player env face cache, we need some signal framework 3668 # HACK to clear player env face cache, we need some signal framework
3573 # for this (global event?) 3669 # for this (global event?)
… …
3588} 3684}
3589 3685
3590sub reload_archetypes { 3686sub reload_archetypes {
3591 load_resource_file "$DATADIR/archetypes" 3687 load_resource_file "$DATADIR/archetypes"
3592 or die "unable to load archetypes\n"; 3688 or die "unable to load archetypes\n";
3689
3690 add_face "res/skill_info" => FT_RSRC,
3691 JSON::XS->new->utf8->canonical->encode (
3692 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3693 );
3694 add_face "res/spell_paths" => FT_RSRC,
3695 JSON::XS->new->utf8->canonical->encode (
3696 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3697 );
3593} 3698}
3594 3699
3595sub reload_treasures { 3700sub reload_treasures {
3596 load_resource_file "$DATADIR/treasures" 3701 load_resource_file "$DATADIR/treasures"
3597 or die "unable to load treasurelists\n"; 3702 or die "unable to load treasurelists\n";
… …
3618} 3723}
3619 3724
3620sub reload_resources { 3725sub reload_resources {
3621 trace "reloading resource files...\n"; 3726 trace "reloading resource files...\n";
3622 3727
3623 reload_exp_table;
3624 reload_materials; 3728 reload_materials;
3625 reload_facedata; 3729 reload_facedata;
3730 reload_exp_table;
3626 reload_sound; 3731 reload_sound;
3627 reload_archetypes; 3732 reload_archetypes;
3628 reload_regions; 3733 reload_regions;
3629 reload_treasures; 3734 reload_treasures;
3630 3735
… …
3682 3787
3683sub main { 3788sub main {
3684 cf::init_globals; # initialise logging 3789 cf::init_globals; # initialise logging
3685 3790
3686 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3791 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3687 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3792 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3688 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3793 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3689 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3794 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3690 3795
3691 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3796 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3692 3797
3693 # we must not ever block the main coroutine 3798 # we must not ever block the main coroutine
3694 local $Coro::idle = sub { 3799 $Coro::idle = sub {
3695 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3800 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3696 (async { 3801 (async {
3697 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3802 $Coro::current->{desc} = "IDLE BUG HANDLER";
3698 EV::loop EV::LOOP_ONESHOT; 3803 EV::loop EV::LOOP_ONESHOT;
3699 })->prio (Coro::PRIO_MAX); 3804 })->prio (Coro::PRIO_MAX);
… …
3702 evthread_start IO::AIO::poll_fileno; 3807 evthread_start IO::AIO::poll_fileno;
3703 3808
3704 cf::sync_job { 3809 cf::sync_job {
3705 cf::incloader::init (); 3810 cf::incloader::init ();
3706 3811
3812 db_init;
3813
3707 cf::init_anim; 3814 cf::init_anim;
3708 cf::init_attackmess; 3815 cf::init_attackmess;
3709 cf::init_dynamic; 3816 cf::init_dynamic;
3710 3817
3711 cf::load_settings; 3818 cf::load_settings;
3712 3819
3713 reload_resources; 3820 reload_resources;
3714 reload_config; 3821 reload_config;
3715 db_init;
3716 3822
3717 cf::init_uuid; 3823 cf::init_uuid;
3718 cf::init_signals; 3824 cf::init_signals;
3719 cf::init_skills; 3825 cf::init_skills;
3720 3826
… …
3734 }; 3840 };
3735 3841
3736 cf::object::thawer::errors_are_fatal 0; 3842 cf::object::thawer::errors_are_fatal 0;
3737 info "parse errors in files are no longer fatal from this point on.\n"; 3843 info "parse errors in files are no longer fatal from this point on.\n";
3738 3844
3739 my $free_main; $free_main = EV::idle sub { 3845 AE::postpone {
3740 undef $free_main;
3741 undef &main; # free gobs of memory :) 3846 undef &main; # free gobs of memory :)
3742 }; 3847 };
3743 3848
3744 goto &main_loop; 3849 goto &main_loop;
3745} 3850}
… …
3902 4007
3903 cf::write_runtime_sync; # external watchdog should not bark 4008 cf::write_runtime_sync; # external watchdog should not bark
3904 4009
3905 trace "emergency_perl_save: flushing outstanding aio requests"; 4010 trace "emergency_perl_save: flushing outstanding aio requests";
3906 while (IO::AIO::nreqs || BDB::nreqs) { 4011 while (IO::AIO::nreqs || BDB::nreqs) {
3907 Coro::EV::timer_once 0.01; # let the sync_job do it's thing 4012 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3908 } 4013 }
3909 4014
3910 cf::write_runtime_sync; # external watchdog should not bark 4015 cf::write_runtime_sync; # external watchdog should not bark
3911 }; 4016 };
3912 4017
… …
4093 4198
4094############################################################################# 4199#############################################################################
4095 4200
4096my $bug_warning = 0; 4201my $bug_warning = 0;
4097 4202
4098our @WAIT_FOR_TICK;
4099our @WAIT_FOR_TICK_BEGIN;
4100
4101sub wait_for_tick() { 4203sub wait_for_tick() {
4102 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4204 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4103 4205
4104 my $signal = new Coro::Signal; 4206 $WAIT_FOR_TICK->wait;
4105 push @WAIT_FOR_TICK, $signal;
4106 $signal->wait;
4107} 4207}
4108 4208
4109sub wait_for_tick_begin() { 4209sub wait_for_tick_begin() {
4110 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4210 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4111 4211
4112 my $signal = new Coro::Signal; 4212 my $signal = new Coro::Signal;
4113 push @WAIT_FOR_TICK_BEGIN, $signal; 4213 push @WAIT_FOR_TICK_BEGIN, $signal;
4114 $signal->wait; 4214 $signal->wait;
4115} 4215}
… …
4119 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4219 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
4120 unless ++$bug_warning > 10; 4220 unless ++$bug_warning > 10;
4121 return; 4221 return;
4122 } 4222 }
4123 4223
4124 cf::server_tick; # one server iteration 4224 cf::one_tick; # one server iteration
4125 4225
4126 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d# 4226 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4127 4227
4128 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4228 if ($NOW >= $NEXT_RUNTIME_WRITE) {
4129 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4229 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
… …
4135 } 4235 }
4136 4236
4137 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4237 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4138 $sig->send; 4238 $sig->send;
4139 } 4239 }
4140 while (my $sig = shift @WAIT_FOR_TICK) { 4240 $WAIT_FOR_TICK->broadcast;
4141 $sig->send;
4142 }
4143 4241
4144 $LOAD = ($NOW - $TICK_START) / $TICK; 4242 $LOAD = ($NOW - $TICK_START) / $TICK;
4145 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4243 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4146 4244
4147 if (0) { 4245 if (0) {
… …
4153 } 4251 }
4154} 4252}
4155 4253
4156{ 4254{
4157 # configure BDB 4255 # configure BDB
4256 info "initialising database";
4158 4257
4159 BDB::min_parallel 16; 4258 BDB::min_parallel 16;
4160 BDB::max_poll_reqs $TICK * 0.1; 4259 BDB::max_poll_reqs $TICK * 0.1;
4161 $AnyEvent::BDB::WATCHER->priority (1); 4260 #$AnyEvent::BDB::WATCHER->priority (1);
4162 4261
4163 unless ($DB_ENV) { 4262 unless ($DB_ENV) {
4164 $DB_ENV = BDB::db_env_create; 4263 $DB_ENV = BDB::db_env_create;
4165 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4264 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4166 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4265 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
… …
4191 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4290 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4192 }; 4291 };
4193 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4292 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4194 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4293 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4195 }; 4294 };
4295
4296 info "database initialised";
4196} 4297}
4197 4298
4198{ 4299{
4199 # configure IO::AIO 4300 # configure IO::AIO
4200 4301
4302 info "initialising aio";
4201 IO::AIO::min_parallel 8; 4303 IO::AIO::min_parallel 8;
4202 IO::AIO::max_poll_time $TICK * 0.1; 4304 IO::AIO::max_poll_time $TICK * 0.1;
4203 undef $AnyEvent::AIO::WATCHER; 4305 undef $AnyEvent::AIO::WATCHER;
4306 info "aio initialised";
4204} 4307}
4205 4308
4206our $_log_backtrace; 4309our $_log_backtrace;
4207our $_log_backtrace_last; 4310our $_log_backtrace_last;
4208 4311

Diff Legend

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