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.406 by root, Mon Dec 17 08:27:44 2007 UTC vs.
Revision 1.427 by root, Sat Apr 26 12:25:45 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
… …
72our $RANDOMDIR = "$LOCALDIR/random"; 90our $RANDOMDIR = "$LOCALDIR/random";
73our $BDBDIR = "$LOCALDIR/db"; 91our $BDBDIR = "$LOCALDIR/db";
74our %RESOURCE; 92our %RESOURCE;
75 93
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER;
78our $AIO_POLL_WATCHER; 95our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 97our $NEXT_TICK;
81our $USE_FSYNC = 1; # use fsync to write maps - default off 98our $USE_FSYNC = 1; # use fsync to write maps - default off
82 99
… …
99# 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 ∕
100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 117our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
101 118
102our $LOAD; # a number between 0 (idle) and 1 (too many objects) 119our $LOAD; # a number between 0 (idle) and 1 (too many objects)
103our $LOADAVG; # same thing, but with alpha-smoothing 120our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter
104our $tick_start; # for load detecting purposes 122our $TICK_START; # for load detecting purposes
105 123
106binmode STDOUT; 124binmode STDOUT;
107binmode STDERR; 125binmode STDERR;
108 126
109# read virtual server time, if available 127# read virtual server time, if available
… …
193 $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;
194 212
195 LOG llevError, $msg; 213 LOG llevError, $msg;
196 }; 214 };
197} 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#?
198 231
199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 232@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
200@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 233@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
201@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 234@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
202@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 235@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
327 360
328 ! ! $LOCK{$key} 361 ! ! $LOCK{$key}
329} 362}
330 363
331sub freeze_mainloop { 364sub freeze_mainloop {
332 return unless $TICK_WATCHER->is_active; 365 tick_inhibit_inc;
333 366
334 my $guard = Coro::guard { 367 Coro::guard \&tick_inhibit_dec;
335 $TICK_WATCHER->start;
336 };
337 $TICK_WATCHER->stop;
338 $guard
339} 368}
340 369
341=item cf::periodic $interval, $cb 370=item cf::periodic $interval, $cb
342 371
343Like 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
… …
398 } 427 }
399 } 428 }
400}; 429};
401 430
402sub get_slot($;$$) { 431sub get_slot($;$$) {
432 return if tick_inhibit || $Coro::current == $Coro::main;
433
403 my ($time, $pri, $name) = @_; 434 my ($time, $pri, $name) = @_;
404 435
405 $time = $TICK * .6 if $time > $TICK * .6; 436 $time = $TICK * .6 if $time > $TICK * .6;
406 my $sig = new Coro::Signal; 437 my $sig = new Coro::Signal;
407 438
… …
444 # this is the main coro, too bad, we have to block 475 # this is the main coro, too bad, we have to block
445 # till the operation succeeds, freezing the server :/ 476 # till the operation succeeds, freezing the server :/
446 477
447 LOG llevError, Carp::longmess "sync job";#d# 478 LOG llevError, Carp::longmess "sync job";#d#
448 479
449 # TODO: use suspend/resume instead
450 # (but this is cancel-safe)
451 my $freeze_guard = freeze_mainloop; 480 my $freeze_guard = freeze_mainloop;
452 481
453 my $busy = 1; 482 my $busy = 1;
454 my @res; 483 my @res;
455 484
… …
466 } else { 495 } else {
467 EV::loop EV::LOOP_ONESHOT; 496 EV::loop EV::LOOP_ONESHOT;
468 } 497 }
469 } 498 }
470 499
471 $time = EV::time - $time; 500 my $time = EV::time - $time;
472 501
473 LOG llevError | logBacktrace, Carp::longmess "long sync job"
474 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
475
476 $tick_start += $time; # do not account sync jobs to server load 502 $TICK_START += $time; # do not account sync jobs to server load
477 503
478 wantarray ? @res : $res[0] 504 wantarray ? @res : $res[0]
479 } else { 505 } else {
480 # we are in another coroutine, how wonderful, everything just works 506 # we are in another coroutine, how wonderful, everything just works
481 507
… …
523 reset_signals; 549 reset_signals;
524 &$cb 550 &$cb
525 }, @args; 551 }, @args;
526 552
527 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
528} 581}
529 582
530=item $value = cf::db_get $family => $key 583=item $value = cf::db_get $family => $key
531 584
532Returns a single value from the environment database. 585Returns a single value from the environment database.
… …
1088 utf8::decode (my $decname = $filename); 1141 utf8::decode (my $decname = $filename);
1089 warn sprintf "saving %s (%d,%d)\n", 1142 warn sprintf "saving %s (%d,%d)\n",
1090 $decname, length $$rdata, scalar @$objs; 1143 $decname, length $$rdata, scalar @$objs;
1091 1144
1092 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1145 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1093 chmod SAVE_MODE, $fh; 1146 aio_chmod $fh, SAVE_MODE;
1094 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1147 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1095 aio_fsync $fh if $cf::USE_FSYNC; 1148 aio_fsync $fh if $cf::USE_FSYNC;
1096 close $fh; 1149 aio_close $fh;
1097 1150
1098 if (@$objs) { 1151 if (@$objs) {
1099 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) {
1100 chmod SAVE_MODE, $fh; 1153 aio_chmod $fh, SAVE_MODE;
1101 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1154 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1102 aio_write $fh, 0, (length $data), $data, 0; 1155 aio_write $fh, 0, (length $data), $data, 0;
1103 aio_fsync $fh if $cf::USE_FSYNC; 1156 aio_fsync $fh if $cf::USE_FSYNC;
1104 close $fh; 1157 aio_close $fh;
1105 aio_rename "$filename.pst~", "$filename.pst"; 1158 aio_rename "$filename.pst~", "$filename.pst";
1106 } 1159 }
1107 } else { 1160 } else {
1108 aio_unlink "$filename.pst"; 1161 aio_unlink "$filename.pst";
1109 } 1162 }
… …
1304 my $msg = $@ ? "$v->{path}: $@\n" 1357 my $msg = $@ ? "$v->{path}: $@\n"
1305 : "$v->{base}: extension inactive.\n"; 1358 : "$v->{base}: extension inactive.\n";
1306 1359
1307 if (exists $v->{meta}{mandatory}) { 1360 if (exists $v->{meta}{mandatory}) {
1308 warn $msg; 1361 warn $msg;
1309 warn "mandatory extension failed to load, exiting.\n"; 1362 cf::cleanup "mandatory extension failed to load, exiting.";
1310 exit 1;
1311 } 1363 }
1312 1364
1313 warn $msg; 1365 warn $msg;
1314 } 1366 }
1315 1367
… …
1404 my $f = new_from_file cf::object::thawer path $login 1456 my $f = new_from_file cf::object::thawer path $login
1405 or return; 1457 or return;
1406 1458
1407 my $pl = cf::player::load_pl $f 1459 my $pl = cf::player::load_pl $f
1408 or return; 1460 or return;
1461
1409 local $cf::PLAYER_LOADING{$login} = $pl; 1462 local $cf::PLAYER_LOADING{$login} = $pl;
1410 $f->resolve_delayed_derefs; 1463 $f->resolve_delayed_derefs;
1411 $cf::PLAYER{$login} = $pl 1464 $cf::PLAYER{$login} = $pl
1412 } 1465 }
1413 } 1466 }
… …
1423 1476
1424 return if $pl->{deny_save}; 1477 return if $pl->{deny_save};
1425 1478
1426 aio_mkdir playerdir $pl, 0770; 1479 aio_mkdir playerdir $pl, 0770;
1427 $pl->{last_save} = $cf::RUNTIME; 1480 $pl->{last_save} = $cf::RUNTIME;
1481
1482 cf::get_slot 0.01;
1428 1483
1429 $pl->save_pl ($path); 1484 $pl->save_pl ($path);
1430 cf::cede_to_tick; 1485 cf::cede_to_tick;
1431} 1486}
1432 1487
… …
1516 1571
1517 for my $login (@$dirs) { 1572 for my $login (@$dirs) {
1518 my $path = path $login; 1573 my $path = path $login;
1519 1574
1520 # a .pst is a dead give-away for a valid player 1575 # a .pst is a dead give-away for a valid player
1521 unless (-e "$path.pst") { 1576 # if no pst file found, open and chekc for blocked users
1577 if (aio_stat "$path.pst") {
1522 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1578 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1523 aio_read $fh, 0, 512, my $buf, 0 or next; 1579 aio_read $fh, 0, 512, my $buf, 0 or next;
1524 $buf !~ /^password -------------$/m or next; # official not-valid tag 1580 $buf !~ /^password -------------$/m or next; # official not-valid tag
1525 } 1581 }
1526 1582
… …
1725our $MAX_RESET = 3600; 1781our $MAX_RESET = 3600;
1726our $DEFAULT_RESET = 3000; 1782our $DEFAULT_RESET = 3000;
1727 1783
1728sub generate_random_map { 1784sub generate_random_map {
1729 my ($self, $rmp) = @_; 1785 my ($self, $rmp) = @_;
1786
1787 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1788
1730 # mit "rum" bekleckern, nicht 1789 # mit "rum" bekleckern, nicht
1731 $self->_create_random_map ( 1790 $self->_create_random_map (
1732 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1791 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1733 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1792 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1734 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1793 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1856 1915
1857# the temporary/swap location 1916# the temporary/swap location
1858sub save_path { 1917sub save_path {
1859 my ($self) = @_; 1918 my ($self) = @_;
1860 1919
1861 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1920 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1862 "$TMPDIR/$path.map" 1921 "$TMPDIR/$path.map"
1863} 1922}
1864 1923
1865# the unique path, undef == no special unique path 1924# the unique path, undef == no special unique path
1866sub uniq_path { 1925sub uniq_path {
1867 my ($self) = @_; 1926 my ($self) = @_;
1868 1927
1869 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1928 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1870 "$UNIQUEDIR/$path" 1929 "$UNIQUEDIR/$path"
1871} 1930}
1872 1931
1873# and all this just because we cannot iterate over 1932# and all this just because we cannot iterate over
1874# all maps in C++... 1933# all maps in C++...
… …
2060 } 2119 }
2061 2120
2062 $self->{last_save} = $cf::RUNTIME; 2121 $self->{last_save} = $cf::RUNTIME;
2063 $self->last_access ($cf::RUNTIME); 2122 $self->last_access ($cf::RUNTIME);
2064 2123
2065 $self->in_memory (cf::MAP_IN_MEMORY); 2124 $self->in_memory (cf::MAP_ACTIVE);
2066 } 2125 }
2067 2126
2068 $self->post_load; 2127 $self->post_load;
2069} 2128}
2070 2129
… …
2128 my ($path, $origin, $load) = @_; 2187 my ($path, $origin, $load) = @_;
2129 2188
2130 $path = normalise $path, $origin && $origin->{path}; 2189 $path = normalise $path, $origin && $origin->{path};
2131 2190
2132 if (my $map = $cf::MAP{$path}) { 2191 if (my $map = $cf::MAP{$path}) {
2133 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2192 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2134 } 2193 }
2135 2194
2136 $MAP_PREFETCH{$path} |= $load; 2195 $MAP_PREFETCH{$path} |= $load;
2137 2196
2138 $MAP_PREFETCHER ||= cf::async { 2197 $MAP_PREFETCHER ||= cf::async {
… …
2175 cf::async { 2234 cf::async {
2176 $Coro::current->{desc} = "map player save"; 2235 $Coro::current->{desc} = "map player save";
2177 $_->contr->save for $self->players; 2236 $_->contr->save for $self->players;
2178 }; 2237 };
2179 2238
2239 cf::get_slot 0.02;
2240
2180 if ($uniq) { 2241 if ($uniq) {
2181 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2242 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2182 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2243 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2183 } else { 2244 } else {
2184 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2245 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
… …
2192 $self->save; 2253 $self->save;
2193 2254
2194 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2255 my $lock = cf::lock_acquire "map_data:$self->{path}";
2195 2256
2196 return if $self->players; 2257 return if $self->players;
2197 return if $self->in_memory != cf::MAP_IN_MEMORY; 2258 return if $self->in_memory != cf::MAP_ACTIVE;
2198 return if $self->{deny_save}; 2259 return if $self->{deny_save};
2199 2260
2200 $self->in_memory (cf::MAP_SWAPPED); 2261 $self->in_memory (cf::MAP_SWAPPED);
2201 2262
2202 $self->deactivate; 2263 $self->deactivate;
… …
2320 2381
2321sub unique_maps() { 2382sub unique_maps() {
2322 [ 2383 [
2323 map { 2384 map {
2324 utf8::decode $_; 2385 utf8::decode $_;
2325 /\.map$/ 2386 s/\.map$//; # TODO future compatibility hack
2387 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2388 ? ()
2326 ? normalise $_ 2389 : normalise $_
2327 : ()
2328 } @{ aio_readdir $UNIQUEDIR or [] } 2390 } @{ aio_readdir $UNIQUEDIR or [] }
2329 ] 2391 ]
2330} 2392}
2331 2393
2332package cf;
2333
2334=back 2394=back
2335 2395
2336=head3 cf::object 2396=head3 cf::object
2337 2397
2338=cut 2398=cut
… …
2341 2401
2342=over 4 2402=over 4
2343 2403
2344=item $ob->inv_recursive 2404=item $ob->inv_recursive
2345 2405
2346Returns the inventory of the object _and_ their inventories, recursively. 2406Returns the inventory of the object I<and> their inventories, recursively,
2407but I<not> the object itself.
2347 2408
2348=cut 2409=cut
2349 2410
2350sub inv_recursive_; 2411sub inv_recursive_;
2351sub inv_recursive_ { 2412sub inv_recursive_ {
… …
2356 inv_recursive_ inv $_[0] 2417 inv_recursive_ inv $_[0]
2357} 2418}
2358 2419
2359=item $ref = $ob->ref 2420=item $ref = $ob->ref
2360 2421
2361creates and returns a persistent reference to an objetc that can be stored as a string. 2422Creates and returns a persistent reference to an object that can be stored as a string.
2362 2423
2363=item $ob = cf::object::deref ($refstring) 2424=item $ob = cf::object::deref ($refstring)
2364 2425
2365returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2426returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2366even if the object actually exists. May block. 2427even if the object actually exists. May block.
… …
2640 $rmp->{origin_y} = $exit->y; 2701 $rmp->{origin_y} = $exit->y;
2641 } 2702 }
2642 2703
2643 $rmp->{random_seed} ||= $exit->random_seed; 2704 $rmp->{random_seed} ||= $exit->random_seed;
2644 2705
2645 my $data = cf::encode_json $rmp; 2706 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2646 my $md5 = Digest::MD5::md5_hex $data; 2707 my $md5 = Digest::MD5::md5_hex $data;
2647 my $meta = "$RANDOMDIR/$md5.meta"; 2708 my $meta = "$RANDOMDIR/$md5.meta";
2648 2709
2649 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2710 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2650 aio_write $fh, 0, (length $data), $data, 0; 2711 aio_write $fh, 0, (length $data), $data, 0;
… …
2773 id => "infobox", 2834 id => "infobox",
2774 title => "Map Info", 2835 title => "Map Info",
2775 reply => undef, 2836 reply => undef,
2776 tooltip => "Information related to the maps", 2837 tooltip => "Information related to the maps",
2777 }, 2838 },
2839 "c/party" => {
2840 id => "party",
2841 title => "Party",
2842 reply => "gsay ",
2843 tooltip => "Messages and chat related to your party",
2844 },
2778); 2845);
2779 2846
2780sub cf::client::send_msg { 2847sub cf::client::send_msg {
2781 my ($self, $channel, $msg, $color, @extra) = @_; 2848 my ($self, $channel, $msg, $color, @extra) = @_;
2782 2849
… …
3019 3086
3020The following functions and methods are available within a safe environment: 3087The following functions and methods are available within a safe environment:
3021 3088
3022 cf::object 3089 cf::object
3023 contr pay_amount pay_player map x y force_find force_add destroy 3090 contr pay_amount pay_player map x y force_find force_add destroy
3024 insert remove name archname title slaying race decrease_ob_nr 3091 insert remove name archname title slaying race decrease split
3025 3092
3026 cf::object::player 3093 cf::object::player
3027 player 3094 player
3028 3095
3029 cf::player 3096 cf::player
… …
3035=cut 3102=cut
3036 3103
3037for ( 3104for (
3038 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3105 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3039 insert remove inv name archname title slaying race 3106 insert remove inv name archname title slaying race
3040 decrease_ob_nr destroy)], 3107 decrease split destroy)],
3041 ["cf::object::player" => qw(player)], 3108 ["cf::object::player" => qw(player)],
3042 ["cf::player" => qw(peaceful)], 3109 ["cf::player" => qw(peaceful)],
3043 ["cf::map" => qw(trigger)], 3110 ["cf::map" => qw(trigger)],
3044) { 3111) {
3045 no strict 'refs'; 3112 no strict 'refs';
… …
3253 while (my ($k, $v) = each %$want) { 3320 while (my ($k, $v) = each %$want) {
3254 $ns->fx_want ($k, $v); 3321 $ns->fx_want ($k, $v);
3255 } 3322 }
3256}; 3323};
3257 3324
3325sub load_resource_file($) {
3326 my $guard = lock_acquire "load_resource_file";
3327
3328 my $status = load_resource_file_ $_[0];
3329 get_slot 0.1, 100;
3330 cf::arch::commit_load;
3331
3332 $status
3333}
3334
3258sub reload_regions { 3335sub reload_regions {
3259 # HACK to clear player env face cache, we need some signal framework 3336 # HACK to clear player env face cache, we need some signal framework
3260 # for this (global event?) 3337 # for this (global event?)
3261 %ext::player_env::MUSIC_FACE_CACHE = (); 3338 %ext::player_env::MUSIC_FACE_CACHE = ();
3262 3339
… …
3275} 3352}
3276 3353
3277sub reload_archetypes { 3354sub reload_archetypes {
3278 load_resource_file "$DATADIR/archetypes" 3355 load_resource_file "$DATADIR/archetypes"
3279 or die "unable to load archetypes\n"; 3356 or die "unable to load archetypes\n";
3280 #d# NEED to laod twice to resolve forward references
3281 # this really needs to be done in an extra post-pass
3282 # (which needs to be synchronous, so solve it differently)
3283 load_resource_file "$DATADIR/archetypes"
3284 or die "unable to load archetypes\n";
3285} 3357}
3286 3358
3287sub reload_treasures { 3359sub reload_treasures {
3288 load_resource_file "$DATADIR/treasures" 3360 load_resource_file "$DATADIR/treasures"
3289 or die "unable to load treasurelists\n"; 3361 or die "unable to load treasurelists\n";
3290} 3362}
3291 3363
3292sub reload_resources { 3364sub reload_resources {
3293 warn "reloading resource files...\n"; 3365 warn "reloading resource files...\n";
3294 3366
3367 reload_facedata;
3368 reload_archetypes;
3295 reload_regions; 3369 reload_regions;
3296 reload_facedata;
3297 #reload_archetypes;#d#
3298 reload_archetypes;
3299 reload_treasures; 3370 reload_treasures;
3300 3371
3301 warn "finished reloading resource files\n"; 3372 warn "finished reloading resource files\n";
3302} 3373}
3303 3374
3304sub init { 3375sub init {
3376 my $guard = freeze_mainloop;
3377
3305 reload_resources; 3378 reload_resources;
3306} 3379}
3307 3380
3308sub reload_config { 3381sub reload_config {
3309 open my $fh, "<:utf8", "$CONFDIR/config" 3382 open my $fh, "<:utf8", "$CONFDIR/config"
3310 or return; 3383 or return;
3311 3384
3312 local $/; 3385 local $/;
3313 *CFG = YAML::Syck::Load <$fh>; 3386 *CFG = YAML::Load <$fh>;
3314 3387
3315 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3388 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3316 3389
3317 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3390 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3318 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3391 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3334 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3407 $Coro::current->{desc} = "IDLE BUG HANDLER";
3335 EV::loop EV::LOOP_ONESHOT; 3408 EV::loop EV::LOOP_ONESHOT;
3336 })->prio (Coro::PRIO_MAX); 3409 })->prio (Coro::PRIO_MAX);
3337 }; 3410 };
3338 3411
3412 {
3413 my $guard = freeze_mainloop;
3339 reload_config; 3414 reload_config;
3340 db_init; 3415 db_init;
3341 load_extensions; 3416 load_extensions;
3342 3417
3343 $TICK_WATCHER->start;
3344 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3418 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3419 evthread_start IO::AIO::poll_fileno;
3420 }
3421
3345 EV::loop; 3422 EV::loop;
3346} 3423}
3347 3424
3348############################################################################# 3425#############################################################################
3349# initialisation and cleanup 3426# initialisation and cleanup
… …
3356 cf::cleanup "SIG$signal"; 3433 cf::cleanup "SIG$signal";
3357 }; 3434 };
3358 } 3435 }
3359} 3436}
3360 3437
3361sub write_runtime { 3438sub write_runtime_sync {
3362 my $runtime = "$LOCALDIR/runtime"; 3439 my $runtime = "$LOCALDIR/runtime";
3363 3440
3364 # first touch the runtime file to show we are still running: 3441 # first touch the runtime file to show we are still running:
3365 # the fsync below can take a very very long time. 3442 # the fsync below can take a very very long time.
3366 3443
… …
3392 and return; 3469 and return;
3393 3470
3394 warn "runtime file written.\n"; 3471 warn "runtime file written.\n";
3395 3472
3396 1 3473 1
3474}
3475
3476our $uuid_lock;
3477our $uuid_skip;
3478
3479sub write_uuid_sync($) {
3480 $uuid_skip ||= $_[0];
3481
3482 return if $uuid_lock;
3483 local $uuid_lock = 1;
3484
3485 my $uuid = "$LOCALDIR/uuid";
3486
3487 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3488 or return;
3489
3490 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3491 $uuid_skip = 0;
3492
3493 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3494 and return;
3495
3496 # always fsync - this file is important
3497 aio_fsync $fh
3498 and return;
3499
3500 close $fh
3501 or return;
3502
3503 aio_rename "$uuid~", $uuid
3504 and return;
3505
3506 warn "uuid file written ($value).\n";
3507
3508 1
3509
3510}
3511
3512sub write_uuid($$) {
3513 my ($skip, $sync) = @_;
3514
3515 $sync ? write_uuid_sync $skip
3516 : async { write_uuid_sync $skip };
3397} 3517}
3398 3518
3399sub emergency_save() { 3519sub emergency_save() {
3400 my $freeze_guard = cf::freeze_mainloop; 3520 my $freeze_guard = cf::freeze_mainloop;
3401 3521
… …
3423 warn "end emergency map save\n"; 3543 warn "end emergency map save\n";
3424 3544
3425 warn "begin emergency database checkpoint\n"; 3545 warn "begin emergency database checkpoint\n";
3426 BDB::db_env_txn_checkpoint $DB_ENV; 3546 BDB::db_env_txn_checkpoint $DB_ENV;
3427 warn "end emergency database checkpoint\n"; 3547 warn "end emergency database checkpoint\n";
3548
3549 warn "begin write uuid\n";
3550 write_uuid_sync 1;
3551 warn "end write uuid\n";
3428 }; 3552 };
3429 3553
3430 warn "leave emergency perl save\n"; 3554 warn "leave emergency perl save\n";
3431} 3555}
3432 3556
… …
3447 warn "reloading..."; 3571 warn "reloading...";
3448 3572
3449 warn "entering sync_job"; 3573 warn "entering sync_job";
3450 3574
3451 cf::sync_job { 3575 cf::sync_job {
3452 cf::write_runtime; # external watchdog should not bark 3576 cf::write_runtime_sync; # external watchdog should not bark
3453 cf::emergency_save; 3577 cf::emergency_save;
3454 cf::write_runtime; # external watchdog should not bark 3578 cf::write_runtime_sync; # external watchdog should not bark
3455 3579
3456 warn "syncing database to disk"; 3580 warn "syncing database to disk";
3457 BDB::db_env_txn_checkpoint $DB_ENV; 3581 BDB::db_env_txn_checkpoint $DB_ENV;
3458 3582
3459 # if anything goes wrong in here, we should simply crash as we already saved 3583 # if anything goes wrong in here, we should simply crash as we already saved
… …
3546 warn "leaving sync_job"; 3670 warn "leaving sync_job";
3547 3671
3548 1 3672 1
3549 } or do { 3673 } or do {
3550 warn $@; 3674 warn $@;
3551 warn "error while reloading, exiting."; 3675 cf::cleanup "error while reloading, exiting.";
3552 exit 1;
3553 }; 3676 };
3554 3677
3555 warn "reloaded"; 3678 warn "reloaded";
3556}; 3679};
3557 3680
… …
3560sub reload_perl() { 3683sub reload_perl() {
3561 # doing reload synchronously and two reloads happen back-to-back, 3684 # doing reload synchronously and two reloads happen back-to-back,
3562 # coro crashes during coro_state_free->destroy here. 3685 # coro crashes during coro_state_free->destroy here.
3563 3686
3564 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3687 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3688 do_reload_perl;
3565 undef $RELOAD_WATCHER; 3689 undef $RELOAD_WATCHER;
3566 do_reload_perl;
3567 }; 3690 };
3568} 3691}
3569 3692
3570register_command "reload" => sub { 3693register_command "reload" => sub {
3571 my ($who, $arg) = @_; 3694 my ($who, $arg) = @_;
… …
3585 3708
3586our @WAIT_FOR_TICK; 3709our @WAIT_FOR_TICK;
3587our @WAIT_FOR_TICK_BEGIN; 3710our @WAIT_FOR_TICK_BEGIN;
3588 3711
3589sub wait_for_tick { 3712sub wait_for_tick {
3590 return unless $TICK_WATCHER->is_active;
3591 return if $Coro::current == $Coro::main; 3713 return if tick_inhibit || $Coro::current == $Coro::main;
3592 3714
3593 my $signal = new Coro::Signal; 3715 my $signal = new Coro::Signal;
3594 push @WAIT_FOR_TICK, $signal; 3716 push @WAIT_FOR_TICK, $signal;
3595 $signal->wait; 3717 $signal->wait;
3596} 3718}
3597 3719
3598sub wait_for_tick_begin { 3720sub wait_for_tick_begin {
3599 return unless $TICK_WATCHER->is_active;
3600 return if $Coro::current == $Coro::main; 3721 return if tick_inhibit || $Coro::current == $Coro::main;
3601 3722
3602 my $signal = new Coro::Signal; 3723 my $signal = new Coro::Signal;
3603 push @WAIT_FOR_TICK_BEGIN, $signal; 3724 push @WAIT_FOR_TICK_BEGIN, $signal;
3604 $signal->wait; 3725 $signal->wait;
3605} 3726}
3606 3727
3607$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 3728sub tick {
3608 if ($Coro::current != $Coro::main) { 3729 if ($Coro::current != $Coro::main) {
3609 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3730 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3610 unless ++$bug_warning > 10; 3731 unless ++$bug_warning > 10;
3611 return; 3732 return;
3612 } 3733 }
3613 3734
3614 $NOW = $tick_start = EV::now;
3615
3616 cf::server_tick; # one server iteration 3735 cf::server_tick; # one server iteration
3617
3618 $RUNTIME += $TICK;
3619 $NEXT_TICK = $_[0]->at;
3620 3736
3621 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3737 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3622 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3738 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3623 Coro::async_pool { 3739 Coro::async_pool {
3624 $Coro::current->{desc} = "runtime saver"; 3740 $Coro::current->{desc} = "runtime saver";
3625 write_runtime 3741 write_runtime_sync
3626 or warn "ERROR: unable to write runtime file: $!"; 3742 or warn "ERROR: unable to write runtime file: $!";
3627 }; 3743 };
3628 } 3744 }
3629 3745
3630 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3746 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
… …
3632 } 3748 }
3633 while (my $sig = shift @WAIT_FOR_TICK) { 3749 while (my $sig = shift @WAIT_FOR_TICK) {
3634 $sig->send; 3750 $sig->send;
3635 } 3751 }
3636 3752
3637 $LOAD = ($NOW - $tick_start) / $TICK; 3753 $LOAD = ($NOW - $TICK_START) / $TICK;
3638 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3754 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3639 3755
3640 _post_tick; 3756 if (0) {
3641}; 3757 if ($NEXT_TICK) {
3642$TICK_WATCHER->priority (EV::MAXPRI); 3758 my $jitter = $TICK_START - $NEXT_TICK;
3759 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3760 warn "jitter $JITTER\n";#d#
3761 }
3762 }
3763}
3643 3764
3644{ 3765{
3645 # configure BDB 3766 # configure BDB
3646 3767
3647 BDB::min_parallel 8; 3768 BDB::min_parallel 8;

Diff Legend

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