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

Diff Legend

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