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.412 by root, Wed Apr 2 11:13:55 2008 UTC vs.
Revision 1.433 by root, Sat May 10 22:38:52 2008 UTC

… …
25use strict; 25use strict;
26 26
27use Symbol; 27use Symbol;
28use List::Util; 28use List::Util;
29use Socket; 29use Socket;
30use EV 1.86; 30use EV;
31use Opcode; 31use Opcode;
32use Safe; 32use Safe;
33use Safe::Hole; 33use Safe::Hole;
34use Storable (); 34use Storable ();
35 35
36use Coro 4.32 (); 36use Coro ();
37use Coro::State; 37use Coro::State;
38use Coro::Handle; 38use Coro::Handle;
39use Coro::EV; 39use Coro::EV;
40use Coro::Timer; 40use Coro::Timer;
41use Coro::Signal; 41use Coro::Signal;
42use Coro::Semaphore; 42use Coro::Semaphore;
43use Coro::AnyEvent;
43use Coro::AIO; 44use Coro::AIO;
44use Coro::BDB; 45use Coro::BDB;
45use Coro::Storable; 46use Coro::Storable;
46use Coro::Util (); 47use Coro::Util ();
47 48
… …
49use BDB (); 50use BDB ();
50use Data::Dumper; 51use Data::Dumper;
51use Digest::MD5; 52use Digest::MD5;
52use Fcntl; 53use Fcntl;
53use YAML (); 54use YAML ();
54use IO::AIO 2.51 (); 55use IO::AIO ();
55use Time::HiRes; 56use Time::HiRes;
56use Compress::LZF; 57use Compress::LZF;
57use Digest::MD5 (); 58use Digest::MD5 ();
59
60AnyEvent::detect;
58 61
59# configure various modules to our taste 62# configure various modules to our taste
60# 63#
61$Storable::canonical = 1; # reduce rsync transfers 64$Storable::canonical = 1; # reduce rsync transfers
62Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 65Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
… …
90our $RANDOMDIR = "$LOCALDIR/random"; 93our $RANDOMDIR = "$LOCALDIR/random";
91our $BDBDIR = "$LOCALDIR/db"; 94our $BDBDIR = "$LOCALDIR/db";
92our %RESOURCE; 95our %RESOURCE;
93 96
94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 97our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
95our $AIO_POLL_WATCHER;
96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 98our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
97our $NEXT_TICK; 99our $NEXT_TICK;
98our $USE_FSYNC = 1; # use fsync to write maps - default off 100our $USE_FSYNC = 1; # use fsync to write maps - default off
99 101
100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER; 102our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER; 103our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER; 104our $BDB_TRICKLE_WATCHER;
104our $DB_ENV; 105our $DB_ENV;
105 106
… …
427 } 428 }
428 } 429 }
429}; 430};
430 431
431sub get_slot($;$$) { 432sub get_slot($;$$) {
433 return if tick_inhibit || $Coro::current == $Coro::main;
434
432 my ($time, $pri, $name) = @_; 435 my ($time, $pri, $name) = @_;
433 436
434 $time = $TICK * .6 if $time > $TICK * .6; 437 $time = $TICK * .6 if $time > $TICK * .6;
435 my $sig = new Coro::Signal; 438 my $sig = new Coro::Signal;
436 439
… …
547 reset_signals; 550 reset_signals;
548 &$cb 551 &$cb
549 }, @args; 552 }, @args;
550 553
551 wantarray ? @res : $res[-1] 554 wantarray ? @res : $res[-1]
555}
556
557=item $coin = coin_from_name $name
558
559=cut
560
561our %coin_alias = (
562 "silver" => "silvercoin",
563 "silvercoin" => "silvercoin",
564 "silvercoins" => "silvercoin",
565 "gold" => "goldcoin",
566 "goldcoin" => "goldcoin",
567 "goldcoins" => "goldcoin",
568 "platinum" => "platinacoin",
569 "platinumcoin" => "platinacoin",
570 "platinumcoins" => "platinacoin",
571 "platina" => "platinacoin",
572 "platinacoin" => "platinacoin",
573 "platinacoins" => "platinacoin",
574 "royalty" => "royalty",
575 "royalties" => "royalty",
576);
577
578sub coin_from_name($) {
579 $coin_alias{$_[0]}
580 ? cf::arch::find $coin_alias{$_[0]}
581 : undef
552} 582}
553 583
554=item $value = cf::db_get $family => $key 584=item $value = cf::db_get $family => $key
555 585
556Returns a single value from the environment database. 586Returns a single value from the environment database.
… …
1112 utf8::decode (my $decname = $filename); 1142 utf8::decode (my $decname = $filename);
1113 warn sprintf "saving %s (%d,%d)\n", 1143 warn sprintf "saving %s (%d,%d)\n",
1114 $decname, length $$rdata, scalar @$objs; 1144 $decname, length $$rdata, scalar @$objs;
1115 1145
1116 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1146 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1117 chmod SAVE_MODE, $fh; 1147 aio_chmod $fh, SAVE_MODE;
1118 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1148 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1119 aio_fsync $fh if $cf::USE_FSYNC; 1149 aio_fsync $fh if $cf::USE_FSYNC;
1120 close $fh; 1150 aio_close $fh;
1121 1151
1122 if (@$objs) { 1152 if (@$objs) {
1123 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1153 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1124 chmod SAVE_MODE, $fh; 1154 aio_chmod $fh, SAVE_MODE;
1125 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1155 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1126 aio_write $fh, 0, (length $data), $data, 0; 1156 aio_write $fh, 0, (length $data), $data, 0;
1127 aio_fsync $fh if $cf::USE_FSYNC; 1157 aio_fsync $fh if $cf::USE_FSYNC;
1128 close $fh; 1158 aio_close $fh;
1129 aio_rename "$filename.pst~", "$filename.pst"; 1159 aio_rename "$filename.pst~", "$filename.pst";
1130 } 1160 }
1131 } else { 1161 } else {
1132 aio_unlink "$filename.pst"; 1162 aio_unlink "$filename.pst";
1133 } 1163 }
… …
1427 my $f = new_from_file cf::object::thawer path $login 1457 my $f = new_from_file cf::object::thawer path $login
1428 or return; 1458 or return;
1429 1459
1430 my $pl = cf::player::load_pl $f 1460 my $pl = cf::player::load_pl $f
1431 or return; 1461 or return;
1462
1432 local $cf::PLAYER_LOADING{$login} = $pl; 1463 local $cf::PLAYER_LOADING{$login} = $pl;
1433 $f->resolve_delayed_derefs; 1464 $f->resolve_delayed_derefs;
1434 $cf::PLAYER{$login} = $pl 1465 $cf::PLAYER{$login} = $pl
1435 } 1466 }
1436 } 1467 }
… …
1446 1477
1447 return if $pl->{deny_save}; 1478 return if $pl->{deny_save};
1448 1479
1449 aio_mkdir playerdir $pl, 0770; 1480 aio_mkdir playerdir $pl, 0770;
1450 $pl->{last_save} = $cf::RUNTIME; 1481 $pl->{last_save} = $cf::RUNTIME;
1482
1483 cf::get_slot 0.01;
1451 1484
1452 $pl->save_pl ($path); 1485 $pl->save_pl ($path);
1453 cf::cede_to_tick; 1486 cf::cede_to_tick;
1454} 1487}
1455 1488
… …
1491 $pl->{deny_save} = 1; 1524 $pl->{deny_save} = 1;
1492 $pl->password ("*"); # this should lock out the player until we nuked the dir 1525 $pl->password ("*"); # this should lock out the player until we nuked the dir
1493 1526
1494 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1527 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1495 $pl->deactivate; 1528 $pl->deactivate;
1529 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1530 $pl->ob->check_score;
1496 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1531 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1497 $pl->ns->destroy if $pl->ns; 1532 $pl->ns->destroy if $pl->ns;
1498 1533
1499 my $path = playerdir $pl; 1534 my $path = playerdir $pl;
1500 my $temp = "$path~$cf::RUNTIME~deleting~"; 1535 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1539 1574
1540 for my $login (@$dirs) { 1575 for my $login (@$dirs) {
1541 my $path = path $login; 1576 my $path = path $login;
1542 1577
1543 # a .pst is a dead give-away for a valid player 1578 # a .pst is a dead give-away for a valid player
1544 unless (-e "$path.pst") { 1579 # if no pst file found, open and chekc for blocked users
1580 if (aio_stat "$path.pst") {
1545 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1581 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1546 aio_read $fh, 0, 512, my $buf, 0 or next; 1582 aio_read $fh, 0, 512, my $buf, 0 or next;
1547 $buf !~ /^password -------------$/m or next; # official not-valid tag 1583 $buf !~ /^password -------------$/m or next; # official not-valid tag
1548 } 1584 }
1549 1585
… …
1748our $MAX_RESET = 3600; 1784our $MAX_RESET = 3600;
1749our $DEFAULT_RESET = 3000; 1785our $DEFAULT_RESET = 3000;
1750 1786
1751sub generate_random_map { 1787sub generate_random_map {
1752 my ($self, $rmp) = @_; 1788 my ($self, $rmp) = @_;
1789
1790 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1791
1753 # mit "rum" bekleckern, nicht 1792 # mit "rum" bekleckern, nicht
1754 $self->_create_random_map ( 1793 $self->_create_random_map (
1755 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1794 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1756 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1795 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1757 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1796 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1879 1918
1880# the temporary/swap location 1919# the temporary/swap location
1881sub save_path { 1920sub save_path {
1882 my ($self) = @_; 1921 my ($self) = @_;
1883 1922
1884 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1923 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1885 "$TMPDIR/$path.map" 1924 "$TMPDIR/$path.map"
1886} 1925}
1887 1926
1888# the unique path, undef == no special unique path 1927# the unique path, undef == no special unique path
1889sub uniq_path { 1928sub uniq_path {
1890 my ($self) = @_; 1929 my ($self) = @_;
1891 1930
1892 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1931 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1893 "$UNIQUEDIR/$path" 1932 "$UNIQUEDIR/$path"
1894} 1933}
1895 1934
1896# and all this just because we cannot iterate over 1935# and all this just because we cannot iterate over
1897# all maps in C++... 1936# all maps in C++...
… …
1995 2034
1996 cf::lock_wait "map_data:$path";#d#remove 2035 cf::lock_wait "map_data:$path";#d#remove
1997 cf::lock_wait "map_find:$path"; 2036 cf::lock_wait "map_find:$path";
1998 2037
1999 $cf::MAP{$path} || do { 2038 $cf::MAP{$path} || do {
2000 my $guard1 = cf::lock_acquire "map_find:$path";
2001 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it 2039 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2040 my $guard2 = cf::lock_acquire "map_find:$path";
2002 2041
2003 my $map = new_from_path cf::map $path 2042 my $map = new_from_path cf::map $path
2004 or return; 2043 or return;
2005 2044
2006 $map->{last_save} = $cf::RUNTIME; 2045 $map->{last_save} = $cf::RUNTIME;
… …
2009 or return; 2048 or return;
2010 2049
2011 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2050 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2012 # doing this can freeze the server in a sync job, obviously 2051 # doing this can freeze the server in a sync job, obviously
2013 #$cf::WAIT_FOR_TICK->wait; 2052 #$cf::WAIT_FOR_TICK->wait;
2053 undef $guard2;
2014 undef $guard1; 2054 undef $guard1;
2015 undef $guard2;
2016 $map->reset; 2055 $map->reset;
2017 return find $path; 2056 return find $path;
2018 } 2057 }
2019 2058
2020 $cf::MAP{$path} = $map 2059 $cf::MAP{$path} = $map
… …
2083 } 2122 }
2084 2123
2085 $self->{last_save} = $cf::RUNTIME; 2124 $self->{last_save} = $cf::RUNTIME;
2086 $self->last_access ($cf::RUNTIME); 2125 $self->last_access ($cf::RUNTIME);
2087 2126
2088 $self->in_memory (cf::MAP_IN_MEMORY); 2127 $self->in_memory (cf::MAP_ACTIVE);
2089 } 2128 }
2090 2129
2091 $self->post_load; 2130 $self->post_load;
2092} 2131}
2093 2132
… …
2151 my ($path, $origin, $load) = @_; 2190 my ($path, $origin, $load) = @_;
2152 2191
2153 $path = normalise $path, $origin && $origin->{path}; 2192 $path = normalise $path, $origin && $origin->{path};
2154 2193
2155 if (my $map = $cf::MAP{$path}) { 2194 if (my $map = $cf::MAP{$path}) {
2156 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2195 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2157 } 2196 }
2158 2197
2159 $MAP_PREFETCH{$path} |= $load; 2198 $MAP_PREFETCH{$path} |= $load;
2160 2199
2161 $MAP_PREFETCHER ||= cf::async { 2200 $MAP_PREFETCHER ||= cf::async {
… …
2198 cf::async { 2237 cf::async {
2199 $Coro::current->{desc} = "map player save"; 2238 $Coro::current->{desc} = "map player save";
2200 $_->contr->save for $self->players; 2239 $_->contr->save for $self->players;
2201 }; 2240 };
2202 2241
2242 cf::get_slot 0.02;
2243
2203 if ($uniq) { 2244 if ($uniq) {
2204 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2245 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2205 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2246 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2206 } else { 2247 } else {
2207 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2248 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
… …
2215 $self->save; 2256 $self->save;
2216 2257
2217 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2258 my $lock = cf::lock_acquire "map_data:$self->{path}";
2218 2259
2219 return if $self->players; 2260 return if $self->players;
2220 return if $self->in_memory != cf::MAP_IN_MEMORY; 2261 return if $self->in_memory != cf::MAP_ACTIVE;
2221 return if $self->{deny_save}; 2262 return if $self->{deny_save};
2222 2263
2223 $self->in_memory (cf::MAP_SWAPPED); 2264 $self->in_memory (cf::MAP_SWAPPED);
2224 2265
2225 $self->deactivate; 2266 $self->deactivate;
… …
2343 2384
2344sub unique_maps() { 2385sub unique_maps() {
2345 [ 2386 [
2346 map { 2387 map {
2347 utf8::decode $_; 2388 utf8::decode $_;
2348 /\.map$/ 2389 s/\.map$//; # TODO future compatibility hack
2390 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2391 ? ()
2349 ? normalise $_ 2392 : normalise $_
2350 : ()
2351 } @{ aio_readdir $UNIQUEDIR or [] } 2393 } @{ aio_readdir $UNIQUEDIR or [] }
2352 ] 2394 ]
2353} 2395}
2354 2396
2355package cf;
2356
2357=back 2397=back
2358 2398
2359=head3 cf::object 2399=head3 cf::object
2360 2400
2361=cut 2401=cut
… …
2364 2404
2365=over 4 2405=over 4
2366 2406
2367=item $ob->inv_recursive 2407=item $ob->inv_recursive
2368 2408
2369Returns the inventory of the object _and_ their inventories, recursively. 2409Returns the inventory of the object I<and> their inventories, recursively,
2410but I<not> the object itself.
2370 2411
2371=cut 2412=cut
2372 2413
2373sub inv_recursive_; 2414sub inv_recursive_;
2374sub inv_recursive_ { 2415sub inv_recursive_ {
… …
2379 inv_recursive_ inv $_[0] 2420 inv_recursive_ inv $_[0]
2380} 2421}
2381 2422
2382=item $ref = $ob->ref 2423=item $ref = $ob->ref
2383 2424
2384creates and returns a persistent reference to an objetc that can be stored as a string. 2425Creates and returns a persistent reference to an object that can be stored as a string.
2385 2426
2386=item $ob = cf::object::deref ($refstring) 2427=item $ob = cf::object::deref ($refstring)
2387 2428
2388returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2429returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2389even if the object actually exists. May block. 2430even if the object actually exists. May block.
… …
2421can be C<undef>. Does the right thing when the player is currently in a 2462can be C<undef>. Does the right thing when the player is currently in a
2422dialogue with the given NPC character. 2463dialogue with the given NPC character.
2423 2464
2424=cut 2465=cut
2425 2466
2467our $SAY_CHANNEL = {
2468 id => "say",
2469 title => "Map",
2470 reply => "say ",
2471 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2472};
2473
2474our $CHAT_CHANNEL = {
2475 id => "chat",
2476 title => "Chat",
2477 reply => "chat ",
2478 tooltip => "Player chat and shouts, global to the server.",
2479};
2480
2426# rough implementation of a future "reply" method that works 2481# rough implementation of a future "reply" method that works
2427# with dialog boxes. 2482# with dialog boxes.
2428#TODO: the first argument must go, split into a $npc->reply_to ( method 2483#TODO: the first argument must go, split into a $npc->reply_to ( method
2429sub cf::object::player::reply($$$;$) { 2484sub cf::object::player::reply($$$;$) {
2430 my ($self, $npc, $msg, $flags) = @_; 2485 my ($self, $npc, $msg, $flags) = @_;
… …
2441 my $dialog = $pl->{npc_dialog}; 2496 my $dialog = $pl->{npc_dialog};
2442 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2497 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2443 2498
2444 } else { 2499 } else {
2445 $msg = $npc->name . " says: $msg" if $npc; 2500 $msg = $npc->name . " says: $msg" if $npc;
2446 $self->message ($msg, $flags); 2501 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2447 } 2502 }
2448 } 2503 }
2449} 2504}
2450 2505
2451=item $object->send_msg ($channel, $msg, $color, [extra...]) 2506=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2646} 2701}
2647 2702
2648sub prepare_random_map { 2703sub prepare_random_map {
2649 my ($exit) = @_; 2704 my ($exit) = @_;
2650 2705
2651 my $guard = cf::lock_acquire "exit_prepare:$exit";
2652
2653 # all this does is basically replace the /! path by 2706 # all this does is basically replace the /! path by
2654 # a new random map path (?random/...) with a seed 2707 # a new random map path (?random/...) with a seed
2655 # that depends on the exit object 2708 # that depends on the exit object
2656 2709
2657 my $rmp = parse_random_map_params $exit->msg; 2710 my $rmp = parse_random_map_params $exit->msg;
… …
2659 if ($exit->map) { 2712 if ($exit->map) {
2660 $rmp->{region} = $exit->region->name; 2713 $rmp->{region} = $exit->region->name;
2661 $rmp->{origin_map} = $exit->map->path; 2714 $rmp->{origin_map} = $exit->map->path;
2662 $rmp->{origin_x} = $exit->x; 2715 $rmp->{origin_x} = $exit->x;
2663 $rmp->{origin_y} = $exit->y; 2716 $rmp->{origin_y} = $exit->y;
2717
2718 $exit->map->touch;
2664 } 2719 }
2665 2720
2666 $rmp->{random_seed} ||= $exit->random_seed; 2721 $rmp->{random_seed} ||= $exit->random_seed;
2667 2722
2668 my $data = cf::encode_json $rmp; 2723 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2669 my $md5 = Digest::MD5::md5_hex $data; 2724 my $md5 = Digest::MD5::md5_hex $data;
2670 my $meta = "$RANDOMDIR/$md5.meta"; 2725 my $meta = "$RANDOMDIR/$md5.meta";
2671 2726
2672 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2727 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2673 aio_write $fh, 0, (length $data), $data, 0; 2728 aio_write $fh, 0, (length $data), $data, 0;
2674 undef $fh; 2729 undef $fh;
2675 aio_rename "$meta~", $meta; 2730 aio_rename "$meta~", $meta;
2676 2731
2732 my $slaying = "?random/$md5";
2733
2734 if ($exit->valid) {
2677 $exit->slaying ("?random/$md5"); 2735 $exit->slaying ("?random/$md5");
2678 $exit->msg (undef); 2736 $exit->msg (undef);
2737 }
2679 } 2738 }
2680} 2739}
2681 2740
2682sub cf::object::player::enter_exit { 2741sub cf::object::player::enter_exit {
2683 my ($self, $exit) = @_; 2742 my ($self, $exit) = @_;
2684 2743
2685 return unless $self->type == cf::PLAYER; 2744 return unless $self->type == cf::PLAYER;
2686 2745
2687 if ($exit->slaying eq "/!") {
2688 #TODO: this should de-fi-ni-te-ly not be a sync-job
2689 # the problem is that $exit might not survive long enough
2690 # so it needs to be done right now, right here
2691 cf::sync_job { prepare_random_map $exit };
2692 }
2693
2694 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2695 my $hp = $exit->stats->hp;
2696 my $sp = $exit->stats->sp;
2697
2698 $self->enter_link; 2746 $self->enter_link;
2699 2747
2700 # if exit is damned, update players death & WoR home-position
2701 $self->contr->savebed ($slaying, $hp, $sp)
2702 if $exit->flag (FLAG_DAMNED);
2703
2704 (async { 2748 (async {
2705 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2749 $Coro::current->{desc} = "enter_exit";
2706 2750
2707 $self->deactivate_recursive; # just to be sure
2708 unless (eval { 2751 unless (eval {
2752 $self->deactivate_recursive; # just to be sure
2753
2754 # random map handling
2755 {
2756 my $guard = cf::lock_acquire "exit_prepare:$exit";
2757
2758 prepare_random_map $exit
2759 if $exit->slaying eq "/!";
2760 }
2761
2762 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2763 my $x = $exit->stats->hp;
2764 my $y = $exit->stats->sp;
2765
2709 $self->goto ($slaying, $hp, $sp); 2766 $self->goto ($map, $x, $y);
2710 2767
2768 # if exit is damned, update players death & WoR home-position
2769 $self->contr->savebed ($map, $x, $y)
2770 if $exit->flag (cf::FLAG_DAMNED);
2771
2711 1; 2772 1
2712 }) { 2773 }) {
2713 $self->message ("Something went wrong deep within the crossfire server. " 2774 $self->message ("Something went wrong deep within the crossfire server. "
2714 . "I'll try to bring you back to the map you were before. " 2775 . "I'll try to bring you back to the map you were before. "
2715 . "Please report this to the dungeon master!", 2776 . "Please report this to the dungeon master!",
2716 cf::NDI_UNIQUE | cf::NDI_RED); 2777 cf::NDI_UNIQUE | cf::NDI_RED);
… …
2796 id => "infobox", 2857 id => "infobox",
2797 title => "Map Info", 2858 title => "Map Info",
2798 reply => undef, 2859 reply => undef,
2799 tooltip => "Information related to the maps", 2860 tooltip => "Information related to the maps",
2800 }, 2861 },
2862 "c/party" => {
2863 id => "party",
2864 title => "Party",
2865 reply => "gsay ",
2866 tooltip => "Messages and chat related to your party",
2867 },
2801); 2868);
2802 2869
2803sub cf::client::send_msg { 2870sub cf::client::send_msg {
2804 my ($self, $channel, $msg, $color, @extra) = @_; 2871 my ($self, $channel, $msg, $color, @extra) = @_;
2805 2872
… …
3042 3109
3043The following functions and methods are available within a safe environment: 3110The following functions and methods are available within a safe environment:
3044 3111
3045 cf::object 3112 cf::object
3046 contr pay_amount pay_player map x y force_find force_add destroy 3113 contr pay_amount pay_player map x y force_find force_add destroy
3047 insert remove name archname title slaying race decrease_ob_nr 3114 insert remove name archname title slaying race decrease split
3048 3115
3049 cf::object::player 3116 cf::object::player
3050 player 3117 player
3051 3118
3052 cf::player 3119 cf::player
… …
3057 3124
3058=cut 3125=cut
3059 3126
3060for ( 3127for (
3061 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3128 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3062 insert remove inv name archname title slaying race 3129 insert remove inv nrof name archname title slaying race
3063 decrease_ob_nr destroy)], 3130 decrease split destroy)],
3064 ["cf::object::player" => qw(player)], 3131 ["cf::object::player" => qw(player)],
3065 ["cf::player" => qw(peaceful)], 3132 ["cf::player" => qw(peaceful)],
3066 ["cf::map" => qw(trigger)], 3133 ["cf::map" => qw(trigger)],
3067) { 3134) {
3068 no strict 'refs'; 3135 no strict 'refs';
… …
3276 while (my ($k, $v) = each %$want) { 3343 while (my ($k, $v) = each %$want) {
3277 $ns->fx_want ($k, $v); 3344 $ns->fx_want ($k, $v);
3278 } 3345 }
3279}; 3346};
3280 3347
3348sub load_resource_file($) {
3349 my $guard = lock_acquire "load_resource_file";
3350
3351 my $status = load_resource_file_ $_[0];
3352 get_slot 0.1, 100;
3353 cf::arch::commit_load;
3354
3355 $status
3356}
3357
3281sub reload_regions { 3358sub reload_regions {
3282 # HACK to clear player env face cache, we need some signal framework 3359 # HACK to clear player env face cache, we need some signal framework
3283 # for this (global event?) 3360 # for this (global event?)
3284 %ext::player_env::MUSIC_FACE_CACHE = (); 3361 %ext::player_env::MUSIC_FACE_CACHE = ();
3285 3362
… …
3298} 3375}
3299 3376
3300sub reload_archetypes { 3377sub reload_archetypes {
3301 load_resource_file "$DATADIR/archetypes" 3378 load_resource_file "$DATADIR/archetypes"
3302 or die "unable to load archetypes\n"; 3379 or die "unable to load archetypes\n";
3303 #d# NEED to laod twice to resolve forward references
3304 # this really needs to be done in an extra post-pass
3305 # (which needs to be synchronous, so solve it differently)
3306 load_resource_file "$DATADIR/archetypes"
3307 or die "unable to load archetypes\n";
3308} 3380}
3309 3381
3310sub reload_treasures { 3382sub reload_treasures {
3311 load_resource_file "$DATADIR/treasures" 3383 load_resource_file "$DATADIR/treasures"
3312 or die "unable to load treasurelists\n"; 3384 or die "unable to load treasurelists\n";
3313} 3385}
3314 3386
3315sub reload_resources { 3387sub reload_resources {
3316 warn "reloading resource files...\n"; 3388 warn "reloading resource files...\n";
3317 3389
3390 reload_facedata;
3391 reload_archetypes;
3318 reload_regions; 3392 reload_regions;
3319 reload_facedata;
3320 #reload_archetypes;#d#
3321 reload_archetypes;
3322 reload_treasures; 3393 reload_treasures;
3323 3394
3324 warn "finished reloading resource files\n"; 3395 warn "finished reloading resource files\n";
3325} 3396}
3326 3397
3327sub init { 3398sub init {
3399 my $guard = freeze_mainloop;
3400
3328 reload_resources; 3401 reload_resources;
3329} 3402}
3330 3403
3331sub reload_config { 3404sub reload_config {
3332 open my $fh, "<:utf8", "$CONFDIR/config" 3405 open my $fh, "<:utf8", "$CONFDIR/config"
… …
3357 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3430 $Coro::current->{desc} = "IDLE BUG HANDLER";
3358 EV::loop EV::LOOP_ONESHOT; 3431 EV::loop EV::LOOP_ONESHOT;
3359 })->prio (Coro::PRIO_MAX); 3432 })->prio (Coro::PRIO_MAX);
3360 }; 3433 };
3361 3434
3435 {
3436 my $guard = freeze_mainloop;
3362 reload_config; 3437 reload_config;
3363 db_init; 3438 db_init;
3364 load_extensions; 3439 load_extensions;
3365 3440
3366 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3441 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3367 evthread_start; 3442 evthread_start IO::AIO::poll_fileno;
3443 }
3444
3368 EV::loop; 3445 EV::loop;
3369} 3446}
3370 3447
3371############################################################################# 3448#############################################################################
3372# initialisation and cleanup 3449# initialisation and cleanup
… …
3379 cf::cleanup "SIG$signal"; 3456 cf::cleanup "SIG$signal";
3380 }; 3457 };
3381 } 3458 }
3382} 3459}
3383 3460
3384sub write_runtime { 3461sub write_runtime_sync {
3385 my $runtime = "$LOCALDIR/runtime"; 3462 my $runtime = "$LOCALDIR/runtime";
3386 3463
3387 # first touch the runtime file to show we are still running: 3464 # first touch the runtime file to show we are still running:
3388 # the fsync below can take a very very long time. 3465 # the fsync below can take a very very long time.
3389 3466
… …
3415 and return; 3492 and return;
3416 3493
3417 warn "runtime file written.\n"; 3494 warn "runtime file written.\n";
3418 3495
3419 1 3496 1
3497}
3498
3499our $uuid_lock;
3500our $uuid_skip;
3501
3502sub write_uuid_sync($) {
3503 $uuid_skip ||= $_[0];
3504
3505 return if $uuid_lock;
3506 local $uuid_lock = 1;
3507
3508 my $uuid = "$LOCALDIR/uuid";
3509
3510 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3511 or return;
3512
3513 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3514 $uuid_skip = 0;
3515
3516 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3517 and return;
3518
3519 # always fsync - this file is important
3520 aio_fsync $fh
3521 and return;
3522
3523 close $fh
3524 or return;
3525
3526 aio_rename "$uuid~", $uuid
3527 and return;
3528
3529 warn "uuid file written ($value).\n";
3530
3531 1
3532
3533}
3534
3535sub write_uuid($$) {
3536 my ($skip, $sync) = @_;
3537
3538 $sync ? write_uuid_sync $skip
3539 : async { write_uuid_sync $skip };
3420} 3540}
3421 3541
3422sub emergency_save() { 3542sub emergency_save() {
3423 my $freeze_guard = cf::freeze_mainloop; 3543 my $freeze_guard = cf::freeze_mainloop;
3424 3544
… …
3446 warn "end emergency map save\n"; 3566 warn "end emergency map save\n";
3447 3567
3448 warn "begin emergency database checkpoint\n"; 3568 warn "begin emergency database checkpoint\n";
3449 BDB::db_env_txn_checkpoint $DB_ENV; 3569 BDB::db_env_txn_checkpoint $DB_ENV;
3450 warn "end emergency database checkpoint\n"; 3570 warn "end emergency database checkpoint\n";
3571
3572 warn "begin write uuid\n";
3573 write_uuid_sync 1;
3574 warn "end write uuid\n";
3451 }; 3575 };
3452 3576
3453 warn "leave emergency perl save\n"; 3577 warn "leave emergency perl save\n";
3454} 3578}
3455 3579
… …
3470 warn "reloading..."; 3594 warn "reloading...";
3471 3595
3472 warn "entering sync_job"; 3596 warn "entering sync_job";
3473 3597
3474 cf::sync_job { 3598 cf::sync_job {
3475 cf::write_runtime; # external watchdog should not bark 3599 cf::write_runtime_sync; # external watchdog should not bark
3476 cf::emergency_save; 3600 cf::emergency_save;
3477 cf::write_runtime; # external watchdog should not bark 3601 cf::write_runtime_sync; # external watchdog should not bark
3478 3602
3479 warn "syncing database to disk"; 3603 warn "syncing database to disk";
3480 BDB::db_env_txn_checkpoint $DB_ENV; 3604 BDB::db_env_txn_checkpoint $DB_ENV;
3481 3605
3482 # if anything goes wrong in here, we should simply crash as we already saved 3606 # if anything goes wrong in here, we should simply crash as we already saved
… …
3607 3731
3608our @WAIT_FOR_TICK; 3732our @WAIT_FOR_TICK;
3609our @WAIT_FOR_TICK_BEGIN; 3733our @WAIT_FOR_TICK_BEGIN;
3610 3734
3611sub wait_for_tick { 3735sub wait_for_tick {
3612 return if tick_inhibit;
3613 return if $Coro::current == $Coro::main; 3736 return if tick_inhibit || $Coro::current == $Coro::main;
3614 3737
3615 my $signal = new Coro::Signal; 3738 my $signal = new Coro::Signal;
3616 push @WAIT_FOR_TICK, $signal; 3739 push @WAIT_FOR_TICK, $signal;
3617 $signal->wait; 3740 $signal->wait;
3618} 3741}
3619 3742
3620sub wait_for_tick_begin { 3743sub wait_for_tick_begin {
3621 return if tick_inhibit;
3622 return if $Coro::current == $Coro::main; 3744 return if tick_inhibit || $Coro::current == $Coro::main;
3623 3745
3624 my $signal = new Coro::Signal; 3746 my $signal = new Coro::Signal;
3625 push @WAIT_FOR_TICK_BEGIN, $signal; 3747 push @WAIT_FOR_TICK_BEGIN, $signal;
3626 $signal->wait; 3748 $signal->wait;
3627} 3749}
… …
3637 3759
3638 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3760 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3639 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3761 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3640 Coro::async_pool { 3762 Coro::async_pool {
3641 $Coro::current->{desc} = "runtime saver"; 3763 $Coro::current->{desc} = "runtime saver";
3642 write_runtime 3764 write_runtime_sync
3643 or warn "ERROR: unable to write runtime file: $!"; 3765 or warn "ERROR: unable to write runtime file: $!";
3644 }; 3766 };
3645 } 3767 }
3646 3768
3647 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3769 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
… …
3666{ 3788{
3667 # configure BDB 3789 # configure BDB
3668 3790
3669 BDB::min_parallel 8; 3791 BDB::min_parallel 8;
3670 BDB::max_poll_reqs $TICK * 0.1; 3792 BDB::max_poll_reqs $TICK * 0.1;
3671 $Coro::BDB::WATCHER->priority (1); 3793 $AnyEvent::BDB::WATCHER->priority (1);
3672 3794
3673 unless ($DB_ENV) { 3795 unless ($DB_ENV) {
3674 $DB_ENV = BDB::db_env_create; 3796 $DB_ENV = BDB::db_env_create;
3675 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3797 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3676 | BDB::LOG_AUTOREMOVE, 1); 3798 | BDB::LOG_AUTOREMOVE, 1);
… …
3707{ 3829{
3708 # configure IO::AIO 3830 # configure IO::AIO
3709 3831
3710 IO::AIO::min_parallel 8; 3832 IO::AIO::min_parallel 8;
3711 IO::AIO::max_poll_time $TICK * 0.1; 3833 IO::AIO::max_poll_time $TICK * 0.1;
3712 $Coro::AIO::WATCHER->priority (1); 3834 $AnyEvent::AIO::WATCHER->priority (1);
3713} 3835}
3714 3836
3715my $_log_backtrace; 3837my $_log_backtrace;
3716 3838
3717sub _log_backtrace { 3839sub _log_backtrace {

Diff Legend

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