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.410 by root, Tue Jan 15 12:02:24 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 }
… …
1316 my $msg = $@ ? "$v->{path}: $@\n" 1357 my $msg = $@ ? "$v->{path}: $@\n"
1317 : "$v->{base}: extension inactive.\n"; 1358 : "$v->{base}: extension inactive.\n";
1318 1359
1319 if (exists $v->{meta}{mandatory}) { 1360 if (exists $v->{meta}{mandatory}) {
1320 warn $msg; 1361 warn $msg;
1321 warn "mandatory extension failed to load, exiting.\n"; 1362 cf::cleanup "mandatory extension failed to load, exiting.";
1322 exit 1;
1323 } 1363 }
1324 1364
1325 warn $msg; 1365 warn $msg;
1326 } 1366 }
1327 1367
… …
1416 my $f = new_from_file cf::object::thawer path $login 1456 my $f = new_from_file cf::object::thawer path $login
1417 or return; 1457 or return;
1418 1458
1419 my $pl = cf::player::load_pl $f 1459 my $pl = cf::player::load_pl $f
1420 or return; 1460 or return;
1461
1421 local $cf::PLAYER_LOADING{$login} = $pl; 1462 local $cf::PLAYER_LOADING{$login} = $pl;
1422 $f->resolve_delayed_derefs; 1463 $f->resolve_delayed_derefs;
1423 $cf::PLAYER{$login} = $pl 1464 $cf::PLAYER{$login} = $pl
1424 } 1465 }
1425 } 1466 }
… …
1435 1476
1436 return if $pl->{deny_save}; 1477 return if $pl->{deny_save};
1437 1478
1438 aio_mkdir playerdir $pl, 0770; 1479 aio_mkdir playerdir $pl, 0770;
1439 $pl->{last_save} = $cf::RUNTIME; 1480 $pl->{last_save} = $cf::RUNTIME;
1481
1482 cf::get_slot 0.01;
1440 1483
1441 $pl->save_pl ($path); 1484 $pl->save_pl ($path);
1442 cf::cede_to_tick; 1485 cf::cede_to_tick;
1443} 1486}
1444 1487
… …
1528 1571
1529 for my $login (@$dirs) { 1572 for my $login (@$dirs) {
1530 my $path = path $login; 1573 my $path = path $login;
1531 1574
1532 # a .pst is a dead give-away for a valid player 1575 # a .pst is a dead give-away for a valid player
1533 unless (-e "$path.pst") { 1576 # if no pst file found, open and chekc for blocked users
1577 if (aio_stat "$path.pst") {
1534 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1578 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1535 aio_read $fh, 0, 512, my $buf, 0 or next; 1579 aio_read $fh, 0, 512, my $buf, 0 or next;
1536 $buf !~ /^password -------------$/m or next; # official not-valid tag 1580 $buf !~ /^password -------------$/m or next; # official not-valid tag
1537 } 1581 }
1538 1582
… …
1737our $MAX_RESET = 3600; 1781our $MAX_RESET = 3600;
1738our $DEFAULT_RESET = 3000; 1782our $DEFAULT_RESET = 3000;
1739 1783
1740sub generate_random_map { 1784sub generate_random_map {
1741 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
1742 # mit "rum" bekleckern, nicht 1789 # mit "rum" bekleckern, nicht
1743 $self->_create_random_map ( 1790 $self->_create_random_map (
1744 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1791 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1745 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1792 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1746 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1793 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1868 1915
1869# the temporary/swap location 1916# the temporary/swap location
1870sub save_path { 1917sub save_path {
1871 my ($self) = @_; 1918 my ($self) = @_;
1872 1919
1873 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1920 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1874 "$TMPDIR/$path.map" 1921 "$TMPDIR/$path.map"
1875} 1922}
1876 1923
1877# the unique path, undef == no special unique path 1924# the unique path, undef == no special unique path
1878sub uniq_path { 1925sub uniq_path {
1879 my ($self) = @_; 1926 my ($self) = @_;
1880 1927
1881 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1928 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1882 "$UNIQUEDIR/$path" 1929 "$UNIQUEDIR/$path"
1883} 1930}
1884 1931
1885# and all this just because we cannot iterate over 1932# and all this just because we cannot iterate over
1886# all maps in C++... 1933# all maps in C++...
… …
1984 2031
1985 cf::lock_wait "map_data:$path";#d#remove 2032 cf::lock_wait "map_data:$path";#d#remove
1986 cf::lock_wait "map_find:$path"; 2033 cf::lock_wait "map_find:$path";
1987 2034
1988 $cf::MAP{$path} || do { 2035 $cf::MAP{$path} || do {
1989 my $guard1 = cf::lock_acquire "map_find:$path";
1990 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";
1991 2038
1992 my $map = new_from_path cf::map $path 2039 my $map = new_from_path cf::map $path
1993 or return; 2040 or return;
1994 2041
1995 $map->{last_save} = $cf::RUNTIME; 2042 $map->{last_save} = $cf::RUNTIME;
… …
1998 or return; 2045 or return;
1999 2046
2000 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2047 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2001 # doing this can freeze the server in a sync job, obviously 2048 # doing this can freeze the server in a sync job, obviously
2002 #$cf::WAIT_FOR_TICK->wait; 2049 #$cf::WAIT_FOR_TICK->wait;
2050 undef $guard2;
2003 undef $guard1; 2051 undef $guard1;
2004 undef $guard2;
2005 $map->reset; 2052 $map->reset;
2006 return find $path; 2053 return find $path;
2007 } 2054 }
2008 2055
2009 $cf::MAP{$path} = $map 2056 $cf::MAP{$path} = $map
… …
2072 } 2119 }
2073 2120
2074 $self->{last_save} = $cf::RUNTIME; 2121 $self->{last_save} = $cf::RUNTIME;
2075 $self->last_access ($cf::RUNTIME); 2122 $self->last_access ($cf::RUNTIME);
2076 2123
2077 $self->in_memory (cf::MAP_IN_MEMORY); 2124 $self->in_memory (cf::MAP_ACTIVE);
2078 } 2125 }
2079 2126
2080 $self->post_load; 2127 $self->post_load;
2081} 2128}
2082 2129
… …
2140 my ($path, $origin, $load) = @_; 2187 my ($path, $origin, $load) = @_;
2141 2188
2142 $path = normalise $path, $origin && $origin->{path}; 2189 $path = normalise $path, $origin && $origin->{path};
2143 2190
2144 if (my $map = $cf::MAP{$path}) { 2191 if (my $map = $cf::MAP{$path}) {
2145 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2192 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2146 } 2193 }
2147 2194
2148 $MAP_PREFETCH{$path} |= $load; 2195 $MAP_PREFETCH{$path} |= $load;
2149 2196
2150 $MAP_PREFETCHER ||= cf::async { 2197 $MAP_PREFETCHER ||= cf::async {
… …
2187 cf::async { 2234 cf::async {
2188 $Coro::current->{desc} = "map player save"; 2235 $Coro::current->{desc} = "map player save";
2189 $_->contr->save for $self->players; 2236 $_->contr->save for $self->players;
2190 }; 2237 };
2191 2238
2239 cf::get_slot 0.02;
2240
2192 if ($uniq) { 2241 if ($uniq) {
2193 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2242 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2194 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2243 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2195 } else { 2244 } else {
2196 $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);
… …
2204 $self->save; 2253 $self->save;
2205 2254
2206 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2255 my $lock = cf::lock_acquire "map_data:$self->{path}";
2207 2256
2208 return if $self->players; 2257 return if $self->players;
2209 return if $self->in_memory != cf::MAP_IN_MEMORY; 2258 return if $self->in_memory != cf::MAP_ACTIVE;
2210 return if $self->{deny_save}; 2259 return if $self->{deny_save};
2211 2260
2212 $self->in_memory (cf::MAP_SWAPPED); 2261 $self->in_memory (cf::MAP_SWAPPED);
2213 2262
2214 $self->deactivate; 2263 $self->deactivate;
… …
2332 2381
2333sub unique_maps() { 2382sub unique_maps() {
2334 [ 2383 [
2335 map { 2384 map {
2336 utf8::decode $_; 2385 utf8::decode $_;
2337 /\.map$/ 2386 s/\.map$//; # TODO future compatibility hack
2387 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2388 ? ()
2338 ? normalise $_ 2389 : normalise $_
2339 : ()
2340 } @{ aio_readdir $UNIQUEDIR or [] } 2390 } @{ aio_readdir $UNIQUEDIR or [] }
2341 ] 2391 ]
2342} 2392}
2343 2393
2344package cf;
2345
2346=back 2394=back
2347 2395
2348=head3 cf::object 2396=head3 cf::object
2349 2397
2350=cut 2398=cut
… …
2353 2401
2354=over 4 2402=over 4
2355 2403
2356=item $ob->inv_recursive 2404=item $ob->inv_recursive
2357 2405
2358Returns 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.
2359 2408
2360=cut 2409=cut
2361 2410
2362sub inv_recursive_; 2411sub inv_recursive_;
2363sub inv_recursive_ { 2412sub inv_recursive_ {
… …
2368 inv_recursive_ inv $_[0] 2417 inv_recursive_ inv $_[0]
2369} 2418}
2370 2419
2371=item $ref = $ob->ref 2420=item $ref = $ob->ref
2372 2421
2373creates 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.
2374 2423
2375=item $ob = cf::object::deref ($refstring) 2424=item $ob = cf::object::deref ($refstring)
2376 2425
2377returns 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,
2378even if the object actually exists. May block. 2427even if the object actually exists. May block.
… …
2410can 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
2411dialogue with the given NPC character. 2460dialogue with the given NPC character.
2412 2461
2413=cut 2462=cut
2414 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
2415# rough implementation of a future "reply" method that works 2478# rough implementation of a future "reply" method that works
2416# with dialog boxes. 2479# with dialog boxes.
2417#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
2418sub cf::object::player::reply($$$;$) { 2481sub cf::object::player::reply($$$;$) {
2419 my ($self, $npc, $msg, $flags) = @_; 2482 my ($self, $npc, $msg, $flags) = @_;
… …
2430 my $dialog = $pl->{npc_dialog}; 2493 my $dialog = $pl->{npc_dialog};
2431 $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));
2432 2495
2433 } else { 2496 } else {
2434 $msg = $npc->name . " says: $msg" if $npc; 2497 $msg = $npc->name . " says: $msg" if $npc;
2435 $self->message ($msg, $flags); 2498 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2436 } 2499 }
2437 } 2500 }
2438} 2501}
2439 2502
2440=item $object->send_msg ($channel, $msg, $color, [extra...]) 2503=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2652 $rmp->{origin_y} = $exit->y; 2715 $rmp->{origin_y} = $exit->y;
2653 } 2716 }
2654 2717
2655 $rmp->{random_seed} ||= $exit->random_seed; 2718 $rmp->{random_seed} ||= $exit->random_seed;
2656 2719
2657 my $data = cf::encode_json $rmp; 2720 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2658 my $md5 = Digest::MD5::md5_hex $data; 2721 my $md5 = Digest::MD5::md5_hex $data;
2659 my $meta = "$RANDOMDIR/$md5.meta"; 2722 my $meta = "$RANDOMDIR/$md5.meta";
2660 2723
2661 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2724 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2662 aio_write $fh, 0, (length $data), $data, 0; 2725 aio_write $fh, 0, (length $data), $data, 0;
… …
2785 id => "infobox", 2848 id => "infobox",
2786 title => "Map Info", 2849 title => "Map Info",
2787 reply => undef, 2850 reply => undef,
2788 tooltip => "Information related to the maps", 2851 tooltip => "Information related to the maps",
2789 }, 2852 },
2853 "c/party" => {
2854 id => "party",
2855 title => "Party",
2856 reply => "gsay ",
2857 tooltip => "Messages and chat related to your party",
2858 },
2790); 2859);
2791 2860
2792sub cf::client::send_msg { 2861sub cf::client::send_msg {
2793 my ($self, $channel, $msg, $color, @extra) = @_; 2862 my ($self, $channel, $msg, $color, @extra) = @_;
2794 2863
… …
3031 3100
3032The following functions and methods are available within a safe environment: 3101The following functions and methods are available within a safe environment:
3033 3102
3034 cf::object 3103 cf::object
3035 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
3036 insert remove name archname title slaying race decrease_ob_nr 3105 insert remove name archname title slaying race decrease split
3037 3106
3038 cf::object::player 3107 cf::object::player
3039 player 3108 player
3040 3109
3041 cf::player 3110 cf::player
… …
3047=cut 3116=cut
3048 3117
3049for ( 3118for (
3050 ["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
3051 insert remove inv name archname title slaying race 3120 insert remove inv name archname title slaying race
3052 decrease_ob_nr destroy)], 3121 decrease split destroy)],
3053 ["cf::object::player" => qw(player)], 3122 ["cf::object::player" => qw(player)],
3054 ["cf::player" => qw(peaceful)], 3123 ["cf::player" => qw(peaceful)],
3055 ["cf::map" => qw(trigger)], 3124 ["cf::map" => qw(trigger)],
3056) { 3125) {
3057 no strict 'refs'; 3126 no strict 'refs';
… …
3265 while (my ($k, $v) = each %$want) { 3334 while (my ($k, $v) = each %$want) {
3266 $ns->fx_want ($k, $v); 3335 $ns->fx_want ($k, $v);
3267 } 3336 }
3268}; 3337};
3269 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
3270sub reload_regions { 3349sub reload_regions {
3271 # 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
3272 # for this (global event?) 3351 # for this (global event?)
3273 %ext::player_env::MUSIC_FACE_CACHE = (); 3352 %ext::player_env::MUSIC_FACE_CACHE = ();
3274 3353
… …
3287} 3366}
3288 3367
3289sub reload_archetypes { 3368sub reload_archetypes {
3290 load_resource_file "$DATADIR/archetypes" 3369 load_resource_file "$DATADIR/archetypes"
3291 or die "unable to load archetypes\n"; 3370 or die "unable to load archetypes\n";
3292 #d# NEED to laod twice to resolve forward references
3293 # this really needs to be done in an extra post-pass
3294 # (which needs to be synchronous, so solve it differently)
3295 load_resource_file "$DATADIR/archetypes"
3296 or die "unable to load archetypes\n";
3297} 3371}
3298 3372
3299sub reload_treasures { 3373sub reload_treasures {
3300 load_resource_file "$DATADIR/treasures" 3374 load_resource_file "$DATADIR/treasures"
3301 or die "unable to load treasurelists\n"; 3375 or die "unable to load treasurelists\n";
3302} 3376}
3303 3377
3304sub reload_resources { 3378sub reload_resources {
3305 warn "reloading resource files...\n"; 3379 warn "reloading resource files...\n";
3306 3380
3381 reload_facedata;
3382 reload_archetypes;
3307 reload_regions; 3383 reload_regions;
3308 reload_facedata;
3309 #reload_archetypes;#d#
3310 reload_archetypes;
3311 reload_treasures; 3384 reload_treasures;
3312 3385
3313 warn "finished reloading resource files\n"; 3386 warn "finished reloading resource files\n";
3314} 3387}
3315 3388
3316sub init { 3389sub init {
3390 my $guard = freeze_mainloop;
3391
3317 reload_resources; 3392 reload_resources;
3318} 3393}
3319 3394
3320sub reload_config { 3395sub reload_config {
3321 open my $fh, "<:utf8", "$CONFDIR/config" 3396 open my $fh, "<:utf8", "$CONFDIR/config"
… …
3346 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3421 $Coro::current->{desc} = "IDLE BUG HANDLER";
3347 EV::loop EV::LOOP_ONESHOT; 3422 EV::loop EV::LOOP_ONESHOT;
3348 })->prio (Coro::PRIO_MAX); 3423 })->prio (Coro::PRIO_MAX);
3349 }; 3424 };
3350 3425
3426 {
3427 my $guard = freeze_mainloop;
3351 reload_config; 3428 reload_config;
3352 db_init; 3429 db_init;
3353 load_extensions; 3430 load_extensions;
3354 3431
3355 $TICK_WATCHER->start;
3356 $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
3357 EV::loop; 3436 EV::loop;
3358} 3437}
3359 3438
3360############################################################################# 3439#############################################################################
3361# initialisation and cleanup 3440# initialisation and cleanup
… …
3368 cf::cleanup "SIG$signal"; 3447 cf::cleanup "SIG$signal";
3369 }; 3448 };
3370 } 3449 }
3371} 3450}
3372 3451
3373sub write_runtime { 3452sub write_runtime_sync {
3374 my $runtime = "$LOCALDIR/runtime"; 3453 my $runtime = "$LOCALDIR/runtime";
3375 3454
3376 # first touch the runtime file to show we are still running: 3455 # first touch the runtime file to show we are still running:
3377 # the fsync below can take a very very long time. 3456 # the fsync below can take a very very long time.
3378 3457
… …
3404 and return; 3483 and return;
3405 3484
3406 warn "runtime file written.\n"; 3485 warn "runtime file written.\n";
3407 3486
3408 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 };
3409} 3531}
3410 3532
3411sub emergency_save() { 3533sub emergency_save() {
3412 my $freeze_guard = cf::freeze_mainloop; 3534 my $freeze_guard = cf::freeze_mainloop;
3413 3535
… …
3435 warn "end emergency map save\n"; 3557 warn "end emergency map save\n";
3436 3558
3437 warn "begin emergency database checkpoint\n"; 3559 warn "begin emergency database checkpoint\n";
3438 BDB::db_env_txn_checkpoint $DB_ENV; 3560 BDB::db_env_txn_checkpoint $DB_ENV;
3439 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";
3440 }; 3566 };
3441 3567
3442 warn "leave emergency perl save\n"; 3568 warn "leave emergency perl save\n";
3443} 3569}
3444 3570
… …
3459 warn "reloading..."; 3585 warn "reloading...";
3460 3586
3461 warn "entering sync_job"; 3587 warn "entering sync_job";
3462 3588
3463 cf::sync_job { 3589 cf::sync_job {
3464 cf::write_runtime; # external watchdog should not bark 3590 cf::write_runtime_sync; # external watchdog should not bark
3465 cf::emergency_save; 3591 cf::emergency_save;
3466 cf::write_runtime; # external watchdog should not bark 3592 cf::write_runtime_sync; # external watchdog should not bark
3467 3593
3468 warn "syncing database to disk"; 3594 warn "syncing database to disk";
3469 BDB::db_env_txn_checkpoint $DB_ENV; 3595 BDB::db_env_txn_checkpoint $DB_ENV;
3470 3596
3471 # 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
… …
3558 warn "leaving sync_job"; 3684 warn "leaving sync_job";
3559 3685
3560 1 3686 1
3561 } or do { 3687 } or do {
3562 warn $@; 3688 warn $@;
3563 warn "error while reloading, exiting."; 3689 cf::cleanup "error while reloading, exiting.";
3564 exit 1;
3565 }; 3690 };
3566 3691
3567 warn "reloaded"; 3692 warn "reloaded";
3568}; 3693};
3569 3694
… …
3597 3722
3598our @WAIT_FOR_TICK; 3723our @WAIT_FOR_TICK;
3599our @WAIT_FOR_TICK_BEGIN; 3724our @WAIT_FOR_TICK_BEGIN;
3600 3725
3601sub wait_for_tick { 3726sub wait_for_tick {
3602 return unless $TICK_WATCHER->is_active;
3603 return if $Coro::current == $Coro::main; 3727 return if tick_inhibit || $Coro::current == $Coro::main;
3604 3728
3605 my $signal = new Coro::Signal; 3729 my $signal = new Coro::Signal;
3606 push @WAIT_FOR_TICK, $signal; 3730 push @WAIT_FOR_TICK, $signal;
3607 $signal->wait; 3731 $signal->wait;
3608} 3732}
3609 3733
3610sub wait_for_tick_begin { 3734sub wait_for_tick_begin {
3611 return unless $TICK_WATCHER->is_active;
3612 return if $Coro::current == $Coro::main; 3735 return if tick_inhibit || $Coro::current == $Coro::main;
3613 3736
3614 my $signal = new Coro::Signal; 3737 my $signal = new Coro::Signal;
3615 push @WAIT_FOR_TICK_BEGIN, $signal; 3738 push @WAIT_FOR_TICK_BEGIN, $signal;
3616 $signal->wait; 3739 $signal->wait;
3617} 3740}
3618 3741
3619$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 3742sub tick {
3620 if ($Coro::current != $Coro::main) { 3743 if ($Coro::current != $Coro::main) {
3621 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"
3622 unless ++$bug_warning > 10; 3745 unless ++$bug_warning > 10;
3623 return; 3746 return;
3624 } 3747 }
3625 3748
3626 $NOW = $tick_start = EV::now;
3627
3628 cf::server_tick; # one server iteration 3749 cf::server_tick; # one server iteration
3629
3630 $RUNTIME += $TICK;
3631 $NEXT_TICK = $_[0]->at;
3632 3750
3633 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3751 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3634 $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.;
3635 Coro::async_pool { 3753 Coro::async_pool {
3636 $Coro::current->{desc} = "runtime saver"; 3754 $Coro::current->{desc} = "runtime saver";
3637 write_runtime 3755 write_runtime_sync
3638 or warn "ERROR: unable to write runtime file: $!"; 3756 or warn "ERROR: unable to write runtime file: $!";
3639 }; 3757 };
3640 } 3758 }
3641 3759
3642 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3760 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
… …
3644 } 3762 }
3645 while (my $sig = shift @WAIT_FOR_TICK) { 3763 while (my $sig = shift @WAIT_FOR_TICK) {
3646 $sig->send; 3764 $sig->send;
3647 } 3765 }
3648 3766
3649 $LOAD = ($NOW - $tick_start) / $TICK; 3767 $LOAD = ($NOW - $TICK_START) / $TICK;
3650 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3768 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3651 3769
3652 _post_tick; 3770 if (0) {
3653}; 3771 if ($NEXT_TICK) {
3654$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}
3655 3778
3656{ 3779{
3657 # configure BDB 3780 # configure BDB
3658 3781
3659 BDB::min_parallel 8; 3782 BDB::min_parallel 8;

Diff Legend

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