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.403 by root, Mon Dec 17 07:09:18 2007 UTC vs.
Revision 1.427 by root, Sat Apr 26 12:25:45 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
… …
1087 utf8::decode (my $decname = $filename); 1141 utf8::decode (my $decname = $filename);
1088 warn sprintf "saving %s (%d,%d)\n", 1142 warn sprintf "saving %s (%d,%d)\n",
1089 $decname, length $$rdata, scalar @$objs; 1143 $decname, length $$rdata, scalar @$objs;
1090 1144
1091 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1145 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1092 chmod SAVE_MODE, $fh; 1146 aio_chmod $fh, SAVE_MODE;
1093 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1147 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1094 aio_fsync $fh if $cf::USE_FSYNC; 1148 aio_fsync $fh if $cf::USE_FSYNC;
1095 close $fh; 1149 aio_close $fh;
1096 1150
1097 if (@$objs) { 1151 if (@$objs) {
1098 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1152 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1099 chmod SAVE_MODE, $fh; 1153 aio_chmod $fh, SAVE_MODE;
1100 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1154 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1101 aio_write $fh, 0, (length $data), $data, 0; 1155 aio_write $fh, 0, (length $data), $data, 0;
1102 aio_fsync $fh if $cf::USE_FSYNC; 1156 aio_fsync $fh if $cf::USE_FSYNC;
1103 close $fh; 1157 aio_close $fh;
1104 aio_rename "$filename.pst~", "$filename.pst"; 1158 aio_rename "$filename.pst~", "$filename.pst";
1105 } 1159 }
1106 } else { 1160 } else {
1107 aio_unlink "$filename.pst"; 1161 aio_unlink "$filename.pst";
1108 } 1162 }
… …
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
… …
1403 my $f = new_from_file cf::object::thawer path $login 1456 my $f = new_from_file cf::object::thawer path $login
1404 or return; 1457 or return;
1405 1458
1406 my $pl = cf::player::load_pl $f 1459 my $pl = cf::player::load_pl $f
1407 or return; 1460 or return;
1461
1408 local $cf::PLAYER_LOADING{$login} = $pl; 1462 local $cf::PLAYER_LOADING{$login} = $pl;
1409 $f->resolve_delayed_derefs; 1463 $f->resolve_delayed_derefs;
1410 $cf::PLAYER{$login} = $pl 1464 $cf::PLAYER{$login} = $pl
1411 } 1465 }
1412 } 1466 }
… …
1422 1476
1423 return if $pl->{deny_save}; 1477 return if $pl->{deny_save};
1424 1478
1425 aio_mkdir playerdir $pl, 0770; 1479 aio_mkdir playerdir $pl, 0770;
1426 $pl->{last_save} = $cf::RUNTIME; 1480 $pl->{last_save} = $cf::RUNTIME;
1481
1482 cf::get_slot 0.01;
1427 1483
1428 $pl->save_pl ($path); 1484 $pl->save_pl ($path);
1429 cf::cede_to_tick; 1485 cf::cede_to_tick;
1430} 1486}
1431 1487
… …
1515 1571
1516 for my $login (@$dirs) { 1572 for my $login (@$dirs) {
1517 my $path = path $login; 1573 my $path = path $login;
1518 1574
1519 # a .pst is a dead give-away for a valid player 1575 # a .pst is a dead give-away for a valid player
1520 unless (-e "$path.pst") { 1576 # if no pst file found, open and chekc for blocked users
1577 if (aio_stat "$path.pst") {
1521 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1578 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1522 aio_read $fh, 0, 512, my $buf, 0 or next; 1579 aio_read $fh, 0, 512, my $buf, 0 or next;
1523 $buf !~ /^password -------------$/m or next; # official not-valid tag 1580 $buf !~ /^password -------------$/m or next; # official not-valid tag
1524 } 1581 }
1525 1582
… …
1724our $MAX_RESET = 3600; 1781our $MAX_RESET = 3600;
1725our $DEFAULT_RESET = 3000; 1782our $DEFAULT_RESET = 3000;
1726 1783
1727sub generate_random_map { 1784sub generate_random_map {
1728 my ($self, $rmp) = @_; 1785 my ($self, $rmp) = @_;
1786
1787 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1788
1729 # mit "rum" bekleckern, nicht 1789 # mit "rum" bekleckern, nicht
1730 $self->_create_random_map ( 1790 $self->_create_random_map (
1731 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1791 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1732 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1792 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1733 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1793 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1855 1915
1856# the temporary/swap location 1916# the temporary/swap location
1857sub save_path { 1917sub save_path {
1858 my ($self) = @_; 1918 my ($self) = @_;
1859 1919
1860 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1920 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1861 "$TMPDIR/$path.map" 1921 "$TMPDIR/$path.map"
1862} 1922}
1863 1923
1864# the unique path, undef == no special unique path 1924# the unique path, undef == no special unique path
1865sub uniq_path { 1925sub uniq_path {
1866 my ($self) = @_; 1926 my ($self) = @_;
1867 1927
1868 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1928 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1869 "$UNIQUEDIR/$path" 1929 "$UNIQUEDIR/$path"
1870} 1930}
1871 1931
1872# and all this just because we cannot iterate over 1932# and all this just because we cannot iterate over
1873# all maps in C++... 1933# all maps in C++...
… …
2059 } 2119 }
2060 2120
2061 $self->{last_save} = $cf::RUNTIME; 2121 $self->{last_save} = $cf::RUNTIME;
2062 $self->last_access ($cf::RUNTIME); 2122 $self->last_access ($cf::RUNTIME);
2063 2123
2064 $self->in_memory (cf::MAP_IN_MEMORY); 2124 $self->in_memory (cf::MAP_ACTIVE);
2065 } 2125 }
2066 2126
2067 $self->post_load; 2127 $self->post_load;
2068} 2128}
2069 2129
… …
2127 my ($path, $origin, $load) = @_; 2187 my ($path, $origin, $load) = @_;
2128 2188
2129 $path = normalise $path, $origin && $origin->{path}; 2189 $path = normalise $path, $origin && $origin->{path};
2130 2190
2131 if (my $map = $cf::MAP{$path}) { 2191 if (my $map = $cf::MAP{$path}) {
2132 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2192 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2133 } 2193 }
2134 2194
2135 $MAP_PREFETCH{$path} |= $load; 2195 $MAP_PREFETCH{$path} |= $load;
2136 2196
2137 $MAP_PREFETCHER ||= cf::async { 2197 $MAP_PREFETCHER ||= cf::async {
… …
2174 cf::async { 2234 cf::async {
2175 $Coro::current->{desc} = "map player save"; 2235 $Coro::current->{desc} = "map player save";
2176 $_->contr->save for $self->players; 2236 $_->contr->save for $self->players;
2177 }; 2237 };
2178 2238
2239 cf::get_slot 0.02;
2240
2179 if ($uniq) { 2241 if ($uniq) {
2180 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2242 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2181 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2243 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2182 } else { 2244 } else {
2183 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2245 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
… …
2191 $self->save; 2253 $self->save;
2192 2254
2193 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2255 my $lock = cf::lock_acquire "map_data:$self->{path}";
2194 2256
2195 return if $self->players; 2257 return if $self->players;
2196 return if $self->in_memory != cf::MAP_IN_MEMORY; 2258 return if $self->in_memory != cf::MAP_ACTIVE;
2197 return if $self->{deny_save}; 2259 return if $self->{deny_save};
2198 2260
2199 $self->in_memory (cf::MAP_SWAPPED); 2261 $self->in_memory (cf::MAP_SWAPPED);
2200 2262
2201 $self->deactivate; 2263 $self->deactivate;
… …
2319 2381
2320sub unique_maps() { 2382sub unique_maps() {
2321 [ 2383 [
2322 map { 2384 map {
2323 utf8::decode $_; 2385 utf8::decode $_;
2324 /\.map$/ 2386 s/\.map$//; # TODO future compatibility hack
2387 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2388 ? ()
2325 ? normalise $_ 2389 : normalise $_
2326 : ()
2327 } @{ aio_readdir $UNIQUEDIR or [] } 2390 } @{ aio_readdir $UNIQUEDIR or [] }
2328 ] 2391 ]
2329} 2392}
2330 2393
2331package cf;
2332
2333=back 2394=back
2334 2395
2335=head3 cf::object 2396=head3 cf::object
2336 2397
2337=cut 2398=cut
… …
2340 2401
2341=over 4 2402=over 4
2342 2403
2343=item $ob->inv_recursive 2404=item $ob->inv_recursive
2344 2405
2345Returns the inventory of the object _and_ their inventories, recursively. 2406Returns the inventory of the object I<and> their inventories, recursively,
2407but I<not> the object itself.
2346 2408
2347=cut 2409=cut
2348 2410
2349sub inv_recursive_; 2411sub inv_recursive_;
2350sub inv_recursive_ { 2412sub inv_recursive_ {
… …
2355 inv_recursive_ inv $_[0] 2417 inv_recursive_ inv $_[0]
2356} 2418}
2357 2419
2358=item $ref = $ob->ref 2420=item $ref = $ob->ref
2359 2421
2360creates and returns a persistent reference to an objetc that can be stored as a string. 2422Creates and returns a persistent reference to an object that can be stored as a string.
2361 2423
2362=item $ob = cf::object::deref ($refstring) 2424=item $ob = cf::object::deref ($refstring)
2363 2425
2364returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2426returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2365even if the object actually exists. May block. 2427even if the object actually exists. May block.
… …
2639 $rmp->{origin_y} = $exit->y; 2701 $rmp->{origin_y} = $exit->y;
2640 } 2702 }
2641 2703
2642 $rmp->{random_seed} ||= $exit->random_seed; 2704 $rmp->{random_seed} ||= $exit->random_seed;
2643 2705
2644 my $data = cf::encode_json $rmp; 2706 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2645 my $md5 = Digest::MD5::md5_hex $data; 2707 my $md5 = Digest::MD5::md5_hex $data;
2646 my $meta = "$RANDOMDIR/$md5.meta"; 2708 my $meta = "$RANDOMDIR/$md5.meta";
2647 2709
2648 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2710 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2649 aio_write $fh, 0, (length $data), $data, 0; 2711 aio_write $fh, 0, (length $data), $data, 0;
… …
2772 id => "infobox", 2834 id => "infobox",
2773 title => "Map Info", 2835 title => "Map Info",
2774 reply => undef, 2836 reply => undef,
2775 tooltip => "Information related to the maps", 2837 tooltip => "Information related to the maps",
2776 }, 2838 },
2839 "c/party" => {
2840 id => "party",
2841 title => "Party",
2842 reply => "gsay ",
2843 tooltip => "Messages and chat related to your party",
2844 },
2777); 2845);
2778 2846
2779sub cf::client::send_msg { 2847sub cf::client::send_msg {
2780 my ($self, $channel, $msg, $color, @extra) = @_; 2848 my ($self, $channel, $msg, $color, @extra) = @_;
2781 2849
… …
3018 3086
3019The following functions and methods are available within a safe environment: 3087The following functions and methods are available within a safe environment:
3020 3088
3021 cf::object 3089 cf::object
3022 contr pay_amount pay_player map x y force_find force_add destroy 3090 contr pay_amount pay_player map x y force_find force_add destroy
3023 insert remove name archname title slaying race decrease_ob_nr 3091 insert remove name archname title slaying race decrease split
3024 3092
3025 cf::object::player 3093 cf::object::player
3026 player 3094 player
3027 3095
3028 cf::player 3096 cf::player
… …
3034=cut 3102=cut
3035 3103
3036for ( 3104for (
3037 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3105 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3038 insert remove inv name archname title slaying race 3106 insert remove inv name archname title slaying race
3039 decrease_ob_nr destroy)], 3107 decrease split destroy)],
3040 ["cf::object::player" => qw(player)], 3108 ["cf::object::player" => qw(player)],
3041 ["cf::player" => qw(peaceful)], 3109 ["cf::player" => qw(peaceful)],
3042 ["cf::map" => qw(trigger)], 3110 ["cf::map" => qw(trigger)],
3043) { 3111) {
3044 no strict 'refs'; 3112 no strict 'refs';
… …
3149 { 3217 {
3150 my $faces = $facedata->{faceinfo}; 3218 my $faces = $facedata->{faceinfo};
3151 3219
3152 while (my ($face, $info) = each %$faces) { 3220 while (my ($face, $info) = each %$faces) {
3153 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3221 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3222
3154 cf::face::set_visibility $idx, $info->{visibility}; 3223 cf::face::set_visibility $idx, $info->{visibility};
3155 cf::face::set_magicmap $idx, $info->{magicmap}; 3224 cf::face::set_magicmap $idx, $info->{magicmap};
3156 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3225 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}; 3226 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3158 3227
3159 cf::cede_to_tick; 3228 cf::cede_to_tick;
3160 } 3229 }
3161 3230
3162 while (my ($face, $info) = each %$faces) { 3231 while (my ($face, $info) = each %$faces) {
3163 next unless $info->{smooth}; 3232 next unless $info->{smooth};
3233
3164 my $idx = cf::face::find $face 3234 my $idx = cf::face::find $face
3165 or next; 3235 or next;
3236
3166 if (my $smooth = cf::face::find $info->{smooth}) { 3237 if (my $smooth = cf::face::find $info->{smooth}) {
3167 cf::face::set_smooth $idx, $smooth; 3238 cf::face::set_smooth $idx, $smooth;
3168 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3239 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3169 } else { 3240 } else {
3170 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3241 warn "smooth face '$info->{smooth}' not found for face '$face'";
… …
3188 { 3259 {
3189 # TODO: for gcfclient pleasure, we should give resources 3260 # TODO: for gcfclient pleasure, we should give resources
3190 # that gcfclient doesn't grok a >10000 face index. 3261 # that gcfclient doesn't grok a >10000 face index.
3191 my $res = $facedata->{resource}; 3262 my $res = $facedata->{resource};
3192 3263
3193 my $soundconf = delete $res->{"res/sound.conf"};
3194
3195 while (my ($name, $info) = each %$res) { 3264 while (my ($name, $info) = each %$res) {
3265 if (defined $info->{type}) {
3196 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3266 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3197 my $data; 3267 my $data;
3198 3268
3199 if ($info->{type} & 1) { 3269 if ($info->{type} & 1) {
3200 # prepend meta info 3270 # prepend meta info
3201 3271
3202 my $meta = $enc->encode ({ 3272 my $meta = $enc->encode ({
3203 name => $name, 3273 name => $name,
3204 %{ $info->{meta} || {} }, 3274 %{ $info->{meta} || {} },
3205 }); 3275 });
3206 3276
3207 $data = pack "(w/a*)*", $meta, $info->{data}; 3277 $data = pack "(w/a*)*", $meta, $info->{data};
3278 } else {
3279 $data = $info->{data};
3280 }
3281
3282 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3283 cf::face::set_type $idx, $info->{type};
3208 } else { 3284 } else {
3209 $data = $info->{data}; 3285 $RESOURCE{$name} = $info;
3210 } 3286 }
3211 3287
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; 3288 cf::cede_to_tick;
3216 } 3289 }
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 } 3290 }
3291
3292 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3236 3293
3237 1 3294 1
3238} 3295}
3296
3297cf::global->attach (on_resource_update => sub {
3298 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3299 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3300
3301 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3302 my $sound = $soundconf->{compat}[$_]
3303 or next;
3304
3305 my $face = cf::face::find "sound/$sound->[1]";
3306 cf::sound::set $sound->[0] => $face;
3307 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3308 }
3309
3310 while (my ($k, $v) = each %{$soundconf->{event}}) {
3311 my $face = cf::face::find "sound/$v";
3312 cf::sound::set $k => $face;
3313 }
3314 }
3315});
3239 3316
3240register_exticmd fx_want => sub { 3317register_exticmd fx_want => sub {
3241 my ($ns, $want) = @_; 3318 my ($ns, $want) = @_;
3242 3319
3243 while (my ($k, $v) = each %$want) { 3320 while (my ($k, $v) = each %$want) {
3244 $ns->fx_want ($k, $v); 3321 $ns->fx_want ($k, $v);
3245 } 3322 }
3246}; 3323};
3324
3325sub load_resource_file($) {
3326 my $guard = lock_acquire "load_resource_file";
3327
3328 my $status = load_resource_file_ $_[0];
3329 get_slot 0.1, 100;
3330 cf::arch::commit_load;
3331
3332 $status
3333}
3247 3334
3248sub reload_regions { 3335sub reload_regions {
3249 # HACK to clear player env face cache, we need some signal framework 3336 # HACK to clear player env face cache, we need some signal framework
3250 # for this (global event?) 3337 # for this (global event?)
3251 %ext::player_env::MUSIC_FACE_CACHE = (); 3338 %ext::player_env::MUSIC_FACE_CACHE = ();
… …
3265} 3352}
3266 3353
3267sub reload_archetypes { 3354sub reload_archetypes {
3268 load_resource_file "$DATADIR/archetypes" 3355 load_resource_file "$DATADIR/archetypes"
3269 or die "unable to load archetypes\n"; 3356 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} 3357}
3276 3358
3277sub reload_treasures { 3359sub reload_treasures {
3278 load_resource_file "$DATADIR/treasures" 3360 load_resource_file "$DATADIR/treasures"
3279 or die "unable to load treasurelists\n"; 3361 or die "unable to load treasurelists\n";
3280} 3362}
3281 3363
3282sub reload_resources { 3364sub reload_resources {
3283 warn "reloading resource files...\n"; 3365 warn "reloading resource files...\n";
3284 3366
3367 reload_facedata;
3368 reload_archetypes;
3285 reload_regions; 3369 reload_regions;
3286 reload_facedata;
3287 #reload_archetypes;#d#
3288 reload_archetypes;
3289 reload_treasures; 3370 reload_treasures;
3290 3371
3291 warn "finished reloading resource files\n"; 3372 warn "finished reloading resource files\n";
3292} 3373}
3293 3374
3294sub init { 3375sub init {
3376 my $guard = freeze_mainloop;
3377
3295 reload_resources; 3378 reload_resources;
3296} 3379}
3297 3380
3298sub reload_config { 3381sub reload_config {
3299 open my $fh, "<:utf8", "$CONFDIR/config" 3382 open my $fh, "<:utf8", "$CONFDIR/config"
3300 or return; 3383 or return;
3301 3384
3302 local $/; 3385 local $/;
3303 *CFG = YAML::Syck::Load <$fh>; 3386 *CFG = YAML::Load <$fh>;
3304 3387
3305 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3388 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3306 3389
3307 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3390 $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}; 3391 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3324 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3407 $Coro::current->{desc} = "IDLE BUG HANDLER";
3325 EV::loop EV::LOOP_ONESHOT; 3408 EV::loop EV::LOOP_ONESHOT;
3326 })->prio (Coro::PRIO_MAX); 3409 })->prio (Coro::PRIO_MAX);
3327 }; 3410 };
3328 3411
3412 {
3413 my $guard = freeze_mainloop;
3329 reload_config; 3414 reload_config;
3330 db_init; 3415 db_init;
3331 load_extensions; 3416 load_extensions;
3332 3417
3333 $TICK_WATCHER->start;
3334 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3418 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3419 evthread_start IO::AIO::poll_fileno;
3420 }
3421
3335 EV::loop; 3422 EV::loop;
3336} 3423}
3337 3424
3338############################################################################# 3425#############################################################################
3339# initialisation and cleanup 3426# initialisation and cleanup
… …
3346 cf::cleanup "SIG$signal"; 3433 cf::cleanup "SIG$signal";
3347 }; 3434 };
3348 } 3435 }
3349} 3436}
3350 3437
3351sub write_runtime { 3438sub write_runtime_sync {
3352 my $runtime = "$LOCALDIR/runtime"; 3439 my $runtime = "$LOCALDIR/runtime";
3353 3440
3354 # first touch the runtime file to show we are still running: 3441 # first touch the runtime file to show we are still running:
3355 # the fsync below can take a very very long time. 3442 # the fsync below can take a very very long time.
3356 3443
… …
3382 and return; 3469 and return;
3383 3470
3384 warn "runtime file written.\n"; 3471 warn "runtime file written.\n";
3385 3472
3386 1 3473 1
3474}
3475
3476our $uuid_lock;
3477our $uuid_skip;
3478
3479sub write_uuid_sync($) {
3480 $uuid_skip ||= $_[0];
3481
3482 return if $uuid_lock;
3483 local $uuid_lock = 1;
3484
3485 my $uuid = "$LOCALDIR/uuid";
3486
3487 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3488 or return;
3489
3490 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3491 $uuid_skip = 0;
3492
3493 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3494 and return;
3495
3496 # always fsync - this file is important
3497 aio_fsync $fh
3498 and return;
3499
3500 close $fh
3501 or return;
3502
3503 aio_rename "$uuid~", $uuid
3504 and return;
3505
3506 warn "uuid file written ($value).\n";
3507
3508 1
3509
3510}
3511
3512sub write_uuid($$) {
3513 my ($skip, $sync) = @_;
3514
3515 $sync ? write_uuid_sync $skip
3516 : async { write_uuid_sync $skip };
3387} 3517}
3388 3518
3389sub emergency_save() { 3519sub emergency_save() {
3390 my $freeze_guard = cf::freeze_mainloop; 3520 my $freeze_guard = cf::freeze_mainloop;
3391 3521
… …
3413 warn "end emergency map save\n"; 3543 warn "end emergency map save\n";
3414 3544
3415 warn "begin emergency database checkpoint\n"; 3545 warn "begin emergency database checkpoint\n";
3416 BDB::db_env_txn_checkpoint $DB_ENV; 3546 BDB::db_env_txn_checkpoint $DB_ENV;
3417 warn "end emergency database checkpoint\n"; 3547 warn "end emergency database checkpoint\n";
3548
3549 warn "begin write uuid\n";
3550 write_uuid_sync 1;
3551 warn "end write uuid\n";
3418 }; 3552 };
3419 3553
3420 warn "leave emergency perl save\n"; 3554 warn "leave emergency perl save\n";
3421} 3555}
3422 3556
… …
3437 warn "reloading..."; 3571 warn "reloading...";
3438 3572
3439 warn "entering sync_job"; 3573 warn "entering sync_job";
3440 3574
3441 cf::sync_job { 3575 cf::sync_job {
3442 cf::write_runtime; # external watchdog should not bark 3576 cf::write_runtime_sync; # external watchdog should not bark
3443 cf::emergency_save; 3577 cf::emergency_save;
3444 cf::write_runtime; # external watchdog should not bark 3578 cf::write_runtime_sync; # external watchdog should not bark
3445 3579
3446 warn "syncing database to disk"; 3580 warn "syncing database to disk";
3447 BDB::db_env_txn_checkpoint $DB_ENV; 3581 BDB::db_env_txn_checkpoint $DB_ENV;
3448 3582
3449 # if anything goes wrong in here, we should simply crash as we already saved 3583 # if anything goes wrong in here, we should simply crash as we already saved
… …
3536 warn "leaving sync_job"; 3670 warn "leaving sync_job";
3537 3671
3538 1 3672 1
3539 } or do { 3673 } or do {
3540 warn $@; 3674 warn $@;
3541 warn "error while reloading, exiting."; 3675 cf::cleanup "error while reloading, exiting.";
3542 exit 1;
3543 }; 3676 };
3544 3677
3545 warn "reloaded"; 3678 warn "reloaded";
3546}; 3679};
3547 3680
… …
3550sub reload_perl() { 3683sub reload_perl() {
3551 # doing reload synchronously and two reloads happen back-to-back, 3684 # doing reload synchronously and two reloads happen back-to-back,
3552 # coro crashes during coro_state_free->destroy here. 3685 # coro crashes during coro_state_free->destroy here.
3553 3686
3554 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3687 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3688 do_reload_perl;
3555 undef $RELOAD_WATCHER; 3689 undef $RELOAD_WATCHER;
3556 do_reload_perl;
3557 }; 3690 };
3558} 3691}
3559 3692
3560register_command "reload" => sub { 3693register_command "reload" => sub {
3561 my ($who, $arg) = @_; 3694 my ($who, $arg) = @_;
… …
3575 3708
3576our @WAIT_FOR_TICK; 3709our @WAIT_FOR_TICK;
3577our @WAIT_FOR_TICK_BEGIN; 3710our @WAIT_FOR_TICK_BEGIN;
3578 3711
3579sub wait_for_tick { 3712sub wait_for_tick {
3580 return unless $TICK_WATCHER->is_active;
3581 return if $Coro::current == $Coro::main; 3713 return if tick_inhibit || $Coro::current == $Coro::main;
3582 3714
3583 my $signal = new Coro::Signal; 3715 my $signal = new Coro::Signal;
3584 push @WAIT_FOR_TICK, $signal; 3716 push @WAIT_FOR_TICK, $signal;
3585 $signal->wait; 3717 $signal->wait;
3586} 3718}
3587 3719
3588sub wait_for_tick_begin { 3720sub wait_for_tick_begin {
3589 return unless $TICK_WATCHER->is_active;
3590 return if $Coro::current == $Coro::main; 3721 return if tick_inhibit || $Coro::current == $Coro::main;
3591 3722
3592 my $signal = new Coro::Signal; 3723 my $signal = new Coro::Signal;
3593 push @WAIT_FOR_TICK_BEGIN, $signal; 3724 push @WAIT_FOR_TICK_BEGIN, $signal;
3594 $signal->wait; 3725 $signal->wait;
3595} 3726}
3596 3727
3597$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 3728sub tick {
3598 if ($Coro::current != $Coro::main) { 3729 if ($Coro::current != $Coro::main) {
3599 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3730 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3600 unless ++$bug_warning > 10; 3731 unless ++$bug_warning > 10;
3601 return; 3732 return;
3602 } 3733 }
3603 3734
3604 $NOW = $tick_start = EV::now;
3605
3606 cf::server_tick; # one server iteration 3735 cf::server_tick; # one server iteration
3607
3608 $RUNTIME += $TICK;
3609 $NEXT_TICK += $TICK;
3610 3736
3611 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3737 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3612 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3738 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3613 Coro::async_pool { 3739 Coro::async_pool {
3614 $Coro::current->{desc} = "runtime saver"; 3740 $Coro::current->{desc} = "runtime saver";
3615 write_runtime 3741 write_runtime_sync
3616 or warn "ERROR: unable to write runtime file: $!"; 3742 or warn "ERROR: unable to write runtime file: $!";
3617 }; 3743 };
3618 } 3744 }
3619 3745
3620 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3746 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
… …
3622 } 3748 }
3623 while (my $sig = shift @WAIT_FOR_TICK) { 3749 while (my $sig = shift @WAIT_FOR_TICK) {
3624 $sig->send; 3750 $sig->send;
3625 } 3751 }
3626 3752
3627 $LOAD = ($NOW - $tick_start) / $TICK; 3753 $LOAD = ($NOW - $TICK_START) / $TICK;
3628 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3754 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3629 3755
3630 _post_tick; 3756 if (0) {
3631}; 3757 if ($NEXT_TICK) {
3632$TICK_WATCHER->priority (EV::MAXPRI); 3758 my $jitter = $TICK_START - $NEXT_TICK;
3759 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3760 warn "jitter $JITTER\n";#d#
3761 }
3762 }
3763}
3633 3764
3634{ 3765{
3635 # configure BDB 3766 # configure BDB
3636 3767
3637 BDB::min_parallel 8; 3768 BDB::min_parallel 8;

Diff Legend

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