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.400 by root, Mon Dec 17 06:36:34 2007 UTC vs.
Revision 1.426 by root, Thu Apr 24 04:40:31 2008 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify
7# it under the terms of the GNU General Public License as published by
8# the Free Software Foundation, either version 3 of the License, or
9# (at your option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19# The authors can be reached via e-mail to <support@deliantra.net>
20#
21
1package cf; 22package cf;
2 23
3use utf8; 24use utf8;
4use strict; 25use strict;
5 26
6use Symbol; 27use Symbol;
7use List::Util; 28use List::Util;
8use Socket; 29use Socket;
9use EV; 30use EV 3.2;
10use Opcode; 31use Opcode;
11use Safe; 32use Safe;
12use Safe::Hole; 33use Safe::Hole;
13use Storable (); 34use Storable ();
14 35
15use Coro 4.32 (); 36use Coro 4.50 ();
16use Coro::State; 37use Coro::State;
17use Coro::Handle; 38use Coro::Handle;
18use Coro::EV; 39use Coro::EV;
19use Coro::Timer; 40use Coro::Timer;
20use Coro::Signal; 41use Coro::Signal;
… …
27use JSON::XS 2.01 (); 48use JSON::XS 2.01 ();
28use BDB (); 49use BDB ();
29use Data::Dumper; 50use Data::Dumper;
30use Digest::MD5; 51use Digest::MD5;
31use Fcntl; 52use Fcntl;
32use YAML::Syck (); 53use YAML ();
33use IO::AIO 2.51 (); 54use IO::AIO 2.51 ();
34use Time::HiRes; 55use Time::HiRes;
35use Compress::LZF; 56use Compress::LZF;
36use Digest::MD5 (); 57use Digest::MD5 ();
37 58
38# configure various modules to our taste 59# configure various modules to our taste
39# 60#
40$Storable::canonical = 1; # reduce rsync transfers 61$Storable::canonical = 1; # reduce rsync transfers
41Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 62Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
42Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 63Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
43
44# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
45$YAML::Syck::ImplicitUnicode = 1;
46 64
47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 65$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
48 66
49sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
50 68
… …
69our $TMPDIR = "$LOCALDIR/" . tmpdir; 87our $TMPDIR = "$LOCALDIR/" . tmpdir;
70our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
71our $PLAYERDIR = "$LOCALDIR/" . playerdir; 89our $PLAYERDIR = "$LOCALDIR/" . playerdir;
72our $RANDOMDIR = "$LOCALDIR/random"; 90our $RANDOMDIR = "$LOCALDIR/random";
73our $BDBDIR = "$LOCALDIR/db"; 91our $BDBDIR = "$LOCALDIR/db";
92our %RESOURCE;
74 93
75our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
76our $TICK_WATCHER;
77our $AIO_POLL_WATCHER; 95our $AIO_POLL_WATCHER;
78our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
79our $NEXT_TICK; 97our $NEXT_TICK;
80our $USE_FSYNC = 1; # use fsync to write maps - default off 98our $USE_FSYNC = 1; # use fsync to write maps - default off
81 99
… …
98# used to convert map paths into valid unix filenames by replacing / by ∕ 116# used to convert map paths into valid unix filenames by replacing / by ∕
99our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 117our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
100 118
101our $LOAD; # a number between 0 (idle) and 1 (too many objects) 119our $LOAD; # a number between 0 (idle) and 1 (too many objects)
102our $LOADAVG; # same thing, but with alpha-smoothing 120our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter
103our $tick_start; # for load detecting purposes 122our $TICK_START; # for load detecting purposes
104 123
105binmode STDOUT; 124binmode STDOUT;
106binmode STDERR; 125binmode STDERR;
107 126
108# read virtual server time, if available 127# read virtual server time, if available
… …
192 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 211 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
193 212
194 LOG llevError, $msg; 213 LOG llevError, $msg;
195 }; 214 };
196} 215}
216
217$Coro::State::DIEHOOK = sub {
218 return unless $^S eq 0; # "eq", not "=="
219
220 if ($Coro::current == $Coro::main) {#d#
221 warn "DIEHOOK called in main context, Coro bug?\n";#d#
222 return;#d#
223 }#d#
224
225 # kill coroutine otherwise
226 warn Carp::longmess $_[0];
227 Coro::terminate
228};
229
230$SIG{__DIE__} = sub { }; #d#?
197 231
198@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 232@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
199@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 233@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
200@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 234@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
201@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 235@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
326 360
327 ! ! $LOCK{$key} 361 ! ! $LOCK{$key}
328} 362}
329 363
330sub freeze_mainloop { 364sub freeze_mainloop {
331 return unless $TICK_WATCHER->is_active; 365 tick_inhibit_inc;
332 366
333 my $guard = Coro::guard { 367 Coro::guard \&tick_inhibit_dec;
334 $TICK_WATCHER->start;
335 };
336 $TICK_WATCHER->stop;
337 $guard
338} 368}
339 369
340=item cf::periodic $interval, $cb 370=item cf::periodic $interval, $cb
341 371
342Like EV::periodic, but randomly selects a starting point so that the actions 372Like EV::periodic, but randomly selects a starting point so that the actions
… …
397 } 427 }
398 } 428 }
399}; 429};
400 430
401sub get_slot($;$$) { 431sub get_slot($;$$) {
432 return if tick_inhibit || $Coro::current == $Coro::main;
433
402 my ($time, $pri, $name) = @_; 434 my ($time, $pri, $name) = @_;
403 435
404 $time = $TICK * .6 if $time > $TICK * .6; 436 $time = $TICK * .6 if $time > $TICK * .6;
405 my $sig = new Coro::Signal; 437 my $sig = new Coro::Signal;
406 438
… …
443 # this is the main coro, too bad, we have to block 475 # this is the main coro, too bad, we have to block
444 # till the operation succeeds, freezing the server :/ 476 # till the operation succeeds, freezing the server :/
445 477
446 LOG llevError, Carp::longmess "sync job";#d# 478 LOG llevError, Carp::longmess "sync job";#d#
447 479
448 # TODO: use suspend/resume instead
449 # (but this is cancel-safe)
450 my $freeze_guard = freeze_mainloop; 480 my $freeze_guard = freeze_mainloop;
451 481
452 my $busy = 1; 482 my $busy = 1;
453 my @res; 483 my @res;
454 484
… …
465 } else { 495 } else {
466 EV::loop EV::LOOP_ONESHOT; 496 EV::loop EV::LOOP_ONESHOT;
467 } 497 }
468 } 498 }
469 499
470 $time = EV::time - $time; 500 my $time = EV::time - $time;
471 501
472 LOG llevError | logBacktrace, Carp::longmess "long sync job"
473 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
474
475 $tick_start += $time; # do not account sync jobs to server load 502 $TICK_START += $time; # do not account sync jobs to server load
476 503
477 wantarray ? @res : $res[0] 504 wantarray ? @res : $res[0]
478 } else { 505 } else {
479 # we are in another coroutine, how wonderful, everything just works 506 # we are in another coroutine, how wonderful, everything just works
480 507
… …
522 reset_signals; 549 reset_signals;
523 &$cb 550 &$cb
524 }, @args; 551 }, @args;
525 552
526 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
527} 581}
528 582
529=item $value = cf::db_get $family => $key 583=item $value = cf::db_get $family => $key
530 584
531Returns a single value from the environment database. 585Returns a single value from the environment database.
… …
968 } 1022 }
969 1023
970 0 1024 0
971} 1025}
972 1026
973=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1027=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
974 1028
975=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1029=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
976 1030
977Generate an object-specific event with the given arguments. 1031Generate an object-specific event with the given arguments.
978 1032
… …
1303 my $msg = $@ ? "$v->{path}: $@\n" 1357 my $msg = $@ ? "$v->{path}: $@\n"
1304 : "$v->{base}: extension inactive.\n"; 1358 : "$v->{base}: extension inactive.\n";
1305 1359
1306 if (exists $v->{meta}{mandatory}) { 1360 if (exists $v->{meta}{mandatory}) {
1307 warn $msg; 1361 warn $msg;
1308 warn "mandatory extension failed to load, exiting.\n"; 1362 cf::cleanup "mandatory extension failed to load, exiting.";
1309 exit 1;
1310 } 1363 }
1311 1364
1312 warn $msg; 1365 warn $msg;
1313 } 1366 }
1314 1367
… …
1422 1475
1423 return if $pl->{deny_save}; 1476 return if $pl->{deny_save};
1424 1477
1425 aio_mkdir playerdir $pl, 0770; 1478 aio_mkdir playerdir $pl, 0770;
1426 $pl->{last_save} = $cf::RUNTIME; 1479 $pl->{last_save} = $cf::RUNTIME;
1480
1481 cf::get_slot 0.01;
1427 1482
1428 $pl->save_pl ($path); 1483 $pl->save_pl ($path);
1429 cf::cede_to_tick; 1484 cf::cede_to_tick;
1430} 1485}
1431 1486
… …
1724our $MAX_RESET = 3600; 1779our $MAX_RESET = 3600;
1725our $DEFAULT_RESET = 3000; 1780our $DEFAULT_RESET = 3000;
1726 1781
1727sub generate_random_map { 1782sub generate_random_map {
1728 my ($self, $rmp) = @_; 1783 my ($self, $rmp) = @_;
1784
1785 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1786
1729 # mit "rum" bekleckern, nicht 1787 # mit "rum" bekleckern, nicht
1730 $self->_create_random_map ( 1788 $self->_create_random_map (
1731 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1789 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1732 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1790 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1733 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1791 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1855 1913
1856# the temporary/swap location 1914# the temporary/swap location
1857sub save_path { 1915sub save_path {
1858 my ($self) = @_; 1916 my ($self) = @_;
1859 1917
1860 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1918 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1861 "$TMPDIR/$path.map" 1919 "$TMPDIR/$path.map"
1862} 1920}
1863 1921
1864# the unique path, undef == no special unique path 1922# the unique path, undef == no special unique path
1865sub uniq_path { 1923sub uniq_path {
1866 my ($self) = @_; 1924 my ($self) = @_;
1867 1925
1868 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1926 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1869 "$UNIQUEDIR/$path" 1927 "$UNIQUEDIR/$path"
1870} 1928}
1871 1929
1872# and all this just because we cannot iterate over 1930# and all this just because we cannot iterate over
1873# all maps in C++... 1931# all maps in C++...
… …
2059 } 2117 }
2060 2118
2061 $self->{last_save} = $cf::RUNTIME; 2119 $self->{last_save} = $cf::RUNTIME;
2062 $self->last_access ($cf::RUNTIME); 2120 $self->last_access ($cf::RUNTIME);
2063 2121
2064 $self->in_memory (cf::MAP_IN_MEMORY); 2122 $self->in_memory (cf::MAP_ACTIVE);
2065 } 2123 }
2066 2124
2067 $self->post_load; 2125 $self->post_load;
2068} 2126}
2069 2127
… …
2127 my ($path, $origin, $load) = @_; 2185 my ($path, $origin, $load) = @_;
2128 2186
2129 $path = normalise $path, $origin && $origin->{path}; 2187 $path = normalise $path, $origin && $origin->{path};
2130 2188
2131 if (my $map = $cf::MAP{$path}) { 2189 if (my $map = $cf::MAP{$path}) {
2132 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2190 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2133 } 2191 }
2134 2192
2135 $MAP_PREFETCH{$path} |= $load; 2193 $MAP_PREFETCH{$path} |= $load;
2136 2194
2137 $MAP_PREFETCHER ||= cf::async { 2195 $MAP_PREFETCHER ||= cf::async {
… …
2174 cf::async { 2232 cf::async {
2175 $Coro::current->{desc} = "map player save"; 2233 $Coro::current->{desc} = "map player save";
2176 $_->contr->save for $self->players; 2234 $_->contr->save for $self->players;
2177 }; 2235 };
2178 2236
2237 cf::get_slot 0.02;
2238
2179 if ($uniq) { 2239 if ($uniq) {
2180 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2240 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2181 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2241 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2182 } else { 2242 } else {
2183 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2243 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
… …
2191 $self->save; 2251 $self->save;
2192 2252
2193 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2253 my $lock = cf::lock_acquire "map_data:$self->{path}";
2194 2254
2195 return if $self->players; 2255 return if $self->players;
2196 return if $self->in_memory != cf::MAP_IN_MEMORY; 2256 return if $self->in_memory != cf::MAP_ACTIVE;
2197 return if $self->{deny_save}; 2257 return if $self->{deny_save};
2198 2258
2199 $self->in_memory (cf::MAP_SWAPPED); 2259 $self->in_memory (cf::MAP_SWAPPED);
2200 2260
2201 $self->deactivate; 2261 $self->deactivate;
… …
2319 2379
2320sub unique_maps() { 2380sub unique_maps() {
2321 [ 2381 [
2322 map { 2382 map {
2323 utf8::decode $_; 2383 utf8::decode $_;
2324 /\.map$/ 2384 s/\.map$//; # TODO future compatibility hack
2385 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2386 ? ()
2325 ? normalise $_ 2387 : normalise $_
2326 : ()
2327 } @{ aio_readdir $UNIQUEDIR or [] } 2388 } @{ aio_readdir $UNIQUEDIR or [] }
2328 ] 2389 ]
2329} 2390}
2330 2391
2331package cf;
2332
2333=back 2392=back
2334 2393
2335=head3 cf::object 2394=head3 cf::object
2336 2395
2337=cut 2396=cut
… …
2340 2399
2341=over 4 2400=over 4
2342 2401
2343=item $ob->inv_recursive 2402=item $ob->inv_recursive
2344 2403
2345Returns the inventory of the object _and_ their inventories, recursively. 2404Returns the inventory of the object I<and> their inventories, recursively,
2405but I<not> the object itself.
2346 2406
2347=cut 2407=cut
2348 2408
2349sub inv_recursive_; 2409sub inv_recursive_;
2350sub inv_recursive_ { 2410sub inv_recursive_ {
… …
2355 inv_recursive_ inv $_[0] 2415 inv_recursive_ inv $_[0]
2356} 2416}
2357 2417
2358=item $ref = $ob->ref 2418=item $ref = $ob->ref
2359 2419
2360creates and returns a persistent reference to an objetc that can be stored as a string. 2420Creates and returns a persistent reference to an object that can be stored as a string.
2361 2421
2362=item $ob = cf::object::deref ($refstring) 2422=item $ob = cf::object::deref ($refstring)
2363 2423
2364returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2424returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2365even if the object actually exists. May block. 2425even if the object actually exists. May block.
… …
2639 $rmp->{origin_y} = $exit->y; 2699 $rmp->{origin_y} = $exit->y;
2640 } 2700 }
2641 2701
2642 $rmp->{random_seed} ||= $exit->random_seed; 2702 $rmp->{random_seed} ||= $exit->random_seed;
2643 2703
2644 my $data = cf::encode_json $rmp; 2704 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2645 my $md5 = Digest::MD5::md5_hex $data; 2705 my $md5 = Digest::MD5::md5_hex $data;
2646 my $meta = "$RANDOMDIR/$md5.meta"; 2706 my $meta = "$RANDOMDIR/$md5.meta";
2647 2707
2648 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2708 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2649 aio_write $fh, 0, (length $data), $data, 0; 2709 aio_write $fh, 0, (length $data), $data, 0;
… …
2772 id => "infobox", 2832 id => "infobox",
2773 title => "Map Info", 2833 title => "Map Info",
2774 reply => undef, 2834 reply => undef,
2775 tooltip => "Information related to the maps", 2835 tooltip => "Information related to the maps",
2776 }, 2836 },
2837 "c/party" => {
2838 id => "party",
2839 title => "Party",
2840 reply => "gsay ",
2841 tooltip => "Messages and chat related to your party",
2842 },
2777); 2843);
2778 2844
2779sub cf::client::send_msg { 2845sub cf::client::send_msg {
2780 my ($self, $channel, $msg, $color, @extra) = @_; 2846 my ($self, $channel, $msg, $color, @extra) = @_;
2781 2847
… …
3018 3084
3019The following functions and methods are available within a safe environment: 3085The following functions and methods are available within a safe environment:
3020 3086
3021 cf::object 3087 cf::object
3022 contr pay_amount pay_player map x y force_find force_add destroy 3088 contr pay_amount pay_player map x y force_find force_add destroy
3023 insert remove name archname title slaying race decrease_ob_nr 3089 insert remove name archname title slaying race decrease split
3024 3090
3025 cf::object::player 3091 cf::object::player
3026 player 3092 player
3027 3093
3028 cf::player 3094 cf::player
… …
3034=cut 3100=cut
3035 3101
3036for ( 3102for (
3037 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3103 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3038 insert remove inv name archname title slaying race 3104 insert remove inv name archname title slaying race
3039 decrease_ob_nr destroy)], 3105 decrease split destroy)],
3040 ["cf::object::player" => qw(player)], 3106 ["cf::object::player" => qw(player)],
3041 ["cf::player" => qw(peaceful)], 3107 ["cf::player" => qw(peaceful)],
3042 ["cf::map" => qw(trigger)], 3108 ["cf::map" => qw(trigger)],
3043) { 3109) {
3044 no strict 'refs'; 3110 no strict 'refs';
… …
3149 { 3215 {
3150 my $faces = $facedata->{faceinfo}; 3216 my $faces = $facedata->{faceinfo};
3151 3217
3152 while (my ($face, $info) = each %$faces) { 3218 while (my ($face, $info) = each %$faces) {
3153 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3219 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3220
3154 cf::face::set_visibility $idx, $info->{visibility}; 3221 cf::face::set_visibility $idx, $info->{visibility};
3155 cf::face::set_magicmap $idx, $info->{magicmap}; 3222 cf::face::set_magicmap $idx, $info->{magicmap};
3156 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3223 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
3157 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3224 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3158 3225
3159 cf::cede_to_tick; 3226 cf::cede_to_tick;
3160 } 3227 }
3161 3228
3162 while (my ($face, $info) = each %$faces) { 3229 while (my ($face, $info) = each %$faces) {
3163 next unless $info->{smooth}; 3230 next unless $info->{smooth};
3231
3164 my $idx = cf::face::find $face 3232 my $idx = cf::face::find $face
3165 or next; 3233 or next;
3234
3166 if (my $smooth = cf::face::find $info->{smooth}) { 3235 if (my $smooth = cf::face::find $info->{smooth}) {
3167 cf::face::set_smooth $idx, $smooth; 3236 cf::face::set_smooth $idx, $smooth;
3168 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3237 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3169 } else { 3238 } else {
3170 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3239 warn "smooth face '$info->{smooth}' not found for face '$face'";
… …
3188 { 3257 {
3189 # TODO: for gcfclient pleasure, we should give resources 3258 # TODO: for gcfclient pleasure, we should give resources
3190 # that gcfclient doesn't grok a >10000 face index. 3259 # that gcfclient doesn't grok a >10000 face index.
3191 my $res = $facedata->{resource}; 3260 my $res = $facedata->{resource};
3192 3261
3193 my $soundconf = delete $res->{"res/sound.conf"};
3194
3195 while (my ($name, $info) = each %$res) { 3262 while (my ($name, $info) = each %$res) {
3263 if (defined $info->{type}) {
3196 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3264 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3197 my $data; 3265 my $data;
3198 3266
3199 if ($info->{type} & 1) { 3267 if ($info->{type} & 1) {
3200 # prepend meta info 3268 # prepend meta info
3201 3269
3202 my $meta = $enc->encode ({ 3270 my $meta = $enc->encode ({
3203 name => $name, 3271 name => $name,
3204 %{ $info->{meta} || {} }, 3272 %{ $info->{meta} || {} },
3205 }); 3273 });
3206 3274
3207 $data = pack "(w/a*)*", $meta, $info->{data}; 3275 $data = pack "(w/a*)*", $meta, $info->{data};
3276 } else {
3277 $data = $info->{data};
3278 }
3279
3280 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3281 cf::face::set_type $idx, $info->{type};
3208 } else { 3282 } else {
3209 $data = $info->{data}; 3283 $RESOURCE{$name} = $info;
3210 } 3284 }
3211 3285
3212 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3213 cf::face::set_type $idx, $info->{type};
3214
3215 cf::cede_to_tick; 3286 cf::cede_to_tick;
3216 } 3287 }
3217
3218 if ($soundconf) {
3219 $soundconf = $enc->decode (delete $soundconf->{data});
3220
3221 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3222 my $sound = $soundconf->{compat}[$_]
3223 or next;
3224
3225 my $face = cf::face::find "sound/$sound->[1]";
3226 cf::sound::set $sound->[0] => $face;
3227 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3228 }
3229
3230 while (my ($k, $v) = each %{$soundconf->{event}}) {
3231 my $face = cf::face::find "sound/$v";
3232 cf::sound::set $k => $face;
3233 }
3234 }
3235 } 3288 }
3289
3290 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3236 3291
3237 1 3292 1
3238} 3293}
3294
3295cf::global->attach (on_resource_update => sub {
3296 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3297 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3298
3299 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3300 my $sound = $soundconf->{compat}[$_]
3301 or next;
3302
3303 my $face = cf::face::find "sound/$sound->[1]";
3304 cf::sound::set $sound->[0] => $face;
3305 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3306 }
3307
3308 while (my ($k, $v) = each %{$soundconf->{event}}) {
3309 my $face = cf::face::find "sound/$v";
3310 cf::sound::set $k => $face;
3311 }
3312 }
3313});
3239 3314
3240register_exticmd fx_want => sub { 3315register_exticmd fx_want => sub {
3241 my ($ns, $want) = @_; 3316 my ($ns, $want) = @_;
3242 3317
3243 while (my ($k, $v) = each %$want) { 3318 while (my ($k, $v) = each %$want) {
3244 $ns->fx_want ($k, $v); 3319 $ns->fx_want ($k, $v);
3245 } 3320 }
3246}; 3321};
3322
3323sub load_resource_file($) {
3324 my $guard = lock_acquire "load_resource_file";
3325
3326 my $status = load_resource_file_ $_[0];
3327 get_slot 0.1, 100;
3328 cf::arch::commit_load;
3329
3330 $status
3331}
3247 3332
3248sub reload_regions { 3333sub reload_regions {
3249 # HACK to clear player env face cache, we need some signal framework 3334 # HACK to clear player env face cache, we need some signal framework
3250 # for this (global event?) 3335 # for this (global event?)
3251 %ext::player_env::MUSIC_FACE_CACHE = (); 3336 %ext::player_env::MUSIC_FACE_CACHE = ();
… …
3265} 3350}
3266 3351
3267sub reload_archetypes { 3352sub reload_archetypes {
3268 load_resource_file "$DATADIR/archetypes" 3353 load_resource_file "$DATADIR/archetypes"
3269 or die "unable to load archetypes\n"; 3354 or die "unable to load archetypes\n";
3270 #d# NEED to laod twice to resolve forward references
3271 # this really needs to be done in an extra post-pass
3272 # (which needs to be synchronous, so solve it differently)
3273 load_resource_file "$DATADIR/archetypes"
3274 or die "unable to load archetypes\n";
3275} 3355}
3276 3356
3277sub reload_treasures { 3357sub reload_treasures {
3278 load_resource_file "$DATADIR/treasures" 3358 load_resource_file "$DATADIR/treasures"
3279 or die "unable to load treasurelists\n"; 3359 or die "unable to load treasurelists\n";
3280} 3360}
3281 3361
3282sub reload_resources { 3362sub reload_resources {
3283 warn "reloading resource files...\n"; 3363 warn "reloading resource files...\n";
3284 3364
3365 reload_facedata;
3366 reload_archetypes;
3285 reload_regions; 3367 reload_regions;
3286 reload_facedata;
3287 #reload_archetypes;#d#
3288 reload_archetypes;
3289 reload_treasures; 3368 reload_treasures;
3290 3369
3291 warn "finished reloading resource files\n"; 3370 warn "finished reloading resource files\n";
3292} 3371}
3293 3372
3294sub init { 3373sub init {
3374 my $guard = freeze_mainloop;
3375
3295 reload_resources; 3376 reload_resources;
3296} 3377}
3297 3378
3298sub reload_config { 3379sub reload_config {
3299 open my $fh, "<:utf8", "$CONFDIR/config" 3380 open my $fh, "<:utf8", "$CONFDIR/config"
3300 or return; 3381 or return;
3301 3382
3302 local $/; 3383 local $/;
3303 *CFG = YAML::Syck::Load <$fh>; 3384 *CFG = YAML::Load <$fh>;
3304 3385
3305 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3386 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3306 3387
3307 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3388 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3308 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3389 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3324 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3405 $Coro::current->{desc} = "IDLE BUG HANDLER";
3325 EV::loop EV::LOOP_ONESHOT; 3406 EV::loop EV::LOOP_ONESHOT;
3326 })->prio (Coro::PRIO_MAX); 3407 })->prio (Coro::PRIO_MAX);
3327 }; 3408 };
3328 3409
3410 {
3411 my $guard = freeze_mainloop;
3329 reload_config; 3412 reload_config;
3330 db_init; 3413 db_init;
3331 load_extensions; 3414 load_extensions;
3332 3415
3333 $TICK_WATCHER->start;
3334 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3416 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3417 evthread_start IO::AIO::poll_fileno;
3418 }
3419
3335 EV::loop; 3420 EV::loop;
3336} 3421}
3337 3422
3338############################################################################# 3423#############################################################################
3339# initialisation and cleanup 3424# initialisation and cleanup
… …
3346 cf::cleanup "SIG$signal"; 3431 cf::cleanup "SIG$signal";
3347 }; 3432 };
3348 } 3433 }
3349} 3434}
3350 3435
3351sub write_runtime { 3436sub write_runtime_sync {
3352 my $runtime = "$LOCALDIR/runtime"; 3437 my $runtime = "$LOCALDIR/runtime";
3353 3438
3354 # first touch the runtime file to show we are still running: 3439 # first touch the runtime file to show we are still running:
3355 # the fsync below can take a very very long time. 3440 # the fsync below can take a very very long time.
3356 3441
… …
3382 and return; 3467 and return;
3383 3468
3384 warn "runtime file written.\n"; 3469 warn "runtime file written.\n";
3385 3470
3386 1 3471 1
3472}
3473
3474our $uuid_lock;
3475our $uuid_skip;
3476
3477sub write_uuid_sync($) {
3478 $uuid_skip ||= $_[0];
3479
3480 return if $uuid_lock;
3481 local $uuid_lock = 1;
3482
3483 my $uuid = "$LOCALDIR/uuid";
3484
3485 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3486 or return;
3487
3488 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3489 $uuid_skip = 0;
3490
3491 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3492 and return;
3493
3494 # always fsync - this file is important
3495 aio_fsync $fh
3496 and return;
3497
3498 close $fh
3499 or return;
3500
3501 aio_rename "$uuid~", $uuid
3502 and return;
3503
3504 warn "uuid file written ($value).\n";
3505
3506 1
3507
3508}
3509
3510sub write_uuid($$) {
3511 my ($skip, $sync) = @_;
3512
3513 $sync ? write_uuid_sync $skip
3514 : async { write_uuid_sync $skip };
3387} 3515}
3388 3516
3389sub emergency_save() { 3517sub emergency_save() {
3390 my $freeze_guard = cf::freeze_mainloop; 3518 my $freeze_guard = cf::freeze_mainloop;
3391 3519
… …
3413 warn "end emergency map save\n"; 3541 warn "end emergency map save\n";
3414 3542
3415 warn "begin emergency database checkpoint\n"; 3543 warn "begin emergency database checkpoint\n";
3416 BDB::db_env_txn_checkpoint $DB_ENV; 3544 BDB::db_env_txn_checkpoint $DB_ENV;
3417 warn "end emergency database checkpoint\n"; 3545 warn "end emergency database checkpoint\n";
3546
3547 warn "begin write uuid\n";
3548 write_uuid_sync 1;
3549 warn "end write uuid\n";
3418 }; 3550 };
3419 3551
3420 warn "leave emergency perl save\n"; 3552 warn "leave emergency perl save\n";
3421} 3553}
3422 3554
… …
3437 warn "reloading..."; 3569 warn "reloading...";
3438 3570
3439 warn "entering sync_job"; 3571 warn "entering sync_job";
3440 3572
3441 cf::sync_job { 3573 cf::sync_job {
3442 cf::write_runtime; # external watchdog should not bark 3574 cf::write_runtime_sync; # external watchdog should not bark
3443 cf::emergency_save; 3575 cf::emergency_save;
3444 cf::write_runtime; # external watchdog should not bark 3576 cf::write_runtime_sync; # external watchdog should not bark
3445 3577
3446 warn "syncing database to disk"; 3578 warn "syncing database to disk";
3447 BDB::db_env_txn_checkpoint $DB_ENV; 3579 BDB::db_env_txn_checkpoint $DB_ENV;
3448 3580
3449 # if anything goes wrong in here, we should simply crash as we already saved 3581 # if anything goes wrong in here, we should simply crash as we already saved
… …
3536 warn "leaving sync_job"; 3668 warn "leaving sync_job";
3537 3669
3538 1 3670 1
3539 } or do { 3671 } or do {
3540 warn $@; 3672 warn $@;
3541 warn "error while reloading, exiting."; 3673 cf::cleanup "error while reloading, exiting.";
3542 exit 1;
3543 }; 3674 };
3544 3675
3545 warn "reloaded"; 3676 warn "reloaded";
3546}; 3677};
3547 3678
… …
3550sub reload_perl() { 3681sub reload_perl() {
3551 # doing reload synchronously and two reloads happen back-to-back, 3682 # doing reload synchronously and two reloads happen back-to-back,
3552 # coro crashes during coro_state_free->destroy here. 3683 # coro crashes during coro_state_free->destroy here.
3553 3684
3554 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3685 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3686 do_reload_perl;
3555 undef $RELOAD_WATCHER; 3687 undef $RELOAD_WATCHER;
3556 do_reload_perl;
3557 }; 3688 };
3558} 3689}
3559 3690
3560register_command "reload" => sub { 3691register_command "reload" => sub {
3561 my ($who, $arg) = @_; 3692 my ($who, $arg) = @_;
… …
3575 3706
3576our @WAIT_FOR_TICK; 3707our @WAIT_FOR_TICK;
3577our @WAIT_FOR_TICK_BEGIN; 3708our @WAIT_FOR_TICK_BEGIN;
3578 3709
3579sub wait_for_tick { 3710sub wait_for_tick {
3580 return unless $TICK_WATCHER->is_active;
3581 return if $Coro::current == $Coro::main; 3711 return if tick_inhibit || $Coro::current == $Coro::main;
3582 3712
3583 my $signal = new Coro::Signal; 3713 my $signal = new Coro::Signal;
3584 push @WAIT_FOR_TICK, $signal; 3714 push @WAIT_FOR_TICK, $signal;
3585 $signal->wait; 3715 $signal->wait;
3586} 3716}
3587 3717
3588sub wait_for_tick_begin { 3718sub wait_for_tick_begin {
3589 return unless $TICK_WATCHER->is_active;
3590 return if $Coro::current == $Coro::main; 3719 return if tick_inhibit || $Coro::current == $Coro::main;
3591 3720
3592 my $signal = new Coro::Signal; 3721 my $signal = new Coro::Signal;
3593 push @WAIT_FOR_TICK_BEGIN, $signal; 3722 push @WAIT_FOR_TICK_BEGIN, $signal;
3594 $signal->wait; 3723 $signal->wait;
3595} 3724}
3596 3725
3597$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 3726sub tick {
3598 if ($Coro::current != $Coro::main) { 3727 if ($Coro::current != $Coro::main) {
3599 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3728 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3600 unless ++$bug_warning > 10; 3729 unless ++$bug_warning > 10;
3601 return; 3730 return;
3602 } 3731 }
3603 3732
3604 $NOW = $tick_start = EV::now;
3605
3606 cf::server_tick; # one server iteration 3733 cf::server_tick; # one server iteration
3607 3734
3608 $RUNTIME += $TICK;
3609 $NEXT_TICK += $TICK;
3610
3611 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3735 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3612 $NEXT_RUNTIME_WRITE = $NOW + 10; 3736 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3613 Coro::async_pool { 3737 Coro::async_pool {
3614 $Coro::current->{desc} = "runtime saver"; 3738 $Coro::current->{desc} = "runtime saver";
3615 write_runtime 3739 write_runtime_sync
3616 or warn "ERROR: unable to write runtime file: $!"; 3740 or warn "ERROR: unable to write runtime file: $!";
3617 }; 3741 };
3618 } 3742 }
3619 3743
3620 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3744 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
… …
3622 } 3746 }
3623 while (my $sig = shift @WAIT_FOR_TICK) { 3747 while (my $sig = shift @WAIT_FOR_TICK) {
3624 $sig->send; 3748 $sig->send;
3625 } 3749 }
3626 3750
3627 $LOAD = ($NOW - $tick_start) / $TICK; 3751 $LOAD = ($NOW - $TICK_START) / $TICK;
3628 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3752 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3629 3753
3630 _post_tick; 3754 if (0) {
3631}; 3755 if ($NEXT_TICK) {
3632$TICK_WATCHER->priority (EV::MAXPRI); 3756 my $jitter = $TICK_START - $NEXT_TICK;
3757 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3758 warn "jitter $JITTER\n";#d#
3759 }
3760 }
3761}
3633 3762
3634{ 3763{
3764 # configure BDB
3765
3635 BDB::min_parallel 8; 3766 BDB::min_parallel 8;
3636 BDB::max_poll_reqs $TICK * 0.1; 3767 BDB::max_poll_reqs $TICK * 0.1;
3768 $Coro::BDB::WATCHER->priority (1);
3637 3769
3638 unless ($DB_ENV) { 3770 unless ($DB_ENV) {
3639 $DB_ENV = BDB::db_env_create; 3771 $DB_ENV = BDB::db_env_create;
3640 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3772 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3641 | BDB::LOG_AUTOREMOVE, 1); 3773 | BDB::LOG_AUTOREMOVE, 1);
… …
3668 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3800 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3669 }; 3801 };
3670} 3802}
3671 3803
3672{ 3804{
3805 # configure IO::AIO
3806
3673 IO::AIO::min_parallel 8; 3807 IO::AIO::min_parallel 8;
3674
3675 undef $Coro::AIO::WATCHER;
3676 IO::AIO::max_poll_time $TICK * 0.1; 3808 IO::AIO::max_poll_time $TICK * 0.1;
3677 $AIO_POLL_WATCHER = EV::io IO::AIO::poll_fileno, EV::READ, \&IO::AIO::poll_cb; 3809 $Coro::AIO::WATCHER->priority (1);
3678} 3810}
3679 3811
3680my $_log_backtrace; 3812my $_log_backtrace;
3681 3813
3682sub _log_backtrace { 3814sub _log_backtrace {

Diff Legend

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