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.398 by root, Wed Dec 5 11:08:34 2007 UTC vs.
Revision 1.425 by root, Mon Apr 21 06:35:26 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.1 (); 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;
21use Coro::Semaphore; 42use Coro::Semaphore;
22use Coro::AIO; 43use Coro::AIO;
44use Coro::BDB;
23use Coro::Storable; 45use Coro::Storable;
24use Coro::Util (); 46use Coro::Util ();
25 47
26use JSON::XS 2.01 (); 48use JSON::XS 2.01 ();
27use BDB (); 49use BDB ();
28use Data::Dumper; 50use Data::Dumper;
29use Digest::MD5; 51use Digest::MD5;
30use Fcntl; 52use Fcntl;
31use YAML::Syck (); 53use YAML ();
32use IO::AIO 2.51 (); 54use IO::AIO 2.51 ();
33use Time::HiRes; 55use Time::HiRes;
34use Compress::LZF; 56use Compress::LZF;
35use Digest::MD5 (); 57use Digest::MD5 ();
36 58
37# configure various modules to our taste 59# configure various modules to our taste
38# 60#
39$Storable::canonical = 1; # reduce rsync transfers 61$Storable::canonical = 1; # reduce rsync transfers
40Coro::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
41Compress::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
42
43# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
44$YAML::Syck::ImplicitUnicode = 1;
45 64
46$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
47 66
48sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
49 68
… …
68our $TMPDIR = "$LOCALDIR/" . tmpdir; 87our $TMPDIR = "$LOCALDIR/" . tmpdir;
69our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
70our $PLAYERDIR = "$LOCALDIR/" . playerdir; 89our $PLAYERDIR = "$LOCALDIR/" . playerdir;
71our $RANDOMDIR = "$LOCALDIR/random"; 90our $RANDOMDIR = "$LOCALDIR/random";
72our $BDBDIR = "$LOCALDIR/db"; 91our $BDBDIR = "$LOCALDIR/db";
92our %RESOURCE;
73 93
74our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
75our $TICK_WATCHER;
76our $AIO_POLL_WATCHER; 95our $AIO_POLL_WATCHER;
77our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
78our $NEXT_TICK; 97our $NEXT_TICK;
79our $NOW;
80our $USE_FSYNC = 1; # use fsync to write maps - default off 98our $USE_FSYNC = 1; # use fsync to write maps - default off
81 99
82our $BDB_POLL_WATCHER; 100our $BDB_POLL_WATCHER;
83our $BDB_DEADLOCK_WATCHER; 101our $BDB_DEADLOCK_WATCHER;
84our $BDB_CHECKPOINT_WATCHER; 102our $BDB_CHECKPOINT_WATCHER;
… …
87 105
88our %CFG; 106our %CFG;
89 107
90our $UPTIME; $UPTIME ||= time; 108our $UPTIME; $UPTIME ||= time;
91our $RUNTIME; 109our $RUNTIME;
110our $NOW;
92 111
93our (%PLAYER, %PLAYER_LOADING); # all users 112our (%PLAYER, %PLAYER_LOADING); # all users
94our (%MAP, %MAP_LOADING ); # all maps 113our (%MAP, %MAP_LOADING ); # all maps
95our $LINK_MAP; # the special {link} map, which is always available 114our $LINK_MAP; # the special {link} map, which is always available
96 115
97# 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 ∕
98our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 117our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
99 118
100our $LOAD; # a number between 0 (idle) and 1 (too many objects) 119our $LOAD; # a number between 0 (idle) and 1 (too many objects)
101our $LOADAVG; # same thing, but with alpha-smoothing 120our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter
102our $tick_start; # for load detecting purposes 122our $TICK_START; # for load detecting purposes
103 123
104binmode STDOUT; 124binmode STDOUT;
105binmode STDERR; 125binmode STDERR;
106 126
107# read virtual server time, if available 127# read virtual server time, if available
… …
191 $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;
192 212
193 LOG llevError, $msg; 213 LOG llevError, $msg;
194 }; 214 };
195} 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#?
196 231
197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 232@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
198@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 233@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
199@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 234@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
200@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 235@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
325 360
326 ! ! $LOCK{$key} 361 ! ! $LOCK{$key}
327} 362}
328 363
329sub freeze_mainloop { 364sub freeze_mainloop {
330 return unless $TICK_WATCHER->is_active; 365 tick_inhibit_inc;
331 366
332 my $guard = Coro::guard { 367 Coro::guard \&tick_inhibit_dec;
333 $TICK_WATCHER->start;
334 };
335 $TICK_WATCHER->stop;
336 $guard
337} 368}
338 369
339=item cf::periodic $interval, $cb 370=item cf::periodic $interval, $cb
340 371
341Like 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
… …
396 } 427 }
397 } 428 }
398}; 429};
399 430
400sub get_slot($;$$) { 431sub get_slot($;$$) {
432 return if tick_inhibit || $Coro::current == $Coro::main;
433
401 my ($time, $pri, $name) = @_; 434 my ($time, $pri, $name) = @_;
402 435
403 $time = $TICK * .6 if $time > $TICK * .6; 436 $time = $TICK * .6 if $time > $TICK * .6;
404 my $sig = new Coro::Signal; 437 my $sig = new Coro::Signal;
405 438
… …
442 # this is the main coro, too bad, we have to block 475 # this is the main coro, too bad, we have to block
443 # till the operation succeeds, freezing the server :/ 476 # till the operation succeeds, freezing the server :/
444 477
445 LOG llevError, Carp::longmess "sync job";#d# 478 LOG llevError, Carp::longmess "sync job";#d#
446 479
447 # TODO: use suspend/resume instead
448 # (but this is cancel-safe)
449 my $freeze_guard = freeze_mainloop; 480 my $freeze_guard = freeze_mainloop;
450 481
451 my $busy = 1; 482 my $busy = 1;
452 my @res; 483 my @res;
453 484
… …
464 } else { 495 } else {
465 EV::loop EV::LOOP_ONESHOT; 496 EV::loop EV::LOOP_ONESHOT;
466 } 497 }
467 } 498 }
468 499
469 $time = EV::time - $time; 500 my $time = EV::time - $time;
470 501
471 LOG llevError | logBacktrace, Carp::longmess "long sync job"
472 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
473
474 $tick_start += $time; # do not account sync jobs to server load 502 $TICK_START += $time; # do not account sync jobs to server load
475 503
476 wantarray ? @res : $res[0] 504 wantarray ? @res : $res[0]
477 } else { 505 } else {
478 # we are in another coroutine, how wonderful, everything just works 506 # we are in another coroutine, how wonderful, everything just works
479 507
… …
521 reset_signals; 549 reset_signals;
522 &$cb 550 &$cb
523 }, @args; 551 }, @args;
524 552
525 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
526} 581}
527 582
528=item $value = cf::db_get $family => $key 583=item $value = cf::db_get $family => $key
529 584
530Returns a single value from the environment database. 585Returns a single value from the environment database.
… …
967 } 1022 }
968 1023
969 0 1024 0
970} 1025}
971 1026
972=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1027=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
973 1028
974=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1029=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
975 1030
976Generate an object-specific event with the given arguments. 1031Generate an object-specific event with the given arguments.
977 1032
… …
1302 my $msg = $@ ? "$v->{path}: $@\n" 1357 my $msg = $@ ? "$v->{path}: $@\n"
1303 : "$v->{base}: extension inactive.\n"; 1358 : "$v->{base}: extension inactive.\n";
1304 1359
1305 if (exists $v->{meta}{mandatory}) { 1360 if (exists $v->{meta}{mandatory}) {
1306 warn $msg; 1361 warn $msg;
1307 warn "mandatory extension failed to load, exiting.\n"; 1362 cf::cleanup "mandatory extension failed to load, exiting.";
1308 exit 1;
1309 } 1363 }
1310 1364
1311 warn $msg; 1365 warn $msg;
1312 } 1366 }
1313 1367
… …
1421 1475
1422 return if $pl->{deny_save}; 1476 return if $pl->{deny_save};
1423 1477
1424 aio_mkdir playerdir $pl, 0770; 1478 aio_mkdir playerdir $pl, 0770;
1425 $pl->{last_save} = $cf::RUNTIME; 1479 $pl->{last_save} = $cf::RUNTIME;
1480
1481 cf::get_slot 0.01;
1426 1482
1427 $pl->save_pl ($path); 1483 $pl->save_pl ($path);
1428 cf::cede_to_tick; 1484 cf::cede_to_tick;
1429} 1485}
1430 1486
… …
1723our $MAX_RESET = 3600; 1779our $MAX_RESET = 3600;
1724our $DEFAULT_RESET = 3000; 1780our $DEFAULT_RESET = 3000;
1725 1781
1726sub generate_random_map { 1782sub generate_random_map {
1727 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
1728 # mit "rum" bekleckern, nicht 1787 # mit "rum" bekleckern, nicht
1729 $self->_create_random_map ( 1788 $self->_create_random_map (
1730 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1789 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1731 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1790 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1732 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1791 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1854 1913
1855# the temporary/swap location 1914# the temporary/swap location
1856sub save_path { 1915sub save_path {
1857 my ($self) = @_; 1916 my ($self) = @_;
1858 1917
1859 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1918 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1860 "$TMPDIR/$path.map" 1919 "$TMPDIR/$path.map"
1861} 1920}
1862 1921
1863# the unique path, undef == no special unique path 1922# the unique path, undef == no special unique path
1864sub uniq_path { 1923sub uniq_path {
1865 my ($self) = @_; 1924 my ($self) = @_;
1866 1925
1867 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1926 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1868 "$UNIQUEDIR/$path" 1927 "$UNIQUEDIR/$path"
1869} 1928}
1870 1929
1871# and all this just because we cannot iterate over 1930# and all this just because we cannot iterate over
1872# all maps in C++... 1931# all maps in C++...
… …
2058 } 2117 }
2059 2118
2060 $self->{last_save} = $cf::RUNTIME; 2119 $self->{last_save} = $cf::RUNTIME;
2061 $self->last_access ($cf::RUNTIME); 2120 $self->last_access ($cf::RUNTIME);
2062 2121
2063 $self->in_memory (cf::MAP_IN_MEMORY); 2122 $self->in_memory (cf::MAP_ACTIVE);
2064 } 2123 }
2065 2124
2066 $self->post_load; 2125 $self->post_load;
2067} 2126}
2068 2127
… …
2126 my ($path, $origin, $load) = @_; 2185 my ($path, $origin, $load) = @_;
2127 2186
2128 $path = normalise $path, $origin && $origin->{path}; 2187 $path = normalise $path, $origin && $origin->{path};
2129 2188
2130 if (my $map = $cf::MAP{$path}) { 2189 if (my $map = $cf::MAP{$path}) {
2131 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2190 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2132 } 2191 }
2133 2192
2134 $MAP_PREFETCH{$path} |= $load; 2193 $MAP_PREFETCH{$path} |= $load;
2135 2194
2136 $MAP_PREFETCHER ||= cf::async { 2195 $MAP_PREFETCHER ||= cf::async {
… …
2173 cf::async { 2232 cf::async {
2174 $Coro::current->{desc} = "map player save"; 2233 $Coro::current->{desc} = "map player save";
2175 $_->contr->save for $self->players; 2234 $_->contr->save for $self->players;
2176 }; 2235 };
2177 2236
2237 cf::get_slot 0.02;
2238
2178 if ($uniq) { 2239 if ($uniq) {
2179 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2240 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2180 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2241 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2181 } else { 2242 } else {
2182 $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);
… …
2190 $self->save; 2251 $self->save;
2191 2252
2192 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2253 my $lock = cf::lock_acquire "map_data:$self->{path}";
2193 2254
2194 return if $self->players; 2255 return if $self->players;
2195 return if $self->in_memory != cf::MAP_IN_MEMORY; 2256 return if $self->in_memory != cf::MAP_ACTIVE;
2196 return if $self->{deny_save}; 2257 return if $self->{deny_save};
2197 2258
2198 $self->in_memory (cf::MAP_SWAPPED); 2259 $self->in_memory (cf::MAP_SWAPPED);
2199 2260
2200 $self->deactivate; 2261 $self->deactivate;
… …
2318 2379
2319sub unique_maps() { 2380sub unique_maps() {
2320 [ 2381 [
2321 map { 2382 map {
2322 utf8::decode $_; 2383 utf8::decode $_;
2323 /\.map$/ 2384 s/\.map$//; # TODO future compatibility hack
2385 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2386 ? ()
2324 ? normalise $_ 2387 : normalise $_
2325 : ()
2326 } @{ aio_readdir $UNIQUEDIR or [] } 2388 } @{ aio_readdir $UNIQUEDIR or [] }
2327 ] 2389 ]
2328} 2390}
2329 2391
2330package cf;
2331
2332=back 2392=back
2333 2393
2334=head3 cf::object 2394=head3 cf::object
2335 2395
2336=cut 2396=cut
… …
2339 2399
2340=over 4 2400=over 4
2341 2401
2342=item $ob->inv_recursive 2402=item $ob->inv_recursive
2343 2403
2344Returns 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.
2345 2406
2346=cut 2407=cut
2347 2408
2348sub inv_recursive_; 2409sub inv_recursive_;
2349sub inv_recursive_ { 2410sub inv_recursive_ {
… …
2354 inv_recursive_ inv $_[0] 2415 inv_recursive_ inv $_[0]
2355} 2416}
2356 2417
2357=item $ref = $ob->ref 2418=item $ref = $ob->ref
2358 2419
2359creates 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.
2360 2421
2361=item $ob = cf::object::deref ($refstring) 2422=item $ob = cf::object::deref ($refstring)
2362 2423
2363returns 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,
2364even if the object actually exists. May block. 2425even if the object actually exists. May block.
… …
2638 $rmp->{origin_y} = $exit->y; 2699 $rmp->{origin_y} = $exit->y;
2639 } 2700 }
2640 2701
2641 $rmp->{random_seed} ||= $exit->random_seed; 2702 $rmp->{random_seed} ||= $exit->random_seed;
2642 2703
2643 my $data = cf::encode_json $rmp; 2704 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2644 my $md5 = Digest::MD5::md5_hex $data; 2705 my $md5 = Digest::MD5::md5_hex $data;
2645 my $meta = "$RANDOMDIR/$md5.meta"; 2706 my $meta = "$RANDOMDIR/$md5.meta";
2646 2707
2647 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2708 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2648 aio_write $fh, 0, (length $data), $data, 0; 2709 aio_write $fh, 0, (length $data), $data, 0;
… …
3017 3078
3018The following functions and methods are available within a safe environment: 3079The following functions and methods are available within a safe environment:
3019 3080
3020 cf::object 3081 cf::object
3021 contr pay_amount pay_player map x y force_find force_add destroy 3082 contr pay_amount pay_player map x y force_find force_add destroy
3022 insert remove name archname title slaying race decrease_ob_nr 3083 insert remove name archname title slaying race decrease split
3023 3084
3024 cf::object::player 3085 cf::object::player
3025 player 3086 player
3026 3087
3027 cf::player 3088 cf::player
… …
3033=cut 3094=cut
3034 3095
3035for ( 3096for (
3036 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3097 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3037 insert remove inv name archname title slaying race 3098 insert remove inv name archname title slaying race
3038 decrease_ob_nr destroy)], 3099 decrease split destroy)],
3039 ["cf::object::player" => qw(player)], 3100 ["cf::object::player" => qw(player)],
3040 ["cf::player" => qw(peaceful)], 3101 ["cf::player" => qw(peaceful)],
3041 ["cf::map" => qw(trigger)], 3102 ["cf::map" => qw(trigger)],
3042) { 3103) {
3043 no strict 'refs'; 3104 no strict 'refs';
… …
3148 { 3209 {
3149 my $faces = $facedata->{faceinfo}; 3210 my $faces = $facedata->{faceinfo};
3150 3211
3151 while (my ($face, $info) = each %$faces) { 3212 while (my ($face, $info) = each %$faces) {
3152 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3213 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3214
3153 cf::face::set_visibility $idx, $info->{visibility}; 3215 cf::face::set_visibility $idx, $info->{visibility};
3154 cf::face::set_magicmap $idx, $info->{magicmap}; 3216 cf::face::set_magicmap $idx, $info->{magicmap};
3155 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};
3156 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};
3157 3219
3158 cf::cede_to_tick; 3220 cf::cede_to_tick;
3159 } 3221 }
3160 3222
3161 while (my ($face, $info) = each %$faces) { 3223 while (my ($face, $info) = each %$faces) {
3162 next unless $info->{smooth}; 3224 next unless $info->{smooth};
3225
3163 my $idx = cf::face::find $face 3226 my $idx = cf::face::find $face
3164 or next; 3227 or next;
3228
3165 if (my $smooth = cf::face::find $info->{smooth}) { 3229 if (my $smooth = cf::face::find $info->{smooth}) {
3166 cf::face::set_smooth $idx, $smooth; 3230 cf::face::set_smooth $idx, $smooth;
3167 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3231 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3168 } else { 3232 } else {
3169 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3233 warn "smooth face '$info->{smooth}' not found for face '$face'";
… …
3187 { 3251 {
3188 # TODO: for gcfclient pleasure, we should give resources 3252 # TODO: for gcfclient pleasure, we should give resources
3189 # that gcfclient doesn't grok a >10000 face index. 3253 # that gcfclient doesn't grok a >10000 face index.
3190 my $res = $facedata->{resource}; 3254 my $res = $facedata->{resource};
3191 3255
3192 my $soundconf = delete $res->{"res/sound.conf"};
3193
3194 while (my ($name, $info) = each %$res) { 3256 while (my ($name, $info) = each %$res) {
3257 if (defined $info->{type}) {
3195 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3258 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3196 my $data; 3259 my $data;
3197 3260
3198 if ($info->{type} & 1) { 3261 if ($info->{type} & 1) {
3199 # prepend meta info 3262 # prepend meta info
3200 3263
3201 my $meta = $enc->encode ({ 3264 my $meta = $enc->encode ({
3202 name => $name, 3265 name => $name,
3203 %{ $info->{meta} || {} }, 3266 %{ $info->{meta} || {} },
3204 }); 3267 });
3205 3268
3206 $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};
3207 } else { 3276 } else {
3208 $data = $info->{data}; 3277 $RESOURCE{$name} = $info;
3209 } 3278 }
3210 3279
3211 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3212 cf::face::set_type $idx, $info->{type};
3213
3214 cf::cede_to_tick; 3280 cf::cede_to_tick;
3215 } 3281 }
3216
3217 if ($soundconf) {
3218 $soundconf = $enc->decode (delete $soundconf->{data});
3219
3220 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3221 my $sound = $soundconf->{compat}[$_]
3222 or next;
3223
3224 my $face = cf::face::find "sound/$sound->[1]";
3225 cf::sound::set $sound->[0] => $face;
3226 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3227 }
3228
3229 while (my ($k, $v) = each %{$soundconf->{event}}) {
3230 my $face = cf::face::find "sound/$v";
3231 cf::sound::set $k => $face;
3232 }
3233 }
3234 } 3282 }
3283
3284 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3235 3285
3236 1 3286 1
3237} 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});
3238 3308
3239register_exticmd fx_want => sub { 3309register_exticmd fx_want => sub {
3240 my ($ns, $want) = @_; 3310 my ($ns, $want) = @_;
3241 3311
3242 while (my ($k, $v) = each %$want) { 3312 while (my ($k, $v) = each %$want) {
3243 $ns->fx_want ($k, $v); 3313 $ns->fx_want ($k, $v);
3244 } 3314 }
3245}; 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}
3246 3326
3247sub reload_regions { 3327sub reload_regions {
3248 # 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
3249 # for this (global event?) 3329 # for this (global event?)
3250 %ext::player_env::MUSIC_FACE_CACHE = (); 3330 %ext::player_env::MUSIC_FACE_CACHE = ();
… …
3264} 3344}
3265 3345
3266sub reload_archetypes { 3346sub reload_archetypes {
3267 load_resource_file "$DATADIR/archetypes" 3347 load_resource_file "$DATADIR/archetypes"
3268 or die "unable to load archetypes\n"; 3348 or die "unable to load archetypes\n";
3269 #d# NEED to laod twice to resolve forward references
3270 # this really needs to be done in an extra post-pass
3271 # (which needs to be synchronous, so solve it differently)
3272 load_resource_file "$DATADIR/archetypes"
3273 or die "unable to load archetypes\n";
3274} 3349}
3275 3350
3276sub reload_treasures { 3351sub reload_treasures {
3277 load_resource_file "$DATADIR/treasures" 3352 load_resource_file "$DATADIR/treasures"
3278 or die "unable to load treasurelists\n"; 3353 or die "unable to load treasurelists\n";
3279} 3354}
3280 3355
3281sub reload_resources { 3356sub reload_resources {
3282 warn "reloading resource files...\n"; 3357 warn "reloading resource files...\n";
3283 3358
3359 reload_facedata;
3360 reload_archetypes;
3284 reload_regions; 3361 reload_regions;
3285 reload_facedata;
3286 #reload_archetypes;#d#
3287 reload_archetypes;
3288 reload_treasures; 3362 reload_treasures;
3289 3363
3290 warn "finished reloading resource files\n"; 3364 warn "finished reloading resource files\n";
3291} 3365}
3292 3366
3293sub init { 3367sub init {
3368 my $guard = freeze_mainloop;
3369
3294 reload_resources; 3370 reload_resources;
3295} 3371}
3296 3372
3297sub reload_config { 3373sub reload_config {
3298 open my $fh, "<:utf8", "$CONFDIR/config" 3374 open my $fh, "<:utf8", "$CONFDIR/config"
3299 or return; 3375 or return;
3300 3376
3301 local $/; 3377 local $/;
3302 *CFG = YAML::Syck::Load <$fh>; 3378 *CFG = YAML::Load <$fh>;
3303 3379
3304 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3380 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3305 3381
3306 $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};
3307 $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};
… …
3323 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3399 $Coro::current->{desc} = "IDLE BUG HANDLER";
3324 EV::loop EV::LOOP_ONESHOT; 3400 EV::loop EV::LOOP_ONESHOT;
3325 })->prio (Coro::PRIO_MAX); 3401 })->prio (Coro::PRIO_MAX);
3326 }; 3402 };
3327 3403
3404 {
3405 my $guard = freeze_mainloop;
3328 reload_config; 3406 reload_config;
3329 db_init; 3407 db_init;
3330 load_extensions; 3408 load_extensions;
3331 3409
3332 $TICK_WATCHER->start;
3333 $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
3334 EV::loop; 3414 EV::loop;
3335} 3415}
3336 3416
3337############################################################################# 3417#############################################################################
3338# initialisation and cleanup 3418# initialisation and cleanup
… …
3345 cf::cleanup "SIG$signal"; 3425 cf::cleanup "SIG$signal";
3346 }; 3426 };
3347 } 3427 }
3348} 3428}
3349 3429
3350sub write_runtime { 3430sub write_runtime_sync {
3351 my $runtime = "$LOCALDIR/runtime"; 3431 my $runtime = "$LOCALDIR/runtime";
3352 3432
3353 # first touch the runtime file to show we are still running: 3433 # first touch the runtime file to show we are still running:
3354 # the fsync below can take a very very long time. 3434 # the fsync below can take a very very long time.
3355 3435
… …
3381 and return; 3461 and return;
3382 3462
3383 warn "runtime file written.\n"; 3463 warn "runtime file written.\n";
3384 3464
3385 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 };
3386} 3509}
3387 3510
3388sub emergency_save() { 3511sub emergency_save() {
3389 my $freeze_guard = cf::freeze_mainloop; 3512 my $freeze_guard = cf::freeze_mainloop;
3390 3513
… …
3412 warn "end emergency map save\n"; 3535 warn "end emergency map save\n";
3413 3536
3414 warn "begin emergency database checkpoint\n"; 3537 warn "begin emergency database checkpoint\n";
3415 BDB::db_env_txn_checkpoint $DB_ENV; 3538 BDB::db_env_txn_checkpoint $DB_ENV;
3416 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";
3417 }; 3544 };
3418 3545
3419 warn "leave emergency perl save\n"; 3546 warn "leave emergency perl save\n";
3420} 3547}
3421 3548
… …
3436 warn "reloading..."; 3563 warn "reloading...";
3437 3564
3438 warn "entering sync_job"; 3565 warn "entering sync_job";
3439 3566
3440 cf::sync_job { 3567 cf::sync_job {
3441 cf::write_runtime; # external watchdog should not bark 3568 cf::write_runtime_sync; # external watchdog should not bark
3442 cf::emergency_save; 3569 cf::emergency_save;
3443 cf::write_runtime; # external watchdog should not bark 3570 cf::write_runtime_sync; # external watchdog should not bark
3444 3571
3445 warn "syncing database to disk"; 3572 warn "syncing database to disk";
3446 BDB::db_env_txn_checkpoint $DB_ENV; 3573 BDB::db_env_txn_checkpoint $DB_ENV;
3447 3574
3448 # 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
… …
3535 warn "leaving sync_job"; 3662 warn "leaving sync_job";
3536 3663
3537 1 3664 1
3538 } or do { 3665 } or do {
3539 warn $@; 3666 warn $@;
3540 warn "error while reloading, exiting."; 3667 cf::cleanup "error while reloading, exiting.";
3541 exit 1;
3542 }; 3668 };
3543 3669
3544 warn "reloaded"; 3670 warn "reloaded";
3545}; 3671};
3546 3672
… …
3549sub reload_perl() { 3675sub reload_perl() {
3550 # doing reload synchronously and two reloads happen back-to-back, 3676 # doing reload synchronously and two reloads happen back-to-back,
3551 # coro crashes during coro_state_free->destroy here. 3677 # coro crashes during coro_state_free->destroy here.
3552 3678
3553 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3679 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3680 do_reload_perl;
3554 undef $RELOAD_WATCHER; 3681 undef $RELOAD_WATCHER;
3555 do_reload_perl;
3556 }; 3682 };
3557} 3683}
3558 3684
3559register_command "reload" => sub { 3685register_command "reload" => sub {
3560 my ($who, $arg) = @_; 3686 my ($who, $arg) = @_;
… …
3574 3700
3575our @WAIT_FOR_TICK; 3701our @WAIT_FOR_TICK;
3576our @WAIT_FOR_TICK_BEGIN; 3702our @WAIT_FOR_TICK_BEGIN;
3577 3703
3578sub wait_for_tick { 3704sub wait_for_tick {
3579 return unless $TICK_WATCHER->is_active;
3580 return if $Coro::current == $Coro::main; 3705 return if tick_inhibit || $Coro::current == $Coro::main;
3581 3706
3582 my $signal = new Coro::Signal; 3707 my $signal = new Coro::Signal;
3583 push @WAIT_FOR_TICK, $signal; 3708 push @WAIT_FOR_TICK, $signal;
3584 $signal->wait; 3709 $signal->wait;
3585} 3710}
3586 3711
3587sub wait_for_tick_begin { 3712sub wait_for_tick_begin {
3588 return unless $TICK_WATCHER->is_active;
3589 return if $Coro::current == $Coro::main; 3713 return if tick_inhibit || $Coro::current == $Coro::main;
3590 3714
3591 my $signal = new Coro::Signal; 3715 my $signal = new Coro::Signal;
3592 push @WAIT_FOR_TICK_BEGIN, $signal; 3716 push @WAIT_FOR_TICK_BEGIN, $signal;
3593 $signal->wait; 3717 $signal->wait;
3594} 3718}
3595 3719
3596$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 3720sub tick {
3597 if ($Coro::current != $Coro::main) { 3721 if ($Coro::current != $Coro::main) {
3598 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"
3599 unless ++$bug_warning > 10; 3723 unless ++$bug_warning > 10;
3600 return; 3724 return;
3601 } 3725 }
3602 3726
3603 $NOW = $tick_start = EV::now;
3604
3605 cf::server_tick; # one server iteration 3727 cf::server_tick; # one server iteration
3606 3728
3607 $RUNTIME += $TICK;
3608 $NEXT_TICK += $TICK;
3609
3610 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3729 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3611 $NEXT_RUNTIME_WRITE = $NOW + 10; 3730 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3612 Coro::async_pool { 3731 Coro::async_pool {
3613 $Coro::current->{desc} = "runtime saver"; 3732 $Coro::current->{desc} = "runtime saver";
3614 write_runtime 3733 write_runtime_sync
3615 or warn "ERROR: unable to write runtime file: $!"; 3734 or warn "ERROR: unable to write runtime file: $!";
3616 }; 3735 };
3617 } 3736 }
3618 3737
3619 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3738 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
… …
3621 } 3740 }
3622 while (my $sig = shift @WAIT_FOR_TICK) { 3741 while (my $sig = shift @WAIT_FOR_TICK) {
3623 $sig->send; 3742 $sig->send;
3624 } 3743 }
3625 3744
3626 $LOAD = ($NOW - $tick_start) / $TICK; 3745 $LOAD = ($NOW - $TICK_START) / $TICK;
3627 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3746 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3628 3747
3629 _post_tick; 3748 if (0) {
3630}; 3749 if ($NEXT_TICK) {
3631$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}
3632 3756
3633{ 3757{
3758 # configure BDB
3759
3634 BDB::min_parallel 8; 3760 BDB::min_parallel 8;
3635 BDB::max_poll_time $TICK * 0.1; 3761 BDB::max_poll_reqs $TICK * 0.1;
3636 $BDB_POLL_WATCHER = EV::io BDB::poll_fileno, EV::READ, \&BDB::poll_cb; 3762 $Coro::BDB::WATCHER->priority (1);
3637
3638 BDB::set_sync_prepare {
3639 my $status;
3640 my $current = $Coro::current;
3641 (
3642 sub {
3643 $status = $!;
3644 $current->ready; undef $current;
3645 },
3646 sub {
3647 Coro::schedule while defined $current;
3648 $! = $status;
3649 },
3650 )
3651 };
3652 3763
3653 unless ($DB_ENV) { 3764 unless ($DB_ENV) {
3654 $DB_ENV = BDB::db_env_create; 3765 $DB_ENV = BDB::db_env_create;
3655 $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
3656 | BDB::LOG_AUTOREMOVE, 1); 3767 | BDB::LOG_AUTOREMOVE, 1);
… …
3683 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3794 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3684 }; 3795 };
3685} 3796}
3686 3797
3687{ 3798{
3799 # configure IO::AIO
3800
3688 IO::AIO::min_parallel 8; 3801 IO::AIO::min_parallel 8;
3689
3690 undef $Coro::AIO::WATCHER;
3691 IO::AIO::max_poll_time $TICK * 0.1; 3802 IO::AIO::max_poll_time $TICK * 0.1;
3692 $AIO_POLL_WATCHER = EV::io IO::AIO::poll_fileno, EV::READ, \&IO::AIO::poll_cb; 3803 $Coro::AIO::WATCHER->priority (1);
3693} 3804}
3694 3805
3695my $_log_backtrace; 3806my $_log_backtrace;
3696 3807
3697sub _log_backtrace { 3808sub _log_backtrace {

Diff Legend

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