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.405 by root, Mon Dec 17 08:03:22 2007 UTC vs.
Revision 1.441 by root, Sat Aug 30 05:19:03 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
24use 5.10.0;
3use utf8; 25use utf8;
4use strict; 26use strict "vars", "subs";
5 27
6use Symbol; 28use Symbol;
7use List::Util; 29use List::Util;
8use Socket; 30use Socket;
9use EV 1.86; 31use EV;
10use Opcode; 32use Opcode;
11use Safe; 33use Safe;
12use Safe::Hole; 34use Safe::Hole;
13use Storable (); 35use Storable ();
14 36
15use Coro 4.32 (); 37use Coro ();
16use Coro::State; 38use Coro::State;
17use Coro::Handle; 39use Coro::Handle;
18use Coro::EV; 40use Coro::EV;
41use Coro::AnyEvent;
19use Coro::Timer; 42use Coro::Timer;
20use Coro::Signal; 43use Coro::Signal;
21use Coro::Semaphore; 44use Coro::Semaphore;
45use Coro::AnyEvent;
22use Coro::AIO; 46use Coro::AIO;
23use Coro::BDB; 47use Coro::BDB 1.6;
24use Coro::Storable; 48use Coro::Storable;
25use Coro::Util (); 49use Coro::Util ();
26 50
27use JSON::XS 2.01 (); 51use JSON::XS 2.01 ();
28use BDB (); 52use BDB ();
29use Data::Dumper; 53use Data::Dumper;
30use Digest::MD5; 54use Digest::MD5;
31use Fcntl; 55use Fcntl;
32use YAML::Syck (); 56use YAML ();
33use IO::AIO 2.51 (); 57use IO::AIO ();
34use Time::HiRes; 58use Time::HiRes;
35use Compress::LZF; 59use Compress::LZF;
36use Digest::MD5 (); 60use Digest::MD5 ();
61
62AnyEvent::detect;
37 63
38# configure various modules to our taste 64# configure various modules to our taste
39# 65#
40$Storable::canonical = 1; # reduce rsync transfers 66$Storable::canonical = 1; # reduce rsync transfers
41Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 67Coro::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 68Compress::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 69
47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
48 71
49sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 72sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
50 73
… …
72our $RANDOMDIR = "$LOCALDIR/random"; 95our $RANDOMDIR = "$LOCALDIR/random";
73our $BDBDIR = "$LOCALDIR/db"; 96our $BDBDIR = "$LOCALDIR/db";
74our %RESOURCE; 97our %RESOURCE;
75 98
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 99our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER;
78our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 100our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 101our $NEXT_TICK;
81our $USE_FSYNC = 1; # use fsync to write maps - default off 102our $USE_FSYNC = 1; # use fsync to write maps - default off
82 103
83our $BDB_POLL_WATCHER;
84our $BDB_DEADLOCK_WATCHER; 104our $BDB_DEADLOCK_WATCHER;
85our $BDB_CHECKPOINT_WATCHER; 105our $BDB_CHECKPOINT_WATCHER;
86our $BDB_TRICKLE_WATCHER; 106our $BDB_TRICKLE_WATCHER;
87our $DB_ENV; 107our $DB_ENV;
88 108
… …
99# used to convert map paths into valid unix filenames by replacing / by ∕ 119# used to convert map paths into valid unix filenames by replacing / by ∕
100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 120our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
101 121
102our $LOAD; # a number between 0 (idle) and 1 (too many objects) 122our $LOAD; # a number between 0 (idle) and 1 (too many objects)
103our $LOADAVG; # same thing, but with alpha-smoothing 123our $LOADAVG; # same thing, but with alpha-smoothing
124our $JITTER; # average jitter
104our $tick_start; # for load detecting purposes 125our $TICK_START; # for load detecting purposes
105 126
106binmode STDOUT; 127binmode STDOUT;
107binmode STDERR; 128binmode STDERR;
108 129
109# read virtual server time, if available 130# read virtual server time, if available
… …
193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 214 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
194 215
195 LOG llevError, $msg; 216 LOG llevError, $msg;
196 }; 217 };
197} 218}
219
220$Coro::State::DIEHOOK = sub {
221 return unless $^S eq 0; # "eq", not "=="
222
223 if ($Coro::current == $Coro::main) {#d#
224 warn "DIEHOOK called in main context, Coro bug?\n";#d#
225 return;#d#
226 }#d#
227
228 # kill coroutine otherwise
229 warn Carp::longmess $_[0];
230 Coro::terminate
231};
232
233$SIG{__DIE__} = sub { }; #d#?
198 234
199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 235@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
200@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 236@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
201@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 237@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
202@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 238@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
209for my $pkg (qw( 245for my $pkg (qw(
210 cf::global cf::attachable 246 cf::global cf::attachable
211 cf::object cf::object::player 247 cf::object cf::object::player
212 cf::client cf::player 248 cf::client cf::player
213 cf::arch cf::living 249 cf::arch cf::living
250 cf::map cf::mapspace
214 cf::map cf::party cf::region 251 cf::party cf::region
215)) { 252)) {
216 no strict 'refs';
217 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 253 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
218} 254}
219 255
220$EV::DIED = sub { 256$EV::DIED = sub {
221 warn "error in event callback: @_"; 257 warn "error in event callback: @_";
… …
327 363
328 ! ! $LOCK{$key} 364 ! ! $LOCK{$key}
329} 365}
330 366
331sub freeze_mainloop { 367sub freeze_mainloop {
332 return unless $TICK_WATCHER->is_active; 368 tick_inhibit_inc;
333 369
334 my $guard = Coro::guard { 370 Coro::guard \&tick_inhibit_dec;
335 $TICK_WATCHER->start;
336 };
337 $TICK_WATCHER->stop;
338 $guard
339} 371}
340 372
341=item cf::periodic $interval, $cb 373=item cf::periodic $interval, $cb
342 374
343Like EV::periodic, but randomly selects a starting point so that the actions 375Like EV::periodic, but randomly selects a starting point so that the actions
… …
398 } 430 }
399 } 431 }
400}; 432};
401 433
402sub get_slot($;$$) { 434sub get_slot($;$$) {
435 return if tick_inhibit || $Coro::current == $Coro::main;
436
403 my ($time, $pri, $name) = @_; 437 my ($time, $pri, $name) = @_;
404 438
405 $time = $TICK * .6 if $time > $TICK * .6; 439 $time = $TICK * .6 if $time > $TICK * .6;
406 my $sig = new Coro::Signal; 440 my $sig = new Coro::Signal;
407 441
… …
444 # this is the main coro, too bad, we have to block 478 # this is the main coro, too bad, we have to block
445 # till the operation succeeds, freezing the server :/ 479 # till the operation succeeds, freezing the server :/
446 480
447 LOG llevError, Carp::longmess "sync job";#d# 481 LOG llevError, Carp::longmess "sync job";#d#
448 482
449 # TODO: use suspend/resume instead
450 # (but this is cancel-safe)
451 my $freeze_guard = freeze_mainloop; 483 my $freeze_guard = freeze_mainloop;
452 484
453 my $busy = 1; 485 my $busy = 1;
454 my @res; 486 my @res;
455 487
… …
466 } else { 498 } else {
467 EV::loop EV::LOOP_ONESHOT; 499 EV::loop EV::LOOP_ONESHOT;
468 } 500 }
469 } 501 }
470 502
471 $time = EV::time - $time; 503 my $time = EV::time - $time;
472 504
473 LOG llevError | logBacktrace, Carp::longmess "long sync job"
474 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
475
476 $tick_start += $time; # do not account sync jobs to server load 505 $TICK_START += $time; # do not account sync jobs to server load
477 506
478 wantarray ? @res : $res[0] 507 wantarray ? @res : $res[0]
479 } else { 508 } else {
480 # we are in another coroutine, how wonderful, everything just works 509 # we are in another coroutine, how wonderful, everything just works
481 510
… …
523 reset_signals; 552 reset_signals;
524 &$cb 553 &$cb
525 }, @args; 554 }, @args;
526 555
527 wantarray ? @res : $res[-1] 556 wantarray ? @res : $res[-1]
557}
558
559=item $coin = coin_from_name $name
560
561=cut
562
563our %coin_alias = (
564 "silver" => "silvercoin",
565 "silvercoin" => "silvercoin",
566 "silvercoins" => "silvercoin",
567 "gold" => "goldcoin",
568 "goldcoin" => "goldcoin",
569 "goldcoins" => "goldcoin",
570 "platinum" => "platinacoin",
571 "platinumcoin" => "platinacoin",
572 "platinumcoins" => "platinacoin",
573 "platina" => "platinacoin",
574 "platinacoin" => "platinacoin",
575 "platinacoins" => "platinacoin",
576 "royalty" => "royalty",
577 "royalties" => "royalty",
578);
579
580sub coin_from_name($) {
581 $coin_alias{$_[0]}
582 ? cf::arch::find $coin_alias{$_[0]}
583 : undef
528} 584}
529 585
530=item $value = cf::db_get $family => $key 586=item $value = cf::db_get $family => $key
531 587
532Returns a single value from the environment database. 588Returns a single value from the environment database.
… …
969 } 1025 }
970 1026
971 0 1027 0
972} 1028}
973 1029
974=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1030=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
975 1031
976=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1032=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
977 1033
978Generate an object-specific event with the given arguments. 1034Generate an object-specific event with the given arguments.
979 1035
… …
1032 1088
1033sub reattach { 1089sub reattach {
1034 # basically do the same as instantiate, without calling instantiate 1090 # basically do the same as instantiate, without calling instantiate
1035 my ($obj) = @_; 1091 my ($obj) = @_;
1036 1092
1093 # no longer needed after getting rid of delete_package?
1037 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1094 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1038 1095
1039 my $registry = $obj->registry; 1096 my $registry = $obj->registry;
1040 1097
1041 @$registry = (); 1098 @$registry = ();
1042 1099
… …
1088 utf8::decode (my $decname = $filename); 1145 utf8::decode (my $decname = $filename);
1089 warn sprintf "saving %s (%d,%d)\n", 1146 warn sprintf "saving %s (%d,%d)\n",
1090 $decname, length $$rdata, scalar @$objs; 1147 $decname, length $$rdata, scalar @$objs;
1091 1148
1092 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1093 chmod SAVE_MODE, $fh; 1150 aio_chmod $fh, SAVE_MODE;
1094 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1095 aio_fsync $fh if $cf::USE_FSYNC; 1152 aio_fsync $fh if $cf::USE_FSYNC;
1096 close $fh; 1153 aio_close $fh;
1097 1154
1098 if (@$objs) { 1155 if (@$objs) {
1099 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1156 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1100 chmod SAVE_MODE, $fh; 1157 aio_chmod $fh, SAVE_MODE;
1101 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1102 aio_write $fh, 0, (length $data), $data, 0; 1159 aio_write $fh, 0, (length $data), $data, 0;
1103 aio_fsync $fh if $cf::USE_FSYNC; 1160 aio_fsync $fh if $cf::USE_FSYNC;
1104 close $fh; 1161 aio_close $fh;
1105 aio_rename "$filename.pst~", "$filename.pst"; 1162 aio_rename "$filename.pst~", "$filename.pst";
1106 } 1163 }
1107 } else { 1164 } else {
1108 aio_unlink "$filename.pst"; 1165 aio_unlink "$filename.pst";
1109 } 1166 }
… …
1278 1335
1279 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1336 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1280 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1337 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1281 1338
1282 $ext{source} = 1339 $ext{source} =
1283 "package $pkg; use strict; use utf8;\n" 1340 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1284 . "#line 1 \"$path\"\n{\n" 1341 . "#line 1 \"$path\"\n{\n"
1285 . $source 1342 . $source
1286 . "\n};\n1"; 1343 . "\n};\n1";
1287 1344
1288 $todo{$base} = \%ext; 1345 $todo{$base} = \%ext;
… …
1304 my $msg = $@ ? "$v->{path}: $@\n" 1361 my $msg = $@ ? "$v->{path}: $@\n"
1305 : "$v->{base}: extension inactive.\n"; 1362 : "$v->{base}: extension inactive.\n";
1306 1363
1307 if (exists $v->{meta}{mandatory}) { 1364 if (exists $v->{meta}{mandatory}) {
1308 warn $msg; 1365 warn $msg;
1309 warn "mandatory extension failed to load, exiting.\n"; 1366 cf::cleanup "mandatory extension failed to load, exiting.";
1310 exit 1;
1311 } 1367 }
1312 1368
1313 warn $msg; 1369 warn $msg;
1314 } 1370 }
1315 1371
… …
1404 my $f = new_from_file cf::object::thawer path $login 1460 my $f = new_from_file cf::object::thawer path $login
1405 or return; 1461 or return;
1406 1462
1407 my $pl = cf::player::load_pl $f 1463 my $pl = cf::player::load_pl $f
1408 or return; 1464 or return;
1465
1409 local $cf::PLAYER_LOADING{$login} = $pl; 1466 local $cf::PLAYER_LOADING{$login} = $pl;
1410 $f->resolve_delayed_derefs; 1467 $f->resolve_delayed_derefs;
1411 $cf::PLAYER{$login} = $pl 1468 $cf::PLAYER{$login} = $pl
1412 } 1469 }
1413 } 1470 }
… …
1423 1480
1424 return if $pl->{deny_save}; 1481 return if $pl->{deny_save};
1425 1482
1426 aio_mkdir playerdir $pl, 0770; 1483 aio_mkdir playerdir $pl, 0770;
1427 $pl->{last_save} = $cf::RUNTIME; 1484 $pl->{last_save} = $cf::RUNTIME;
1485
1486 cf::get_slot 0.01;
1428 1487
1429 $pl->save_pl ($path); 1488 $pl->save_pl ($path);
1430 cf::cede_to_tick; 1489 cf::cede_to_tick;
1431} 1490}
1432 1491
… …
1468 $pl->{deny_save} = 1; 1527 $pl->{deny_save} = 1;
1469 $pl->password ("*"); # this should lock out the player until we nuked the dir 1528 $pl->password ("*"); # this should lock out the player until we nuked the dir
1470 1529
1471 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1530 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1472 $pl->deactivate; 1531 $pl->deactivate;
1532 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1533 $pl->ob->check_score;
1473 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1534 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1474 $pl->ns->destroy if $pl->ns; 1535 $pl->ns->destroy if $pl->ns;
1475 1536
1476 my $path = playerdir $pl; 1537 my $path = playerdir $pl;
1477 my $temp = "$path~$cf::RUNTIME~deleting~"; 1538 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1516 1577
1517 for my $login (@$dirs) { 1578 for my $login (@$dirs) {
1518 my $path = path $login; 1579 my $path = path $login;
1519 1580
1520 # a .pst is a dead give-away for a valid player 1581 # a .pst is a dead give-away for a valid player
1521 unless (-e "$path.pst") { 1582 # if no pst file found, open and chekc for blocked users
1583 if (aio_stat "$path.pst") {
1522 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1584 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1523 aio_read $fh, 0, 512, my $buf, 0 or next; 1585 aio_read $fh, 0, 512, my $buf, 0 or next;
1524 $buf !~ /^password -------------$/m or next; # official not-valid tag 1586 $buf !~ /^password -------------$/m or next; # official not-valid tag
1525 } 1587 }
1526 1588
… …
1725our $MAX_RESET = 3600; 1787our $MAX_RESET = 3600;
1726our $DEFAULT_RESET = 3000; 1788our $DEFAULT_RESET = 3000;
1727 1789
1728sub generate_random_map { 1790sub generate_random_map {
1729 my ($self, $rmp) = @_; 1791 my ($self, $rmp) = @_;
1792
1793 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1794
1730 # mit "rum" bekleckern, nicht 1795 # mit "rum" bekleckern, nicht
1731 $self->_create_random_map ( 1796 $self->_create_random_map (
1732 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1797 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1733 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1798 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1734 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1799 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1856 1921
1857# the temporary/swap location 1922# the temporary/swap location
1858sub save_path { 1923sub save_path {
1859 my ($self) = @_; 1924 my ($self) = @_;
1860 1925
1861 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1926 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1862 "$TMPDIR/$path.map" 1927 "$TMPDIR/$path.map"
1863} 1928}
1864 1929
1865# the unique path, undef == no special unique path 1930# the unique path, undef == no special unique path
1866sub uniq_path { 1931sub uniq_path {
1867 my ($self) = @_; 1932 my ($self) = @_;
1868 1933
1869 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1934 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1870 "$UNIQUEDIR/$path" 1935 "$UNIQUEDIR/$path"
1871} 1936}
1872 1937
1873# and all this just because we cannot iterate over 1938# and all this just because we cannot iterate over
1874# all maps in C++... 1939# all maps in C++...
… …
1972 2037
1973 cf::lock_wait "map_data:$path";#d#remove 2038 cf::lock_wait "map_data:$path";#d#remove
1974 cf::lock_wait "map_find:$path"; 2039 cf::lock_wait "map_find:$path";
1975 2040
1976 $cf::MAP{$path} || do { 2041 $cf::MAP{$path} || do {
1977 my $guard1 = cf::lock_acquire "map_find:$path";
1978 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it 2042 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2043 my $guard2 = cf::lock_acquire "map_find:$path";
1979 2044
1980 my $map = new_from_path cf::map $path 2045 my $map = new_from_path cf::map $path
1981 or return; 2046 or return;
1982 2047
1983 $map->{last_save} = $cf::RUNTIME; 2048 $map->{last_save} = $cf::RUNTIME;
… …
1986 or return; 2051 or return;
1987 2052
1988 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2053 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1989 # doing this can freeze the server in a sync job, obviously 2054 # doing this can freeze the server in a sync job, obviously
1990 #$cf::WAIT_FOR_TICK->wait; 2055 #$cf::WAIT_FOR_TICK->wait;
2056 undef $guard2;
1991 undef $guard1; 2057 undef $guard1;
1992 undef $guard2;
1993 $map->reset; 2058 $map->reset;
1994 return find $path; 2059 return find $path;
1995 } 2060 }
1996 2061
1997 $cf::MAP{$path} = $map 2062 $cf::MAP{$path} = $map
… …
2024 my $f = new_from_file cf::object::thawer $self->{load_path}; 2089 my $f = new_from_file cf::object::thawer $self->{load_path};
2025 $f->skip_block; 2090 $f->skip_block;
2026 $self->_load_objects ($f) 2091 $self->_load_objects ($f)
2027 or return; 2092 or return;
2028 2093
2029 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2094 $self->post_load_original
2030 if delete $self->{load_original}; 2095 if delete $self->{load_original};
2031 2096
2032 if (my $uniq = $self->uniq_path) { 2097 if (my $uniq = $self->uniq_path) {
2033 utf8::encode $uniq; 2098 utf8::encode $uniq;
2034 unless (aio_stat $uniq) { 2099 unless (aio_stat $uniq) {
… …
2060 } 2125 }
2061 2126
2062 $self->{last_save} = $cf::RUNTIME; 2127 $self->{last_save} = $cf::RUNTIME;
2063 $self->last_access ($cf::RUNTIME); 2128 $self->last_access ($cf::RUNTIME);
2064 2129
2065 $self->in_memory (cf::MAP_IN_MEMORY); 2130 $self->in_memory (cf::MAP_ACTIVE);
2066 } 2131 }
2067 2132
2068 $self->post_load; 2133 $self->post_load;
2069} 2134}
2070 2135
… …
2128 my ($path, $origin, $load) = @_; 2193 my ($path, $origin, $load) = @_;
2129 2194
2130 $path = normalise $path, $origin && $origin->{path}; 2195 $path = normalise $path, $origin && $origin->{path};
2131 2196
2132 if (my $map = $cf::MAP{$path}) { 2197 if (my $map = $cf::MAP{$path}) {
2133 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2198 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2134 } 2199 }
2135 2200
2136 $MAP_PREFETCH{$path} |= $load; 2201 $MAP_PREFETCH{$path} |= $load;
2137 2202
2138 $MAP_PREFETCHER ||= cf::async { 2203 $MAP_PREFETCHER ||= cf::async {
… …
2175 cf::async { 2240 cf::async {
2176 $Coro::current->{desc} = "map player save"; 2241 $Coro::current->{desc} = "map player save";
2177 $_->contr->save for $self->players; 2242 $_->contr->save for $self->players;
2178 }; 2243 };
2179 2244
2245 cf::get_slot 0.02;
2246
2180 if ($uniq) { 2247 if ($uniq) {
2181 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2248 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2182 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2249 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2183 } else { 2250 } else {
2184 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2251 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
… …
2192 $self->save; 2259 $self->save;
2193 2260
2194 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2261 my $lock = cf::lock_acquire "map_data:$self->{path}";
2195 2262
2196 return if $self->players; 2263 return if $self->players;
2197 return if $self->in_memory != cf::MAP_IN_MEMORY; 2264 return if $self->in_memory != cf::MAP_ACTIVE;
2198 return if $self->{deny_save}; 2265 return if $self->{deny_save};
2199 2266
2200 $self->in_memory (cf::MAP_SWAPPED); 2267 $self->in_memory (cf::MAP_SWAPPED);
2201 2268
2202 $self->deactivate; 2269 $self->deactivate;
… …
2320 2387
2321sub unique_maps() { 2388sub unique_maps() {
2322 [ 2389 [
2323 map { 2390 map {
2324 utf8::decode $_; 2391 utf8::decode $_;
2325 /\.map$/ 2392 s/\.map$//; # TODO future compatibility hack
2393 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2394 ? ()
2326 ? normalise $_ 2395 : normalise $_
2327 : ()
2328 } @{ aio_readdir $UNIQUEDIR or [] } 2396 } @{ aio_readdir $UNIQUEDIR or [] }
2329 ] 2397 ]
2330} 2398}
2331 2399
2332package cf;
2333
2334=back 2400=back
2335 2401
2336=head3 cf::object 2402=head3 cf::object
2337 2403
2338=cut 2404=cut
… …
2341 2407
2342=over 4 2408=over 4
2343 2409
2344=item $ob->inv_recursive 2410=item $ob->inv_recursive
2345 2411
2346Returns the inventory of the object _and_ their inventories, recursively. 2412Returns the inventory of the object I<and> their inventories, recursively,
2413but I<not> the object itself.
2347 2414
2348=cut 2415=cut
2349 2416
2350sub inv_recursive_; 2417sub inv_recursive_;
2351sub inv_recursive_ { 2418sub inv_recursive_ {
… …
2356 inv_recursive_ inv $_[0] 2423 inv_recursive_ inv $_[0]
2357} 2424}
2358 2425
2359=item $ref = $ob->ref 2426=item $ref = $ob->ref
2360 2427
2361creates and returns a persistent reference to an objetc that can be stored as a string. 2428Creates and returns a persistent reference to an object that can be stored as a string.
2362 2429
2363=item $ob = cf::object::deref ($refstring) 2430=item $ob = cf::object::deref ($refstring)
2364 2431
2365returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2432returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2366even if the object actually exists. May block. 2433even if the object actually exists. May block.
… …
2398can be C<undef>. Does the right thing when the player is currently in a 2465can be C<undef>. Does the right thing when the player is currently in a
2399dialogue with the given NPC character. 2466dialogue with the given NPC character.
2400 2467
2401=cut 2468=cut
2402 2469
2470our $SAY_CHANNEL = {
2471 id => "say",
2472 title => "Map",
2473 reply => "say ",
2474 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2475};
2476
2477our $CHAT_CHANNEL = {
2478 id => "chat",
2479 title => "Chat",
2480 reply => "chat ",
2481 tooltip => "Player chat and shouts, global to the server.",
2482};
2483
2403# rough implementation of a future "reply" method that works 2484# rough implementation of a future "reply" method that works
2404# with dialog boxes. 2485# with dialog boxes.
2405#TODO: the first argument must go, split into a $npc->reply_to ( method 2486#TODO: the first argument must go, split into a $npc->reply_to ( method
2406sub cf::object::player::reply($$$;$) { 2487sub cf::object::player::reply($$$;$) {
2407 my ($self, $npc, $msg, $flags) = @_; 2488 my ($self, $npc, $msg, $flags) = @_;
… …
2418 my $dialog = $pl->{npc_dialog}; 2499 my $dialog = $pl->{npc_dialog};
2419 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2500 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2420 2501
2421 } else { 2502 } else {
2422 $msg = $npc->name . " says: $msg" if $npc; 2503 $msg = $npc->name . " says: $msg" if $npc;
2423 $self->message ($msg, $flags); 2504 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2424 } 2505 }
2425 } 2506 }
2426} 2507}
2427 2508
2428=item $object->send_msg ($channel, $msg, $color, [extra...]) 2509=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2535Moves the player to the given map-path and coordinates by first freezing 2616Moves the player to the given map-path and coordinates by first freezing
2536her, loading and preparing them map, calling the provided $check callback 2617her, loading and preparing them map, calling the provided $check callback
2537that has to return the map if sucecssful, and then unfreezes the player on 2618that has to return the map if sucecssful, and then unfreezes the player on
2538the new (success) or old (failed) map position. In either case, $done will 2619the new (success) or old (failed) map position. In either case, $done will
2539be called at the end of this process. 2620be called at the end of this process.
2621
2622Note that $check will be called with a potentially non-loaded map, so if
2623it needs a loaded map it has to call C<< ->load >>.
2540 2624
2541=cut 2625=cut
2542 2626
2543our $GOTOGEN; 2627our $GOTOGEN;
2544 2628
… …
2623} 2707}
2624 2708
2625sub prepare_random_map { 2709sub prepare_random_map {
2626 my ($exit) = @_; 2710 my ($exit) = @_;
2627 2711
2628 my $guard = cf::lock_acquire "exit_prepare:$exit";
2629
2630 # all this does is basically replace the /! path by 2712 # all this does is basically replace the /! path by
2631 # a new random map path (?random/...) with a seed 2713 # a new random map path (?random/...) with a seed
2632 # that depends on the exit object 2714 # that depends on the exit object
2633 2715
2634 my $rmp = parse_random_map_params $exit->msg; 2716 my $rmp = parse_random_map_params $exit->msg;
… …
2636 if ($exit->map) { 2718 if ($exit->map) {
2637 $rmp->{region} = $exit->region->name; 2719 $rmp->{region} = $exit->region->name;
2638 $rmp->{origin_map} = $exit->map->path; 2720 $rmp->{origin_map} = $exit->map->path;
2639 $rmp->{origin_x} = $exit->x; 2721 $rmp->{origin_x} = $exit->x;
2640 $rmp->{origin_y} = $exit->y; 2722 $rmp->{origin_y} = $exit->y;
2723
2724 $exit->map->touch;
2641 } 2725 }
2642 2726
2643 $rmp->{random_seed} ||= $exit->random_seed; 2727 $rmp->{random_seed} ||= $exit->random_seed;
2644 2728
2645 my $data = cf::encode_json $rmp; 2729 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2646 my $md5 = Digest::MD5::md5_hex $data; 2730 my $md5 = Digest::MD5::md5_hex $data;
2647 my $meta = "$RANDOMDIR/$md5.meta"; 2731 my $meta = "$RANDOMDIR/$md5.meta";
2648 2732
2649 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2733 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2650 aio_write $fh, 0, (length $data), $data, 0; 2734 aio_write $fh, 0, (length $data), $data, 0;
2651 undef $fh; 2735 undef $fh;
2652 aio_rename "$meta~", $meta; 2736 aio_rename "$meta~", $meta;
2653 2737
2738 my $slaying = "?random/$md5";
2739
2740 if ($exit->valid) {
2654 $exit->slaying ("?random/$md5"); 2741 $exit->slaying ("?random/$md5");
2655 $exit->msg (undef); 2742 $exit->msg (undef);
2743 }
2656 } 2744 }
2657} 2745}
2658 2746
2659sub cf::object::player::enter_exit { 2747sub cf::object::player::enter_exit {
2660 my ($self, $exit) = @_; 2748 my ($self, $exit) = @_;
2661 2749
2662 return unless $self->type == cf::PLAYER; 2750 return unless $self->type == cf::PLAYER;
2663 2751
2664 if ($exit->slaying eq "/!") {
2665 #TODO: this should de-fi-ni-te-ly not be a sync-job
2666 # the problem is that $exit might not survive long enough
2667 # so it needs to be done right now, right here
2668 cf::sync_job { prepare_random_map $exit };
2669 }
2670
2671 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2672 my $hp = $exit->stats->hp;
2673 my $sp = $exit->stats->sp;
2674
2675 $self->enter_link; 2752 $self->enter_link;
2676 2753
2677 # if exit is damned, update players death & WoR home-position
2678 $self->contr->savebed ($slaying, $hp, $sp)
2679 if $exit->flag (FLAG_DAMNED);
2680
2681 (async { 2754 (async {
2682 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2755 $Coro::current->{desc} = "enter_exit";
2683 2756
2684 $self->deactivate_recursive; # just to be sure
2685 unless (eval { 2757 unless (eval {
2758 $self->deactivate_recursive; # just to be sure
2759
2760 # random map handling
2761 {
2762 my $guard = cf::lock_acquire "exit_prepare:$exit";
2763
2764 prepare_random_map $exit
2765 if $exit->slaying eq "/!";
2766 }
2767
2768 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2769 my $x = $exit->stats->hp;
2770 my $y = $exit->stats->sp;
2771
2686 $self->goto ($slaying, $hp, $sp); 2772 $self->goto ($map, $x, $y);
2687 2773
2774 # if exit is damned, update players death & WoR home-position
2775 $self->contr->savebed ($map, $x, $y)
2776 if $exit->flag (cf::FLAG_DAMNED);
2777
2688 1; 2778 1
2689 }) { 2779 }) {
2690 $self->message ("Something went wrong deep within the crossfire server. " 2780 $self->message ("Something went wrong deep within the crossfire server. "
2691 . "I'll try to bring you back to the map you were before. " 2781 . "I'll try to bring you back to the map you were before. "
2692 . "Please report this to the dungeon master!", 2782 . "Please report this to the dungeon master!",
2693 cf::NDI_UNIQUE | cf::NDI_RED); 2783 cf::NDI_UNIQUE | cf::NDI_RED);
… …
2773 id => "infobox", 2863 id => "infobox",
2774 title => "Map Info", 2864 title => "Map Info",
2775 reply => undef, 2865 reply => undef,
2776 tooltip => "Information related to the maps", 2866 tooltip => "Information related to the maps",
2777 }, 2867 },
2868 "c/party" => {
2869 id => "party",
2870 title => "Party",
2871 reply => "gsay ",
2872 tooltip => "Messages and chat related to your party",
2873 },
2778); 2874);
2779 2875
2780sub cf::client::send_msg { 2876sub cf::client::send_msg {
2781 my ($self, $channel, $msg, $color, @extra) = @_; 2877 my ($self, $channel, $msg, $color, @extra) = @_;
2782 2878
… …
3019 3115
3020The following functions and methods are available within a safe environment: 3116The following functions and methods are available within a safe environment:
3021 3117
3022 cf::object 3118 cf::object
3023 contr pay_amount pay_player map x y force_find force_add destroy 3119 contr pay_amount pay_player map x y force_find force_add destroy
3024 insert remove name archname title slaying race decrease_ob_nr 3120 insert remove name archname title slaying race decrease split
3025 3121
3026 cf::object::player 3122 cf::object::player
3027 player 3123 player
3028 3124
3029 cf::player 3125 cf::player
… …
3034 3130
3035=cut 3131=cut
3036 3132
3037for ( 3133for (
3038 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3134 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3039 insert remove inv name archname title slaying race 3135 insert remove inv nrof name archname title slaying race
3040 decrease_ob_nr destroy)], 3136 decrease split destroy change_exp)],
3041 ["cf::object::player" => qw(player)], 3137 ["cf::object::player" => qw(player)],
3042 ["cf::player" => qw(peaceful)], 3138 ["cf::player" => qw(peaceful)],
3043 ["cf::map" => qw(trigger)], 3139 ["cf::map" => qw(trigger)],
3044) { 3140) {
3045 no strict 'refs'; 3141 no strict 'refs';
… …
3218 $RESOURCE{$name} = $info; 3314 $RESOURCE{$name} = $info;
3219 } 3315 }
3220 3316
3221 cf::cede_to_tick; 3317 cf::cede_to_tick;
3222 } 3318 }
3223
3224 if (my $soundconf = delete $res->{"res/sound.conf"}) {
3225 $soundconf = $enc->decode (delete $soundconf->{data});
3226
3227 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3228 my $sound = $soundconf->{compat}[$_]
3229 or next;
3230
3231 my $face = cf::face::find "sound/$sound->[1]";
3232 cf::sound::set $sound->[0] => $face;
3233 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3234 }
3235
3236 while (my ($k, $v) = each %{$soundconf->{event}}) {
3237 my $face = cf::face::find "sound/$v";
3238 cf::sound::set $k => $face;
3239 }
3240 }
3241 } 3319 }
3320
3321 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3242 3322
3243 1 3323 1
3244} 3324}
3325
3326cf::global->attach (on_resource_update => sub {
3327 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3328 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3329
3330 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3331 my $sound = $soundconf->{compat}[$_]
3332 or next;
3333
3334 my $face = cf::face::find "sound/$sound->[1]";
3335 cf::sound::set $sound->[0] => $face;
3336 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3337 }
3338
3339 while (my ($k, $v) = each %{$soundconf->{event}}) {
3340 my $face = cf::face::find "sound/$v";
3341 cf::sound::set $k => $face;
3342 }
3343 }
3344});
3245 3345
3246register_exticmd fx_want => sub { 3346register_exticmd fx_want => sub {
3247 my ($ns, $want) = @_; 3347 my ($ns, $want) = @_;
3248 3348
3249 while (my ($k, $v) = each %$want) { 3349 while (my ($k, $v) = each %$want) {
3250 $ns->fx_want ($k, $v); 3350 $ns->fx_want ($k, $v);
3251 } 3351 }
3252}; 3352};
3353
3354sub load_resource_file($) {
3355 my $guard = lock_acquire "load_resource_file";
3356
3357 my $status = load_resource_file_ $_[0];
3358 get_slot 0.1, 100;
3359 cf::arch::commit_load;
3360
3361 $status
3362}
3253 3363
3254sub reload_regions { 3364sub reload_regions {
3255 # HACK to clear player env face cache, we need some signal framework 3365 # HACK to clear player env face cache, we need some signal framework
3256 # for this (global event?) 3366 # for this (global event?)
3257 %ext::player_env::MUSIC_FACE_CACHE = (); 3367 %ext::player_env::MUSIC_FACE_CACHE = ();
… …
3271} 3381}
3272 3382
3273sub reload_archetypes { 3383sub reload_archetypes {
3274 load_resource_file "$DATADIR/archetypes" 3384 load_resource_file "$DATADIR/archetypes"
3275 or die "unable to load archetypes\n"; 3385 or die "unable to load archetypes\n";
3276 #d# NEED to laod twice to resolve forward references
3277 # this really needs to be done in an extra post-pass
3278 # (which needs to be synchronous, so solve it differently)
3279 load_resource_file "$DATADIR/archetypes"
3280 or die "unable to load archetypes\n";
3281} 3386}
3282 3387
3283sub reload_treasures { 3388sub reload_treasures {
3284 load_resource_file "$DATADIR/treasures" 3389 load_resource_file "$DATADIR/treasures"
3285 or die "unable to load treasurelists\n"; 3390 or die "unable to load treasurelists\n";
3286} 3391}
3287 3392
3288sub reload_resources { 3393sub reload_resources {
3289 warn "reloading resource files...\n"; 3394 warn "reloading resource files...\n";
3290 3395
3396 reload_facedata;
3397 reload_archetypes;
3291 reload_regions; 3398 reload_regions;
3292 reload_facedata;
3293 #reload_archetypes;#d#
3294 reload_archetypes;
3295 reload_treasures; 3399 reload_treasures;
3296 3400
3297 warn "finished reloading resource files\n"; 3401 warn "finished reloading resource files\n";
3298} 3402}
3299 3403
3300sub init { 3404sub init {
3405 my $guard = freeze_mainloop;
3406
3407 evthread_start IO::AIO::poll_fileno;
3408
3301 reload_resources; 3409 reload_resources;
3302} 3410}
3303 3411
3304sub reload_config { 3412sub reload_config {
3305 open my $fh, "<:utf8", "$CONFDIR/config" 3413 open my $fh, "<:utf8", "$CONFDIR/config"
3306 or return; 3414 or return;
3307 3415
3308 local $/; 3416 local $/;
3309 *CFG = YAML::Syck::Load <$fh>; 3417 *CFG = YAML::Load <$fh>;
3310 3418
3311 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3419 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3312 3420
3313 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3421 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3314 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3422 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3330 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3438 $Coro::current->{desc} = "IDLE BUG HANDLER";
3331 EV::loop EV::LOOP_ONESHOT; 3439 EV::loop EV::LOOP_ONESHOT;
3332 })->prio (Coro::PRIO_MAX); 3440 })->prio (Coro::PRIO_MAX);
3333 }; 3441 };
3334 3442
3443 {
3444 my $guard = freeze_mainloop;
3335 reload_config; 3445 reload_config;
3336 db_init; 3446 db_init;
3337 load_extensions; 3447 load_extensions;
3338 3448
3339 $TICK_WATCHER->start;
3340 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3449 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3450 }
3451
3341 EV::loop; 3452 EV::loop;
3342} 3453}
3343 3454
3344############################################################################# 3455#############################################################################
3345# initialisation and cleanup 3456# initialisation and cleanup
… …
3352 cf::cleanup "SIG$signal"; 3463 cf::cleanup "SIG$signal";
3353 }; 3464 };
3354 } 3465 }
3355} 3466}
3356 3467
3357sub write_runtime { 3468sub write_runtime_sync {
3358 my $runtime = "$LOCALDIR/runtime"; 3469 my $runtime = "$LOCALDIR/runtime";
3359 3470
3360 # first touch the runtime file to show we are still running: 3471 # first touch the runtime file to show we are still running:
3361 # the fsync below can take a very very long time. 3472 # the fsync below can take a very very long time.
3362 3473
… …
3388 and return; 3499 and return;
3389 3500
3390 warn "runtime file written.\n"; 3501 warn "runtime file written.\n";
3391 3502
3392 1 3503 1
3504}
3505
3506our $uuid_lock;
3507our $uuid_skip;
3508
3509sub write_uuid_sync($) {
3510 $uuid_skip ||= $_[0];
3511
3512 return if $uuid_lock;
3513 local $uuid_lock = 1;
3514
3515 my $uuid = "$LOCALDIR/uuid";
3516
3517 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3518 or return;
3519
3520 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3521 $uuid_skip = 0;
3522
3523 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3524 and return;
3525
3526 # always fsync - this file is important
3527 aio_fsync $fh
3528 and return;
3529
3530 close $fh
3531 or return;
3532
3533 aio_rename "$uuid~", $uuid
3534 and return;
3535
3536 warn "uuid file written ($value).\n";
3537
3538 1
3539
3540}
3541
3542sub write_uuid($$) {
3543 my ($skip, $sync) = @_;
3544
3545 $sync ? write_uuid_sync $skip
3546 : async { write_uuid_sync $skip };
3393} 3547}
3394 3548
3395sub emergency_save() { 3549sub emergency_save() {
3396 my $freeze_guard = cf::freeze_mainloop; 3550 my $freeze_guard = cf::freeze_mainloop;
3397 3551
… …
3419 warn "end emergency map save\n"; 3573 warn "end emergency map save\n";
3420 3574
3421 warn "begin emergency database checkpoint\n"; 3575 warn "begin emergency database checkpoint\n";
3422 BDB::db_env_txn_checkpoint $DB_ENV; 3576 BDB::db_env_txn_checkpoint $DB_ENV;
3423 warn "end emergency database checkpoint\n"; 3577 warn "end emergency database checkpoint\n";
3578
3579 warn "begin write uuid\n";
3580 write_uuid_sync 1;
3581 warn "end write uuid\n";
3424 }; 3582 };
3425 3583
3426 warn "leave emergency perl save\n"; 3584 warn "leave emergency perl save\n";
3427} 3585}
3428 3586
… …
3430 my ($make_core) = @_; 3588 my ($make_core) = @_;
3431 3589
3432 warn Carp::longmess "post_cleanup backtrace" 3590 warn Carp::longmess "post_cleanup backtrace"
3433 if $make_core; 3591 if $make_core;
3434} 3592}
3593
3594# a safer delete_package, copied from Symbol
3595sub clear_package($) {
3596 my $pkg = shift;
3597
3598 # expand to full symbol table name if needed
3599 unless ($pkg =~ /^main::.*::$/) {
3600 $pkg = "main$pkg" if $pkg =~ /^::/;
3601 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3602 $pkg .= '::' unless $pkg =~ /::$/;
3603 }
3604
3605 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3606 my $stem_symtab = *{$stem}{HASH};
3607
3608 defined $stem_symtab and exists $stem_symtab->{$leaf}
3609 or return;
3610
3611 # clear all symbols
3612 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3613 for my $name (keys %$leaf_symtab) {
3614 _gv_clear *{"$pkg$name"};
3615# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3616 }
3617 warn "cleared package #$pkg\n";#d#
3618}
3619
3620our $RELOAD; # how many times to reload
3435 3621
3436sub do_reload_perl() { 3622sub do_reload_perl() {
3437 # can/must only be called in main 3623 # can/must only be called in main
3438 if ($Coro::current != $Coro::main) { 3624 if ($Coro::current != $Coro::main) {
3439 warn "can only reload from main coroutine"; 3625 warn "can only reload from main coroutine";
3440 return; 3626 return;
3441 } 3627 }
3442 3628
3629 return if $RELOAD++;
3630
3631 while ($RELOAD) {
3443 warn "reloading..."; 3632 warn "reloading...";
3444 3633
3445 warn "entering sync_job"; 3634 warn "entering sync_job";
3446 3635
3447 cf::sync_job { 3636 cf::sync_job {
3448 cf::write_runtime; # external watchdog should not bark 3637 cf::write_runtime_sync; # external watchdog should not bark
3449 cf::emergency_save; 3638 cf::emergency_save;
3450 cf::write_runtime; # external watchdog should not bark 3639 cf::write_runtime_sync; # external watchdog should not bark
3451 3640
3452 warn "syncing database to disk"; 3641 warn "syncing database to disk";
3453 BDB::db_env_txn_checkpoint $DB_ENV; 3642 BDB::db_env_txn_checkpoint $DB_ENV;
3454 3643
3455 # if anything goes wrong in here, we should simply crash as we already saved 3644 # if anything goes wrong in here, we should simply crash as we already saved
3456 3645
3457 warn "flushing outstanding aio requests"; 3646 warn "flushing outstanding aio requests";
3458 for (;;) {
3459 BDB::flush;
3460 IO::AIO::flush;
3461 Coro::cede_notself;
3462 last unless IO::AIO::nreqs || BDB::nreqs; 3647 while (IO::AIO::nreqs || BDB::nreqs) {
3463 warn "iterate..."; 3648 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3464 }
3465
3466 ++$RELOAD;
3467
3468 warn "cancelling all extension coros";
3469 $_->cancel for values %EXT_CORO;
3470 %EXT_CORO = ();
3471
3472 warn "removing commands";
3473 %COMMAND = ();
3474
3475 warn "removing ext/exti commands";
3476 %EXTCMD = ();
3477 %EXTICMD = ();
3478
3479 warn "unloading/nuking all extensions";
3480 for my $pkg (@EXTS) {
3481 warn "... unloading $pkg";
3482
3483 if (my $cb = $pkg->can ("unload")) {
3484 eval {
3485 $cb->($pkg);
3486 1
3487 } or warn "$pkg unloaded, but with errors: $@";
3488 } 3649 }
3489 3650
3490 warn "... nuking $pkg"; 3651 warn "cancelling all extension coros";
3491 Symbol::delete_package $pkg; 3652 $_->cancel for values %EXT_CORO;
3492 } 3653 %EXT_CORO = ();
3493 3654
3494 warn "unloading all perl modules loaded from $LIBDIR"; 3655 warn "removing commands";
3495 while (my ($k, $v) = each %INC) { 3656 %COMMAND = ();
3496 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3497 3657
3658 warn "removing ext/exti commands";
3659 %EXTCMD = ();
3660 %EXTICMD = ();
3661
3662 warn "unloading/nuking all extensions";
3663 for my $pkg (@EXTS) {
3498 warn "... unloading $k"; 3664 warn "... unloading $pkg";
3499 delete $INC{$k};
3500 3665
3501 $k =~ s/\.pm$//;
3502 $k =~ s/\//::/g;
3503
3504 if (my $cb = $k->can ("unload_module")) { 3666 if (my $cb = $pkg->can ("unload")) {
3667 eval {
3505 $cb->(); 3668 $cb->($pkg);
3669 1
3670 } or warn "$pkg unloaded, but with errors: $@";
3671 }
3672
3673 warn "... clearing $pkg";
3674 clear_package $pkg;
3506 } 3675 }
3507 3676
3508 Symbol::delete_package $k; 3677 warn "unloading all perl modules loaded from $LIBDIR";
3678 while (my ($k, $v) = each %INC) {
3679 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3680
3681 warn "... unloading $k";
3682 delete $INC{$k};
3683
3684 $k =~ s/\.pm$//;
3685 $k =~ s/\//::/g;
3686
3687 if (my $cb = $k->can ("unload_module")) {
3688 $cb->();
3689 }
3690
3691 clear_package $k;
3509 } 3692 }
3510 3693
3511 warn "getting rid of safe::, as good as possible"; 3694 warn "getting rid of safe::, as good as possible";
3512 Symbol::delete_package "safe::$_" 3695 clear_package "safe::$_"
3513 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3696 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3514 3697
3515 warn "unloading cf.pm \"a bit\""; 3698 warn "unloading cf.pm \"a bit\"";
3516 delete $INC{"cf.pm"}; 3699 delete $INC{"cf.pm"};
3517 delete $INC{"cf/pod.pm"}; 3700 delete $INC{"cf/pod.pm"};
3518 3701
3519 # don't, removes xs symbols, too, 3702 # don't, removes xs symbols, too,
3520 # and global variables created in xs 3703 # and global variables created in xs
3521 #Symbol::delete_package __PACKAGE__; 3704 #clear_package __PACKAGE__;
3522 3705
3523 warn "unload completed, starting to reload now"; 3706 warn "unload completed, starting to reload now";
3524 3707
3525 warn "reloading cf.pm"; 3708 warn "reloading cf.pm";
3526 require cf; 3709 require cf;
3527 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3710 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3528 3711
3529 warn "loading config and database again"; 3712 warn "loading config and database again";
3530 cf::reload_config; 3713 cf::reload_config;
3531 3714
3532 warn "loading extensions"; 3715 warn "loading extensions";
3533 cf::load_extensions; 3716 cf::load_extensions;
3534 3717
3535 warn "reattaching attachments to objects/players"; 3718 warn "reattaching attachments to objects/players";
3536 _global_reattach; # objects, sockets 3719 _global_reattach; # objects, sockets
3537 warn "reattaching attachments to maps"; 3720 warn "reattaching attachments to maps";
3538 reattach $_ for values %MAP; 3721 reattach $_ for values %MAP;
3539 warn "reattaching attachments to players"; 3722 warn "reattaching attachments to players";
3540 reattach $_ for values %PLAYER; 3723 reattach $_ for values %PLAYER;
3541 3724
3542 warn "leaving sync_job"; 3725 warn "leaving sync_job";
3543 3726
3544 1 3727 1
3545 } or do { 3728 } or do {
3546 warn $@; 3729 warn $@;
3547 warn "error while reloading, exiting."; 3730 cf::cleanup "error while reloading, exiting.";
3548 exit 1;
3549 }; 3731 };
3550 3732
3551 warn "reloaded"; 3733 warn "reloaded";
3734 --$RELOAD;
3735 }
3552}; 3736};
3553 3737
3554our $RELOAD_WATCHER; # used only during reload 3738our $RELOAD_WATCHER; # used only during reload
3555 3739
3556sub reload_perl() { 3740sub reload_perl() {
3557 # doing reload synchronously and two reloads happen back-to-back, 3741 # doing reload synchronously and two reloads happen back-to-back,
3558 # coro crashes during coro_state_free->destroy here. 3742 # coro crashes during coro_state_free->destroy here.
3559 3743
3560 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3744 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3745 do_reload_perl;
3561 undef $RELOAD_WATCHER; 3746 undef $RELOAD_WATCHER;
3562 do_reload_perl;
3563 }; 3747 };
3564} 3748}
3565 3749
3566register_command "reload" => sub { 3750register_command "reload" => sub {
3567 my ($who, $arg) = @_; 3751 my ($who, $arg) = @_;
… …
3581 3765
3582our @WAIT_FOR_TICK; 3766our @WAIT_FOR_TICK;
3583our @WAIT_FOR_TICK_BEGIN; 3767our @WAIT_FOR_TICK_BEGIN;
3584 3768
3585sub wait_for_tick { 3769sub wait_for_tick {
3586 return unless $TICK_WATCHER->is_active;
3587 return if $Coro::current == $Coro::main; 3770 return if tick_inhibit || $Coro::current == $Coro::main;
3588 3771
3589 my $signal = new Coro::Signal; 3772 my $signal = new Coro::Signal;
3590 push @WAIT_FOR_TICK, $signal; 3773 push @WAIT_FOR_TICK, $signal;
3591 $signal->wait; 3774 $signal->wait;
3592} 3775}
3593 3776
3594sub wait_for_tick_begin { 3777sub wait_for_tick_begin {
3595 return unless $TICK_WATCHER->is_active;
3596 return if $Coro::current == $Coro::main; 3778 return if tick_inhibit || $Coro::current == $Coro::main;
3597 3779
3598 my $signal = new Coro::Signal; 3780 my $signal = new Coro::Signal;
3599 push @WAIT_FOR_TICK_BEGIN, $signal; 3781 push @WAIT_FOR_TICK_BEGIN, $signal;
3600 $signal->wait; 3782 $signal->wait;
3601} 3783}
3602 3784
3603$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 3785sub tick {
3604 if ($Coro::current != $Coro::main) { 3786 if ($Coro::current != $Coro::main) {
3605 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3787 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3606 unless ++$bug_warning > 10; 3788 unless ++$bug_warning > 10;
3607 return; 3789 return;
3608 } 3790 }
3609 3791
3610 $NOW = $tick_start = EV::now;
3611
3612 cf::server_tick; # one server iteration 3792 cf::server_tick; # one server iteration
3613
3614 $RUNTIME += $TICK;
3615 $NEXT_TICK = $_[0]->at;
3616 3793
3617 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3794 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3618 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3795 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3619 Coro::async_pool { 3796 Coro::async_pool {
3620 $Coro::current->{desc} = "runtime saver"; 3797 $Coro::current->{desc} = "runtime saver";
3621 write_runtime 3798 write_runtime_sync
3622 or warn "ERROR: unable to write runtime file: $!"; 3799 or warn "ERROR: unable to write runtime file: $!";
3623 }; 3800 };
3624 } 3801 }
3625 3802
3626 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3803 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
… …
3628 } 3805 }
3629 while (my $sig = shift @WAIT_FOR_TICK) { 3806 while (my $sig = shift @WAIT_FOR_TICK) {
3630 $sig->send; 3807 $sig->send;
3631 } 3808 }
3632 3809
3633 $LOAD = ($NOW - $tick_start) / $TICK; 3810 $LOAD = ($NOW - $TICK_START) / $TICK;
3634 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3811 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3635 3812
3636 _post_tick; 3813 if (0) {
3637}; 3814 if ($NEXT_TICK) {
3638$TICK_WATCHER->priority (EV::MAXPRI); 3815 my $jitter = $TICK_START - $NEXT_TICK;
3816 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3817 warn "jitter $JITTER\n";#d#
3818 }
3819 }
3820}
3639 3821
3640{ 3822{
3641 # configure BDB 3823 # configure BDB
3642 3824
3643 BDB::min_parallel 8; 3825 BDB::min_parallel 8;
3644 BDB::max_poll_reqs $TICK * 0.1; 3826 BDB::max_poll_reqs $TICK * 0.1;
3645 $Coro::BDB::WATCHER->priority (1); 3827 $AnyEvent::BDB::WATCHER->priority (1);
3646 3828
3647 unless ($DB_ENV) { 3829 unless ($DB_ENV) {
3648 $DB_ENV = BDB::db_env_create; 3830 $DB_ENV = BDB::db_env_create;
3649 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3831 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3650 | BDB::LOG_AUTOREMOVE, 1); 3832 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3833 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3651 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3834 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3652 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3835 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3653 3836
3654 cf::sync_job { 3837 cf::sync_job {
3655 eval { 3838 eval {
… …
3681{ 3864{
3682 # configure IO::AIO 3865 # configure IO::AIO
3683 3866
3684 IO::AIO::min_parallel 8; 3867 IO::AIO::min_parallel 8;
3685 IO::AIO::max_poll_time $TICK * 0.1; 3868 IO::AIO::max_poll_time $TICK * 0.1;
3686 $Coro::AIO::WATCHER->priority (1); 3869 undef $AnyEvent::AIO::WATCHER;
3687} 3870}
3688 3871
3689my $_log_backtrace; 3872my $_log_backtrace;
3690 3873
3691sub _log_backtrace { 3874sub _log_backtrace {

Diff Legend

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