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.401 by root, Mon Dec 17 06:45:53 2007 UTC vs.
Revision 1.424 by root, Sun Apr 20 05:24:55 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;
… …
3149 { 3209 {
3150 my $faces = $facedata->{faceinfo}; 3210 my $faces = $facedata->{faceinfo};
3151 3211
3152 while (my ($face, $info) = each %$faces) { 3212 while (my ($face, $info) = each %$faces) {
3153 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3213 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3214
3154 cf::face::set_visibility $idx, $info->{visibility}; 3215 cf::face::set_visibility $idx, $info->{visibility};
3155 cf::face::set_magicmap $idx, $info->{magicmap}; 3216 cf::face::set_magicmap $idx, $info->{magicmap};
3156 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3217 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}; 3218 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3158 3219
3159 cf::cede_to_tick; 3220 cf::cede_to_tick;
3160 } 3221 }
3161 3222
3162 while (my ($face, $info) = each %$faces) { 3223 while (my ($face, $info) = each %$faces) {
3163 next unless $info->{smooth}; 3224 next unless $info->{smooth};
3225
3164 my $idx = cf::face::find $face 3226 my $idx = cf::face::find $face
3165 or next; 3227 or next;
3228
3166 if (my $smooth = cf::face::find $info->{smooth}) { 3229 if (my $smooth = cf::face::find $info->{smooth}) {
3167 cf::face::set_smooth $idx, $smooth; 3230 cf::face::set_smooth $idx, $smooth;
3168 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3231 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3169 } else { 3232 } else {
3170 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3233 warn "smooth face '$info->{smooth}' not found for face '$face'";
… …
3188 { 3251 {
3189 # TODO: for gcfclient pleasure, we should give resources 3252 # TODO: for gcfclient pleasure, we should give resources
3190 # that gcfclient doesn't grok a >10000 face index. 3253 # that gcfclient doesn't grok a >10000 face index.
3191 my $res = $facedata->{resource}; 3254 my $res = $facedata->{resource};
3192 3255
3193 my $soundconf = delete $res->{"res/sound.conf"};
3194
3195 while (my ($name, $info) = each %$res) { 3256 while (my ($name, $info) = each %$res) {
3257 if (defined $info->{type}) {
3196 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3258 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3197 my $data; 3259 my $data;
3198 3260
3199 if ($info->{type} & 1) { 3261 if ($info->{type} & 1) {
3200 # prepend meta info 3262 # prepend meta info
3201 3263
3202 my $meta = $enc->encode ({ 3264 my $meta = $enc->encode ({
3203 name => $name, 3265 name => $name,
3204 %{ $info->{meta} || {} }, 3266 %{ $info->{meta} || {} },
3205 }); 3267 });
3206 3268
3207 $data = pack "(w/a*)*", $meta, $info->{data}; 3269 $data = pack "(w/a*)*", $meta, $info->{data};
3270 } else {
3271 $data = $info->{data};
3272 }
3273
3274 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3275 cf::face::set_type $idx, $info->{type};
3208 } else { 3276 } else {
3209 $data = $info->{data}; 3277 $RESOURCE{$name} = $info;
3210 } 3278 }
3211 3279
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; 3280 cf::cede_to_tick;
3216 } 3281 }
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 } 3282 }
3283
3284 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3236 3285
3237 1 3286 1
3238} 3287}
3288
3289cf::global->attach (on_resource_update => sub {
3290 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3291 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3292
3293 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3294 my $sound = $soundconf->{compat}[$_]
3295 or next;
3296
3297 my $face = cf::face::find "sound/$sound->[1]";
3298 cf::sound::set $sound->[0] => $face;
3299 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3300 }
3301
3302 while (my ($k, $v) = each %{$soundconf->{event}}) {
3303 my $face = cf::face::find "sound/$v";
3304 cf::sound::set $k => $face;
3305 }
3306 }
3307});
3239 3308
3240register_exticmd fx_want => sub { 3309register_exticmd fx_want => sub {
3241 my ($ns, $want) = @_; 3310 my ($ns, $want) = @_;
3242 3311
3243 while (my ($k, $v) = each %$want) { 3312 while (my ($k, $v) = each %$want) {
3244 $ns->fx_want ($k, $v); 3313 $ns->fx_want ($k, $v);
3245 } 3314 }
3246}; 3315};
3316
3317sub load_resource_file($) {
3318 my $guard = lock_acquire "load_resource_file";
3319
3320 my $status = load_resource_file_ $_[0];
3321 get_slot 0.1, 100;
3322 cf::arch::commit_load;
3323
3324 $status
3325}
3247 3326
3248sub reload_regions { 3327sub reload_regions {
3249 # HACK to clear player env face cache, we need some signal framework 3328 # HACK to clear player env face cache, we need some signal framework
3250 # for this (global event?) 3329 # for this (global event?)
3251 %ext::player_env::MUSIC_FACE_CACHE = (); 3330 %ext::player_env::MUSIC_FACE_CACHE = ();
… …
3265} 3344}
3266 3345
3267sub reload_archetypes { 3346sub reload_archetypes {
3268 load_resource_file "$DATADIR/archetypes" 3347 load_resource_file "$DATADIR/archetypes"
3269 or die "unable to load archetypes\n"; 3348 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} 3349}
3276 3350
3277sub reload_treasures { 3351sub reload_treasures {
3278 load_resource_file "$DATADIR/treasures" 3352 load_resource_file "$DATADIR/treasures"
3279 or die "unable to load treasurelists\n"; 3353 or die "unable to load treasurelists\n";
3280} 3354}
3281 3355
3282sub reload_resources { 3356sub reload_resources {
3283 warn "reloading resource files...\n"; 3357 warn "reloading resource files...\n";
3284 3358
3359 reload_facedata;
3360 reload_archetypes;
3285 reload_regions; 3361 reload_regions;
3286 reload_facedata;
3287 #reload_archetypes;#d#
3288 reload_archetypes;
3289 reload_treasures; 3362 reload_treasures;
3290 3363
3291 warn "finished reloading resource files\n"; 3364 warn "finished reloading resource files\n";
3292} 3365}
3293 3366
3294sub init { 3367sub init {
3368 my $guard = freeze_mainloop;
3369
3295 reload_resources; 3370 reload_resources;
3296} 3371}
3297 3372
3298sub reload_config { 3373sub reload_config {
3299 open my $fh, "<:utf8", "$CONFDIR/config" 3374 open my $fh, "<:utf8", "$CONFDIR/config"
3300 or return; 3375 or return;
3301 3376
3302 local $/; 3377 local $/;
3303 *CFG = YAML::Syck::Load <$fh>; 3378 *CFG = YAML::Load <$fh>;
3304 3379
3305 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3380 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3306 3381
3307 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3382 $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}; 3383 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3324 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3399 $Coro::current->{desc} = "IDLE BUG HANDLER";
3325 EV::loop EV::LOOP_ONESHOT; 3400 EV::loop EV::LOOP_ONESHOT;
3326 })->prio (Coro::PRIO_MAX); 3401 })->prio (Coro::PRIO_MAX);
3327 }; 3402 };
3328 3403
3404 {
3405 my $guard = freeze_mainloop;
3329 reload_config; 3406 reload_config;
3330 db_init; 3407 db_init;
3331 load_extensions; 3408 load_extensions;
3332 3409
3333 $TICK_WATCHER->start;
3334 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3410 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3411 evthread_start IO::AIO::poll_fileno;
3412 }
3413
3335 EV::loop; 3414 EV::loop;
3336} 3415}
3337 3416
3338############################################################################# 3417#############################################################################
3339# initialisation and cleanup 3418# initialisation and cleanup
… …
3346 cf::cleanup "SIG$signal"; 3425 cf::cleanup "SIG$signal";
3347 }; 3426 };
3348 } 3427 }
3349} 3428}
3350 3429
3351sub write_runtime { 3430sub write_runtime_sync {
3352 my $runtime = "$LOCALDIR/runtime"; 3431 my $runtime = "$LOCALDIR/runtime";
3353 3432
3354 # first touch the runtime file to show we are still running: 3433 # first touch the runtime file to show we are still running:
3355 # the fsync below can take a very very long time. 3434 # the fsync below can take a very very long time.
3356 3435
… …
3382 and return; 3461 and return;
3383 3462
3384 warn "runtime file written.\n"; 3463 warn "runtime file written.\n";
3385 3464
3386 1 3465 1
3466}
3467
3468our $uuid_lock;
3469our $uuid_skip;
3470
3471sub write_uuid_sync($) {
3472 $uuid_skip ||= $_[0];
3473
3474 return if $uuid_lock;
3475 local $uuid_lock = 1;
3476
3477 my $uuid = "$LOCALDIR/uuid";
3478
3479 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3480 or return;
3481
3482 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3483 $uuid_skip = 0;
3484
3485 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3486 and return;
3487
3488 # always fsync - this file is important
3489 aio_fsync $fh
3490 and return;
3491
3492 close $fh
3493 or return;
3494
3495 aio_rename "$uuid~", $uuid
3496 and return;
3497
3498 warn "uuid file written ($value).\n";
3499
3500 1
3501
3502}
3503
3504sub write_uuid($$) {
3505 my ($skip, $sync) = @_;
3506
3507 $sync ? write_uuid_sync $skip
3508 : async { write_uuid_sync $skip };
3387} 3509}
3388 3510
3389sub emergency_save() { 3511sub emergency_save() {
3390 my $freeze_guard = cf::freeze_mainloop; 3512 my $freeze_guard = cf::freeze_mainloop;
3391 3513
… …
3413 warn "end emergency map save\n"; 3535 warn "end emergency map save\n";
3414 3536
3415 warn "begin emergency database checkpoint\n"; 3537 warn "begin emergency database checkpoint\n";
3416 BDB::db_env_txn_checkpoint $DB_ENV; 3538 BDB::db_env_txn_checkpoint $DB_ENV;
3417 warn "end emergency database checkpoint\n"; 3539 warn "end emergency database checkpoint\n";
3540
3541 warn "begin write uuid\n";
3542 write_uuid_sync 1;
3543 warn "end write uuid\n";
3418 }; 3544 };
3419 3545
3420 warn "leave emergency perl save\n"; 3546 warn "leave emergency perl save\n";
3421} 3547}
3422 3548
… …
3437 warn "reloading..."; 3563 warn "reloading...";
3438 3564
3439 warn "entering sync_job"; 3565 warn "entering sync_job";
3440 3566
3441 cf::sync_job { 3567 cf::sync_job {
3442 cf::write_runtime; # external watchdog should not bark 3568 cf::write_runtime_sync; # external watchdog should not bark
3443 cf::emergency_save; 3569 cf::emergency_save;
3444 cf::write_runtime; # external watchdog should not bark 3570 cf::write_runtime_sync; # external watchdog should not bark
3445 3571
3446 warn "syncing database to disk"; 3572 warn "syncing database to disk";
3447 BDB::db_env_txn_checkpoint $DB_ENV; 3573 BDB::db_env_txn_checkpoint $DB_ENV;
3448 3574
3449 # if anything goes wrong in here, we should simply crash as we already saved 3575 # if anything goes wrong in here, we should simply crash as we already saved
… …
3536 warn "leaving sync_job"; 3662 warn "leaving sync_job";
3537 3663
3538 1 3664 1
3539 } or do { 3665 } or do {
3540 warn $@; 3666 warn $@;
3541 warn "error while reloading, exiting."; 3667 cf::cleanup "error while reloading, exiting.";
3542 exit 1;
3543 }; 3668 };
3544 3669
3545 warn "reloaded"; 3670 warn "reloaded";
3546}; 3671};
3547 3672
… …
3550sub reload_perl() { 3675sub reload_perl() {
3551 # doing reload synchronously and two reloads happen back-to-back, 3676 # doing reload synchronously and two reloads happen back-to-back,
3552 # coro crashes during coro_state_free->destroy here. 3677 # coro crashes during coro_state_free->destroy here.
3553 3678
3554 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3679 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3680 do_reload_perl;
3555 undef $RELOAD_WATCHER; 3681 undef $RELOAD_WATCHER;
3556 do_reload_perl;
3557 }; 3682 };
3558} 3683}
3559 3684
3560register_command "reload" => sub { 3685register_command "reload" => sub {
3561 my ($who, $arg) = @_; 3686 my ($who, $arg) = @_;
… …
3575 3700
3576our @WAIT_FOR_TICK; 3701our @WAIT_FOR_TICK;
3577our @WAIT_FOR_TICK_BEGIN; 3702our @WAIT_FOR_TICK_BEGIN;
3578 3703
3579sub wait_for_tick { 3704sub wait_for_tick {
3580 return unless $TICK_WATCHER->is_active;
3581 return if $Coro::current == $Coro::main; 3705 return if tick_inhibit || $Coro::current == $Coro::main;
3582 3706
3583 my $signal = new Coro::Signal; 3707 my $signal = new Coro::Signal;
3584 push @WAIT_FOR_TICK, $signal; 3708 push @WAIT_FOR_TICK, $signal;
3585 $signal->wait; 3709 $signal->wait;
3586} 3710}
3587 3711
3588sub wait_for_tick_begin { 3712sub wait_for_tick_begin {
3589 return unless $TICK_WATCHER->is_active;
3590 return if $Coro::current == $Coro::main; 3713 return if tick_inhibit || $Coro::current == $Coro::main;
3591 3714
3592 my $signal = new Coro::Signal; 3715 my $signal = new Coro::Signal;
3593 push @WAIT_FOR_TICK_BEGIN, $signal; 3716 push @WAIT_FOR_TICK_BEGIN, $signal;
3594 $signal->wait; 3717 $signal->wait;
3595} 3718}
3596 3719
3597$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 3720sub tick {
3598 if ($Coro::current != $Coro::main) { 3721 if ($Coro::current != $Coro::main) {
3599 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3722 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3600 unless ++$bug_warning > 10; 3723 unless ++$bug_warning > 10;
3601 return; 3724 return;
3602 } 3725 }
3603 3726
3604 $NOW = $tick_start = EV::now;
3605
3606 cf::server_tick; # one server iteration 3727 cf::server_tick; # one server iteration
3607 3728
3608 $RUNTIME += $TICK;
3609 $NEXT_TICK += $TICK;
3610
3611 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3729 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3612 $NEXT_RUNTIME_WRITE = $NOW + 10; 3730 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3613 Coro::async_pool { 3731 Coro::async_pool {
3614 $Coro::current->{desc} = "runtime saver"; 3732 $Coro::current->{desc} = "runtime saver";
3615 write_runtime 3733 write_runtime_sync
3616 or warn "ERROR: unable to write runtime file: $!"; 3734 or warn "ERROR: unable to write runtime file: $!";
3617 }; 3735 };
3618 } 3736 }
3619 3737
3620 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3738 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
… …
3622 } 3740 }
3623 while (my $sig = shift @WAIT_FOR_TICK) { 3741 while (my $sig = shift @WAIT_FOR_TICK) {
3624 $sig->send; 3742 $sig->send;
3625 } 3743 }
3626 3744
3627 $LOAD = ($NOW - $tick_start) / $TICK; 3745 $LOAD = ($NOW - $TICK_START) / $TICK;
3628 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3746 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3629 3747
3630 _post_tick; 3748 if (0) {
3631}; 3749 if ($NEXT_TICK) {
3632$TICK_WATCHER->priority (EV::MAXPRI); 3750 my $jitter = $TICK_START - $NEXT_TICK;
3751 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3752 warn "jitter $JITTER\n";#d#
3753 }
3754 }
3755}
3633 3756
3634{ 3757{
3635 # configure BDB 3758 # configure BDB
3636 3759
3637 BDB::min_parallel 8; 3760 BDB::min_parallel 8;
3638 BDB::max_poll_reqs $TICK * 0.1; 3761 BDB::max_poll_reqs $TICK * 0.1;
3762 $Coro::BDB::WATCHER->priority (1);
3639 3763
3640 unless ($DB_ENV) { 3764 unless ($DB_ENV) {
3641 $DB_ENV = BDB::db_env_create; 3765 $DB_ENV = BDB::db_env_create;
3642 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3766 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3643 | BDB::LOG_AUTOREMOVE, 1); 3767 | BDB::LOG_AUTOREMOVE, 1);
… …
3674{ 3798{
3675 # configure IO::AIO 3799 # configure IO::AIO
3676 3800
3677 IO::AIO::min_parallel 8; 3801 IO::AIO::min_parallel 8;
3678 IO::AIO::max_poll_time $TICK * 0.1; 3802 IO::AIO::max_poll_time $TICK * 0.1;
3803 $Coro::AIO::WATCHER->priority (1);
3679} 3804}
3680 3805
3681my $_log_backtrace; 3806my $_log_backtrace;
3682 3807
3683sub _log_backtrace { 3808sub _log_backtrace {

Diff Legend

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