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.412 by root, Wed Apr 2 11:13:55 2008 UTC vs.
Revision 1.441 by root, Sat Aug 30 05:19:03 2008 UTC

… …
19# The authors can be reached via e-mail to <support@deliantra.net> 19# The authors can be reached via e-mail to <support@deliantra.net>
20# 20#
21 21
22package cf; 22package cf;
23 23
24use 5.10.0;
24use utf8; 25use utf8;
25use strict; 26use strict "vars", "subs";
26 27
27use Symbol; 28use Symbol;
28use List::Util; 29use List::Util;
29use Socket; 30use Socket;
30use EV 1.86; 31use EV;
31use Opcode; 32use Opcode;
32use Safe; 33use Safe;
33use Safe::Hole; 34use Safe::Hole;
34use Storable (); 35use Storable ();
35 36
36use Coro 4.32 (); 37use Coro ();
37use Coro::State; 38use Coro::State;
38use Coro::Handle; 39use Coro::Handle;
39use Coro::EV; 40use Coro::EV;
41use Coro::AnyEvent;
40use Coro::Timer; 42use Coro::Timer;
41use Coro::Signal; 43use Coro::Signal;
42use Coro::Semaphore; 44use Coro::Semaphore;
45use Coro::AnyEvent;
43use Coro::AIO; 46use Coro::AIO;
44use Coro::BDB; 47use Coro::BDB 1.6;
45use Coro::Storable; 48use Coro::Storable;
46use Coro::Util (); 49use Coro::Util ();
47 50
48use JSON::XS 2.01 (); 51use JSON::XS 2.01 ();
49use BDB (); 52use BDB ();
50use Data::Dumper; 53use Data::Dumper;
51use Digest::MD5; 54use Digest::MD5;
52use Fcntl; 55use Fcntl;
53use YAML (); 56use YAML ();
54use IO::AIO 2.51 (); 57use IO::AIO ();
55use Time::HiRes; 58use Time::HiRes;
56use Compress::LZF; 59use Compress::LZF;
57use Digest::MD5 (); 60use Digest::MD5 ();
61
62AnyEvent::detect;
58 63
59# configure various modules to our taste 64# configure various modules to our taste
60# 65#
61$Storable::canonical = 1; # reduce rsync transfers 66$Storable::canonical = 1; # reduce rsync transfers
62Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 67Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
… …
90our $RANDOMDIR = "$LOCALDIR/random"; 95our $RANDOMDIR = "$LOCALDIR/random";
91our $BDBDIR = "$LOCALDIR/db"; 96our $BDBDIR = "$LOCALDIR/db";
92our %RESOURCE; 97our %RESOURCE;
93 98
94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 99our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
95our $AIO_POLL_WATCHER;
96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 100our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
97our $NEXT_TICK; 101our $NEXT_TICK;
98our $USE_FSYNC = 1; # use fsync to write maps - default off 102our $USE_FSYNC = 1; # use fsync to write maps - default off
99 103
100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER; 104our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER; 105our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER; 106our $BDB_TRICKLE_WATCHER;
104our $DB_ENV; 107our $DB_ENV;
105 108
… …
242for my $pkg (qw( 245for my $pkg (qw(
243 cf::global cf::attachable 246 cf::global cf::attachable
244 cf::object cf::object::player 247 cf::object cf::object::player
245 cf::client cf::player 248 cf::client cf::player
246 cf::arch cf::living 249 cf::arch cf::living
250 cf::map cf::mapspace
247 cf::map cf::party cf::region 251 cf::party cf::region
248)) { 252)) {
249 no strict 'refs';
250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 253 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
251} 254}
252 255
253$EV::DIED = sub { 256$EV::DIED = sub {
254 warn "error in event callback: @_"; 257 warn "error in event callback: @_";
… …
427 } 430 }
428 } 431 }
429}; 432};
430 433
431sub get_slot($;$$) { 434sub get_slot($;$$) {
435 return if tick_inhibit || $Coro::current == $Coro::main;
436
432 my ($time, $pri, $name) = @_; 437 my ($time, $pri, $name) = @_;
433 438
434 $time = $TICK * .6 if $time > $TICK * .6; 439 $time = $TICK * .6 if $time > $TICK * .6;
435 my $sig = new Coro::Signal; 440 my $sig = new Coro::Signal;
436 441
… …
547 reset_signals; 552 reset_signals;
548 &$cb 553 &$cb
549 }, @args; 554 }, @args;
550 555
551 wantarray ? @res : $res[-1] 556 wantarray ? @res : $res[-1]
557}
558
559=item $coin = coin_from_name $name
560
561=cut
562
563our %coin_alias = (
564 "silver" => "silvercoin",
565 "silvercoin" => "silvercoin",
566 "silvercoins" => "silvercoin",
567 "gold" => "goldcoin",
568 "goldcoin" => "goldcoin",
569 "goldcoins" => "goldcoin",
570 "platinum" => "platinacoin",
571 "platinumcoin" => "platinacoin",
572 "platinumcoins" => "platinacoin",
573 "platina" => "platinacoin",
574 "platinacoin" => "platinacoin",
575 "platinacoins" => "platinacoin",
576 "royalty" => "royalty",
577 "royalties" => "royalty",
578);
579
580sub coin_from_name($) {
581 $coin_alias{$_[0]}
582 ? cf::arch::find $coin_alias{$_[0]}
583 : undef
552} 584}
553 585
554=item $value = cf::db_get $family => $key 586=item $value = cf::db_get $family => $key
555 587
556Returns a single value from the environment database. 588Returns a single value from the environment database.
… …
1056 1088
1057sub reattach { 1089sub reattach {
1058 # basically do the same as instantiate, without calling instantiate 1090 # basically do the same as instantiate, without calling instantiate
1059 my ($obj) = @_; 1091 my ($obj) = @_;
1060 1092
1093 # no longer needed after getting rid of delete_package?
1061 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1094 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1062 1095
1063 my $registry = $obj->registry; 1096 my $registry = $obj->registry;
1064 1097
1065 @$registry = (); 1098 @$registry = ();
1066 1099
… …
1112 utf8::decode (my $decname = $filename); 1145 utf8::decode (my $decname = $filename);
1113 warn sprintf "saving %s (%d,%d)\n", 1146 warn sprintf "saving %s (%d,%d)\n",
1114 $decname, length $$rdata, scalar @$objs; 1147 $decname, length $$rdata, scalar @$objs;
1115 1148
1116 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1117 chmod SAVE_MODE, $fh; 1150 aio_chmod $fh, SAVE_MODE;
1118 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1119 aio_fsync $fh if $cf::USE_FSYNC; 1152 aio_fsync $fh if $cf::USE_FSYNC;
1120 close $fh; 1153 aio_close $fh;
1121 1154
1122 if (@$objs) { 1155 if (@$objs) {
1123 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1156 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1124 chmod SAVE_MODE, $fh; 1157 aio_chmod $fh, SAVE_MODE;
1125 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1126 aio_write $fh, 0, (length $data), $data, 0; 1159 aio_write $fh, 0, (length $data), $data, 0;
1127 aio_fsync $fh if $cf::USE_FSYNC; 1160 aio_fsync $fh if $cf::USE_FSYNC;
1128 close $fh; 1161 aio_close $fh;
1129 aio_rename "$filename.pst~", "$filename.pst"; 1162 aio_rename "$filename.pst~", "$filename.pst";
1130 } 1163 }
1131 } else { 1164 } else {
1132 aio_unlink "$filename.pst"; 1165 aio_unlink "$filename.pst";
1133 } 1166 }
… …
1302 1335
1303 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1336 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1304 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1337 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1305 1338
1306 $ext{source} = 1339 $ext{source} =
1307 "package $pkg; use strict; use utf8;\n" 1340 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1308 . "#line 1 \"$path\"\n{\n" 1341 . "#line 1 \"$path\"\n{\n"
1309 . $source 1342 . $source
1310 . "\n};\n1"; 1343 . "\n};\n1";
1311 1344
1312 $todo{$base} = \%ext; 1345 $todo{$base} = \%ext;
… …
1427 my $f = new_from_file cf::object::thawer path $login 1460 my $f = new_from_file cf::object::thawer path $login
1428 or return; 1461 or return;
1429 1462
1430 my $pl = cf::player::load_pl $f 1463 my $pl = cf::player::load_pl $f
1431 or return; 1464 or return;
1465
1432 local $cf::PLAYER_LOADING{$login} = $pl; 1466 local $cf::PLAYER_LOADING{$login} = $pl;
1433 $f->resolve_delayed_derefs; 1467 $f->resolve_delayed_derefs;
1434 $cf::PLAYER{$login} = $pl 1468 $cf::PLAYER{$login} = $pl
1435 } 1469 }
1436 } 1470 }
… …
1446 1480
1447 return if $pl->{deny_save}; 1481 return if $pl->{deny_save};
1448 1482
1449 aio_mkdir playerdir $pl, 0770; 1483 aio_mkdir playerdir $pl, 0770;
1450 $pl->{last_save} = $cf::RUNTIME; 1484 $pl->{last_save} = $cf::RUNTIME;
1485
1486 cf::get_slot 0.01;
1451 1487
1452 $pl->save_pl ($path); 1488 $pl->save_pl ($path);
1453 cf::cede_to_tick; 1489 cf::cede_to_tick;
1454} 1490}
1455 1491
… …
1491 $pl->{deny_save} = 1; 1527 $pl->{deny_save} = 1;
1492 $pl->password ("*"); # this should lock out the player until we nuked the dir 1528 $pl->password ("*"); # this should lock out the player until we nuked the dir
1493 1529
1494 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1530 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1495 $pl->deactivate; 1531 $pl->deactivate;
1532 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1533 $pl->ob->check_score;
1496 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1534 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1497 $pl->ns->destroy if $pl->ns; 1535 $pl->ns->destroy if $pl->ns;
1498 1536
1499 my $path = playerdir $pl; 1537 my $path = playerdir $pl;
1500 my $temp = "$path~$cf::RUNTIME~deleting~"; 1538 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1539 1577
1540 for my $login (@$dirs) { 1578 for my $login (@$dirs) {
1541 my $path = path $login; 1579 my $path = path $login;
1542 1580
1543 # a .pst is a dead give-away for a valid player 1581 # a .pst is a dead give-away for a valid player
1544 unless (-e "$path.pst") { 1582 # if no pst file found, open and chekc for blocked users
1583 if (aio_stat "$path.pst") {
1545 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1584 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1546 aio_read $fh, 0, 512, my $buf, 0 or next; 1585 aio_read $fh, 0, 512, my $buf, 0 or next;
1547 $buf !~ /^password -------------$/m or next; # official not-valid tag 1586 $buf !~ /^password -------------$/m or next; # official not-valid tag
1548 } 1587 }
1549 1588
… …
1748our $MAX_RESET = 3600; 1787our $MAX_RESET = 3600;
1749our $DEFAULT_RESET = 3000; 1788our $DEFAULT_RESET = 3000;
1750 1789
1751sub generate_random_map { 1790sub generate_random_map {
1752 my ($self, $rmp) = @_; 1791 my ($self, $rmp) = @_;
1792
1793 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1794
1753 # mit "rum" bekleckern, nicht 1795 # mit "rum" bekleckern, nicht
1754 $self->_create_random_map ( 1796 $self->_create_random_map (
1755 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1797 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1756 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1798 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1757 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1799 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1879 1921
1880# the temporary/swap location 1922# the temporary/swap location
1881sub save_path { 1923sub save_path {
1882 my ($self) = @_; 1924 my ($self) = @_;
1883 1925
1884 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1926 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1885 "$TMPDIR/$path.map" 1927 "$TMPDIR/$path.map"
1886} 1928}
1887 1929
1888# the unique path, undef == no special unique path 1930# the unique path, undef == no special unique path
1889sub uniq_path { 1931sub uniq_path {
1890 my ($self) = @_; 1932 my ($self) = @_;
1891 1933
1892 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1934 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1893 "$UNIQUEDIR/$path" 1935 "$UNIQUEDIR/$path"
1894} 1936}
1895 1937
1896# and all this just because we cannot iterate over 1938# and all this just because we cannot iterate over
1897# all maps in C++... 1939# all maps in C++...
… …
1995 2037
1996 cf::lock_wait "map_data:$path";#d#remove 2038 cf::lock_wait "map_data:$path";#d#remove
1997 cf::lock_wait "map_find:$path"; 2039 cf::lock_wait "map_find:$path";
1998 2040
1999 $cf::MAP{$path} || do { 2041 $cf::MAP{$path} || do {
2000 my $guard1 = cf::lock_acquire "map_find:$path";
2001 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it 2042 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2043 my $guard2 = cf::lock_acquire "map_find:$path";
2002 2044
2003 my $map = new_from_path cf::map $path 2045 my $map = new_from_path cf::map $path
2004 or return; 2046 or return;
2005 2047
2006 $map->{last_save} = $cf::RUNTIME; 2048 $map->{last_save} = $cf::RUNTIME;
… …
2009 or return; 2051 or return;
2010 2052
2011 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2053 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2012 # doing this can freeze the server in a sync job, obviously 2054 # doing this can freeze the server in a sync job, obviously
2013 #$cf::WAIT_FOR_TICK->wait; 2055 #$cf::WAIT_FOR_TICK->wait;
2056 undef $guard2;
2014 undef $guard1; 2057 undef $guard1;
2015 undef $guard2;
2016 $map->reset; 2058 $map->reset;
2017 return find $path; 2059 return find $path;
2018 } 2060 }
2019 2061
2020 $cf::MAP{$path} = $map 2062 $cf::MAP{$path} = $map
… …
2047 my $f = new_from_file cf::object::thawer $self->{load_path}; 2089 my $f = new_from_file cf::object::thawer $self->{load_path};
2048 $f->skip_block; 2090 $f->skip_block;
2049 $self->_load_objects ($f) 2091 $self->_load_objects ($f)
2050 or return; 2092 or return;
2051 2093
2052 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2094 $self->post_load_original
2053 if delete $self->{load_original}; 2095 if delete $self->{load_original};
2054 2096
2055 if (my $uniq = $self->uniq_path) { 2097 if (my $uniq = $self->uniq_path) {
2056 utf8::encode $uniq; 2098 utf8::encode $uniq;
2057 unless (aio_stat $uniq) { 2099 unless (aio_stat $uniq) {
… …
2083 } 2125 }
2084 2126
2085 $self->{last_save} = $cf::RUNTIME; 2127 $self->{last_save} = $cf::RUNTIME;
2086 $self->last_access ($cf::RUNTIME); 2128 $self->last_access ($cf::RUNTIME);
2087 2129
2088 $self->in_memory (cf::MAP_IN_MEMORY); 2130 $self->in_memory (cf::MAP_ACTIVE);
2089 } 2131 }
2090 2132
2091 $self->post_load; 2133 $self->post_load;
2092} 2134}
2093 2135
… …
2151 my ($path, $origin, $load) = @_; 2193 my ($path, $origin, $load) = @_;
2152 2194
2153 $path = normalise $path, $origin && $origin->{path}; 2195 $path = normalise $path, $origin && $origin->{path};
2154 2196
2155 if (my $map = $cf::MAP{$path}) { 2197 if (my $map = $cf::MAP{$path}) {
2156 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2198 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2157 } 2199 }
2158 2200
2159 $MAP_PREFETCH{$path} |= $load; 2201 $MAP_PREFETCH{$path} |= $load;
2160 2202
2161 $MAP_PREFETCHER ||= cf::async { 2203 $MAP_PREFETCHER ||= cf::async {
… …
2198 cf::async { 2240 cf::async {
2199 $Coro::current->{desc} = "map player save"; 2241 $Coro::current->{desc} = "map player save";
2200 $_->contr->save for $self->players; 2242 $_->contr->save for $self->players;
2201 }; 2243 };
2202 2244
2245 cf::get_slot 0.02;
2246
2203 if ($uniq) { 2247 if ($uniq) {
2204 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2248 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2205 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2249 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2206 } else { 2250 } else {
2207 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2251 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
… …
2215 $self->save; 2259 $self->save;
2216 2260
2217 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2261 my $lock = cf::lock_acquire "map_data:$self->{path}";
2218 2262
2219 return if $self->players; 2263 return if $self->players;
2220 return if $self->in_memory != cf::MAP_IN_MEMORY; 2264 return if $self->in_memory != cf::MAP_ACTIVE;
2221 return if $self->{deny_save}; 2265 return if $self->{deny_save};
2222 2266
2223 $self->in_memory (cf::MAP_SWAPPED); 2267 $self->in_memory (cf::MAP_SWAPPED);
2224 2268
2225 $self->deactivate; 2269 $self->deactivate;
… …
2343 2387
2344sub unique_maps() { 2388sub unique_maps() {
2345 [ 2389 [
2346 map { 2390 map {
2347 utf8::decode $_; 2391 utf8::decode $_;
2348 /\.map$/ 2392 s/\.map$//; # TODO future compatibility hack
2393 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2394 ? ()
2349 ? normalise $_ 2395 : normalise $_
2350 : ()
2351 } @{ aio_readdir $UNIQUEDIR or [] } 2396 } @{ aio_readdir $UNIQUEDIR or [] }
2352 ] 2397 ]
2353} 2398}
2354 2399
2355package cf;
2356
2357=back 2400=back
2358 2401
2359=head3 cf::object 2402=head3 cf::object
2360 2403
2361=cut 2404=cut
… …
2364 2407
2365=over 4 2408=over 4
2366 2409
2367=item $ob->inv_recursive 2410=item $ob->inv_recursive
2368 2411
2369Returns the inventory of the object _and_ their inventories, recursively. 2412Returns the inventory of the object I<and> their inventories, recursively,
2413but I<not> the object itself.
2370 2414
2371=cut 2415=cut
2372 2416
2373sub inv_recursive_; 2417sub inv_recursive_;
2374sub inv_recursive_ { 2418sub inv_recursive_ {
… …
2379 inv_recursive_ inv $_[0] 2423 inv_recursive_ inv $_[0]
2380} 2424}
2381 2425
2382=item $ref = $ob->ref 2426=item $ref = $ob->ref
2383 2427
2384creates and returns a persistent reference to an objetc that can be stored as a string. 2428Creates and returns a persistent reference to an object that can be stored as a string.
2385 2429
2386=item $ob = cf::object::deref ($refstring) 2430=item $ob = cf::object::deref ($refstring)
2387 2431
2388returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2432returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2389even if the object actually exists. May block. 2433even if the object actually exists. May block.
… …
2421can be C<undef>. Does the right thing when the player is currently in a 2465can be C<undef>. Does the right thing when the player is currently in a
2422dialogue with the given NPC character. 2466dialogue with the given NPC character.
2423 2467
2424=cut 2468=cut
2425 2469
2470our $SAY_CHANNEL = {
2471 id => "say",
2472 title => "Map",
2473 reply => "say ",
2474 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2475};
2476
2477our $CHAT_CHANNEL = {
2478 id => "chat",
2479 title => "Chat",
2480 reply => "chat ",
2481 tooltip => "Player chat and shouts, global to the server.",
2482};
2483
2426# rough implementation of a future "reply" method that works 2484# rough implementation of a future "reply" method that works
2427# with dialog boxes. 2485# with dialog boxes.
2428#TODO: the first argument must go, split into a $npc->reply_to ( method 2486#TODO: the first argument must go, split into a $npc->reply_to ( method
2429sub cf::object::player::reply($$$;$) { 2487sub cf::object::player::reply($$$;$) {
2430 my ($self, $npc, $msg, $flags) = @_; 2488 my ($self, $npc, $msg, $flags) = @_;
… …
2441 my $dialog = $pl->{npc_dialog}; 2499 my $dialog = $pl->{npc_dialog};
2442 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2500 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2443 2501
2444 } else { 2502 } else {
2445 $msg = $npc->name . " says: $msg" if $npc; 2503 $msg = $npc->name . " says: $msg" if $npc;
2446 $self->message ($msg, $flags); 2504 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2447 } 2505 }
2448 } 2506 }
2449} 2507}
2450 2508
2451=item $object->send_msg ($channel, $msg, $color, [extra...]) 2509=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2558Moves the player to the given map-path and coordinates by first freezing 2616Moves the player to the given map-path and coordinates by first freezing
2559her, loading and preparing them map, calling the provided $check callback 2617her, loading and preparing them map, calling the provided $check callback
2560that has to return the map if sucecssful, and then unfreezes the player on 2618that has to return the map if sucecssful, and then unfreezes the player on
2561the new (success) or old (failed) map position. In either case, $done will 2619the new (success) or old (failed) map position. In either case, $done will
2562be called at the end of this process. 2620be called at the end of this process.
2621
2622Note that $check will be called with a potentially non-loaded map, so if
2623it needs a loaded map it has to call C<< ->load >>.
2563 2624
2564=cut 2625=cut
2565 2626
2566our $GOTOGEN; 2627our $GOTOGEN;
2567 2628
… …
2646} 2707}
2647 2708
2648sub prepare_random_map { 2709sub prepare_random_map {
2649 my ($exit) = @_; 2710 my ($exit) = @_;
2650 2711
2651 my $guard = cf::lock_acquire "exit_prepare:$exit";
2652
2653 # all this does is basically replace the /! path by 2712 # all this does is basically replace the /! path by
2654 # a new random map path (?random/...) with a seed 2713 # a new random map path (?random/...) with a seed
2655 # that depends on the exit object 2714 # that depends on the exit object
2656 2715
2657 my $rmp = parse_random_map_params $exit->msg; 2716 my $rmp = parse_random_map_params $exit->msg;
… …
2659 if ($exit->map) { 2718 if ($exit->map) {
2660 $rmp->{region} = $exit->region->name; 2719 $rmp->{region} = $exit->region->name;
2661 $rmp->{origin_map} = $exit->map->path; 2720 $rmp->{origin_map} = $exit->map->path;
2662 $rmp->{origin_x} = $exit->x; 2721 $rmp->{origin_x} = $exit->x;
2663 $rmp->{origin_y} = $exit->y; 2722 $rmp->{origin_y} = $exit->y;
2723
2724 $exit->map->touch;
2664 } 2725 }
2665 2726
2666 $rmp->{random_seed} ||= $exit->random_seed; 2727 $rmp->{random_seed} ||= $exit->random_seed;
2667 2728
2668 my $data = cf::encode_json $rmp; 2729 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2669 my $md5 = Digest::MD5::md5_hex $data; 2730 my $md5 = Digest::MD5::md5_hex $data;
2670 my $meta = "$RANDOMDIR/$md5.meta"; 2731 my $meta = "$RANDOMDIR/$md5.meta";
2671 2732
2672 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2733 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2673 aio_write $fh, 0, (length $data), $data, 0; 2734 aio_write $fh, 0, (length $data), $data, 0;
2674 undef $fh; 2735 undef $fh;
2675 aio_rename "$meta~", $meta; 2736 aio_rename "$meta~", $meta;
2676 2737
2738 my $slaying = "?random/$md5";
2739
2740 if ($exit->valid) {
2677 $exit->slaying ("?random/$md5"); 2741 $exit->slaying ("?random/$md5");
2678 $exit->msg (undef); 2742 $exit->msg (undef);
2743 }
2679 } 2744 }
2680} 2745}
2681 2746
2682sub cf::object::player::enter_exit { 2747sub cf::object::player::enter_exit {
2683 my ($self, $exit) = @_; 2748 my ($self, $exit) = @_;
2684 2749
2685 return unless $self->type == cf::PLAYER; 2750 return unless $self->type == cf::PLAYER;
2686 2751
2687 if ($exit->slaying eq "/!") {
2688 #TODO: this should de-fi-ni-te-ly not be a sync-job
2689 # the problem is that $exit might not survive long enough
2690 # so it needs to be done right now, right here
2691 cf::sync_job { prepare_random_map $exit };
2692 }
2693
2694 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2695 my $hp = $exit->stats->hp;
2696 my $sp = $exit->stats->sp;
2697
2698 $self->enter_link; 2752 $self->enter_link;
2699 2753
2700 # if exit is damned, update players death & WoR home-position
2701 $self->contr->savebed ($slaying, $hp, $sp)
2702 if $exit->flag (FLAG_DAMNED);
2703
2704 (async { 2754 (async {
2705 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2755 $Coro::current->{desc} = "enter_exit";
2706 2756
2707 $self->deactivate_recursive; # just to be sure
2708 unless (eval { 2757 unless (eval {
2758 $self->deactivate_recursive; # just to be sure
2759
2760 # random map handling
2761 {
2762 my $guard = cf::lock_acquire "exit_prepare:$exit";
2763
2764 prepare_random_map $exit
2765 if $exit->slaying eq "/!";
2766 }
2767
2768 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2769 my $x = $exit->stats->hp;
2770 my $y = $exit->stats->sp;
2771
2709 $self->goto ($slaying, $hp, $sp); 2772 $self->goto ($map, $x, $y);
2710 2773
2774 # if exit is damned, update players death & WoR home-position
2775 $self->contr->savebed ($map, $x, $y)
2776 if $exit->flag (cf::FLAG_DAMNED);
2777
2711 1; 2778 1
2712 }) { 2779 }) {
2713 $self->message ("Something went wrong deep within the crossfire server. " 2780 $self->message ("Something went wrong deep within the crossfire server. "
2714 . "I'll try to bring you back to the map you were before. " 2781 . "I'll try to bring you back to the map you were before. "
2715 . "Please report this to the dungeon master!", 2782 . "Please report this to the dungeon master!",
2716 cf::NDI_UNIQUE | cf::NDI_RED); 2783 cf::NDI_UNIQUE | cf::NDI_RED);
… …
2796 id => "infobox", 2863 id => "infobox",
2797 title => "Map Info", 2864 title => "Map Info",
2798 reply => undef, 2865 reply => undef,
2799 tooltip => "Information related to the maps", 2866 tooltip => "Information related to the maps",
2800 }, 2867 },
2868 "c/party" => {
2869 id => "party",
2870 title => "Party",
2871 reply => "gsay ",
2872 tooltip => "Messages and chat related to your party",
2873 },
2801); 2874);
2802 2875
2803sub cf::client::send_msg { 2876sub cf::client::send_msg {
2804 my ($self, $channel, $msg, $color, @extra) = @_; 2877 my ($self, $channel, $msg, $color, @extra) = @_;
2805 2878
… …
3042 3115
3043The following functions and methods are available within a safe environment: 3116The following functions and methods are available within a safe environment:
3044 3117
3045 cf::object 3118 cf::object
3046 contr pay_amount pay_player map x y force_find force_add destroy 3119 contr pay_amount pay_player map x y force_find force_add destroy
3047 insert remove name archname title slaying race decrease_ob_nr 3120 insert remove name archname title slaying race decrease split
3048 3121
3049 cf::object::player 3122 cf::object::player
3050 player 3123 player
3051 3124
3052 cf::player 3125 cf::player
… …
3057 3130
3058=cut 3131=cut
3059 3132
3060for ( 3133for (
3061 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3134 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3062 insert remove inv name archname title slaying race 3135 insert remove inv nrof name archname title slaying race
3063 decrease_ob_nr destroy)], 3136 decrease split destroy change_exp)],
3064 ["cf::object::player" => qw(player)], 3137 ["cf::object::player" => qw(player)],
3065 ["cf::player" => qw(peaceful)], 3138 ["cf::player" => qw(peaceful)],
3066 ["cf::map" => qw(trigger)], 3139 ["cf::map" => qw(trigger)],
3067) { 3140) {
3068 no strict 'refs'; 3141 no strict 'refs';
… …
3276 while (my ($k, $v) = each %$want) { 3349 while (my ($k, $v) = each %$want) {
3277 $ns->fx_want ($k, $v); 3350 $ns->fx_want ($k, $v);
3278 } 3351 }
3279}; 3352};
3280 3353
3354sub load_resource_file($) {
3355 my $guard = lock_acquire "load_resource_file";
3356
3357 my $status = load_resource_file_ $_[0];
3358 get_slot 0.1, 100;
3359 cf::arch::commit_load;
3360
3361 $status
3362}
3363
3281sub reload_regions { 3364sub reload_regions {
3282 # HACK to clear player env face cache, we need some signal framework 3365 # HACK to clear player env face cache, we need some signal framework
3283 # for this (global event?) 3366 # for this (global event?)
3284 %ext::player_env::MUSIC_FACE_CACHE = (); 3367 %ext::player_env::MUSIC_FACE_CACHE = ();
3285 3368
… …
3298} 3381}
3299 3382
3300sub reload_archetypes { 3383sub reload_archetypes {
3301 load_resource_file "$DATADIR/archetypes" 3384 load_resource_file "$DATADIR/archetypes"
3302 or die "unable to load archetypes\n"; 3385 or die "unable to load archetypes\n";
3303 #d# NEED to laod twice to resolve forward references
3304 # this really needs to be done in an extra post-pass
3305 # (which needs to be synchronous, so solve it differently)
3306 load_resource_file "$DATADIR/archetypes"
3307 or die "unable to load archetypes\n";
3308} 3386}
3309 3387
3310sub reload_treasures { 3388sub reload_treasures {
3311 load_resource_file "$DATADIR/treasures" 3389 load_resource_file "$DATADIR/treasures"
3312 or die "unable to load treasurelists\n"; 3390 or die "unable to load treasurelists\n";
3313} 3391}
3314 3392
3315sub reload_resources { 3393sub reload_resources {
3316 warn "reloading resource files...\n"; 3394 warn "reloading resource files...\n";
3317 3395
3396 reload_facedata;
3397 reload_archetypes;
3318 reload_regions; 3398 reload_regions;
3319 reload_facedata;
3320 #reload_archetypes;#d#
3321 reload_archetypes;
3322 reload_treasures; 3399 reload_treasures;
3323 3400
3324 warn "finished reloading resource files\n"; 3401 warn "finished reloading resource files\n";
3325} 3402}
3326 3403
3327sub init { 3404sub init {
3405 my $guard = freeze_mainloop;
3406
3407 evthread_start IO::AIO::poll_fileno;
3408
3328 reload_resources; 3409 reload_resources;
3329} 3410}
3330 3411
3331sub reload_config { 3412sub reload_config {
3332 open my $fh, "<:utf8", "$CONFDIR/config" 3413 open my $fh, "<:utf8", "$CONFDIR/config"
… …
3357 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3438 $Coro::current->{desc} = "IDLE BUG HANDLER";
3358 EV::loop EV::LOOP_ONESHOT; 3439 EV::loop EV::LOOP_ONESHOT;
3359 })->prio (Coro::PRIO_MAX); 3440 })->prio (Coro::PRIO_MAX);
3360 }; 3441 };
3361 3442
3443 {
3444 my $guard = freeze_mainloop;
3362 reload_config; 3445 reload_config;
3363 db_init; 3446 db_init;
3364 load_extensions; 3447 load_extensions;
3365 3448
3366 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3449 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3367 evthread_start; 3450 }
3451
3368 EV::loop; 3452 EV::loop;
3369} 3453}
3370 3454
3371############################################################################# 3455#############################################################################
3372# initialisation and cleanup 3456# initialisation and cleanup
… …
3379 cf::cleanup "SIG$signal"; 3463 cf::cleanup "SIG$signal";
3380 }; 3464 };
3381 } 3465 }
3382} 3466}
3383 3467
3384sub write_runtime { 3468sub write_runtime_sync {
3385 my $runtime = "$LOCALDIR/runtime"; 3469 my $runtime = "$LOCALDIR/runtime";
3386 3470
3387 # first touch the runtime file to show we are still running: 3471 # first touch the runtime file to show we are still running:
3388 # the fsync below can take a very very long time. 3472 # the fsync below can take a very very long time.
3389 3473
… …
3415 and return; 3499 and return;
3416 3500
3417 warn "runtime file written.\n"; 3501 warn "runtime file written.\n";
3418 3502
3419 1 3503 1
3504}
3505
3506our $uuid_lock;
3507our $uuid_skip;
3508
3509sub write_uuid_sync($) {
3510 $uuid_skip ||= $_[0];
3511
3512 return if $uuid_lock;
3513 local $uuid_lock = 1;
3514
3515 my $uuid = "$LOCALDIR/uuid";
3516
3517 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3518 or return;
3519
3520 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3521 $uuid_skip = 0;
3522
3523 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3524 and return;
3525
3526 # always fsync - this file is important
3527 aio_fsync $fh
3528 and return;
3529
3530 close $fh
3531 or return;
3532
3533 aio_rename "$uuid~", $uuid
3534 and return;
3535
3536 warn "uuid file written ($value).\n";
3537
3538 1
3539
3540}
3541
3542sub write_uuid($$) {
3543 my ($skip, $sync) = @_;
3544
3545 $sync ? write_uuid_sync $skip
3546 : async { write_uuid_sync $skip };
3420} 3547}
3421 3548
3422sub emergency_save() { 3549sub emergency_save() {
3423 my $freeze_guard = cf::freeze_mainloop; 3550 my $freeze_guard = cf::freeze_mainloop;
3424 3551
… …
3446 warn "end emergency map save\n"; 3573 warn "end emergency map save\n";
3447 3574
3448 warn "begin emergency database checkpoint\n"; 3575 warn "begin emergency database checkpoint\n";
3449 BDB::db_env_txn_checkpoint $DB_ENV; 3576 BDB::db_env_txn_checkpoint $DB_ENV;
3450 warn "end emergency database checkpoint\n"; 3577 warn "end emergency database checkpoint\n";
3578
3579 warn "begin write uuid\n";
3580 write_uuid_sync 1;
3581 warn "end write uuid\n";
3451 }; 3582 };
3452 3583
3453 warn "leave emergency perl save\n"; 3584 warn "leave emergency perl save\n";
3454} 3585}
3455 3586
… …
3457 my ($make_core) = @_; 3588 my ($make_core) = @_;
3458 3589
3459 warn Carp::longmess "post_cleanup backtrace" 3590 warn Carp::longmess "post_cleanup backtrace"
3460 if $make_core; 3591 if $make_core;
3461} 3592}
3593
3594# a safer delete_package, copied from Symbol
3595sub clear_package($) {
3596 my $pkg = shift;
3597
3598 # expand to full symbol table name if needed
3599 unless ($pkg =~ /^main::.*::$/) {
3600 $pkg = "main$pkg" if $pkg =~ /^::/;
3601 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3602 $pkg .= '::' unless $pkg =~ /::$/;
3603 }
3604
3605 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3606 my $stem_symtab = *{$stem}{HASH};
3607
3608 defined $stem_symtab and exists $stem_symtab->{$leaf}
3609 or return;
3610
3611 # clear all symbols
3612 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3613 for my $name (keys %$leaf_symtab) {
3614 _gv_clear *{"$pkg$name"};
3615# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3616 }
3617 warn "cleared package #$pkg\n";#d#
3618}
3619
3620our $RELOAD; # how many times to reload
3462 3621
3463sub do_reload_perl() { 3622sub do_reload_perl() {
3464 # can/must only be called in main 3623 # can/must only be called in main
3465 if ($Coro::current != $Coro::main) { 3624 if ($Coro::current != $Coro::main) {
3466 warn "can only reload from main coroutine"; 3625 warn "can only reload from main coroutine";
3467 return; 3626 return;
3468 } 3627 }
3469 3628
3629 return if $RELOAD++;
3630
3631 while ($RELOAD) {
3470 warn "reloading..."; 3632 warn "reloading...";
3471 3633
3472 warn "entering sync_job"; 3634 warn "entering sync_job";
3473 3635
3474 cf::sync_job { 3636 cf::sync_job {
3475 cf::write_runtime; # external watchdog should not bark 3637 cf::write_runtime_sync; # external watchdog should not bark
3476 cf::emergency_save; 3638 cf::emergency_save;
3477 cf::write_runtime; # external watchdog should not bark 3639 cf::write_runtime_sync; # external watchdog should not bark
3478 3640
3479 warn "syncing database to disk"; 3641 warn "syncing database to disk";
3480 BDB::db_env_txn_checkpoint $DB_ENV; 3642 BDB::db_env_txn_checkpoint $DB_ENV;
3481 3643
3482 # if anything goes wrong in here, we should simply crash as we already saved 3644 # if anything goes wrong in here, we should simply crash as we already saved
3483 3645
3484 warn "flushing outstanding aio requests"; 3646 warn "flushing outstanding aio requests";
3485 for (;;) {
3486 BDB::flush;
3487 IO::AIO::flush;
3488 Coro::cede_notself;
3489 last unless IO::AIO::nreqs || BDB::nreqs; 3647 while (IO::AIO::nreqs || BDB::nreqs) {
3490 warn "iterate..."; 3648 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3491 }
3492
3493 ++$RELOAD;
3494
3495 warn "cancelling all extension coros";
3496 $_->cancel for values %EXT_CORO;
3497 %EXT_CORO = ();
3498
3499 warn "removing commands";
3500 %COMMAND = ();
3501
3502 warn "removing ext/exti commands";
3503 %EXTCMD = ();
3504 %EXTICMD = ();
3505
3506 warn "unloading/nuking all extensions";
3507 for my $pkg (@EXTS) {
3508 warn "... unloading $pkg";
3509
3510 if (my $cb = $pkg->can ("unload")) {
3511 eval {
3512 $cb->($pkg);
3513 1
3514 } or warn "$pkg unloaded, but with errors: $@";
3515 } 3649 }
3516 3650
3517 warn "... nuking $pkg"; 3651 warn "cancelling all extension coros";
3518 Symbol::delete_package $pkg; 3652 $_->cancel for values %EXT_CORO;
3519 } 3653 %EXT_CORO = ();
3520 3654
3521 warn "unloading all perl modules loaded from $LIBDIR"; 3655 warn "removing commands";
3522 while (my ($k, $v) = each %INC) { 3656 %COMMAND = ();
3523 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3524 3657
3658 warn "removing ext/exti commands";
3659 %EXTCMD = ();
3660 %EXTICMD = ();
3661
3662 warn "unloading/nuking all extensions";
3663 for my $pkg (@EXTS) {
3525 warn "... unloading $k"; 3664 warn "... unloading $pkg";
3526 delete $INC{$k};
3527 3665
3528 $k =~ s/\.pm$//;
3529 $k =~ s/\//::/g;
3530
3531 if (my $cb = $k->can ("unload_module")) { 3666 if (my $cb = $pkg->can ("unload")) {
3667 eval {
3532 $cb->(); 3668 $cb->($pkg);
3669 1
3670 } or warn "$pkg unloaded, but with errors: $@";
3671 }
3672
3673 warn "... clearing $pkg";
3674 clear_package $pkg;
3533 } 3675 }
3534 3676
3535 Symbol::delete_package $k; 3677 warn "unloading all perl modules loaded from $LIBDIR";
3678 while (my ($k, $v) = each %INC) {
3679 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3680
3681 warn "... unloading $k";
3682 delete $INC{$k};
3683
3684 $k =~ s/\.pm$//;
3685 $k =~ s/\//::/g;
3686
3687 if (my $cb = $k->can ("unload_module")) {
3688 $cb->();
3689 }
3690
3691 clear_package $k;
3536 } 3692 }
3537 3693
3538 warn "getting rid of safe::, as good as possible"; 3694 warn "getting rid of safe::, as good as possible";
3539 Symbol::delete_package "safe::$_" 3695 clear_package "safe::$_"
3540 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3696 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3541 3697
3542 warn "unloading cf.pm \"a bit\""; 3698 warn "unloading cf.pm \"a bit\"";
3543 delete $INC{"cf.pm"}; 3699 delete $INC{"cf.pm"};
3544 delete $INC{"cf/pod.pm"}; 3700 delete $INC{"cf/pod.pm"};
3545 3701
3546 # don't, removes xs symbols, too, 3702 # don't, removes xs symbols, too,
3547 # and global variables created in xs 3703 # and global variables created in xs
3548 #Symbol::delete_package __PACKAGE__; 3704 #clear_package __PACKAGE__;
3549 3705
3550 warn "unload completed, starting to reload now"; 3706 warn "unload completed, starting to reload now";
3551 3707
3552 warn "reloading cf.pm"; 3708 warn "reloading cf.pm";
3553 require cf; 3709 require cf;
3554 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3710 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3555 3711
3556 warn "loading config and database again"; 3712 warn "loading config and database again";
3557 cf::reload_config; 3713 cf::reload_config;
3558 3714
3559 warn "loading extensions"; 3715 warn "loading extensions";
3560 cf::load_extensions; 3716 cf::load_extensions;
3561 3717
3562 warn "reattaching attachments to objects/players"; 3718 warn "reattaching attachments to objects/players";
3563 _global_reattach; # objects, sockets 3719 _global_reattach; # objects, sockets
3564 warn "reattaching attachments to maps"; 3720 warn "reattaching attachments to maps";
3565 reattach $_ for values %MAP; 3721 reattach $_ for values %MAP;
3566 warn "reattaching attachments to players"; 3722 warn "reattaching attachments to players";
3567 reattach $_ for values %PLAYER; 3723 reattach $_ for values %PLAYER;
3568 3724
3569 warn "leaving sync_job"; 3725 warn "leaving sync_job";
3570 3726
3571 1 3727 1
3572 } or do { 3728 } or do {
3573 warn $@; 3729 warn $@;
3574 cf::cleanup "error while reloading, exiting."; 3730 cf::cleanup "error while reloading, exiting.";
3575 }; 3731 };
3576 3732
3577 warn "reloaded"; 3733 warn "reloaded";
3734 --$RELOAD;
3735 }
3578}; 3736};
3579 3737
3580our $RELOAD_WATCHER; # used only during reload 3738our $RELOAD_WATCHER; # used only during reload
3581 3739
3582sub reload_perl() { 3740sub reload_perl() {
… …
3607 3765
3608our @WAIT_FOR_TICK; 3766our @WAIT_FOR_TICK;
3609our @WAIT_FOR_TICK_BEGIN; 3767our @WAIT_FOR_TICK_BEGIN;
3610 3768
3611sub wait_for_tick { 3769sub wait_for_tick {
3612 return if tick_inhibit;
3613 return if $Coro::current == $Coro::main; 3770 return if tick_inhibit || $Coro::current == $Coro::main;
3614 3771
3615 my $signal = new Coro::Signal; 3772 my $signal = new Coro::Signal;
3616 push @WAIT_FOR_TICK, $signal; 3773 push @WAIT_FOR_TICK, $signal;
3617 $signal->wait; 3774 $signal->wait;
3618} 3775}
3619 3776
3620sub wait_for_tick_begin { 3777sub wait_for_tick_begin {
3621 return if tick_inhibit;
3622 return if $Coro::current == $Coro::main; 3778 return if tick_inhibit || $Coro::current == $Coro::main;
3623 3779
3624 my $signal = new Coro::Signal; 3780 my $signal = new Coro::Signal;
3625 push @WAIT_FOR_TICK_BEGIN, $signal; 3781 push @WAIT_FOR_TICK_BEGIN, $signal;
3626 $signal->wait; 3782 $signal->wait;
3627} 3783}
… …
3637 3793
3638 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3794 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3639 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3795 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3640 Coro::async_pool { 3796 Coro::async_pool {
3641 $Coro::current->{desc} = "runtime saver"; 3797 $Coro::current->{desc} = "runtime saver";
3642 write_runtime 3798 write_runtime_sync
3643 or warn "ERROR: unable to write runtime file: $!"; 3799 or warn "ERROR: unable to write runtime file: $!";
3644 }; 3800 };
3645 } 3801 }
3646 3802
3647 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3803 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
… …
3666{ 3822{
3667 # configure BDB 3823 # configure BDB
3668 3824
3669 BDB::min_parallel 8; 3825 BDB::min_parallel 8;
3670 BDB::max_poll_reqs $TICK * 0.1; 3826 BDB::max_poll_reqs $TICK * 0.1;
3671 $Coro::BDB::WATCHER->priority (1); 3827 $AnyEvent::BDB::WATCHER->priority (1);
3672 3828
3673 unless ($DB_ENV) { 3829 unless ($DB_ENV) {
3674 $DB_ENV = BDB::db_env_create; 3830 $DB_ENV = BDB::db_env_create;
3675 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3831 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3676 | BDB::LOG_AUTOREMOVE, 1); 3832 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3833 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3677 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3834 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3678 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3835 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3679 3836
3680 cf::sync_job { 3837 cf::sync_job {
3681 eval { 3838 eval {
… …
3707{ 3864{
3708 # configure IO::AIO 3865 # configure IO::AIO
3709 3866
3710 IO::AIO::min_parallel 8; 3867 IO::AIO::min_parallel 8;
3711 IO::AIO::max_poll_time $TICK * 0.1; 3868 IO::AIO::max_poll_time $TICK * 0.1;
3712 $Coro::AIO::WATCHER->priority (1); 3869 undef $AnyEvent::AIO::WATCHER;
3713} 3870}
3714 3871
3715my $_log_backtrace; 3872my $_log_backtrace;
3716 3873
3717sub _log_backtrace { 3874sub _log_backtrace {

Diff Legend

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