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.404 by root, Mon Dec 17 07:27:58 2007 UTC vs.
Revision 1.435 by root, Thu May 29 03:33:20 2008 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify
7# it under the terms of the GNU General Public License as published by
8# the Free Software Foundation, either version 3 of the License, or
9# (at your option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19# The authors can be reached via e-mail to <support@deliantra.net>
20#
21
1package cf; 22package cf;
2 23
3use utf8; 24use utf8;
4use strict; 25use strict;
5 26
6use Symbol; 27use Symbol;
7use List::Util; 28use List::Util;
8use Socket; 29use Socket;
9use EV 1.86; 30use EV;
10use Opcode; 31use Opcode;
11use Safe; 32use Safe;
12use Safe::Hole; 33use Safe::Hole;
13use Storable (); 34use Storable ();
14 35
15use Coro 4.32 (); 36use Coro ();
16use Coro::State; 37use Coro::State;
17use Coro::Handle; 38use Coro::Handle;
18use Coro::EV; 39use Coro::AnyEvent;
19use Coro::Timer; 40use Coro::Timer;
20use Coro::Signal; 41use Coro::Signal;
21use Coro::Semaphore; 42use Coro::Semaphore;
43use Coro::AnyEvent;
22use Coro::AIO; 44use Coro::AIO;
23use Coro::BDB; 45use Coro::BDB;
24use Coro::Storable; 46use Coro::Storable;
25use Coro::Util (); 47use Coro::Util ();
26 48
27use JSON::XS 2.01 (); 49use JSON::XS 2.01 ();
28use BDB (); 50use BDB ();
29use Data::Dumper; 51use Data::Dumper;
30use Digest::MD5; 52use Digest::MD5;
31use Fcntl; 53use Fcntl;
32use YAML::Syck (); 54use YAML ();
33use IO::AIO 2.51 (); 55use IO::AIO ();
34use Time::HiRes; 56use Time::HiRes;
35use Compress::LZF; 57use Compress::LZF;
36use Digest::MD5 (); 58use Digest::MD5 ();
59
60AnyEvent::detect;
37 61
38# configure various modules to our taste 62# configure various modules to our taste
39# 63#
40$Storable::canonical = 1; # reduce rsync transfers 64$Storable::canonical = 1; # reduce rsync transfers
41Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 65Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
42Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 66Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
43
44# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
45$YAML::Syck::ImplicitUnicode = 1;
46 67
47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 68$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
48 69
49sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 70sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
50 71
… …
69our $TMPDIR = "$LOCALDIR/" . tmpdir; 90our $TMPDIR = "$LOCALDIR/" . tmpdir;
70our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 91our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
71our $PLAYERDIR = "$LOCALDIR/" . playerdir; 92our $PLAYERDIR = "$LOCALDIR/" . playerdir;
72our $RANDOMDIR = "$LOCALDIR/random"; 93our $RANDOMDIR = "$LOCALDIR/random";
73our $BDBDIR = "$LOCALDIR/db"; 94our $BDBDIR = "$LOCALDIR/db";
95our %RESOURCE;
74 96
75our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 97our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
76our $TICK_WATCHER;
77our $AIO_POLL_WATCHER;
78our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 98our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
79our $NEXT_TICK; 99our $NEXT_TICK;
80our $USE_FSYNC = 1; # use fsync to write maps - default off 100our $USE_FSYNC = 1; # use fsync to write maps - default off
81 101
82our $BDB_POLL_WATCHER;
83our $BDB_DEADLOCK_WATCHER; 102our $BDB_DEADLOCK_WATCHER;
84our $BDB_CHECKPOINT_WATCHER; 103our $BDB_CHECKPOINT_WATCHER;
85our $BDB_TRICKLE_WATCHER; 104our $BDB_TRICKLE_WATCHER;
86our $DB_ENV; 105our $DB_ENV;
87 106
… …
98# used to convert map paths into valid unix filenames by replacing / by ∕ 117# used to convert map paths into valid unix filenames by replacing / by ∕
99our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 118our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
100 119
101our $LOAD; # a number between 0 (idle) and 1 (too many objects) 120our $LOAD; # a number between 0 (idle) and 1 (too many objects)
102our $LOADAVG; # same thing, but with alpha-smoothing 121our $LOADAVG; # same thing, but with alpha-smoothing
122our $JITTER; # average jitter
103our $tick_start; # for load detecting purposes 123our $TICK_START; # for load detecting purposes
104 124
105binmode STDOUT; 125binmode STDOUT;
106binmode STDERR; 126binmode STDERR;
107 127
108# read virtual server time, if available 128# read virtual server time, if available
… …
192 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 212 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
193 213
194 LOG llevError, $msg; 214 LOG llevError, $msg;
195 }; 215 };
196} 216}
217
218$Coro::State::DIEHOOK = sub {
219 return unless $^S eq 0; # "eq", not "=="
220
221 if ($Coro::current == $Coro::main) {#d#
222 warn "DIEHOOK called in main context, Coro bug?\n";#d#
223 return;#d#
224 }#d#
225
226 # kill coroutine otherwise
227 warn Carp::longmess $_[0];
228 Coro::terminate
229};
230
231$SIG{__DIE__} = sub { }; #d#?
197 232
198@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 233@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
199@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 234@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
200@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 235@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
201@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 236@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
326 361
327 ! ! $LOCK{$key} 362 ! ! $LOCK{$key}
328} 363}
329 364
330sub freeze_mainloop { 365sub freeze_mainloop {
331 return unless $TICK_WATCHER->is_active; 366 tick_inhibit_inc;
332 367
333 my $guard = Coro::guard { 368 Coro::guard \&tick_inhibit_dec;
334 $TICK_WATCHER->start;
335 };
336 $TICK_WATCHER->stop;
337 $guard
338} 369}
339 370
340=item cf::periodic $interval, $cb 371=item cf::periodic $interval, $cb
341 372
342Like EV::periodic, but randomly selects a starting point so that the actions 373Like EV::periodic, but randomly selects a starting point so that the actions
… …
397 } 428 }
398 } 429 }
399}; 430};
400 431
401sub get_slot($;$$) { 432sub get_slot($;$$) {
433 return if tick_inhibit || $Coro::current == $Coro::main;
434
402 my ($time, $pri, $name) = @_; 435 my ($time, $pri, $name) = @_;
403 436
404 $time = $TICK * .6 if $time > $TICK * .6; 437 $time = $TICK * .6 if $time > $TICK * .6;
405 my $sig = new Coro::Signal; 438 my $sig = new Coro::Signal;
406 439
… …
443 # this is the main coro, too bad, we have to block 476 # this is the main coro, too bad, we have to block
444 # till the operation succeeds, freezing the server :/ 477 # till the operation succeeds, freezing the server :/
445 478
446 LOG llevError, Carp::longmess "sync job";#d# 479 LOG llevError, Carp::longmess "sync job";#d#
447 480
448 # TODO: use suspend/resume instead
449 # (but this is cancel-safe)
450 my $freeze_guard = freeze_mainloop; 481 my $freeze_guard = freeze_mainloop;
451 482
452 my $busy = 1; 483 my $busy = 1;
453 my @res; 484 my @res;
454 485
… …
465 } else { 496 } else {
466 EV::loop EV::LOOP_ONESHOT; 497 EV::loop EV::LOOP_ONESHOT;
467 } 498 }
468 } 499 }
469 500
470 $time = EV::time - $time; 501 my $time = EV::time - $time;
471 502
472 LOG llevError | logBacktrace, Carp::longmess "long sync job"
473 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
474
475 $tick_start += $time; # do not account sync jobs to server load 503 $TICK_START += $time; # do not account sync jobs to server load
476 504
477 wantarray ? @res : $res[0] 505 wantarray ? @res : $res[0]
478 } else { 506 } else {
479 # we are in another coroutine, how wonderful, everything just works 507 # we are in another coroutine, how wonderful, everything just works
480 508
… …
522 reset_signals; 550 reset_signals;
523 &$cb 551 &$cb
524 }, @args; 552 }, @args;
525 553
526 wantarray ? @res : $res[-1] 554 wantarray ? @res : $res[-1]
555}
556
557=item $coin = coin_from_name $name
558
559=cut
560
561our %coin_alias = (
562 "silver" => "silvercoin",
563 "silvercoin" => "silvercoin",
564 "silvercoins" => "silvercoin",
565 "gold" => "goldcoin",
566 "goldcoin" => "goldcoin",
567 "goldcoins" => "goldcoin",
568 "platinum" => "platinacoin",
569 "platinumcoin" => "platinacoin",
570 "platinumcoins" => "platinacoin",
571 "platina" => "platinacoin",
572 "platinacoin" => "platinacoin",
573 "platinacoins" => "platinacoin",
574 "royalty" => "royalty",
575 "royalties" => "royalty",
576);
577
578sub coin_from_name($) {
579 $coin_alias{$_[0]}
580 ? cf::arch::find $coin_alias{$_[0]}
581 : undef
527} 582}
528 583
529=item $value = cf::db_get $family => $key 584=item $value = cf::db_get $family => $key
530 585
531Returns a single value from the environment database. 586Returns a single value from the environment database.
… …
968 } 1023 }
969 1024
970 0 1025 0
971} 1026}
972 1027
973=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1028=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
974 1029
975=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1030=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
976 1031
977Generate an object-specific event with the given arguments. 1032Generate an object-specific event with the given arguments.
978 1033
… …
1087 utf8::decode (my $decname = $filename); 1142 utf8::decode (my $decname = $filename);
1088 warn sprintf "saving %s (%d,%d)\n", 1143 warn sprintf "saving %s (%d,%d)\n",
1089 $decname, length $$rdata, scalar @$objs; 1144 $decname, length $$rdata, scalar @$objs;
1090 1145
1091 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1146 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1092 chmod SAVE_MODE, $fh; 1147 aio_chmod $fh, SAVE_MODE;
1093 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1148 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1094 aio_fsync $fh if $cf::USE_FSYNC; 1149 aio_fsync $fh if $cf::USE_FSYNC;
1095 close $fh; 1150 aio_close $fh;
1096 1151
1097 if (@$objs) { 1152 if (@$objs) {
1098 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1153 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1099 chmod SAVE_MODE, $fh; 1154 aio_chmod $fh, SAVE_MODE;
1100 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1155 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1101 aio_write $fh, 0, (length $data), $data, 0; 1156 aio_write $fh, 0, (length $data), $data, 0;
1102 aio_fsync $fh if $cf::USE_FSYNC; 1157 aio_fsync $fh if $cf::USE_FSYNC;
1103 close $fh; 1158 aio_close $fh;
1104 aio_rename "$filename.pst~", "$filename.pst"; 1159 aio_rename "$filename.pst~", "$filename.pst";
1105 } 1160 }
1106 } else { 1161 } else {
1107 aio_unlink "$filename.pst"; 1162 aio_unlink "$filename.pst";
1108 } 1163 }
… …
1303 my $msg = $@ ? "$v->{path}: $@\n" 1358 my $msg = $@ ? "$v->{path}: $@\n"
1304 : "$v->{base}: extension inactive.\n"; 1359 : "$v->{base}: extension inactive.\n";
1305 1360
1306 if (exists $v->{meta}{mandatory}) { 1361 if (exists $v->{meta}{mandatory}) {
1307 warn $msg; 1362 warn $msg;
1308 warn "mandatory extension failed to load, exiting.\n"; 1363 cf::cleanup "mandatory extension failed to load, exiting.";
1309 exit 1;
1310 } 1364 }
1311 1365
1312 warn $msg; 1366 warn $msg;
1313 } 1367 }
1314 1368
… …
1403 my $f = new_from_file cf::object::thawer path $login 1457 my $f = new_from_file cf::object::thawer path $login
1404 or return; 1458 or return;
1405 1459
1406 my $pl = cf::player::load_pl $f 1460 my $pl = cf::player::load_pl $f
1407 or return; 1461 or return;
1462
1408 local $cf::PLAYER_LOADING{$login} = $pl; 1463 local $cf::PLAYER_LOADING{$login} = $pl;
1409 $f->resolve_delayed_derefs; 1464 $f->resolve_delayed_derefs;
1410 $cf::PLAYER{$login} = $pl 1465 $cf::PLAYER{$login} = $pl
1411 } 1466 }
1412 } 1467 }
… …
1422 1477
1423 return if $pl->{deny_save}; 1478 return if $pl->{deny_save};
1424 1479
1425 aio_mkdir playerdir $pl, 0770; 1480 aio_mkdir playerdir $pl, 0770;
1426 $pl->{last_save} = $cf::RUNTIME; 1481 $pl->{last_save} = $cf::RUNTIME;
1482
1483 cf::get_slot 0.01;
1427 1484
1428 $pl->save_pl ($path); 1485 $pl->save_pl ($path);
1429 cf::cede_to_tick; 1486 cf::cede_to_tick;
1430} 1487}
1431 1488
… …
1467 $pl->{deny_save} = 1; 1524 $pl->{deny_save} = 1;
1468 $pl->password ("*"); # this should lock out the player until we nuked the dir 1525 $pl->password ("*"); # this should lock out the player until we nuked the dir
1469 1526
1470 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1527 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1471 $pl->deactivate; 1528 $pl->deactivate;
1529 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1530 $pl->ob->check_score;
1472 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1531 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1473 $pl->ns->destroy if $pl->ns; 1532 $pl->ns->destroy if $pl->ns;
1474 1533
1475 my $path = playerdir $pl; 1534 my $path = playerdir $pl;
1476 my $temp = "$path~$cf::RUNTIME~deleting~"; 1535 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1515 1574
1516 for my $login (@$dirs) { 1575 for my $login (@$dirs) {
1517 my $path = path $login; 1576 my $path = path $login;
1518 1577
1519 # a .pst is a dead give-away for a valid player 1578 # a .pst is a dead give-away for a valid player
1520 unless (-e "$path.pst") { 1579 # if no pst file found, open and chekc for blocked users
1580 if (aio_stat "$path.pst") {
1521 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1581 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1522 aio_read $fh, 0, 512, my $buf, 0 or next; 1582 aio_read $fh, 0, 512, my $buf, 0 or next;
1523 $buf !~ /^password -------------$/m or next; # official not-valid tag 1583 $buf !~ /^password -------------$/m or next; # official not-valid tag
1524 } 1584 }
1525 1585
… …
1724our $MAX_RESET = 3600; 1784our $MAX_RESET = 3600;
1725our $DEFAULT_RESET = 3000; 1785our $DEFAULT_RESET = 3000;
1726 1786
1727sub generate_random_map { 1787sub generate_random_map {
1728 my ($self, $rmp) = @_; 1788 my ($self, $rmp) = @_;
1789
1790 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1791
1729 # mit "rum" bekleckern, nicht 1792 # mit "rum" bekleckern, nicht
1730 $self->_create_random_map ( 1793 $self->_create_random_map (
1731 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1794 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1732 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1795 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1733 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1796 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1855 1918
1856# the temporary/swap location 1919# the temporary/swap location
1857sub save_path { 1920sub save_path {
1858 my ($self) = @_; 1921 my ($self) = @_;
1859 1922
1860 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1923 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1861 "$TMPDIR/$path.map" 1924 "$TMPDIR/$path.map"
1862} 1925}
1863 1926
1864# the unique path, undef == no special unique path 1927# the unique path, undef == no special unique path
1865sub uniq_path { 1928sub uniq_path {
1866 my ($self) = @_; 1929 my ($self) = @_;
1867 1930
1868 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1931 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1869 "$UNIQUEDIR/$path" 1932 "$UNIQUEDIR/$path"
1870} 1933}
1871 1934
1872# and all this just because we cannot iterate over 1935# and all this just because we cannot iterate over
1873# all maps in C++... 1936# all maps in C++...
… …
1971 2034
1972 cf::lock_wait "map_data:$path";#d#remove 2035 cf::lock_wait "map_data:$path";#d#remove
1973 cf::lock_wait "map_find:$path"; 2036 cf::lock_wait "map_find:$path";
1974 2037
1975 $cf::MAP{$path} || do { 2038 $cf::MAP{$path} || do {
1976 my $guard1 = cf::lock_acquire "map_find:$path";
1977 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it 2039 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2040 my $guard2 = cf::lock_acquire "map_find:$path";
1978 2041
1979 my $map = new_from_path cf::map $path 2042 my $map = new_from_path cf::map $path
1980 or return; 2043 or return;
1981 2044
1982 $map->{last_save} = $cf::RUNTIME; 2045 $map->{last_save} = $cf::RUNTIME;
… …
1985 or return; 2048 or return;
1986 2049
1987 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2050 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1988 # doing this can freeze the server in a sync job, obviously 2051 # doing this can freeze the server in a sync job, obviously
1989 #$cf::WAIT_FOR_TICK->wait; 2052 #$cf::WAIT_FOR_TICK->wait;
2053 undef $guard2;
1990 undef $guard1; 2054 undef $guard1;
1991 undef $guard2;
1992 $map->reset; 2055 $map->reset;
1993 return find $path; 2056 return find $path;
1994 } 2057 }
1995 2058
1996 $cf::MAP{$path} = $map 2059 $cf::MAP{$path} = $map
… …
2059 } 2122 }
2060 2123
2061 $self->{last_save} = $cf::RUNTIME; 2124 $self->{last_save} = $cf::RUNTIME;
2062 $self->last_access ($cf::RUNTIME); 2125 $self->last_access ($cf::RUNTIME);
2063 2126
2064 $self->in_memory (cf::MAP_IN_MEMORY); 2127 $self->in_memory (cf::MAP_ACTIVE);
2065 } 2128 }
2066 2129
2067 $self->post_load; 2130 $self->post_load;
2068} 2131}
2069 2132
… …
2127 my ($path, $origin, $load) = @_; 2190 my ($path, $origin, $load) = @_;
2128 2191
2129 $path = normalise $path, $origin && $origin->{path}; 2192 $path = normalise $path, $origin && $origin->{path};
2130 2193
2131 if (my $map = $cf::MAP{$path}) { 2194 if (my $map = $cf::MAP{$path}) {
2132 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2195 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2133 } 2196 }
2134 2197
2135 $MAP_PREFETCH{$path} |= $load; 2198 $MAP_PREFETCH{$path} |= $load;
2136 2199
2137 $MAP_PREFETCHER ||= cf::async { 2200 $MAP_PREFETCHER ||= cf::async {
… …
2174 cf::async { 2237 cf::async {
2175 $Coro::current->{desc} = "map player save"; 2238 $Coro::current->{desc} = "map player save";
2176 $_->contr->save for $self->players; 2239 $_->contr->save for $self->players;
2177 }; 2240 };
2178 2241
2242 cf::get_slot 0.02;
2243
2179 if ($uniq) { 2244 if ($uniq) {
2180 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2245 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2181 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2246 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2182 } else { 2247 } else {
2183 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2248 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
… …
2191 $self->save; 2256 $self->save;
2192 2257
2193 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2258 my $lock = cf::lock_acquire "map_data:$self->{path}";
2194 2259
2195 return if $self->players; 2260 return if $self->players;
2196 return if $self->in_memory != cf::MAP_IN_MEMORY; 2261 return if $self->in_memory != cf::MAP_ACTIVE;
2197 return if $self->{deny_save}; 2262 return if $self->{deny_save};
2198 2263
2199 $self->in_memory (cf::MAP_SWAPPED); 2264 $self->in_memory (cf::MAP_SWAPPED);
2200 2265
2201 $self->deactivate; 2266 $self->deactivate;
… …
2319 2384
2320sub unique_maps() { 2385sub unique_maps() {
2321 [ 2386 [
2322 map { 2387 map {
2323 utf8::decode $_; 2388 utf8::decode $_;
2324 /\.map$/ 2389 s/\.map$//; # TODO future compatibility hack
2390 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2391 ? ()
2325 ? normalise $_ 2392 : normalise $_
2326 : ()
2327 } @{ aio_readdir $UNIQUEDIR or [] } 2393 } @{ aio_readdir $UNIQUEDIR or [] }
2328 ] 2394 ]
2329} 2395}
2330 2396
2331package cf;
2332
2333=back 2397=back
2334 2398
2335=head3 cf::object 2399=head3 cf::object
2336 2400
2337=cut 2401=cut
… …
2340 2404
2341=over 4 2405=over 4
2342 2406
2343=item $ob->inv_recursive 2407=item $ob->inv_recursive
2344 2408
2345Returns the inventory of the object _and_ their inventories, recursively. 2409Returns the inventory of the object I<and> their inventories, recursively,
2410but I<not> the object itself.
2346 2411
2347=cut 2412=cut
2348 2413
2349sub inv_recursive_; 2414sub inv_recursive_;
2350sub inv_recursive_ { 2415sub inv_recursive_ {
… …
2355 inv_recursive_ inv $_[0] 2420 inv_recursive_ inv $_[0]
2356} 2421}
2357 2422
2358=item $ref = $ob->ref 2423=item $ref = $ob->ref
2359 2424
2360creates and returns a persistent reference to an objetc that can be stored as a string. 2425Creates and returns a persistent reference to an object that can be stored as a string.
2361 2426
2362=item $ob = cf::object::deref ($refstring) 2427=item $ob = cf::object::deref ($refstring)
2363 2428
2364returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2429returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2365even if the object actually exists. May block. 2430even if the object actually exists. May block.
… …
2397can be C<undef>. Does the right thing when the player is currently in a 2462can be C<undef>. Does the right thing when the player is currently in a
2398dialogue with the given NPC character. 2463dialogue with the given NPC character.
2399 2464
2400=cut 2465=cut
2401 2466
2467our $SAY_CHANNEL = {
2468 id => "say",
2469 title => "Map",
2470 reply => "say ",
2471 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2472};
2473
2474our $CHAT_CHANNEL = {
2475 id => "chat",
2476 title => "Chat",
2477 reply => "chat ",
2478 tooltip => "Player chat and shouts, global to the server.",
2479};
2480
2402# rough implementation of a future "reply" method that works 2481# rough implementation of a future "reply" method that works
2403# with dialog boxes. 2482# with dialog boxes.
2404#TODO: the first argument must go, split into a $npc->reply_to ( method 2483#TODO: the first argument must go, split into a $npc->reply_to ( method
2405sub cf::object::player::reply($$$;$) { 2484sub cf::object::player::reply($$$;$) {
2406 my ($self, $npc, $msg, $flags) = @_; 2485 my ($self, $npc, $msg, $flags) = @_;
… …
2417 my $dialog = $pl->{npc_dialog}; 2496 my $dialog = $pl->{npc_dialog};
2418 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2497 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2419 2498
2420 } else { 2499 } else {
2421 $msg = $npc->name . " says: $msg" if $npc; 2500 $msg = $npc->name . " says: $msg" if $npc;
2422 $self->message ($msg, $flags); 2501 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2423 } 2502 }
2424 } 2503 }
2425} 2504}
2426 2505
2427=item $object->send_msg ($channel, $msg, $color, [extra...]) 2506=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2622} 2701}
2623 2702
2624sub prepare_random_map { 2703sub prepare_random_map {
2625 my ($exit) = @_; 2704 my ($exit) = @_;
2626 2705
2627 my $guard = cf::lock_acquire "exit_prepare:$exit";
2628
2629 # all this does is basically replace the /! path by 2706 # all this does is basically replace the /! path by
2630 # a new random map path (?random/...) with a seed 2707 # a new random map path (?random/...) with a seed
2631 # that depends on the exit object 2708 # that depends on the exit object
2632 2709
2633 my $rmp = parse_random_map_params $exit->msg; 2710 my $rmp = parse_random_map_params $exit->msg;
… …
2635 if ($exit->map) { 2712 if ($exit->map) {
2636 $rmp->{region} = $exit->region->name; 2713 $rmp->{region} = $exit->region->name;
2637 $rmp->{origin_map} = $exit->map->path; 2714 $rmp->{origin_map} = $exit->map->path;
2638 $rmp->{origin_x} = $exit->x; 2715 $rmp->{origin_x} = $exit->x;
2639 $rmp->{origin_y} = $exit->y; 2716 $rmp->{origin_y} = $exit->y;
2717
2718 $exit->map->touch;
2640 } 2719 }
2641 2720
2642 $rmp->{random_seed} ||= $exit->random_seed; 2721 $rmp->{random_seed} ||= $exit->random_seed;
2643 2722
2644 my $data = cf::encode_json $rmp; 2723 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2645 my $md5 = Digest::MD5::md5_hex $data; 2724 my $md5 = Digest::MD5::md5_hex $data;
2646 my $meta = "$RANDOMDIR/$md5.meta"; 2725 my $meta = "$RANDOMDIR/$md5.meta";
2647 2726
2648 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2727 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2649 aio_write $fh, 0, (length $data), $data, 0; 2728 aio_write $fh, 0, (length $data), $data, 0;
2650 undef $fh; 2729 undef $fh;
2651 aio_rename "$meta~", $meta; 2730 aio_rename "$meta~", $meta;
2652 2731
2732 my $slaying = "?random/$md5";
2733
2734 if ($exit->valid) {
2653 $exit->slaying ("?random/$md5"); 2735 $exit->slaying ("?random/$md5");
2654 $exit->msg (undef); 2736 $exit->msg (undef);
2737 }
2655 } 2738 }
2656} 2739}
2657 2740
2658sub cf::object::player::enter_exit { 2741sub cf::object::player::enter_exit {
2659 my ($self, $exit) = @_; 2742 my ($self, $exit) = @_;
2660 2743
2661 return unless $self->type == cf::PLAYER; 2744 return unless $self->type == cf::PLAYER;
2662 2745
2663 if ($exit->slaying eq "/!") {
2664 #TODO: this should de-fi-ni-te-ly not be a sync-job
2665 # the problem is that $exit might not survive long enough
2666 # so it needs to be done right now, right here
2667 cf::sync_job { prepare_random_map $exit };
2668 }
2669
2670 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2671 my $hp = $exit->stats->hp;
2672 my $sp = $exit->stats->sp;
2673
2674 $self->enter_link; 2746 $self->enter_link;
2675 2747
2676 # if exit is damned, update players death & WoR home-position
2677 $self->contr->savebed ($slaying, $hp, $sp)
2678 if $exit->flag (FLAG_DAMNED);
2679
2680 (async { 2748 (async {
2681 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2749 $Coro::current->{desc} = "enter_exit";
2682 2750
2683 $self->deactivate_recursive; # just to be sure
2684 unless (eval { 2751 unless (eval {
2752 $self->deactivate_recursive; # just to be sure
2753
2754 # random map handling
2755 {
2756 my $guard = cf::lock_acquire "exit_prepare:$exit";
2757
2758 prepare_random_map $exit
2759 if $exit->slaying eq "/!";
2760 }
2761
2762 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2763 my $x = $exit->stats->hp;
2764 my $y = $exit->stats->sp;
2765
2685 $self->goto ($slaying, $hp, $sp); 2766 $self->goto ($map, $x, $y);
2686 2767
2768 # if exit is damned, update players death & WoR home-position
2769 $self->contr->savebed ($map, $x, $y)
2770 if $exit->flag (cf::FLAG_DAMNED);
2771
2687 1; 2772 1
2688 }) { 2773 }) {
2689 $self->message ("Something went wrong deep within the crossfire server. " 2774 $self->message ("Something went wrong deep within the crossfire server. "
2690 . "I'll try to bring you back to the map you were before. " 2775 . "I'll try to bring you back to the map you were before. "
2691 . "Please report this to the dungeon master!", 2776 . "Please report this to the dungeon master!",
2692 cf::NDI_UNIQUE | cf::NDI_RED); 2777 cf::NDI_UNIQUE | cf::NDI_RED);
… …
2772 id => "infobox", 2857 id => "infobox",
2773 title => "Map Info", 2858 title => "Map Info",
2774 reply => undef, 2859 reply => undef,
2775 tooltip => "Information related to the maps", 2860 tooltip => "Information related to the maps",
2776 }, 2861 },
2862 "c/party" => {
2863 id => "party",
2864 title => "Party",
2865 reply => "gsay ",
2866 tooltip => "Messages and chat related to your party",
2867 },
2777); 2868);
2778 2869
2779sub cf::client::send_msg { 2870sub cf::client::send_msg {
2780 my ($self, $channel, $msg, $color, @extra) = @_; 2871 my ($self, $channel, $msg, $color, @extra) = @_;
2781 2872
… …
3018 3109
3019The following functions and methods are available within a safe environment: 3110The following functions and methods are available within a safe environment:
3020 3111
3021 cf::object 3112 cf::object
3022 contr pay_amount pay_player map x y force_find force_add destroy 3113 contr pay_amount pay_player map x y force_find force_add destroy
3023 insert remove name archname title slaying race decrease_ob_nr 3114 insert remove name archname title slaying race decrease split
3024 3115
3025 cf::object::player 3116 cf::object::player
3026 player 3117 player
3027 3118
3028 cf::player 3119 cf::player
… …
3033 3124
3034=cut 3125=cut
3035 3126
3036for ( 3127for (
3037 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3128 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3038 insert remove inv name archname title slaying race 3129 insert remove inv nrof name archname title slaying race
3039 decrease_ob_nr destroy)], 3130 decrease split destroy)],
3040 ["cf::object::player" => qw(player)], 3131 ["cf::object::player" => qw(player)],
3041 ["cf::player" => qw(peaceful)], 3132 ["cf::player" => qw(peaceful)],
3042 ["cf::map" => qw(trigger)], 3133 ["cf::map" => qw(trigger)],
3043) { 3134) {
3044 no strict 'refs'; 3135 no strict 'refs';
… …
3149 { 3240 {
3150 my $faces = $facedata->{faceinfo}; 3241 my $faces = $facedata->{faceinfo};
3151 3242
3152 while (my ($face, $info) = each %$faces) { 3243 while (my ($face, $info) = each %$faces) {
3153 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3244 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3245
3154 cf::face::set_visibility $idx, $info->{visibility}; 3246 cf::face::set_visibility $idx, $info->{visibility};
3155 cf::face::set_magicmap $idx, $info->{magicmap}; 3247 cf::face::set_magicmap $idx, $info->{magicmap};
3156 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3248 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
3157 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3249 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3158 3250
3159 cf::cede_to_tick; 3251 cf::cede_to_tick;
3160 } 3252 }
3161 3253
3162 while (my ($face, $info) = each %$faces) { 3254 while (my ($face, $info) = each %$faces) {
3163 next unless $info->{smooth}; 3255 next unless $info->{smooth};
3256
3164 my $idx = cf::face::find $face 3257 my $idx = cf::face::find $face
3165 or next; 3258 or next;
3259
3166 if (my $smooth = cf::face::find $info->{smooth}) { 3260 if (my $smooth = cf::face::find $info->{smooth}) {
3167 cf::face::set_smooth $idx, $smooth; 3261 cf::face::set_smooth $idx, $smooth;
3168 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3262 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3169 } else { 3263 } else {
3170 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3264 warn "smooth face '$info->{smooth}' not found for face '$face'";
… …
3188 { 3282 {
3189 # TODO: for gcfclient pleasure, we should give resources 3283 # TODO: for gcfclient pleasure, we should give resources
3190 # that gcfclient doesn't grok a >10000 face index. 3284 # that gcfclient doesn't grok a >10000 face index.
3191 my $res = $facedata->{resource}; 3285 my $res = $facedata->{resource};
3192 3286
3193 my $soundconf = delete $res->{"res/sound.conf"};
3194
3195 while (my ($name, $info) = each %$res) { 3287 while (my ($name, $info) = each %$res) {
3288 if (defined $info->{type}) {
3196 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3289 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3197 my $data; 3290 my $data;
3198 3291
3199 if ($info->{type} & 1) { 3292 if ($info->{type} & 1) {
3200 # prepend meta info 3293 # prepend meta info
3201 3294
3202 my $meta = $enc->encode ({ 3295 my $meta = $enc->encode ({
3203 name => $name, 3296 name => $name,
3204 %{ $info->{meta} || {} }, 3297 %{ $info->{meta} || {} },
3205 }); 3298 });
3206 3299
3207 $data = pack "(w/a*)*", $meta, $info->{data}; 3300 $data = pack "(w/a*)*", $meta, $info->{data};
3301 } else {
3302 $data = $info->{data};
3303 }
3304
3305 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3306 cf::face::set_type $idx, $info->{type};
3208 } else { 3307 } else {
3209 $data = $info->{data}; 3308 $RESOURCE{$name} = $info;
3210 } 3309 }
3211 3310
3212 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3213 cf::face::set_type $idx, $info->{type};
3214
3215 cf::cede_to_tick; 3311 cf::cede_to_tick;
3216 } 3312 }
3217
3218 if ($soundconf) {
3219 $soundconf = $enc->decode (delete $soundconf->{data});
3220
3221 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3222 my $sound = $soundconf->{compat}[$_]
3223 or next;
3224
3225 my $face = cf::face::find "sound/$sound->[1]";
3226 cf::sound::set $sound->[0] => $face;
3227 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3228 }
3229
3230 while (my ($k, $v) = each %{$soundconf->{event}}) {
3231 my $face = cf::face::find "sound/$v";
3232 cf::sound::set $k => $face;
3233 }
3234 }
3235 } 3313 }
3314
3315 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3236 3316
3237 1 3317 1
3238} 3318}
3319
3320cf::global->attach (on_resource_update => sub {
3321 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3322 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3323
3324 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3325 my $sound = $soundconf->{compat}[$_]
3326 or next;
3327
3328 my $face = cf::face::find "sound/$sound->[1]";
3329 cf::sound::set $sound->[0] => $face;
3330 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3331 }
3332
3333 while (my ($k, $v) = each %{$soundconf->{event}}) {
3334 my $face = cf::face::find "sound/$v";
3335 cf::sound::set $k => $face;
3336 }
3337 }
3338});
3239 3339
3240register_exticmd fx_want => sub { 3340register_exticmd fx_want => sub {
3241 my ($ns, $want) = @_; 3341 my ($ns, $want) = @_;
3242 3342
3243 while (my ($k, $v) = each %$want) { 3343 while (my ($k, $v) = each %$want) {
3244 $ns->fx_want ($k, $v); 3344 $ns->fx_want ($k, $v);
3245 } 3345 }
3246}; 3346};
3347
3348sub load_resource_file($) {
3349 my $guard = lock_acquire "load_resource_file";
3350
3351 my $status = load_resource_file_ $_[0];
3352 get_slot 0.1, 100;
3353 cf::arch::commit_load;
3354
3355 $status
3356}
3247 3357
3248sub reload_regions { 3358sub reload_regions {
3249 # HACK to clear player env face cache, we need some signal framework 3359 # HACK to clear player env face cache, we need some signal framework
3250 # for this (global event?) 3360 # for this (global event?)
3251 %ext::player_env::MUSIC_FACE_CACHE = (); 3361 %ext::player_env::MUSIC_FACE_CACHE = ();
… …
3265} 3375}
3266 3376
3267sub reload_archetypes { 3377sub reload_archetypes {
3268 load_resource_file "$DATADIR/archetypes" 3378 load_resource_file "$DATADIR/archetypes"
3269 or die "unable to load archetypes\n"; 3379 or die "unable to load archetypes\n";
3270 #d# NEED to laod twice to resolve forward references
3271 # this really needs to be done in an extra post-pass
3272 # (which needs to be synchronous, so solve it differently)
3273 load_resource_file "$DATADIR/archetypes"
3274 or die "unable to load archetypes\n";
3275} 3380}
3276 3381
3277sub reload_treasures { 3382sub reload_treasures {
3278 load_resource_file "$DATADIR/treasures" 3383 load_resource_file "$DATADIR/treasures"
3279 or die "unable to load treasurelists\n"; 3384 or die "unable to load treasurelists\n";
3280} 3385}
3281 3386
3282sub reload_resources { 3387sub reload_resources {
3283 warn "reloading resource files...\n"; 3388 warn "reloading resource files...\n";
3284 3389
3390 reload_facedata;
3391 reload_archetypes;
3285 reload_regions; 3392 reload_regions;
3286 reload_facedata;
3287 #reload_archetypes;#d#
3288 reload_archetypes;
3289 reload_treasures; 3393 reload_treasures;
3290 3394
3291 warn "finished reloading resource files\n"; 3395 warn "finished reloading resource files\n";
3292} 3396}
3293 3397
3294sub init { 3398sub init {
3399 my $guard = freeze_mainloop;
3400
3401 evthread_start IO::AIO::poll_fileno;
3402
3295 reload_resources; 3403 reload_resources;
3296} 3404}
3297 3405
3298sub reload_config { 3406sub reload_config {
3299 open my $fh, "<:utf8", "$CONFDIR/config" 3407 open my $fh, "<:utf8", "$CONFDIR/config"
3300 or return; 3408 or return;
3301 3409
3302 local $/; 3410 local $/;
3303 *CFG = YAML::Syck::Load <$fh>; 3411 *CFG = YAML::Load <$fh>;
3304 3412
3305 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3413 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3306 3414
3307 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3415 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3308 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3416 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3324 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3432 $Coro::current->{desc} = "IDLE BUG HANDLER";
3325 EV::loop EV::LOOP_ONESHOT; 3433 EV::loop EV::LOOP_ONESHOT;
3326 })->prio (Coro::PRIO_MAX); 3434 })->prio (Coro::PRIO_MAX);
3327 }; 3435 };
3328 3436
3437 {
3438 my $guard = freeze_mainloop;
3329 reload_config; 3439 reload_config;
3330 db_init; 3440 db_init;
3331 load_extensions; 3441 load_extensions;
3332 3442
3333 $TICK_WATCHER->start;
3334 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3443 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3444 }
3445
3335 EV::loop; 3446 EV::loop;
3336} 3447}
3337 3448
3338############################################################################# 3449#############################################################################
3339# initialisation and cleanup 3450# initialisation and cleanup
… …
3346 cf::cleanup "SIG$signal"; 3457 cf::cleanup "SIG$signal";
3347 }; 3458 };
3348 } 3459 }
3349} 3460}
3350 3461
3351sub write_runtime { 3462sub write_runtime_sync {
3352 my $runtime = "$LOCALDIR/runtime"; 3463 my $runtime = "$LOCALDIR/runtime";
3353 3464
3354 # first touch the runtime file to show we are still running: 3465 # first touch the runtime file to show we are still running:
3355 # the fsync below can take a very very long time. 3466 # the fsync below can take a very very long time.
3356 3467
… …
3382 and return; 3493 and return;
3383 3494
3384 warn "runtime file written.\n"; 3495 warn "runtime file written.\n";
3385 3496
3386 1 3497 1
3498}
3499
3500our $uuid_lock;
3501our $uuid_skip;
3502
3503sub write_uuid_sync($) {
3504 $uuid_skip ||= $_[0];
3505
3506 return if $uuid_lock;
3507 local $uuid_lock = 1;
3508
3509 my $uuid = "$LOCALDIR/uuid";
3510
3511 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3512 or return;
3513
3514 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3515 $uuid_skip = 0;
3516
3517 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3518 and return;
3519
3520 # always fsync - this file is important
3521 aio_fsync $fh
3522 and return;
3523
3524 close $fh
3525 or return;
3526
3527 aio_rename "$uuid~", $uuid
3528 and return;
3529
3530 warn "uuid file written ($value).\n";
3531
3532 1
3533
3534}
3535
3536sub write_uuid($$) {
3537 my ($skip, $sync) = @_;
3538
3539 $sync ? write_uuid_sync $skip
3540 : async { write_uuid_sync $skip };
3387} 3541}
3388 3542
3389sub emergency_save() { 3543sub emergency_save() {
3390 my $freeze_guard = cf::freeze_mainloop; 3544 my $freeze_guard = cf::freeze_mainloop;
3391 3545
… …
3413 warn "end emergency map save\n"; 3567 warn "end emergency map save\n";
3414 3568
3415 warn "begin emergency database checkpoint\n"; 3569 warn "begin emergency database checkpoint\n";
3416 BDB::db_env_txn_checkpoint $DB_ENV; 3570 BDB::db_env_txn_checkpoint $DB_ENV;
3417 warn "end emergency database checkpoint\n"; 3571 warn "end emergency database checkpoint\n";
3572
3573 warn "begin write uuid\n";
3574 write_uuid_sync 1;
3575 warn "end write uuid\n";
3418 }; 3576 };
3419 3577
3420 warn "leave emergency perl save\n"; 3578 warn "leave emergency perl save\n";
3421} 3579}
3422 3580
… …
3437 warn "reloading..."; 3595 warn "reloading...";
3438 3596
3439 warn "entering sync_job"; 3597 warn "entering sync_job";
3440 3598
3441 cf::sync_job { 3599 cf::sync_job {
3442 cf::write_runtime; # external watchdog should not bark 3600 cf::write_runtime_sync; # external watchdog should not bark
3443 cf::emergency_save; 3601 cf::emergency_save;
3444 cf::write_runtime; # external watchdog should not bark 3602 cf::write_runtime_sync; # external watchdog should not bark
3445 3603
3446 warn "syncing database to disk"; 3604 warn "syncing database to disk";
3447 BDB::db_env_txn_checkpoint $DB_ENV; 3605 BDB::db_env_txn_checkpoint $DB_ENV;
3448 3606
3449 # if anything goes wrong in here, we should simply crash as we already saved 3607 # if anything goes wrong in here, we should simply crash as we already saved
… …
3536 warn "leaving sync_job"; 3694 warn "leaving sync_job";
3537 3695
3538 1 3696 1
3539 } or do { 3697 } or do {
3540 warn $@; 3698 warn $@;
3541 warn "error while reloading, exiting."; 3699 cf::cleanup "error while reloading, exiting.";
3542 exit 1;
3543 }; 3700 };
3544 3701
3545 warn "reloaded"; 3702 warn "reloaded";
3546}; 3703};
3547 3704
… …
3550sub reload_perl() { 3707sub reload_perl() {
3551 # doing reload synchronously and two reloads happen back-to-back, 3708 # doing reload synchronously and two reloads happen back-to-back,
3552 # coro crashes during coro_state_free->destroy here. 3709 # coro crashes during coro_state_free->destroy here.
3553 3710
3554 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3711 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3712 do_reload_perl;
3555 undef $RELOAD_WATCHER; 3713 undef $RELOAD_WATCHER;
3556 do_reload_perl;
3557 }; 3714 };
3558} 3715}
3559 3716
3560register_command "reload" => sub { 3717register_command "reload" => sub {
3561 my ($who, $arg) = @_; 3718 my ($who, $arg) = @_;
… …
3575 3732
3576our @WAIT_FOR_TICK; 3733our @WAIT_FOR_TICK;
3577our @WAIT_FOR_TICK_BEGIN; 3734our @WAIT_FOR_TICK_BEGIN;
3578 3735
3579sub wait_for_tick { 3736sub wait_for_tick {
3580 return unless $TICK_WATCHER->is_active;
3581 return if $Coro::current == $Coro::main; 3737 return if tick_inhibit || $Coro::current == $Coro::main;
3582 3738
3583 my $signal = new Coro::Signal; 3739 my $signal = new Coro::Signal;
3584 push @WAIT_FOR_TICK, $signal; 3740 push @WAIT_FOR_TICK, $signal;
3585 $signal->wait; 3741 $signal->wait;
3586} 3742}
3587 3743
3588sub wait_for_tick_begin { 3744sub wait_for_tick_begin {
3589 return unless $TICK_WATCHER->is_active;
3590 return if $Coro::current == $Coro::main; 3745 return if tick_inhibit || $Coro::current == $Coro::main;
3591 3746
3592 my $signal = new Coro::Signal; 3747 my $signal = new Coro::Signal;
3593 push @WAIT_FOR_TICK_BEGIN, $signal; 3748 push @WAIT_FOR_TICK_BEGIN, $signal;
3594 $signal->wait; 3749 $signal->wait;
3595} 3750}
3596 3751
3597$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 3752sub tick {
3598 if ($Coro::current != $Coro::main) { 3753 if ($Coro::current != $Coro::main) {
3599 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3754 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3600 unless ++$bug_warning > 10; 3755 unless ++$bug_warning > 10;
3601 return; 3756 return;
3602 } 3757 }
3603 3758
3604 $NOW = $tick_start = EV::now;
3605
3606 cf::server_tick; # one server iteration 3759 cf::server_tick; # one server iteration
3607
3608 $RUNTIME += $TICK;
3609 $NEXT_TICK = $_[0]->at;
3610 3760
3611 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3761 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3612 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3762 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3613 Coro::async_pool { 3763 Coro::async_pool {
3614 $Coro::current->{desc} = "runtime saver"; 3764 $Coro::current->{desc} = "runtime saver";
3615 write_runtime 3765 write_runtime_sync
3616 or warn "ERROR: unable to write runtime file: $!"; 3766 or warn "ERROR: unable to write runtime file: $!";
3617 }; 3767 };
3618 } 3768 }
3619 3769
3620 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3770 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
… …
3622 } 3772 }
3623 while (my $sig = shift @WAIT_FOR_TICK) { 3773 while (my $sig = shift @WAIT_FOR_TICK) {
3624 $sig->send; 3774 $sig->send;
3625 } 3775 }
3626 3776
3627 $LOAD = ($NOW - $tick_start) / $TICK; 3777 $LOAD = ($NOW - $TICK_START) / $TICK;
3628 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3778 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3629 3779
3630 _post_tick; 3780 if (0) {
3631}; 3781 if ($NEXT_TICK) {
3632$TICK_WATCHER->priority (EV::MAXPRI); 3782 my $jitter = $TICK_START - $NEXT_TICK;
3783 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3784 warn "jitter $JITTER\n";#d#
3785 }
3786 }
3787}
3633 3788
3634{ 3789{
3635 # configure BDB 3790 # configure BDB
3636 3791
3637 BDB::min_parallel 8; 3792 BDB::min_parallel 8;
3638 BDB::max_poll_reqs $TICK * 0.1; 3793 BDB::max_poll_reqs $TICK * 0.1;
3639 $Coro::BDB::WATCHER->priority (1); 3794 $AnyEvent::BDB::WATCHER->priority (1);
3640 3795
3641 unless ($DB_ENV) { 3796 unless ($DB_ENV) {
3642 $DB_ENV = BDB::db_env_create; 3797 $DB_ENV = BDB::db_env_create;
3643 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3798 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3644 | BDB::LOG_AUTOREMOVE, 1); 3799 | BDB::LOG_AUTOREMOVE, 1);
… …
3675{ 3830{
3676 # configure IO::AIO 3831 # configure IO::AIO
3677 3832
3678 IO::AIO::min_parallel 8; 3833 IO::AIO::min_parallel 8;
3679 IO::AIO::max_poll_time $TICK * 0.1; 3834 IO::AIO::max_poll_time $TICK * 0.1;
3680 $Coro::AIO::WATCHER->priority (1); 3835 undef $AnyEvent::AIO::WATCHER;
3681} 3836}
3682 3837
3683my $_log_backtrace; 3838my $_log_backtrace;
3684 3839
3685sub _log_backtrace { 3840sub _log_backtrace {

Diff Legend

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