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.413 by root, Sun Apr 6 16:13:20 2008 UTC vs.
Revision 1.439 by root, Mon Jul 14 16:42:49 2008 UTC

… …
25use strict; 25use strict;
26 26
27use Symbol; 27use Symbol;
28use List::Util; 28use List::Util;
29use Socket; 29use Socket;
30use EV 3.2; 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::AnyEvent;
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 1.6;
45use Coro::Storable; 46use Coro::Storable;
46use Coro::Util (); 47use Coro::Util ();
47 48
48use JSON::XS 2.01 (); 49use JSON::XS 2.01 ();
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
… …
2047 my $f = new_from_file cf::object::thawer $self->{load_path}; 2086 my $f = new_from_file cf::object::thawer $self->{load_path};
2048 $f->skip_block; 2087 $f->skip_block;
2049 $self->_load_objects ($f) 2088 $self->_load_objects ($f)
2050 or return; 2089 or return;
2051 2090
2052 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2091 $self->post_load_original
2053 if delete $self->{load_original}; 2092 if delete $self->{load_original};
2054 2093
2055 if (my $uniq = $self->uniq_path) { 2094 if (my $uniq = $self->uniq_path) {
2056 utf8::encode $uniq; 2095 utf8::encode $uniq;
2057 unless (aio_stat $uniq) { 2096 unless (aio_stat $uniq) {
… …
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...])
… …
2558Moves the player to the given map-path and coordinates by first freezing 2613Moves the player to the given map-path and coordinates by first freezing
2559her, loading and preparing them map, calling the provided $check callback 2614her, loading and preparing them map, calling the provided $check callback
2560that has to return the map if sucecssful, and then unfreezes the player on 2615that has to return the map if sucecssful, and then unfreezes the player on
2561the new (success) or old (failed) map position. In either case, $done will 2616the new (success) or old (failed) map position. In either case, $done will
2562be called at the end of this process. 2617be called at the end of this process.
2618
2619Note that $check will be called with a potentially non-loaded map, so if
2620it needs a loaded map it has to call C<< ->load >>.
2563 2621
2564=cut 2622=cut
2565 2623
2566our $GOTOGEN; 2624our $GOTOGEN;
2567 2625
… …
2646} 2704}
2647 2705
2648sub prepare_random_map { 2706sub prepare_random_map {
2649 my ($exit) = @_; 2707 my ($exit) = @_;
2650 2708
2651 my $guard = cf::lock_acquire "exit_prepare:$exit";
2652
2653 # all this does is basically replace the /! path by 2709 # all this does is basically replace the /! path by
2654 # a new random map path (?random/...) with a seed 2710 # a new random map path (?random/...) with a seed
2655 # that depends on the exit object 2711 # that depends on the exit object
2656 2712
2657 my $rmp = parse_random_map_params $exit->msg; 2713 my $rmp = parse_random_map_params $exit->msg;
… …
2659 if ($exit->map) { 2715 if ($exit->map) {
2660 $rmp->{region} = $exit->region->name; 2716 $rmp->{region} = $exit->region->name;
2661 $rmp->{origin_map} = $exit->map->path; 2717 $rmp->{origin_map} = $exit->map->path;
2662 $rmp->{origin_x} = $exit->x; 2718 $rmp->{origin_x} = $exit->x;
2663 $rmp->{origin_y} = $exit->y; 2719 $rmp->{origin_y} = $exit->y;
2720
2721 $exit->map->touch;
2664 } 2722 }
2665 2723
2666 $rmp->{random_seed} ||= $exit->random_seed; 2724 $rmp->{random_seed} ||= $exit->random_seed;
2667 2725
2668 my $data = cf::encode_json $rmp; 2726 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2669 my $md5 = Digest::MD5::md5_hex $data; 2727 my $md5 = Digest::MD5::md5_hex $data;
2670 my $meta = "$RANDOMDIR/$md5.meta"; 2728 my $meta = "$RANDOMDIR/$md5.meta";
2671 2729
2672 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2730 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2673 aio_write $fh, 0, (length $data), $data, 0; 2731 aio_write $fh, 0, (length $data), $data, 0;
2674 undef $fh; 2732 undef $fh;
2675 aio_rename "$meta~", $meta; 2733 aio_rename "$meta~", $meta;
2676 2734
2735 my $slaying = "?random/$md5";
2736
2737 if ($exit->valid) {
2677 $exit->slaying ("?random/$md5"); 2738 $exit->slaying ("?random/$md5");
2678 $exit->msg (undef); 2739 $exit->msg (undef);
2740 }
2679 } 2741 }
2680} 2742}
2681 2743
2682sub cf::object::player::enter_exit { 2744sub cf::object::player::enter_exit {
2683 my ($self, $exit) = @_; 2745 my ($self, $exit) = @_;
2684 2746
2685 return unless $self->type == cf::PLAYER; 2747 return unless $self->type == cf::PLAYER;
2686 2748
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; 2749 $self->enter_link;
2699 2750
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 { 2751 (async {
2705 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2752 $Coro::current->{desc} = "enter_exit";
2706 2753
2707 $self->deactivate_recursive; # just to be sure
2708 unless (eval { 2754 unless (eval {
2755 $self->deactivate_recursive; # just to be sure
2756
2757 # random map handling
2758 {
2759 my $guard = cf::lock_acquire "exit_prepare:$exit";
2760
2761 prepare_random_map $exit
2762 if $exit->slaying eq "/!";
2763 }
2764
2765 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2766 my $x = $exit->stats->hp;
2767 my $y = $exit->stats->sp;
2768
2709 $self->goto ($slaying, $hp, $sp); 2769 $self->goto ($map, $x, $y);
2710 2770
2771 # if exit is damned, update players death & WoR home-position
2772 $self->contr->savebed ($map, $x, $y)
2773 if $exit->flag (cf::FLAG_DAMNED);
2774
2711 1; 2775 1
2712 }) { 2776 }) {
2713 $self->message ("Something went wrong deep within the crossfire server. " 2777 $self->message ("Something went wrong deep within the crossfire server. "
2714 . "I'll try to bring you back to the map you were before. " 2778 . "I'll try to bring you back to the map you were before. "
2715 . "Please report this to the dungeon master!", 2779 . "Please report this to the dungeon master!",
2716 cf::NDI_UNIQUE | cf::NDI_RED); 2780 cf::NDI_UNIQUE | cf::NDI_RED);
… …
2796 id => "infobox", 2860 id => "infobox",
2797 title => "Map Info", 2861 title => "Map Info",
2798 reply => undef, 2862 reply => undef,
2799 tooltip => "Information related to the maps", 2863 tooltip => "Information related to the maps",
2800 }, 2864 },
2865 "c/party" => {
2866 id => "party",
2867 title => "Party",
2868 reply => "gsay ",
2869 tooltip => "Messages and chat related to your party",
2870 },
2801); 2871);
2802 2872
2803sub cf::client::send_msg { 2873sub cf::client::send_msg {
2804 my ($self, $channel, $msg, $color, @extra) = @_; 2874 my ($self, $channel, $msg, $color, @extra) = @_;
2805 2875
… …
3042 3112
3043The following functions and methods are available within a safe environment: 3113The following functions and methods are available within a safe environment:
3044 3114
3045 cf::object 3115 cf::object
3046 contr pay_amount pay_player map x y force_find force_add destroy 3116 contr pay_amount pay_player map x y force_find force_add destroy
3047 insert remove name archname title slaying race decrease_ob_nr 3117 insert remove name archname title slaying race decrease split
3048 3118
3049 cf::object::player 3119 cf::object::player
3050 player 3120 player
3051 3121
3052 cf::player 3122 cf::player
… …
3057 3127
3058=cut 3128=cut
3059 3129
3060for ( 3130for (
3061 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3131 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3062 insert remove inv name archname title slaying race 3132 insert remove inv nrof name archname title slaying race
3063 decrease_ob_nr destroy)], 3133 decrease split destroy change_exp)],
3064 ["cf::object::player" => qw(player)], 3134 ["cf::object::player" => qw(player)],
3065 ["cf::player" => qw(peaceful)], 3135 ["cf::player" => qw(peaceful)],
3066 ["cf::map" => qw(trigger)], 3136 ["cf::map" => qw(trigger)],
3067) { 3137) {
3068 no strict 'refs'; 3138 no strict 'refs';
… …
3276 while (my ($k, $v) = each %$want) { 3346 while (my ($k, $v) = each %$want) {
3277 $ns->fx_want ($k, $v); 3347 $ns->fx_want ($k, $v);
3278 } 3348 }
3279}; 3349};
3280 3350
3351sub load_resource_file($) {
3352 my $guard = lock_acquire "load_resource_file";
3353
3354 my $status = load_resource_file_ $_[0];
3355 get_slot 0.1, 100;
3356 cf::arch::commit_load;
3357
3358 $status
3359}
3360
3281sub reload_regions { 3361sub reload_regions {
3282 # HACK to clear player env face cache, we need some signal framework 3362 # HACK to clear player env face cache, we need some signal framework
3283 # for this (global event?) 3363 # for this (global event?)
3284 %ext::player_env::MUSIC_FACE_CACHE = (); 3364 %ext::player_env::MUSIC_FACE_CACHE = ();
3285 3365
… …
3298} 3378}
3299 3379
3300sub reload_archetypes { 3380sub reload_archetypes {
3301 load_resource_file "$DATADIR/archetypes" 3381 load_resource_file "$DATADIR/archetypes"
3302 or die "unable to load archetypes\n"; 3382 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} 3383}
3309 3384
3310sub reload_treasures { 3385sub reload_treasures {
3311 load_resource_file "$DATADIR/treasures" 3386 load_resource_file "$DATADIR/treasures"
3312 or die "unable to load treasurelists\n"; 3387 or die "unable to load treasurelists\n";
3313} 3388}
3314 3389
3315sub reload_resources { 3390sub reload_resources {
3316 warn "reloading resource files...\n"; 3391 warn "reloading resource files...\n";
3317 3392
3393 reload_facedata;
3394 reload_archetypes;
3318 reload_regions; 3395 reload_regions;
3319 reload_facedata;
3320 #reload_archetypes;#d#
3321 reload_archetypes;
3322 reload_treasures; 3396 reload_treasures;
3323 3397
3324 warn "finished reloading resource files\n"; 3398 warn "finished reloading resource files\n";
3325} 3399}
3326 3400
3327sub init { 3401sub init {
3402 my $guard = freeze_mainloop;
3403
3404 evthread_start IO::AIO::poll_fileno;
3405
3328 reload_resources; 3406 reload_resources;
3329} 3407}
3330 3408
3331sub reload_config { 3409sub reload_config {
3332 open my $fh, "<:utf8", "$CONFDIR/config" 3410 open my $fh, "<:utf8", "$CONFDIR/config"
… …
3357 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3435 $Coro::current->{desc} = "IDLE BUG HANDLER";
3358 EV::loop EV::LOOP_ONESHOT; 3436 EV::loop EV::LOOP_ONESHOT;
3359 })->prio (Coro::PRIO_MAX); 3437 })->prio (Coro::PRIO_MAX);
3360 }; 3438 };
3361 3439
3440 {
3441 my $guard = freeze_mainloop;
3362 reload_config; 3442 reload_config;
3363 db_init; 3443 db_init;
3364 load_extensions; 3444 load_extensions;
3365 3445
3366 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3446 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3367 evthread_start IO::AIO::poll_fileno; 3447 }
3448
3368 EV::loop; 3449 EV::loop;
3369} 3450}
3370 3451
3371############################################################################# 3452#############################################################################
3372# initialisation and cleanup 3453# initialisation and cleanup
… …
3379 cf::cleanup "SIG$signal"; 3460 cf::cleanup "SIG$signal";
3380 }; 3461 };
3381 } 3462 }
3382} 3463}
3383 3464
3384sub write_runtime { 3465sub write_runtime_sync {
3385 my $runtime = "$LOCALDIR/runtime"; 3466 my $runtime = "$LOCALDIR/runtime";
3386 3467
3387 # first touch the runtime file to show we are still running: 3468 # first touch the runtime file to show we are still running:
3388 # the fsync below can take a very very long time. 3469 # the fsync below can take a very very long time.
3389 3470
… …
3415 and return; 3496 and return;
3416 3497
3417 warn "runtime file written.\n"; 3498 warn "runtime file written.\n";
3418 3499
3419 1 3500 1
3501}
3502
3503our $uuid_lock;
3504our $uuid_skip;
3505
3506sub write_uuid_sync($) {
3507 $uuid_skip ||= $_[0];
3508
3509 return if $uuid_lock;
3510 local $uuid_lock = 1;
3511
3512 my $uuid = "$LOCALDIR/uuid";
3513
3514 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3515 or return;
3516
3517 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3518 $uuid_skip = 0;
3519
3520 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3521 and return;
3522
3523 # always fsync - this file is important
3524 aio_fsync $fh
3525 and return;
3526
3527 close $fh
3528 or return;
3529
3530 aio_rename "$uuid~", $uuid
3531 and return;
3532
3533 warn "uuid file written ($value).\n";
3534
3535 1
3536
3537}
3538
3539sub write_uuid($$) {
3540 my ($skip, $sync) = @_;
3541
3542 $sync ? write_uuid_sync $skip
3543 : async { write_uuid_sync $skip };
3420} 3544}
3421 3545
3422sub emergency_save() { 3546sub emergency_save() {
3423 my $freeze_guard = cf::freeze_mainloop; 3547 my $freeze_guard = cf::freeze_mainloop;
3424 3548
… …
3446 warn "end emergency map save\n"; 3570 warn "end emergency map save\n";
3447 3571
3448 warn "begin emergency database checkpoint\n"; 3572 warn "begin emergency database checkpoint\n";
3449 BDB::db_env_txn_checkpoint $DB_ENV; 3573 BDB::db_env_txn_checkpoint $DB_ENV;
3450 warn "end emergency database checkpoint\n"; 3574 warn "end emergency database checkpoint\n";
3575
3576 warn "begin write uuid\n";
3577 write_uuid_sync 1;
3578 warn "end write uuid\n";
3451 }; 3579 };
3452 3580
3453 warn "leave emergency perl save\n"; 3581 warn "leave emergency perl save\n";
3454} 3582}
3455 3583
… …
3470 warn "reloading..."; 3598 warn "reloading...";
3471 3599
3472 warn "entering sync_job"; 3600 warn "entering sync_job";
3473 3601
3474 cf::sync_job { 3602 cf::sync_job {
3475 cf::write_runtime; # external watchdog should not bark 3603 cf::write_runtime_sync; # external watchdog should not bark
3476 cf::emergency_save; 3604 cf::emergency_save;
3477 cf::write_runtime; # external watchdog should not bark 3605 cf::write_runtime_sync; # external watchdog should not bark
3478 3606
3479 warn "syncing database to disk"; 3607 warn "syncing database to disk";
3480 BDB::db_env_txn_checkpoint $DB_ENV; 3608 BDB::db_env_txn_checkpoint $DB_ENV;
3481 3609
3482 # if anything goes wrong in here, we should simply crash as we already saved 3610 # if anything goes wrong in here, we should simply crash as we already saved
… …
3607 3735
3608our @WAIT_FOR_TICK; 3736our @WAIT_FOR_TICK;
3609our @WAIT_FOR_TICK_BEGIN; 3737our @WAIT_FOR_TICK_BEGIN;
3610 3738
3611sub wait_for_tick { 3739sub wait_for_tick {
3612 return if tick_inhibit;
3613 return if $Coro::current == $Coro::main; 3740 return if tick_inhibit || $Coro::current == $Coro::main;
3614 3741
3615 my $signal = new Coro::Signal; 3742 my $signal = new Coro::Signal;
3616 push @WAIT_FOR_TICK, $signal; 3743 push @WAIT_FOR_TICK, $signal;
3617 $signal->wait; 3744 $signal->wait;
3618} 3745}
3619 3746
3620sub wait_for_tick_begin { 3747sub wait_for_tick_begin {
3621 return if tick_inhibit;
3622 return if $Coro::current == $Coro::main; 3748 return if tick_inhibit || $Coro::current == $Coro::main;
3623 3749
3624 my $signal = new Coro::Signal; 3750 my $signal = new Coro::Signal;
3625 push @WAIT_FOR_TICK_BEGIN, $signal; 3751 push @WAIT_FOR_TICK_BEGIN, $signal;
3626 $signal->wait; 3752 $signal->wait;
3627} 3753}
… …
3637 3763
3638 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3764 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3639 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3765 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3640 Coro::async_pool { 3766 Coro::async_pool {
3641 $Coro::current->{desc} = "runtime saver"; 3767 $Coro::current->{desc} = "runtime saver";
3642 write_runtime 3768 write_runtime_sync
3643 or warn "ERROR: unable to write runtime file: $!"; 3769 or warn "ERROR: unable to write runtime file: $!";
3644 }; 3770 };
3645 } 3771 }
3646 3772
3647 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3773 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
… …
3666{ 3792{
3667 # configure BDB 3793 # configure BDB
3668 3794
3669 BDB::min_parallel 8; 3795 BDB::min_parallel 8;
3670 BDB::max_poll_reqs $TICK * 0.1; 3796 BDB::max_poll_reqs $TICK * 0.1;
3671 $Coro::BDB::WATCHER->priority (1); 3797 $AnyEvent::BDB::WATCHER->priority (1);
3672 3798
3673 unless ($DB_ENV) { 3799 unless ($DB_ENV) {
3674 $DB_ENV = BDB::db_env_create; 3800 $DB_ENV = BDB::db_env_create;
3675 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3801 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3676 | BDB::LOG_AUTOREMOVE, 1); 3802 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3803 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3677 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3804 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3678 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3805 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3679 3806
3680 cf::sync_job { 3807 cf::sync_job {
3681 eval { 3808 eval {
… …
3707{ 3834{
3708 # configure IO::AIO 3835 # configure IO::AIO
3709 3836
3710 IO::AIO::min_parallel 8; 3837 IO::AIO::min_parallel 8;
3711 IO::AIO::max_poll_time $TICK * 0.1; 3838 IO::AIO::max_poll_time $TICK * 0.1;
3712 $Coro::AIO::WATCHER->priority (1); 3839 undef $AnyEvent::AIO::WATCHER;
3713} 3840}
3714 3841
3715my $_log_backtrace; 3842my $_log_backtrace;
3716 3843
3717sub _log_backtrace { 3844sub _log_backtrace {

Diff Legend

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