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.414 by root, Thu Apr 10 09:10:45 2008 UTC vs.
Revision 1.431 by elmex, Sun May 4 19:27:27 2008 UTC

… …
427 } 427 }
428 } 428 }
429}; 429};
430 430
431sub get_slot($;$$) { 431sub get_slot($;$$) {
432 return if tick_inhibit || $Coro::current == $Coro::main;
433
432 my ($time, $pri, $name) = @_; 434 my ($time, $pri, $name) = @_;
433 435
434 $time = $TICK * .6 if $time > $TICK * .6; 436 $time = $TICK * .6 if $time > $TICK * .6;
435 my $sig = new Coro::Signal; 437 my $sig = new Coro::Signal;
436 438
… …
547 reset_signals; 549 reset_signals;
548 &$cb 550 &$cb
549 }, @args; 551 }, @args;
550 552
551 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
552} 581}
553 582
554=item $value = cf::db_get $family => $key 583=item $value = cf::db_get $family => $key
555 584
556Returns a single value from the environment database. 585Returns a single value from the environment database.
… …
1112 utf8::decode (my $decname = $filename); 1141 utf8::decode (my $decname = $filename);
1113 warn sprintf "saving %s (%d,%d)\n", 1142 warn sprintf "saving %s (%d,%d)\n",
1114 $decname, length $$rdata, scalar @$objs; 1143 $decname, length $$rdata, scalar @$objs;
1115 1144
1116 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1145 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1117 chmod SAVE_MODE, $fh; 1146 aio_chmod $fh, SAVE_MODE;
1118 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1147 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1119 aio_fsync $fh if $cf::USE_FSYNC; 1148 aio_fsync $fh if $cf::USE_FSYNC;
1120 close $fh; 1149 aio_close $fh;
1121 1150
1122 if (@$objs) { 1151 if (@$objs) {
1123 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) {
1124 chmod SAVE_MODE, $fh; 1153 aio_chmod $fh, SAVE_MODE;
1125 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1154 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1126 aio_write $fh, 0, (length $data), $data, 0; 1155 aio_write $fh, 0, (length $data), $data, 0;
1127 aio_fsync $fh if $cf::USE_FSYNC; 1156 aio_fsync $fh if $cf::USE_FSYNC;
1128 close $fh; 1157 aio_close $fh;
1129 aio_rename "$filename.pst~", "$filename.pst"; 1158 aio_rename "$filename.pst~", "$filename.pst";
1130 } 1159 }
1131 } else { 1160 } else {
1132 aio_unlink "$filename.pst"; 1161 aio_unlink "$filename.pst";
1133 } 1162 }
… …
1427 my $f = new_from_file cf::object::thawer path $login 1456 my $f = new_from_file cf::object::thawer path $login
1428 or return; 1457 or return;
1429 1458
1430 my $pl = cf::player::load_pl $f 1459 my $pl = cf::player::load_pl $f
1431 or return; 1460 or return;
1461
1432 local $cf::PLAYER_LOADING{$login} = $pl; 1462 local $cf::PLAYER_LOADING{$login} = $pl;
1433 $f->resolve_delayed_derefs; 1463 $f->resolve_delayed_derefs;
1434 $cf::PLAYER{$login} = $pl 1464 $cf::PLAYER{$login} = $pl
1435 } 1465 }
1436 } 1466 }
… …
1446 1476
1447 return if $pl->{deny_save}; 1477 return if $pl->{deny_save};
1448 1478
1449 aio_mkdir playerdir $pl, 0770; 1479 aio_mkdir playerdir $pl, 0770;
1450 $pl->{last_save} = $cf::RUNTIME; 1480 $pl->{last_save} = $cf::RUNTIME;
1481
1482 cf::get_slot 0.01;
1451 1483
1452 $pl->save_pl ($path); 1484 $pl->save_pl ($path);
1453 cf::cede_to_tick; 1485 cf::cede_to_tick;
1454} 1486}
1455 1487
… …
1539 1571
1540 for my $login (@$dirs) { 1572 for my $login (@$dirs) {
1541 my $path = path $login; 1573 my $path = path $login;
1542 1574
1543 # a .pst is a dead give-away for a valid player 1575 # a .pst is a dead give-away for a valid player
1544 unless (-e "$path.pst") { 1576 # if no pst file found, open and chekc for blocked users
1577 if (aio_stat "$path.pst") {
1545 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1578 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1546 aio_read $fh, 0, 512, my $buf, 0 or next; 1579 aio_read $fh, 0, 512, my $buf, 0 or next;
1547 $buf !~ /^password -------------$/m or next; # official not-valid tag 1580 $buf !~ /^password -------------$/m or next; # official not-valid tag
1548 } 1581 }
1549 1582
… …
1748our $MAX_RESET = 3600; 1781our $MAX_RESET = 3600;
1749our $DEFAULT_RESET = 3000; 1782our $DEFAULT_RESET = 3000;
1750 1783
1751sub generate_random_map { 1784sub generate_random_map {
1752 my ($self, $rmp) = @_; 1785 my ($self, $rmp) = @_;
1786
1787 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1788
1753 # mit "rum" bekleckern, nicht 1789 # mit "rum" bekleckern, nicht
1754 $self->_create_random_map ( 1790 $self->_create_random_map (
1755 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1791 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1756 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1792 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1757 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1793 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1879 1915
1880# the temporary/swap location 1916# the temporary/swap location
1881sub save_path { 1917sub save_path {
1882 my ($self) = @_; 1918 my ($self) = @_;
1883 1919
1884 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1920 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1885 "$TMPDIR/$path.map" 1921 "$TMPDIR/$path.map"
1886} 1922}
1887 1923
1888# the unique path, undef == no special unique path 1924# the unique path, undef == no special unique path
1889sub uniq_path { 1925sub uniq_path {
1890 my ($self) = @_; 1926 my ($self) = @_;
1891 1927
1892 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1928 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1893 "$UNIQUEDIR/$path" 1929 "$UNIQUEDIR/$path"
1894} 1930}
1895 1931
1896# and all this just because we cannot iterate over 1932# and all this just because we cannot iterate over
1897# all maps in C++... 1933# all maps in C++...
… …
1995 2031
1996 cf::lock_wait "map_data:$path";#d#remove 2032 cf::lock_wait "map_data:$path";#d#remove
1997 cf::lock_wait "map_find:$path"; 2033 cf::lock_wait "map_find:$path";
1998 2034
1999 $cf::MAP{$path} || do { 2035 $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 2036 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2037 my $guard2 = cf::lock_acquire "map_find:$path";
2002 2038
2003 my $map = new_from_path cf::map $path 2039 my $map = new_from_path cf::map $path
2004 or return; 2040 or return;
2005 2041
2006 $map->{last_save} = $cf::RUNTIME; 2042 $map->{last_save} = $cf::RUNTIME;
… …
2009 or return; 2045 or return;
2010 2046
2011 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2047 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2012 # doing this can freeze the server in a sync job, obviously 2048 # doing this can freeze the server in a sync job, obviously
2013 #$cf::WAIT_FOR_TICK->wait; 2049 #$cf::WAIT_FOR_TICK->wait;
2050 undef $guard2;
2014 undef $guard1; 2051 undef $guard1;
2015 undef $guard2;
2016 $map->reset; 2052 $map->reset;
2017 return find $path; 2053 return find $path;
2018 } 2054 }
2019 2055
2020 $cf::MAP{$path} = $map 2056 $cf::MAP{$path} = $map
… …
2083 } 2119 }
2084 2120
2085 $self->{last_save} = $cf::RUNTIME; 2121 $self->{last_save} = $cf::RUNTIME;
2086 $self->last_access ($cf::RUNTIME); 2122 $self->last_access ($cf::RUNTIME);
2087 2123
2088 $self->in_memory (cf::MAP_IN_MEMORY); 2124 $self->in_memory (cf::MAP_ACTIVE);
2089 } 2125 }
2090 2126
2091 $self->post_load; 2127 $self->post_load;
2092} 2128}
2093 2129
… …
2151 my ($path, $origin, $load) = @_; 2187 my ($path, $origin, $load) = @_;
2152 2188
2153 $path = normalise $path, $origin && $origin->{path}; 2189 $path = normalise $path, $origin && $origin->{path};
2154 2190
2155 if (my $map = $cf::MAP{$path}) { 2191 if (my $map = $cf::MAP{$path}) {
2156 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2192 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2157 } 2193 }
2158 2194
2159 $MAP_PREFETCH{$path} |= $load; 2195 $MAP_PREFETCH{$path} |= $load;
2160 2196
2161 $MAP_PREFETCHER ||= cf::async { 2197 $MAP_PREFETCHER ||= cf::async {
… …
2198 cf::async { 2234 cf::async {
2199 $Coro::current->{desc} = "map player save"; 2235 $Coro::current->{desc} = "map player save";
2200 $_->contr->save for $self->players; 2236 $_->contr->save for $self->players;
2201 }; 2237 };
2202 2238
2239 cf::get_slot 0.02;
2240
2203 if ($uniq) { 2241 if ($uniq) {
2204 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2242 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2205 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2243 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2206 } else { 2244 } else {
2207 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2245 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
… …
2215 $self->save; 2253 $self->save;
2216 2254
2217 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2255 my $lock = cf::lock_acquire "map_data:$self->{path}";
2218 2256
2219 return if $self->players; 2257 return if $self->players;
2220 return if $self->in_memory != cf::MAP_IN_MEMORY; 2258 return if $self->in_memory != cf::MAP_ACTIVE;
2221 return if $self->{deny_save}; 2259 return if $self->{deny_save};
2222 2260
2223 $self->in_memory (cf::MAP_SWAPPED); 2261 $self->in_memory (cf::MAP_SWAPPED);
2224 2262
2225 $self->deactivate; 2263 $self->deactivate;
… …
2343 2381
2344sub unique_maps() { 2382sub unique_maps() {
2345 [ 2383 [
2346 map { 2384 map {
2347 utf8::decode $_; 2385 utf8::decode $_;
2348 /\.map$/ 2386 s/\.map$//; # TODO future compatibility hack
2387 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2388 ? ()
2349 ? normalise $_ 2389 : normalise $_
2350 : ()
2351 } @{ aio_readdir $UNIQUEDIR or [] } 2390 } @{ aio_readdir $UNIQUEDIR or [] }
2352 ] 2391 ]
2353} 2392}
2354 2393
2355package cf;
2356
2357=back 2394=back
2358 2395
2359=head3 cf::object 2396=head3 cf::object
2360 2397
2361=cut 2398=cut
… …
2364 2401
2365=over 4 2402=over 4
2366 2403
2367=item $ob->inv_recursive 2404=item $ob->inv_recursive
2368 2405
2369Returns the inventory of the object _and_ their inventories, recursively. 2406Returns the inventory of the object I<and> their inventories, recursively,
2407but I<not> the object itself.
2370 2408
2371=cut 2409=cut
2372 2410
2373sub inv_recursive_; 2411sub inv_recursive_;
2374sub inv_recursive_ { 2412sub inv_recursive_ {
… …
2379 inv_recursive_ inv $_[0] 2417 inv_recursive_ inv $_[0]
2380} 2418}
2381 2419
2382=item $ref = $ob->ref 2420=item $ref = $ob->ref
2383 2421
2384creates and returns a persistent reference to an objetc that can be stored as a string. 2422Creates and returns a persistent reference to an object that can be stored as a string.
2385 2423
2386=item $ob = cf::object::deref ($refstring) 2424=item $ob = cf::object::deref ($refstring)
2387 2425
2388returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2426returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2389even if the object actually exists. May block. 2427even if the object actually exists. May block.
… …
2421can be C<undef>. Does the right thing when the player is currently in a 2459can be C<undef>. Does the right thing when the player is currently in a
2422dialogue with the given NPC character. 2460dialogue with the given NPC character.
2423 2461
2424=cut 2462=cut
2425 2463
2464our $SAY_CHANNEL = {
2465 id => "say",
2466 title => "Map",
2467 reply => "say ",
2468 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2469};
2470
2471our $CHAT_CHANNEL = {
2472 id => "chat",
2473 title => "Chat",
2474 reply => "chat ",
2475 tooltip => "Player chat and shouts, global to the server.",
2476};
2477
2426# rough implementation of a future "reply" method that works 2478# rough implementation of a future "reply" method that works
2427# with dialog boxes. 2479# with dialog boxes.
2428#TODO: the first argument must go, split into a $npc->reply_to ( method 2480#TODO: the first argument must go, split into a $npc->reply_to ( method
2429sub cf::object::player::reply($$$;$) { 2481sub cf::object::player::reply($$$;$) {
2430 my ($self, $npc, $msg, $flags) = @_; 2482 my ($self, $npc, $msg, $flags) = @_;
… …
2441 my $dialog = $pl->{npc_dialog}; 2493 my $dialog = $pl->{npc_dialog};
2442 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2494 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2443 2495
2444 } else { 2496 } else {
2445 $msg = $npc->name . " says: $msg" if $npc; 2497 $msg = $npc->name . " says: $msg" if $npc;
2446 $self->message ($msg, $flags); 2498 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2447 } 2499 }
2448 } 2500 }
2449} 2501}
2450 2502
2451=item $object->send_msg ($channel, $msg, $color, [extra...]) 2503=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2646} 2698}
2647 2699
2648sub prepare_random_map { 2700sub prepare_random_map {
2649 my ($exit) = @_; 2701 my ($exit) = @_;
2650 2702
2651 my $guard = cf::lock_acquire "exit_prepare:$exit";
2652
2653 # all this does is basically replace the /! path by 2703 # all this does is basically replace the /! path by
2654 # a new random map path (?random/...) with a seed 2704 # a new random map path (?random/...) with a seed
2655 # that depends on the exit object 2705 # that depends on the exit object
2656 2706
2657 my $rmp = parse_random_map_params $exit->msg; 2707 my $rmp = parse_random_map_params $exit->msg;
… …
2659 if ($exit->map) { 2709 if ($exit->map) {
2660 $rmp->{region} = $exit->region->name; 2710 $rmp->{region} = $exit->region->name;
2661 $rmp->{origin_map} = $exit->map->path; 2711 $rmp->{origin_map} = $exit->map->path;
2662 $rmp->{origin_x} = $exit->x; 2712 $rmp->{origin_x} = $exit->x;
2663 $rmp->{origin_y} = $exit->y; 2713 $rmp->{origin_y} = $exit->y;
2714
2715 $exit->map->touch;
2664 } 2716 }
2665 2717
2666 $rmp->{random_seed} ||= $exit->random_seed; 2718 $rmp->{random_seed} ||= $exit->random_seed;
2667 2719
2668 my $data = cf::encode_json $rmp; 2720 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2669 my $md5 = Digest::MD5::md5_hex $data; 2721 my $md5 = Digest::MD5::md5_hex $data;
2670 my $meta = "$RANDOMDIR/$md5.meta"; 2722 my $meta = "$RANDOMDIR/$md5.meta";
2671 2723
2672 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2724 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2673 aio_write $fh, 0, (length $data), $data, 0; 2725 aio_write $fh, 0, (length $data), $data, 0;
2674 undef $fh; 2726 undef $fh;
2675 aio_rename "$meta~", $meta; 2727 aio_rename "$meta~", $meta;
2676 2728
2729 my $slaying = "?random/$md5";
2730
2731 if ($exit->valid) {
2677 $exit->slaying ("?random/$md5"); 2732 $exit->slaying ("?random/$md5");
2678 $exit->msg (undef); 2733 $exit->msg (undef);
2734 }
2679 } 2735 }
2680} 2736}
2681 2737
2682sub cf::object::player::enter_exit { 2738sub cf::object::player::enter_exit {
2683 my ($self, $exit) = @_; 2739 my ($self, $exit) = @_;
2684 2740
2685 return unless $self->type == cf::PLAYER; 2741 return unless $self->type == cf::PLAYER;
2686 2742
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; 2743 $self->enter_link;
2699 2744
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 { 2745 (async {
2705 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2746 $Coro::current->{desc} = "enter_exit";
2706 2747
2707 $self->deactivate_recursive; # just to be sure
2708 unless (eval { 2748 unless (eval {
2749 $self->deactivate_recursive; # just to be sure
2750
2751 # random map handling
2752 {
2753 my $guard = cf::lock_acquire "exit_prepare:$exit";
2754
2755 prepare_random_map $exit
2756 if $exit->slaying eq "/!";
2757 }
2758
2759 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2760 my $x = $exit->stats->hp;
2761 my $y = $exit->stats->sp;
2762
2709 $self->goto ($slaying, $hp, $sp); 2763 $self->goto ($map, $x, $y);
2710 2764
2765 # if exit is damned, update players death & WoR home-position
2766 $self->contr->savebed ($map, $x, $y)
2767 if $exit->flag (cf::FLAG_DAMNED);
2768
2711 1; 2769 1
2712 }) { 2770 }) {
2713 $self->message ("Something went wrong deep within the crossfire server. " 2771 $self->message ("Something went wrong deep within the crossfire server. "
2714 . "I'll try to bring you back to the map you were before. " 2772 . "I'll try to bring you back to the map you were before. "
2715 . "Please report this to the dungeon master!", 2773 . "Please report this to the dungeon master!",
2716 cf::NDI_UNIQUE | cf::NDI_RED); 2774 cf::NDI_UNIQUE | cf::NDI_RED);
… …
2796 id => "infobox", 2854 id => "infobox",
2797 title => "Map Info", 2855 title => "Map Info",
2798 reply => undef, 2856 reply => undef,
2799 tooltip => "Information related to the maps", 2857 tooltip => "Information related to the maps",
2800 }, 2858 },
2859 "c/party" => {
2860 id => "party",
2861 title => "Party",
2862 reply => "gsay ",
2863 tooltip => "Messages and chat related to your party",
2864 },
2801); 2865);
2802 2866
2803sub cf::client::send_msg { 2867sub cf::client::send_msg {
2804 my ($self, $channel, $msg, $color, @extra) = @_; 2868 my ($self, $channel, $msg, $color, @extra) = @_;
2805 2869
… …
3042 3106
3043The following functions and methods are available within a safe environment: 3107The following functions and methods are available within a safe environment:
3044 3108
3045 cf::object 3109 cf::object
3046 contr pay_amount pay_player map x y force_find force_add destroy 3110 contr pay_amount pay_player map x y force_find force_add destroy
3047 insert remove name archname title slaying race decrease_ob_nr 3111 insert remove name archname title slaying race decrease split
3048 3112
3049 cf::object::player 3113 cf::object::player
3050 player 3114 player
3051 3115
3052 cf::player 3116 cf::player
… …
3057 3121
3058=cut 3122=cut
3059 3123
3060for ( 3124for (
3061 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3125 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3062 insert remove inv name archname title slaying race 3126 insert remove inv nrof name archname title slaying race
3063 decrease_ob_nr destroy)], 3127 decrease split destroy)],
3064 ["cf::object::player" => qw(player)], 3128 ["cf::object::player" => qw(player)],
3065 ["cf::player" => qw(peaceful)], 3129 ["cf::player" => qw(peaceful)],
3066 ["cf::map" => qw(trigger)], 3130 ["cf::map" => qw(trigger)],
3067) { 3131) {
3068 no strict 'refs'; 3132 no strict 'refs';
… …
3276 while (my ($k, $v) = each %$want) { 3340 while (my ($k, $v) = each %$want) {
3277 $ns->fx_want ($k, $v); 3341 $ns->fx_want ($k, $v);
3278 } 3342 }
3279}; 3343};
3280 3344
3345sub load_resource_file($) {
3346 my $guard = lock_acquire "load_resource_file";
3347
3348 my $status = load_resource_file_ $_[0];
3349 get_slot 0.1, 100;
3350 cf::arch::commit_load;
3351
3352 $status
3353}
3354
3281sub reload_regions { 3355sub reload_regions {
3282 # HACK to clear player env face cache, we need some signal framework 3356 # HACK to clear player env face cache, we need some signal framework
3283 # for this (global event?) 3357 # for this (global event?)
3284 %ext::player_env::MUSIC_FACE_CACHE = (); 3358 %ext::player_env::MUSIC_FACE_CACHE = ();
3285 3359
… …
3298} 3372}
3299 3373
3300sub reload_archetypes { 3374sub reload_archetypes {
3301 load_resource_file "$DATADIR/archetypes" 3375 load_resource_file "$DATADIR/archetypes"
3302 or die "unable to load archetypes\n"; 3376 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} 3377}
3309 3378
3310sub reload_treasures { 3379sub reload_treasures {
3311 load_resource_file "$DATADIR/treasures" 3380 load_resource_file "$DATADIR/treasures"
3312 or die "unable to load treasurelists\n"; 3381 or die "unable to load treasurelists\n";
3313} 3382}
3314 3383
3315sub reload_resources { 3384sub reload_resources {
3316 warn "reloading resource files...\n"; 3385 warn "reloading resource files...\n";
3317 3386
3387 reload_facedata;
3388 reload_archetypes;
3318 reload_regions; 3389 reload_regions;
3319 reload_facedata;
3320 #reload_archetypes;#d#
3321 reload_archetypes;
3322 reload_treasures; 3390 reload_treasures;
3323 3391
3324 warn "finished reloading resource files\n"; 3392 warn "finished reloading resource files\n";
3325} 3393}
3326 3394
3327sub init { 3395sub init {
3396 my $guard = freeze_mainloop;
3397
3328 reload_resources; 3398 reload_resources;
3329} 3399}
3330 3400
3331sub reload_config { 3401sub reload_config {
3332 open my $fh, "<:utf8", "$CONFDIR/config" 3402 open my $fh, "<:utf8", "$CONFDIR/config"
… …
3357 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3427 $Coro::current->{desc} = "IDLE BUG HANDLER";
3358 EV::loop EV::LOOP_ONESHOT; 3428 EV::loop EV::LOOP_ONESHOT;
3359 })->prio (Coro::PRIO_MAX); 3429 })->prio (Coro::PRIO_MAX);
3360 }; 3430 };
3361 3431
3432 {
3433 my $guard = freeze_mainloop;
3362 reload_config; 3434 reload_config;
3363 db_init; 3435 db_init;
3364 load_extensions; 3436 load_extensions;
3365 3437
3366 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3438 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3367 evthread_start IO::AIO::poll_fileno; 3439 evthread_start IO::AIO::poll_fileno;
3440 }
3441
3368 EV::loop; 3442 EV::loop;
3369} 3443}
3370 3444
3371############################################################################# 3445#############################################################################
3372# initialisation and cleanup 3446# initialisation and cleanup
… …
3379 cf::cleanup "SIG$signal"; 3453 cf::cleanup "SIG$signal";
3380 }; 3454 };
3381 } 3455 }
3382} 3456}
3383 3457
3384sub write_runtime { 3458sub write_runtime_sync {
3385 my $runtime = "$LOCALDIR/runtime"; 3459 my $runtime = "$LOCALDIR/runtime";
3386 3460
3387 # first touch the runtime file to show we are still running: 3461 # first touch the runtime file to show we are still running:
3388 # the fsync below can take a very very long time. 3462 # the fsync below can take a very very long time.
3389 3463
… …
3415 and return; 3489 and return;
3416 3490
3417 warn "runtime file written.\n"; 3491 warn "runtime file written.\n";
3418 3492
3419 1 3493 1
3494}
3495
3496our $uuid_lock;
3497our $uuid_skip;
3498
3499sub write_uuid_sync($) {
3500 $uuid_skip ||= $_[0];
3501
3502 return if $uuid_lock;
3503 local $uuid_lock = 1;
3504
3505 my $uuid = "$LOCALDIR/uuid";
3506
3507 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3508 or return;
3509
3510 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3511 $uuid_skip = 0;
3512
3513 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3514 and return;
3515
3516 # always fsync - this file is important
3517 aio_fsync $fh
3518 and return;
3519
3520 close $fh
3521 or return;
3522
3523 aio_rename "$uuid~", $uuid
3524 and return;
3525
3526 warn "uuid file written ($value).\n";
3527
3528 1
3529
3530}
3531
3532sub write_uuid($$) {
3533 my ($skip, $sync) = @_;
3534
3535 $sync ? write_uuid_sync $skip
3536 : async { write_uuid_sync $skip };
3420} 3537}
3421 3538
3422sub emergency_save() { 3539sub emergency_save() {
3423 my $freeze_guard = cf::freeze_mainloop; 3540 my $freeze_guard = cf::freeze_mainloop;
3424 3541
… …
3446 warn "end emergency map save\n"; 3563 warn "end emergency map save\n";
3447 3564
3448 warn "begin emergency database checkpoint\n"; 3565 warn "begin emergency database checkpoint\n";
3449 BDB::db_env_txn_checkpoint $DB_ENV; 3566 BDB::db_env_txn_checkpoint $DB_ENV;
3450 warn "end emergency database checkpoint\n"; 3567 warn "end emergency database checkpoint\n";
3568
3569 warn "begin write uuid\n";
3570 write_uuid_sync 1;
3571 warn "end write uuid\n";
3451 }; 3572 };
3452 3573
3453 warn "leave emergency perl save\n"; 3574 warn "leave emergency perl save\n";
3454} 3575}
3455 3576
… …
3470 warn "reloading..."; 3591 warn "reloading...";
3471 3592
3472 warn "entering sync_job"; 3593 warn "entering sync_job";
3473 3594
3474 cf::sync_job { 3595 cf::sync_job {
3475 cf::write_runtime; # external watchdog should not bark 3596 cf::write_runtime_sync; # external watchdog should not bark
3476 cf::emergency_save; 3597 cf::emergency_save;
3477 cf::write_runtime; # external watchdog should not bark 3598 cf::write_runtime_sync; # external watchdog should not bark
3478 3599
3479 warn "syncing database to disk"; 3600 warn "syncing database to disk";
3480 BDB::db_env_txn_checkpoint $DB_ENV; 3601 BDB::db_env_txn_checkpoint $DB_ENV;
3481 3602
3482 # if anything goes wrong in here, we should simply crash as we already saved 3603 # if anything goes wrong in here, we should simply crash as we already saved
… …
3607 3728
3608our @WAIT_FOR_TICK; 3729our @WAIT_FOR_TICK;
3609our @WAIT_FOR_TICK_BEGIN; 3730our @WAIT_FOR_TICK_BEGIN;
3610 3731
3611sub wait_for_tick { 3732sub wait_for_tick {
3612 return if tick_inhibit;
3613 return if $Coro::current == $Coro::main; 3733 return if tick_inhibit || $Coro::current == $Coro::main;
3614 3734
3615 my $signal = new Coro::Signal; 3735 my $signal = new Coro::Signal;
3616 push @WAIT_FOR_TICK, $signal; 3736 push @WAIT_FOR_TICK, $signal;
3617 $signal->wait; 3737 $signal->wait;
3618} 3738}
3619 3739
3620sub wait_for_tick_begin { 3740sub wait_for_tick_begin {
3621 return if tick_inhibit;
3622 return if $Coro::current == $Coro::main; 3741 return if tick_inhibit || $Coro::current == $Coro::main;
3623 3742
3624 my $signal = new Coro::Signal; 3743 my $signal = new Coro::Signal;
3625 push @WAIT_FOR_TICK_BEGIN, $signal; 3744 push @WAIT_FOR_TICK_BEGIN, $signal;
3626 $signal->wait; 3745 $signal->wait;
3627} 3746}
… …
3637 3756
3638 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3757 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3639 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3758 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3640 Coro::async_pool { 3759 Coro::async_pool {
3641 $Coro::current->{desc} = "runtime saver"; 3760 $Coro::current->{desc} = "runtime saver";
3642 write_runtime 3761 write_runtime_sync
3643 or warn "ERROR: unable to write runtime file: $!"; 3762 or warn "ERROR: unable to write runtime file: $!";
3644 }; 3763 };
3645 } 3764 }
3646 3765
3647 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3766 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {

Diff Legend

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