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.411 by root, Fri Feb 1 15:54:07 2008 UTC vs.
Revision 1.429 by root, Sat May 3 15:17:13 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;
… …
69our $RANDOMDIR = "$LOCALDIR/random"; 90our $RANDOMDIR = "$LOCALDIR/random";
70our $BDBDIR = "$LOCALDIR/db"; 91our $BDBDIR = "$LOCALDIR/db";
71our %RESOURCE; 92our %RESOURCE;
72 93
73our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
74our $TICK_WATCHER;
75our $AIO_POLL_WATCHER; 95our $AIO_POLL_WATCHER;
76our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
77our $NEXT_TICK; 97our $NEXT_TICK;
78our $USE_FSYNC = 1; # use fsync to write maps - default off 98our $USE_FSYNC = 1; # use fsync to write maps - default off
79 99
… …
96# 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 ∕
97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 117our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98 118
99our $LOAD; # a number between 0 (idle) and 1 (too many objects) 119our $LOAD; # a number between 0 (idle) and 1 (too many objects)
100our $LOADAVG; # same thing, but with alpha-smoothing 120our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter
101our $tick_start; # for load detecting purposes 122our $TICK_START; # for load detecting purposes
102 123
103binmode STDOUT; 124binmode STDOUT;
104binmode STDERR; 125binmode STDERR;
105 126
106# read virtual server time, if available 127# read virtual server time, if available
… …
339 360
340 ! ! $LOCK{$key} 361 ! ! $LOCK{$key}
341} 362}
342 363
343sub freeze_mainloop { 364sub freeze_mainloop {
344 return unless $TICK_WATCHER->is_active; 365 tick_inhibit_inc;
345 366
346 my $guard = Coro::guard { 367 Coro::guard \&tick_inhibit_dec;
347 $TICK_WATCHER->start;
348 };
349 $TICK_WATCHER->stop;
350 $guard
351} 368}
352 369
353=item cf::periodic $interval, $cb 370=item cf::periodic $interval, $cb
354 371
355Like 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
… …
410 } 427 }
411 } 428 }
412}; 429};
413 430
414sub get_slot($;$$) { 431sub get_slot($;$$) {
432 return if tick_inhibit || $Coro::current == $Coro::main;
433
415 my ($time, $pri, $name) = @_; 434 my ($time, $pri, $name) = @_;
416 435
417 $time = $TICK * .6 if $time > $TICK * .6; 436 $time = $TICK * .6 if $time > $TICK * .6;
418 my $sig = new Coro::Signal; 437 my $sig = new Coro::Signal;
419 438
… …
456 # this is the main coro, too bad, we have to block 475 # this is the main coro, too bad, we have to block
457 # till the operation succeeds, freezing the server :/ 476 # till the operation succeeds, freezing the server :/
458 477
459 LOG llevError, Carp::longmess "sync job";#d# 478 LOG llevError, Carp::longmess "sync job";#d#
460 479
461 # TODO: use suspend/resume instead
462 # (but this is cancel-safe)
463 my $freeze_guard = freeze_mainloop; 480 my $freeze_guard = freeze_mainloop;
464 481
465 my $busy = 1; 482 my $busy = 1;
466 my @res; 483 my @res;
467 484
… …
478 } else { 495 } else {
479 EV::loop EV::LOOP_ONESHOT; 496 EV::loop EV::LOOP_ONESHOT;
480 } 497 }
481 } 498 }
482 499
483 $time = EV::time - $time; 500 my $time = EV::time - $time;
484 501
485 LOG llevError | logBacktrace, Carp::longmess "long sync job"
486 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
487
488 $tick_start += $time; # do not account sync jobs to server load 502 $TICK_START += $time; # do not account sync jobs to server load
489 503
490 wantarray ? @res : $res[0] 504 wantarray ? @res : $res[0]
491 } else { 505 } else {
492 # we are in another coroutine, how wonderful, everything just works 506 # we are in another coroutine, how wonderful, everything just works
493 507
… …
535 reset_signals; 549 reset_signals;
536 &$cb 550 &$cb
537 }, @args; 551 }, @args;
538 552
539 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
540} 581}
541 582
542=item $value = cf::db_get $family => $key 583=item $value = cf::db_get $family => $key
543 584
544Returns a single value from the environment database. 585Returns a single value from the environment database.
… …
1100 utf8::decode (my $decname = $filename); 1141 utf8::decode (my $decname = $filename);
1101 warn sprintf "saving %s (%d,%d)\n", 1142 warn sprintf "saving %s (%d,%d)\n",
1102 $decname, length $$rdata, scalar @$objs; 1143 $decname, length $$rdata, scalar @$objs;
1103 1144
1104 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1145 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1105 chmod SAVE_MODE, $fh; 1146 aio_chmod $fh, SAVE_MODE;
1106 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1147 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1107 aio_fsync $fh if $cf::USE_FSYNC; 1148 aio_fsync $fh if $cf::USE_FSYNC;
1108 close $fh; 1149 aio_close $fh;
1109 1150
1110 if (@$objs) { 1151 if (@$objs) {
1111 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) {
1112 chmod SAVE_MODE, $fh; 1153 aio_chmod $fh, SAVE_MODE;
1113 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1154 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1114 aio_write $fh, 0, (length $data), $data, 0; 1155 aio_write $fh, 0, (length $data), $data, 0;
1115 aio_fsync $fh if $cf::USE_FSYNC; 1156 aio_fsync $fh if $cf::USE_FSYNC;
1116 close $fh; 1157 aio_close $fh;
1117 aio_rename "$filename.pst~", "$filename.pst"; 1158 aio_rename "$filename.pst~", "$filename.pst";
1118 } 1159 }
1119 } else { 1160 } else {
1120 aio_unlink "$filename.pst"; 1161 aio_unlink "$filename.pst";
1121 } 1162 }
… …
1415 my $f = new_from_file cf::object::thawer path $login 1456 my $f = new_from_file cf::object::thawer path $login
1416 or return; 1457 or return;
1417 1458
1418 my $pl = cf::player::load_pl $f 1459 my $pl = cf::player::load_pl $f
1419 or return; 1460 or return;
1461
1420 local $cf::PLAYER_LOADING{$login} = $pl; 1462 local $cf::PLAYER_LOADING{$login} = $pl;
1421 $f->resolve_delayed_derefs; 1463 $f->resolve_delayed_derefs;
1422 $cf::PLAYER{$login} = $pl 1464 $cf::PLAYER{$login} = $pl
1423 } 1465 }
1424 } 1466 }
… …
1434 1476
1435 return if $pl->{deny_save}; 1477 return if $pl->{deny_save};
1436 1478
1437 aio_mkdir playerdir $pl, 0770; 1479 aio_mkdir playerdir $pl, 0770;
1438 $pl->{last_save} = $cf::RUNTIME; 1480 $pl->{last_save} = $cf::RUNTIME;
1481
1482 cf::get_slot 0.01;
1439 1483
1440 $pl->save_pl ($path); 1484 $pl->save_pl ($path);
1441 cf::cede_to_tick; 1485 cf::cede_to_tick;
1442} 1486}
1443 1487
… …
1527 1571
1528 for my $login (@$dirs) { 1572 for my $login (@$dirs) {
1529 my $path = path $login; 1573 my $path = path $login;
1530 1574
1531 # a .pst is a dead give-away for a valid player 1575 # a .pst is a dead give-away for a valid player
1532 unless (-e "$path.pst") { 1576 # if no pst file found, open and chekc for blocked users
1577 if (aio_stat "$path.pst") {
1533 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1578 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1534 aio_read $fh, 0, 512, my $buf, 0 or next; 1579 aio_read $fh, 0, 512, my $buf, 0 or next;
1535 $buf !~ /^password -------------$/m or next; # official not-valid tag 1580 $buf !~ /^password -------------$/m or next; # official not-valid tag
1536 } 1581 }
1537 1582
… …
1736our $MAX_RESET = 3600; 1781our $MAX_RESET = 3600;
1737our $DEFAULT_RESET = 3000; 1782our $DEFAULT_RESET = 3000;
1738 1783
1739sub generate_random_map { 1784sub generate_random_map {
1740 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
1741 # mit "rum" bekleckern, nicht 1789 # mit "rum" bekleckern, nicht
1742 $self->_create_random_map ( 1790 $self->_create_random_map (
1743 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1791 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1744 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1792 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1745 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1793 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1867 1915
1868# the temporary/swap location 1916# the temporary/swap location
1869sub save_path { 1917sub save_path {
1870 my ($self) = @_; 1918 my ($self) = @_;
1871 1919
1872 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1920 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1873 "$TMPDIR/$path.map" 1921 "$TMPDIR/$path.map"
1874} 1922}
1875 1923
1876# the unique path, undef == no special unique path 1924# the unique path, undef == no special unique path
1877sub uniq_path { 1925sub uniq_path {
1878 my ($self) = @_; 1926 my ($self) = @_;
1879 1927
1880 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1928 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1881 "$UNIQUEDIR/$path" 1929 "$UNIQUEDIR/$path"
1882} 1930}
1883 1931
1884# and all this just because we cannot iterate over 1932# and all this just because we cannot iterate over
1885# all maps in C++... 1933# all maps in C++...
… …
1983 2031
1984 cf::lock_wait "map_data:$path";#d#remove 2032 cf::lock_wait "map_data:$path";#d#remove
1985 cf::lock_wait "map_find:$path"; 2033 cf::lock_wait "map_find:$path";
1986 2034
1987 $cf::MAP{$path} || do { 2035 $cf::MAP{$path} || do {
1988 my $guard1 = cf::lock_acquire "map_find:$path";
1989 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it 2036 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2037 my $guard2 = cf::lock_acquire "map_find:$path";
1990 2038
1991 my $map = new_from_path cf::map $path 2039 my $map = new_from_path cf::map $path
1992 or return; 2040 or return;
1993 2041
1994 $map->{last_save} = $cf::RUNTIME; 2042 $map->{last_save} = $cf::RUNTIME;
… …
1997 or return; 2045 or return;
1998 2046
1999 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2047 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2000 # doing this can freeze the server in a sync job, obviously 2048 # doing this can freeze the server in a sync job, obviously
2001 #$cf::WAIT_FOR_TICK->wait; 2049 #$cf::WAIT_FOR_TICK->wait;
2050 undef $guard2;
2002 undef $guard1; 2051 undef $guard1;
2003 undef $guard2;
2004 $map->reset; 2052 $map->reset;
2005 return find $path; 2053 return find $path;
2006 } 2054 }
2007 2055
2008 $cf::MAP{$path} = $map 2056 $cf::MAP{$path} = $map
… …
2071 } 2119 }
2072 2120
2073 $self->{last_save} = $cf::RUNTIME; 2121 $self->{last_save} = $cf::RUNTIME;
2074 $self->last_access ($cf::RUNTIME); 2122 $self->last_access ($cf::RUNTIME);
2075 2123
2076 $self->in_memory (cf::MAP_IN_MEMORY); 2124 $self->in_memory (cf::MAP_ACTIVE);
2077 } 2125 }
2078 2126
2079 $self->post_load; 2127 $self->post_load;
2080} 2128}
2081 2129
… …
2139 my ($path, $origin, $load) = @_; 2187 my ($path, $origin, $load) = @_;
2140 2188
2141 $path = normalise $path, $origin && $origin->{path}; 2189 $path = normalise $path, $origin && $origin->{path};
2142 2190
2143 if (my $map = $cf::MAP{$path}) { 2191 if (my $map = $cf::MAP{$path}) {
2144 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2192 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2145 } 2193 }
2146 2194
2147 $MAP_PREFETCH{$path} |= $load; 2195 $MAP_PREFETCH{$path} |= $load;
2148 2196
2149 $MAP_PREFETCHER ||= cf::async { 2197 $MAP_PREFETCHER ||= cf::async {
… …
2186 cf::async { 2234 cf::async {
2187 $Coro::current->{desc} = "map player save"; 2235 $Coro::current->{desc} = "map player save";
2188 $_->contr->save for $self->players; 2236 $_->contr->save for $self->players;
2189 }; 2237 };
2190 2238
2239 cf::get_slot 0.02;
2240
2191 if ($uniq) { 2241 if ($uniq) {
2192 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2242 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2193 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2243 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2194 } else { 2244 } else {
2195 $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);
… …
2203 $self->save; 2253 $self->save;
2204 2254
2205 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2255 my $lock = cf::lock_acquire "map_data:$self->{path}";
2206 2256
2207 return if $self->players; 2257 return if $self->players;
2208 return if $self->in_memory != cf::MAP_IN_MEMORY; 2258 return if $self->in_memory != cf::MAP_ACTIVE;
2209 return if $self->{deny_save}; 2259 return if $self->{deny_save};
2210 2260
2211 $self->in_memory (cf::MAP_SWAPPED); 2261 $self->in_memory (cf::MAP_SWAPPED);
2212 2262
2213 $self->deactivate; 2263 $self->deactivate;
… …
2331 2381
2332sub unique_maps() { 2382sub unique_maps() {
2333 [ 2383 [
2334 map { 2384 map {
2335 utf8::decode $_; 2385 utf8::decode $_;
2336 /\.map$/ 2386 s/\.map$//; # TODO future compatibility hack
2387 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2388 ? ()
2337 ? normalise $_ 2389 : normalise $_
2338 : ()
2339 } @{ aio_readdir $UNIQUEDIR or [] } 2390 } @{ aio_readdir $UNIQUEDIR or [] }
2340 ] 2391 ]
2341} 2392}
2342 2393
2343package cf;
2344
2345=back 2394=back
2346 2395
2347=head3 cf::object 2396=head3 cf::object
2348 2397
2349=cut 2398=cut
… …
2352 2401
2353=over 4 2402=over 4
2354 2403
2355=item $ob->inv_recursive 2404=item $ob->inv_recursive
2356 2405
2357Returns 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.
2358 2408
2359=cut 2409=cut
2360 2410
2361sub inv_recursive_; 2411sub inv_recursive_;
2362sub inv_recursive_ { 2412sub inv_recursive_ {
… …
2367 inv_recursive_ inv $_[0] 2417 inv_recursive_ inv $_[0]
2368} 2418}
2369 2419
2370=item $ref = $ob->ref 2420=item $ref = $ob->ref
2371 2421
2372creates 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.
2373 2423
2374=item $ob = cf::object::deref ($refstring) 2424=item $ob = cf::object::deref ($refstring)
2375 2425
2376returns 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,
2377even if the object actually exists. May block. 2427even if the object actually exists. May block.
… …
2409can be C<undef>. Does the right thing when the player is currently in a 2459can be C<undef>. Does the right thing when the player is currently in a
2410dialogue with the given NPC character. 2460dialogue with the given NPC character.
2411 2461
2412=cut 2462=cut
2413 2463
2464our $SAY_CHANNEL = {
2465 id => "say",
2466 title => "Map",
2467 reply => "say ",
2468 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2469};
2470
2471our $CHAT_CHANNEL = {
2472 id => "chat",
2473 title => "Chat",
2474 reply => "chat ",
2475 tooltip => "Player chat and shouts, global to the server.",
2476};
2477
2414# rough implementation of a future "reply" method that works 2478# rough implementation of a future "reply" method that works
2415# with dialog boxes. 2479# with dialog boxes.
2416#TODO: the first argument must go, split into a $npc->reply_to ( method 2480#TODO: the first argument must go, split into a $npc->reply_to ( method
2417sub cf::object::player::reply($$$;$) { 2481sub cf::object::player::reply($$$;$) {
2418 my ($self, $npc, $msg, $flags) = @_; 2482 my ($self, $npc, $msg, $flags) = @_;
… …
2429 my $dialog = $pl->{npc_dialog}; 2493 my $dialog = $pl->{npc_dialog};
2430 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2494 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2431 2495
2432 } else { 2496 } else {
2433 $msg = $npc->name . " says: $msg" if $npc; 2497 $msg = $npc->name . " says: $msg" if $npc;
2434 $self->message ($msg, $flags); 2498 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2435 } 2499 }
2436 } 2500 }
2437} 2501}
2438 2502
2439=item $object->send_msg ($channel, $msg, $color, [extra...]) 2503=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2651 $rmp->{origin_y} = $exit->y; 2715 $rmp->{origin_y} = $exit->y;
2652 } 2716 }
2653 2717
2654 $rmp->{random_seed} ||= $exit->random_seed; 2718 $rmp->{random_seed} ||= $exit->random_seed;
2655 2719
2656 my $data = cf::encode_json $rmp; 2720 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2657 my $md5 = Digest::MD5::md5_hex $data; 2721 my $md5 = Digest::MD5::md5_hex $data;
2658 my $meta = "$RANDOMDIR/$md5.meta"; 2722 my $meta = "$RANDOMDIR/$md5.meta";
2659 2723
2660 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2724 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2661 aio_write $fh, 0, (length $data), $data, 0; 2725 aio_write $fh, 0, (length $data), $data, 0;
… …
2784 id => "infobox", 2848 id => "infobox",
2785 title => "Map Info", 2849 title => "Map Info",
2786 reply => undef, 2850 reply => undef,
2787 tooltip => "Information related to the maps", 2851 tooltip => "Information related to the maps",
2788 }, 2852 },
2853 "c/party" => {
2854 id => "party",
2855 title => "Party",
2856 reply => "gsay ",
2857 tooltip => "Messages and chat related to your party",
2858 },
2789); 2859);
2790 2860
2791sub cf::client::send_msg { 2861sub cf::client::send_msg {
2792 my ($self, $channel, $msg, $color, @extra) = @_; 2862 my ($self, $channel, $msg, $color, @extra) = @_;
2793 2863
… …
3030 3100
3031The following functions and methods are available within a safe environment: 3101The following functions and methods are available within a safe environment:
3032 3102
3033 cf::object 3103 cf::object
3034 contr pay_amount pay_player map x y force_find force_add destroy 3104 contr pay_amount pay_player map x y force_find force_add destroy
3035 insert remove name archname title slaying race decrease_ob_nr 3105 insert remove name archname title slaying race decrease split
3036 3106
3037 cf::object::player 3107 cf::object::player
3038 player 3108 player
3039 3109
3040 cf::player 3110 cf::player
… …
3046=cut 3116=cut
3047 3117
3048for ( 3118for (
3049 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3119 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3050 insert remove inv name archname title slaying race 3120 insert remove inv name archname title slaying race
3051 decrease_ob_nr destroy)], 3121 decrease split destroy)],
3052 ["cf::object::player" => qw(player)], 3122 ["cf::object::player" => qw(player)],
3053 ["cf::player" => qw(peaceful)], 3123 ["cf::player" => qw(peaceful)],
3054 ["cf::map" => qw(trigger)], 3124 ["cf::map" => qw(trigger)],
3055) { 3125) {
3056 no strict 'refs'; 3126 no strict 'refs';
… …
3264 while (my ($k, $v) = each %$want) { 3334 while (my ($k, $v) = each %$want) {
3265 $ns->fx_want ($k, $v); 3335 $ns->fx_want ($k, $v);
3266 } 3336 }
3267}; 3337};
3268 3338
3339sub load_resource_file($) {
3340 my $guard = lock_acquire "load_resource_file";
3341
3342 my $status = load_resource_file_ $_[0];
3343 get_slot 0.1, 100;
3344 cf::arch::commit_load;
3345
3346 $status
3347}
3348
3269sub reload_regions { 3349sub reload_regions {
3270 # HACK to clear player env face cache, we need some signal framework 3350 # HACK to clear player env face cache, we need some signal framework
3271 # for this (global event?) 3351 # for this (global event?)
3272 %ext::player_env::MUSIC_FACE_CACHE = (); 3352 %ext::player_env::MUSIC_FACE_CACHE = ();
3273 3353
… …
3286} 3366}
3287 3367
3288sub reload_archetypes { 3368sub reload_archetypes {
3289 load_resource_file "$DATADIR/archetypes" 3369 load_resource_file "$DATADIR/archetypes"
3290 or die "unable to load archetypes\n"; 3370 or die "unable to load archetypes\n";
3291 #d# NEED to laod twice to resolve forward references
3292 # this really needs to be done in an extra post-pass
3293 # (which needs to be synchronous, so solve it differently)
3294 load_resource_file "$DATADIR/archetypes"
3295 or die "unable to load archetypes\n";
3296} 3371}
3297 3372
3298sub reload_treasures { 3373sub reload_treasures {
3299 load_resource_file "$DATADIR/treasures" 3374 load_resource_file "$DATADIR/treasures"
3300 or die "unable to load treasurelists\n"; 3375 or die "unable to load treasurelists\n";
3301} 3376}
3302 3377
3303sub reload_resources { 3378sub reload_resources {
3304 warn "reloading resource files...\n"; 3379 warn "reloading resource files...\n";
3305 3380
3381 reload_facedata;
3382 reload_archetypes;
3306 reload_regions; 3383 reload_regions;
3307 reload_facedata;
3308 #reload_archetypes;#d#
3309 reload_archetypes;
3310 reload_treasures; 3384 reload_treasures;
3311 3385
3312 warn "finished reloading resource files\n"; 3386 warn "finished reloading resource files\n";
3313} 3387}
3314 3388
3315sub init { 3389sub init {
3390 my $guard = freeze_mainloop;
3391
3316 reload_resources; 3392 reload_resources;
3317} 3393}
3318 3394
3319sub reload_config { 3395sub reload_config {
3320 open my $fh, "<:utf8", "$CONFDIR/config" 3396 open my $fh, "<:utf8", "$CONFDIR/config"
… …
3345 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3421 $Coro::current->{desc} = "IDLE BUG HANDLER";
3346 EV::loop EV::LOOP_ONESHOT; 3422 EV::loop EV::LOOP_ONESHOT;
3347 })->prio (Coro::PRIO_MAX); 3423 })->prio (Coro::PRIO_MAX);
3348 }; 3424 };
3349 3425
3426 {
3427 my $guard = freeze_mainloop;
3350 reload_config; 3428 reload_config;
3351 db_init; 3429 db_init;
3352 load_extensions; 3430 load_extensions;
3353 3431
3354 $TICK_WATCHER->start;
3355 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3432 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3433 evthread_start IO::AIO::poll_fileno;
3434 }
3435
3356 EV::loop; 3436 EV::loop;
3357} 3437}
3358 3438
3359############################################################################# 3439#############################################################################
3360# initialisation and cleanup 3440# initialisation and cleanup
… …
3367 cf::cleanup "SIG$signal"; 3447 cf::cleanup "SIG$signal";
3368 }; 3448 };
3369 } 3449 }
3370} 3450}
3371 3451
3372sub write_runtime { 3452sub write_runtime_sync {
3373 my $runtime = "$LOCALDIR/runtime"; 3453 my $runtime = "$LOCALDIR/runtime";
3374 3454
3375 # first touch the runtime file to show we are still running: 3455 # first touch the runtime file to show we are still running:
3376 # the fsync below can take a very very long time. 3456 # the fsync below can take a very very long time.
3377 3457
… …
3403 and return; 3483 and return;
3404 3484
3405 warn "runtime file written.\n"; 3485 warn "runtime file written.\n";
3406 3486
3407 1 3487 1
3488}
3489
3490our $uuid_lock;
3491our $uuid_skip;
3492
3493sub write_uuid_sync($) {
3494 $uuid_skip ||= $_[0];
3495
3496 return if $uuid_lock;
3497 local $uuid_lock = 1;
3498
3499 my $uuid = "$LOCALDIR/uuid";
3500
3501 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3502 or return;
3503
3504 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3505 $uuid_skip = 0;
3506
3507 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3508 and return;
3509
3510 # always fsync - this file is important
3511 aio_fsync $fh
3512 and return;
3513
3514 close $fh
3515 or return;
3516
3517 aio_rename "$uuid~", $uuid
3518 and return;
3519
3520 warn "uuid file written ($value).\n";
3521
3522 1
3523
3524}
3525
3526sub write_uuid($$) {
3527 my ($skip, $sync) = @_;
3528
3529 $sync ? write_uuid_sync $skip
3530 : async { write_uuid_sync $skip };
3408} 3531}
3409 3532
3410sub emergency_save() { 3533sub emergency_save() {
3411 my $freeze_guard = cf::freeze_mainloop; 3534 my $freeze_guard = cf::freeze_mainloop;
3412 3535
… …
3434 warn "end emergency map save\n"; 3557 warn "end emergency map save\n";
3435 3558
3436 warn "begin emergency database checkpoint\n"; 3559 warn "begin emergency database checkpoint\n";
3437 BDB::db_env_txn_checkpoint $DB_ENV; 3560 BDB::db_env_txn_checkpoint $DB_ENV;
3438 warn "end emergency database checkpoint\n"; 3561 warn "end emergency database checkpoint\n";
3562
3563 warn "begin write uuid\n";
3564 write_uuid_sync 1;
3565 warn "end write uuid\n";
3439 }; 3566 };
3440 3567
3441 warn "leave emergency perl save\n"; 3568 warn "leave emergency perl save\n";
3442} 3569}
3443 3570
… …
3458 warn "reloading..."; 3585 warn "reloading...";
3459 3586
3460 warn "entering sync_job"; 3587 warn "entering sync_job";
3461 3588
3462 cf::sync_job { 3589 cf::sync_job {
3463 cf::write_runtime; # external watchdog should not bark 3590 cf::write_runtime_sync; # external watchdog should not bark
3464 cf::emergency_save; 3591 cf::emergency_save;
3465 cf::write_runtime; # external watchdog should not bark 3592 cf::write_runtime_sync; # external watchdog should not bark
3466 3593
3467 warn "syncing database to disk"; 3594 warn "syncing database to disk";
3468 BDB::db_env_txn_checkpoint $DB_ENV; 3595 BDB::db_env_txn_checkpoint $DB_ENV;
3469 3596
3470 # if anything goes wrong in here, we should simply crash as we already saved 3597 # if anything goes wrong in here, we should simply crash as we already saved
… …
3595 3722
3596our @WAIT_FOR_TICK; 3723our @WAIT_FOR_TICK;
3597our @WAIT_FOR_TICK_BEGIN; 3724our @WAIT_FOR_TICK_BEGIN;
3598 3725
3599sub wait_for_tick { 3726sub wait_for_tick {
3600 return unless $TICK_WATCHER->is_active;
3601 return if $Coro::current == $Coro::main; 3727 return if tick_inhibit || $Coro::current == $Coro::main;
3602 3728
3603 my $signal = new Coro::Signal; 3729 my $signal = new Coro::Signal;
3604 push @WAIT_FOR_TICK, $signal; 3730 push @WAIT_FOR_TICK, $signal;
3605 $signal->wait; 3731 $signal->wait;
3606} 3732}
3607 3733
3608sub wait_for_tick_begin { 3734sub wait_for_tick_begin {
3609 return unless $TICK_WATCHER->is_active;
3610 return if $Coro::current == $Coro::main; 3735 return if tick_inhibit || $Coro::current == $Coro::main;
3611 3736
3612 my $signal = new Coro::Signal; 3737 my $signal = new Coro::Signal;
3613 push @WAIT_FOR_TICK_BEGIN, $signal; 3738 push @WAIT_FOR_TICK_BEGIN, $signal;
3614 $signal->wait; 3739 $signal->wait;
3615} 3740}
3616 3741
3617$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 3742sub tick {
3618 if ($Coro::current != $Coro::main) { 3743 if ($Coro::current != $Coro::main) {
3619 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3744 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3620 unless ++$bug_warning > 10; 3745 unless ++$bug_warning > 10;
3621 return; 3746 return;
3622 } 3747 }
3623 3748
3624 $NOW = $tick_start = EV::now;
3625
3626 cf::server_tick; # one server iteration 3749 cf::server_tick; # one server iteration
3627
3628 $RUNTIME += $TICK;
3629 $NEXT_TICK = $_[0]->at;
3630 3750
3631 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3751 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3632 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3752 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3633 Coro::async_pool { 3753 Coro::async_pool {
3634 $Coro::current->{desc} = "runtime saver"; 3754 $Coro::current->{desc} = "runtime saver";
3635 write_runtime 3755 write_runtime_sync
3636 or warn "ERROR: unable to write runtime file: $!"; 3756 or warn "ERROR: unable to write runtime file: $!";
3637 }; 3757 };
3638 } 3758 }
3639 3759
3640 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3760 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
… …
3642 } 3762 }
3643 while (my $sig = shift @WAIT_FOR_TICK) { 3763 while (my $sig = shift @WAIT_FOR_TICK) {
3644 $sig->send; 3764 $sig->send;
3645 } 3765 }
3646 3766
3647 $LOAD = ($NOW - $tick_start) / $TICK; 3767 $LOAD = ($NOW - $TICK_START) / $TICK;
3648 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3768 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3649 3769
3650 _post_tick; 3770 if (0) {
3651}; 3771 if ($NEXT_TICK) {
3652$TICK_WATCHER->priority (EV::MAXPRI); 3772 my $jitter = $TICK_START - $NEXT_TICK;
3773 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3774 warn "jitter $JITTER\n";#d#
3775 }
3776 }
3777}
3653 3778
3654{ 3779{
3655 # configure BDB 3780 # configure BDB
3656 3781
3657 BDB::min_parallel 8; 3782 BDB::min_parallel 8;

Diff Legend

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