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.432 by root, Mon May 5 22:38:47 2008 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify
7# it under the terms of the GNU General Public License as published by
8# the Free Software Foundation, either version 3 of the License, or
9# (at your option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19# The authors can be reached via e-mail to <support@deliantra.net>
20#
21
1package cf; 22package cf;
2 23
3use utf8; 24use utf8;
4use strict; 25use strict;
5 26
6use Symbol; 27use Symbol;
7use List::Util; 28use List::Util;
8use Socket; 29use Socket;
9use EV 1.86; 30use EV 3.2;
10use Opcode; 31use Opcode;
11use Safe; 32use Safe;
12use Safe::Hole; 33use Safe::Hole;
13use Storable (); 34use Storable ();
14 35
15use Coro 4.32 (); 36use Coro 4.50 ();
16use Coro::State; 37use Coro::State;
17use Coro::Handle; 38use Coro::Handle;
18use Coro::EV; 39use Coro::EV;
19use Coro::Timer; 40use Coro::Timer;
20use Coro::Signal; 41use Coro::Signal;
… …
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
… …
1479 $pl->{deny_save} = 1; 1523 $pl->{deny_save} = 1;
1480 $pl->password ("*"); # this should lock out the player until we nuked the dir 1524 $pl->password ("*"); # this should lock out the player until we nuked the dir
1481 1525
1482 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1526 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1483 $pl->deactivate; 1527 $pl->deactivate;
1528 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1529 $pl->ob->check_score;
1484 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1530 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1485 $pl->ns->destroy if $pl->ns; 1531 $pl->ns->destroy if $pl->ns;
1486 1532
1487 my $path = playerdir $pl; 1533 my $path = playerdir $pl;
1488 my $temp = "$path~$cf::RUNTIME~deleting~"; 1534 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1527 1573
1528 for my $login (@$dirs) { 1574 for my $login (@$dirs) {
1529 my $path = path $login; 1575 my $path = path $login;
1530 1576
1531 # a .pst is a dead give-away for a valid player 1577 # a .pst is a dead give-away for a valid player
1532 unless (-e "$path.pst") { 1578 # if no pst file found, open and chekc for blocked users
1579 if (aio_stat "$path.pst") {
1533 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1580 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1534 aio_read $fh, 0, 512, my $buf, 0 or next; 1581 aio_read $fh, 0, 512, my $buf, 0 or next;
1535 $buf !~ /^password -------------$/m or next; # official not-valid tag 1582 $buf !~ /^password -------------$/m or next; # official not-valid tag
1536 } 1583 }
1537 1584
… …
1736our $MAX_RESET = 3600; 1783our $MAX_RESET = 3600;
1737our $DEFAULT_RESET = 3000; 1784our $DEFAULT_RESET = 3000;
1738 1785
1739sub generate_random_map { 1786sub generate_random_map {
1740 my ($self, $rmp) = @_; 1787 my ($self, $rmp) = @_;
1788
1789 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1790
1741 # mit "rum" bekleckern, nicht 1791 # mit "rum" bekleckern, nicht
1742 $self->_create_random_map ( 1792 $self->_create_random_map (
1743 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1793 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1744 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1794 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1745 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1795 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1867 1917
1868# the temporary/swap location 1918# the temporary/swap location
1869sub save_path { 1919sub save_path {
1870 my ($self) = @_; 1920 my ($self) = @_;
1871 1921
1872 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1922 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1873 "$TMPDIR/$path.map" 1923 "$TMPDIR/$path.map"
1874} 1924}
1875 1925
1876# the unique path, undef == no special unique path 1926# the unique path, undef == no special unique path
1877sub uniq_path { 1927sub uniq_path {
1878 my ($self) = @_; 1928 my ($self) = @_;
1879 1929
1880 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1930 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1881 "$UNIQUEDIR/$path" 1931 "$UNIQUEDIR/$path"
1882} 1932}
1883 1933
1884# and all this just because we cannot iterate over 1934# and all this just because we cannot iterate over
1885# all maps in C++... 1935# all maps in C++...
… …
1983 2033
1984 cf::lock_wait "map_data:$path";#d#remove 2034 cf::lock_wait "map_data:$path";#d#remove
1985 cf::lock_wait "map_find:$path"; 2035 cf::lock_wait "map_find:$path";
1986 2036
1987 $cf::MAP{$path} || do { 2037 $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 2038 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2039 my $guard2 = cf::lock_acquire "map_find:$path";
1990 2040
1991 my $map = new_from_path cf::map $path 2041 my $map = new_from_path cf::map $path
1992 or return; 2042 or return;
1993 2043
1994 $map->{last_save} = $cf::RUNTIME; 2044 $map->{last_save} = $cf::RUNTIME;
… …
1997 or return; 2047 or return;
1998 2048
1999 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2049 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2000 # doing this can freeze the server in a sync job, obviously 2050 # doing this can freeze the server in a sync job, obviously
2001 #$cf::WAIT_FOR_TICK->wait; 2051 #$cf::WAIT_FOR_TICK->wait;
2052 undef $guard2;
2002 undef $guard1; 2053 undef $guard1;
2003 undef $guard2;
2004 $map->reset; 2054 $map->reset;
2005 return find $path; 2055 return find $path;
2006 } 2056 }
2007 2057
2008 $cf::MAP{$path} = $map 2058 $cf::MAP{$path} = $map
… …
2071 } 2121 }
2072 2122
2073 $self->{last_save} = $cf::RUNTIME; 2123 $self->{last_save} = $cf::RUNTIME;
2074 $self->last_access ($cf::RUNTIME); 2124 $self->last_access ($cf::RUNTIME);
2075 2125
2076 $self->in_memory (cf::MAP_IN_MEMORY); 2126 $self->in_memory (cf::MAP_ACTIVE);
2077 } 2127 }
2078 2128
2079 $self->post_load; 2129 $self->post_load;
2080} 2130}
2081 2131
… …
2139 my ($path, $origin, $load) = @_; 2189 my ($path, $origin, $load) = @_;
2140 2190
2141 $path = normalise $path, $origin && $origin->{path}; 2191 $path = normalise $path, $origin && $origin->{path};
2142 2192
2143 if (my $map = $cf::MAP{$path}) { 2193 if (my $map = $cf::MAP{$path}) {
2144 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2194 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2145 } 2195 }
2146 2196
2147 $MAP_PREFETCH{$path} |= $load; 2197 $MAP_PREFETCH{$path} |= $load;
2148 2198
2149 $MAP_PREFETCHER ||= cf::async { 2199 $MAP_PREFETCHER ||= cf::async {
… …
2186 cf::async { 2236 cf::async {
2187 $Coro::current->{desc} = "map player save"; 2237 $Coro::current->{desc} = "map player save";
2188 $_->contr->save for $self->players; 2238 $_->contr->save for $self->players;
2189 }; 2239 };
2190 2240
2241 cf::get_slot 0.02;
2242
2191 if ($uniq) { 2243 if ($uniq) {
2192 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2244 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2193 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2245 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2194 } else { 2246 } else {
2195 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2247 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
… …
2203 $self->save; 2255 $self->save;
2204 2256
2205 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2257 my $lock = cf::lock_acquire "map_data:$self->{path}";
2206 2258
2207 return if $self->players; 2259 return if $self->players;
2208 return if $self->in_memory != cf::MAP_IN_MEMORY; 2260 return if $self->in_memory != cf::MAP_ACTIVE;
2209 return if $self->{deny_save}; 2261 return if $self->{deny_save};
2210 2262
2211 $self->in_memory (cf::MAP_SWAPPED); 2263 $self->in_memory (cf::MAP_SWAPPED);
2212 2264
2213 $self->deactivate; 2265 $self->deactivate;
… …
2331 2383
2332sub unique_maps() { 2384sub unique_maps() {
2333 [ 2385 [
2334 map { 2386 map {
2335 utf8::decode $_; 2387 utf8::decode $_;
2336 /\.map$/ 2388 s/\.map$//; # TODO future compatibility hack
2389 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2390 ? ()
2337 ? normalise $_ 2391 : normalise $_
2338 : ()
2339 } @{ aio_readdir $UNIQUEDIR or [] } 2392 } @{ aio_readdir $UNIQUEDIR or [] }
2340 ] 2393 ]
2341} 2394}
2342 2395
2343package cf;
2344
2345=back 2396=back
2346 2397
2347=head3 cf::object 2398=head3 cf::object
2348 2399
2349=cut 2400=cut
… …
2352 2403
2353=over 4 2404=over 4
2354 2405
2355=item $ob->inv_recursive 2406=item $ob->inv_recursive
2356 2407
2357Returns the inventory of the object _and_ their inventories, recursively. 2408Returns the inventory of the object I<and> their inventories, recursively,
2409but I<not> the object itself.
2358 2410
2359=cut 2411=cut
2360 2412
2361sub inv_recursive_; 2413sub inv_recursive_;
2362sub inv_recursive_ { 2414sub inv_recursive_ {
… …
2367 inv_recursive_ inv $_[0] 2419 inv_recursive_ inv $_[0]
2368} 2420}
2369 2421
2370=item $ref = $ob->ref 2422=item $ref = $ob->ref
2371 2423
2372creates and returns a persistent reference to an objetc that can be stored as a string. 2424Creates and returns a persistent reference to an object that can be stored as a string.
2373 2425
2374=item $ob = cf::object::deref ($refstring) 2426=item $ob = cf::object::deref ($refstring)
2375 2427
2376returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2428returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2377even if the object actually exists. May block. 2429even if the object actually exists. May block.
… …
2409can be C<undef>. Does the right thing when the player is currently in a 2461can be C<undef>. Does the right thing when the player is currently in a
2410dialogue with the given NPC character. 2462dialogue with the given NPC character.
2411 2463
2412=cut 2464=cut
2413 2465
2466our $SAY_CHANNEL = {
2467 id => "say",
2468 title => "Map",
2469 reply => "say ",
2470 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2471};
2472
2473our $CHAT_CHANNEL = {
2474 id => "chat",
2475 title => "Chat",
2476 reply => "chat ",
2477 tooltip => "Player chat and shouts, global to the server.",
2478};
2479
2414# rough implementation of a future "reply" method that works 2480# rough implementation of a future "reply" method that works
2415# with dialog boxes. 2481# with dialog boxes.
2416#TODO: the first argument must go, split into a $npc->reply_to ( method 2482#TODO: the first argument must go, split into a $npc->reply_to ( method
2417sub cf::object::player::reply($$$;$) { 2483sub cf::object::player::reply($$$;$) {
2418 my ($self, $npc, $msg, $flags) = @_; 2484 my ($self, $npc, $msg, $flags) = @_;
… …
2429 my $dialog = $pl->{npc_dialog}; 2495 my $dialog = $pl->{npc_dialog};
2430 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2496 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2431 2497
2432 } else { 2498 } else {
2433 $msg = $npc->name . " says: $msg" if $npc; 2499 $msg = $npc->name . " says: $msg" if $npc;
2434 $self->message ($msg, $flags); 2500 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2435 } 2501 }
2436 } 2502 }
2437} 2503}
2438 2504
2439=item $object->send_msg ($channel, $msg, $color, [extra...]) 2505=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2634} 2700}
2635 2701
2636sub prepare_random_map { 2702sub prepare_random_map {
2637 my ($exit) = @_; 2703 my ($exit) = @_;
2638 2704
2639 my $guard = cf::lock_acquire "exit_prepare:$exit";
2640
2641 # all this does is basically replace the /! path by 2705 # all this does is basically replace the /! path by
2642 # a new random map path (?random/...) with a seed 2706 # a new random map path (?random/...) with a seed
2643 # that depends on the exit object 2707 # that depends on the exit object
2644 2708
2645 my $rmp = parse_random_map_params $exit->msg; 2709 my $rmp = parse_random_map_params $exit->msg;
… …
2647 if ($exit->map) { 2711 if ($exit->map) {
2648 $rmp->{region} = $exit->region->name; 2712 $rmp->{region} = $exit->region->name;
2649 $rmp->{origin_map} = $exit->map->path; 2713 $rmp->{origin_map} = $exit->map->path;
2650 $rmp->{origin_x} = $exit->x; 2714 $rmp->{origin_x} = $exit->x;
2651 $rmp->{origin_y} = $exit->y; 2715 $rmp->{origin_y} = $exit->y;
2716
2717 $exit->map->touch;
2652 } 2718 }
2653 2719
2654 $rmp->{random_seed} ||= $exit->random_seed; 2720 $rmp->{random_seed} ||= $exit->random_seed;
2655 2721
2656 my $data = cf::encode_json $rmp; 2722 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2657 my $md5 = Digest::MD5::md5_hex $data; 2723 my $md5 = Digest::MD5::md5_hex $data;
2658 my $meta = "$RANDOMDIR/$md5.meta"; 2724 my $meta = "$RANDOMDIR/$md5.meta";
2659 2725
2660 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2726 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2661 aio_write $fh, 0, (length $data), $data, 0; 2727 aio_write $fh, 0, (length $data), $data, 0;
2662 undef $fh; 2728 undef $fh;
2663 aio_rename "$meta~", $meta; 2729 aio_rename "$meta~", $meta;
2664 2730
2731 my $slaying = "?random/$md5";
2732
2733 if ($exit->valid) {
2665 $exit->slaying ("?random/$md5"); 2734 $exit->slaying ("?random/$md5");
2666 $exit->msg (undef); 2735 $exit->msg (undef);
2736 }
2667 } 2737 }
2668} 2738}
2669 2739
2670sub cf::object::player::enter_exit { 2740sub cf::object::player::enter_exit {
2671 my ($self, $exit) = @_; 2741 my ($self, $exit) = @_;
2672 2742
2673 return unless $self->type == cf::PLAYER; 2743 return unless $self->type == cf::PLAYER;
2674 2744
2675 if ($exit->slaying eq "/!") {
2676 #TODO: this should de-fi-ni-te-ly not be a sync-job
2677 # the problem is that $exit might not survive long enough
2678 # so it needs to be done right now, right here
2679 cf::sync_job { prepare_random_map $exit };
2680 }
2681
2682 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2683 my $hp = $exit->stats->hp;
2684 my $sp = $exit->stats->sp;
2685
2686 $self->enter_link; 2745 $self->enter_link;
2687 2746
2688 # if exit is damned, update players death & WoR home-position
2689 $self->contr->savebed ($slaying, $hp, $sp)
2690 if $exit->flag (FLAG_DAMNED);
2691
2692 (async { 2747 (async {
2693 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2748 $Coro::current->{desc} = "enter_exit";
2694 2749
2695 $self->deactivate_recursive; # just to be sure
2696 unless (eval { 2750 unless (eval {
2751 $self->deactivate_recursive; # just to be sure
2752
2753 # random map handling
2754 {
2755 my $guard = cf::lock_acquire "exit_prepare:$exit";
2756
2757 prepare_random_map $exit
2758 if $exit->slaying eq "/!";
2759 }
2760
2761 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2762 my $x = $exit->stats->hp;
2763 my $y = $exit->stats->sp;
2764
2697 $self->goto ($slaying, $hp, $sp); 2765 $self->goto ($map, $x, $y);
2698 2766
2767 # if exit is damned, update players death & WoR home-position
2768 $self->contr->savebed ($map, $x, $y)
2769 if $exit->flag (cf::FLAG_DAMNED);
2770
2699 1; 2771 1
2700 }) { 2772 }) {
2701 $self->message ("Something went wrong deep within the crossfire server. " 2773 $self->message ("Something went wrong deep within the crossfire server. "
2702 . "I'll try to bring you back to the map you were before. " 2774 . "I'll try to bring you back to the map you were before. "
2703 . "Please report this to the dungeon master!", 2775 . "Please report this to the dungeon master!",
2704 cf::NDI_UNIQUE | cf::NDI_RED); 2776 cf::NDI_UNIQUE | cf::NDI_RED);
… …
2784 id => "infobox", 2856 id => "infobox",
2785 title => "Map Info", 2857 title => "Map Info",
2786 reply => undef, 2858 reply => undef,
2787 tooltip => "Information related to the maps", 2859 tooltip => "Information related to the maps",
2788 }, 2860 },
2861 "c/party" => {
2862 id => "party",
2863 title => "Party",
2864 reply => "gsay ",
2865 tooltip => "Messages and chat related to your party",
2866 },
2789); 2867);
2790 2868
2791sub cf::client::send_msg { 2869sub cf::client::send_msg {
2792 my ($self, $channel, $msg, $color, @extra) = @_; 2870 my ($self, $channel, $msg, $color, @extra) = @_;
2793 2871
… …
3030 3108
3031The following functions and methods are available within a safe environment: 3109The following functions and methods are available within a safe environment:
3032 3110
3033 cf::object 3111 cf::object
3034 contr pay_amount pay_player map x y force_find force_add destroy 3112 contr pay_amount pay_player map x y force_find force_add destroy
3035 insert remove name archname title slaying race decrease_ob_nr 3113 insert remove name archname title slaying race decrease split
3036 3114
3037 cf::object::player 3115 cf::object::player
3038 player 3116 player
3039 3117
3040 cf::player 3118 cf::player
… …
3045 3123
3046=cut 3124=cut
3047 3125
3048for ( 3126for (
3049 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3127 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3050 insert remove inv name archname title slaying race 3128 insert remove inv nrof name archname title slaying race
3051 decrease_ob_nr destroy)], 3129 decrease split destroy)],
3052 ["cf::object::player" => qw(player)], 3130 ["cf::object::player" => qw(player)],
3053 ["cf::player" => qw(peaceful)], 3131 ["cf::player" => qw(peaceful)],
3054 ["cf::map" => qw(trigger)], 3132 ["cf::map" => qw(trigger)],
3055) { 3133) {
3056 no strict 'refs'; 3134 no strict 'refs';
… …
3264 while (my ($k, $v) = each %$want) { 3342 while (my ($k, $v) = each %$want) {
3265 $ns->fx_want ($k, $v); 3343 $ns->fx_want ($k, $v);
3266 } 3344 }
3267}; 3345};
3268 3346
3347sub load_resource_file($) {
3348 my $guard = lock_acquire "load_resource_file";
3349
3350 my $status = load_resource_file_ $_[0];
3351 get_slot 0.1, 100;
3352 cf::arch::commit_load;
3353
3354 $status
3355}
3356
3269sub reload_regions { 3357sub reload_regions {
3270 # HACK to clear player env face cache, we need some signal framework 3358 # HACK to clear player env face cache, we need some signal framework
3271 # for this (global event?) 3359 # for this (global event?)
3272 %ext::player_env::MUSIC_FACE_CACHE = (); 3360 %ext::player_env::MUSIC_FACE_CACHE = ();
3273 3361
… …
3286} 3374}
3287 3375
3288sub reload_archetypes { 3376sub reload_archetypes {
3289 load_resource_file "$DATADIR/archetypes" 3377 load_resource_file "$DATADIR/archetypes"
3290 or die "unable to load archetypes\n"; 3378 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} 3379}
3297 3380
3298sub reload_treasures { 3381sub reload_treasures {
3299 load_resource_file "$DATADIR/treasures" 3382 load_resource_file "$DATADIR/treasures"
3300 or die "unable to load treasurelists\n"; 3383 or die "unable to load treasurelists\n";
3301} 3384}
3302 3385
3303sub reload_resources { 3386sub reload_resources {
3304 warn "reloading resource files...\n"; 3387 warn "reloading resource files...\n";
3305 3388
3389 reload_facedata;
3390 reload_archetypes;
3306 reload_regions; 3391 reload_regions;
3307 reload_facedata;
3308 #reload_archetypes;#d#
3309 reload_archetypes;
3310 reload_treasures; 3392 reload_treasures;
3311 3393
3312 warn "finished reloading resource files\n"; 3394 warn "finished reloading resource files\n";
3313} 3395}
3314 3396
3315sub init { 3397sub init {
3398 my $guard = freeze_mainloop;
3399
3316 reload_resources; 3400 reload_resources;
3317} 3401}
3318 3402
3319sub reload_config { 3403sub reload_config {
3320 open my $fh, "<:utf8", "$CONFDIR/config" 3404 open my $fh, "<:utf8", "$CONFDIR/config"
… …
3345 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3429 $Coro::current->{desc} = "IDLE BUG HANDLER";
3346 EV::loop EV::LOOP_ONESHOT; 3430 EV::loop EV::LOOP_ONESHOT;
3347 })->prio (Coro::PRIO_MAX); 3431 })->prio (Coro::PRIO_MAX);
3348 }; 3432 };
3349 3433
3434 {
3435 my $guard = freeze_mainloop;
3350 reload_config; 3436 reload_config;
3351 db_init; 3437 db_init;
3352 load_extensions; 3438 load_extensions;
3353 3439
3354 $TICK_WATCHER->start;
3355 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3440 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3441 evthread_start IO::AIO::poll_fileno;
3442 }
3443
3356 EV::loop; 3444 EV::loop;
3357} 3445}
3358 3446
3359############################################################################# 3447#############################################################################
3360# initialisation and cleanup 3448# initialisation and cleanup
… …
3367 cf::cleanup "SIG$signal"; 3455 cf::cleanup "SIG$signal";
3368 }; 3456 };
3369 } 3457 }
3370} 3458}
3371 3459
3372sub write_runtime { 3460sub write_runtime_sync {
3373 my $runtime = "$LOCALDIR/runtime"; 3461 my $runtime = "$LOCALDIR/runtime";
3374 3462
3375 # first touch the runtime file to show we are still running: 3463 # first touch the runtime file to show we are still running:
3376 # the fsync below can take a very very long time. 3464 # the fsync below can take a very very long time.
3377 3465
… …
3403 and return; 3491 and return;
3404 3492
3405 warn "runtime file written.\n"; 3493 warn "runtime file written.\n";
3406 3494
3407 1 3495 1
3496}
3497
3498our $uuid_lock;
3499our $uuid_skip;
3500
3501sub write_uuid_sync($) {
3502 $uuid_skip ||= $_[0];
3503
3504 return if $uuid_lock;
3505 local $uuid_lock = 1;
3506
3507 my $uuid = "$LOCALDIR/uuid";
3508
3509 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3510 or return;
3511
3512 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3513 $uuid_skip = 0;
3514
3515 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3516 and return;
3517
3518 # always fsync - this file is important
3519 aio_fsync $fh
3520 and return;
3521
3522 close $fh
3523 or return;
3524
3525 aio_rename "$uuid~", $uuid
3526 and return;
3527
3528 warn "uuid file written ($value).\n";
3529
3530 1
3531
3532}
3533
3534sub write_uuid($$) {
3535 my ($skip, $sync) = @_;
3536
3537 $sync ? write_uuid_sync $skip
3538 : async { write_uuid_sync $skip };
3408} 3539}
3409 3540
3410sub emergency_save() { 3541sub emergency_save() {
3411 my $freeze_guard = cf::freeze_mainloop; 3542 my $freeze_guard = cf::freeze_mainloop;
3412 3543
… …
3434 warn "end emergency map save\n"; 3565 warn "end emergency map save\n";
3435 3566
3436 warn "begin emergency database checkpoint\n"; 3567 warn "begin emergency database checkpoint\n";
3437 BDB::db_env_txn_checkpoint $DB_ENV; 3568 BDB::db_env_txn_checkpoint $DB_ENV;
3438 warn "end emergency database checkpoint\n"; 3569 warn "end emergency database checkpoint\n";
3570
3571 warn "begin write uuid\n";
3572 write_uuid_sync 1;
3573 warn "end write uuid\n";
3439 }; 3574 };
3440 3575
3441 warn "leave emergency perl save\n"; 3576 warn "leave emergency perl save\n";
3442} 3577}
3443 3578
… …
3458 warn "reloading..."; 3593 warn "reloading...";
3459 3594
3460 warn "entering sync_job"; 3595 warn "entering sync_job";
3461 3596
3462 cf::sync_job { 3597 cf::sync_job {
3463 cf::write_runtime; # external watchdog should not bark 3598 cf::write_runtime_sync; # external watchdog should not bark
3464 cf::emergency_save; 3599 cf::emergency_save;
3465 cf::write_runtime; # external watchdog should not bark 3600 cf::write_runtime_sync; # external watchdog should not bark
3466 3601
3467 warn "syncing database to disk"; 3602 warn "syncing database to disk";
3468 BDB::db_env_txn_checkpoint $DB_ENV; 3603 BDB::db_env_txn_checkpoint $DB_ENV;
3469 3604
3470 # if anything goes wrong in here, we should simply crash as we already saved 3605 # if anything goes wrong in here, we should simply crash as we already saved
… …
3595 3730
3596our @WAIT_FOR_TICK; 3731our @WAIT_FOR_TICK;
3597our @WAIT_FOR_TICK_BEGIN; 3732our @WAIT_FOR_TICK_BEGIN;
3598 3733
3599sub wait_for_tick { 3734sub wait_for_tick {
3600 return unless $TICK_WATCHER->is_active;
3601 return if $Coro::current == $Coro::main; 3735 return if tick_inhibit || $Coro::current == $Coro::main;
3602 3736
3603 my $signal = new Coro::Signal; 3737 my $signal = new Coro::Signal;
3604 push @WAIT_FOR_TICK, $signal; 3738 push @WAIT_FOR_TICK, $signal;
3605 $signal->wait; 3739 $signal->wait;
3606} 3740}
3607 3741
3608sub wait_for_tick_begin { 3742sub wait_for_tick_begin {
3609 return unless $TICK_WATCHER->is_active;
3610 return if $Coro::current == $Coro::main; 3743 return if tick_inhibit || $Coro::current == $Coro::main;
3611 3744
3612 my $signal = new Coro::Signal; 3745 my $signal = new Coro::Signal;
3613 push @WAIT_FOR_TICK_BEGIN, $signal; 3746 push @WAIT_FOR_TICK_BEGIN, $signal;
3614 $signal->wait; 3747 $signal->wait;
3615} 3748}
3616 3749
3617$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 3750sub tick {
3618 if ($Coro::current != $Coro::main) { 3751 if ($Coro::current != $Coro::main) {
3619 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3752 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3620 unless ++$bug_warning > 10; 3753 unless ++$bug_warning > 10;
3621 return; 3754 return;
3622 } 3755 }
3623 3756
3624 $NOW = $tick_start = EV::now;
3625
3626 cf::server_tick; # one server iteration 3757 cf::server_tick; # one server iteration
3627
3628 $RUNTIME += $TICK;
3629 $NEXT_TICK = $_[0]->at;
3630 3758
3631 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3759 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3632 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3760 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3633 Coro::async_pool { 3761 Coro::async_pool {
3634 $Coro::current->{desc} = "runtime saver"; 3762 $Coro::current->{desc} = "runtime saver";
3635 write_runtime 3763 write_runtime_sync
3636 or warn "ERROR: unable to write runtime file: $!"; 3764 or warn "ERROR: unable to write runtime file: $!";
3637 }; 3765 };
3638 } 3766 }
3639 3767
3640 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3768 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
… …
3642 } 3770 }
3643 while (my $sig = shift @WAIT_FOR_TICK) { 3771 while (my $sig = shift @WAIT_FOR_TICK) {
3644 $sig->send; 3772 $sig->send;
3645 } 3773 }
3646 3774
3647 $LOAD = ($NOW - $tick_start) / $TICK; 3775 $LOAD = ($NOW - $TICK_START) / $TICK;
3648 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3776 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3649 3777
3650 _post_tick; 3778 if (0) {
3651}; 3779 if ($NEXT_TICK) {
3652$TICK_WATCHER->priority (EV::MAXPRI); 3780 my $jitter = $TICK_START - $NEXT_TICK;
3781 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3782 warn "jitter $JITTER\n";#d#
3783 }
3784 }
3785}
3653 3786
3654{ 3787{
3655 # configure BDB 3788 # configure BDB
3656 3789
3657 BDB::min_parallel 8; 3790 BDB::min_parallel 8;

Diff Legend

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