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.167 by root, Sat Jan 13 23:32:43 2007 UTC vs.
Revision 1.255 by root, Thu Apr 19 16:23:47 2007 UTC

3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Socket;
8use Storable; 9use Storable;
10use Event;
9use Opcode; 11use Opcode;
10use Safe; 12use Safe;
11use Safe::Hole; 13use Safe::Hole;
12 14
13use Coro 3.3 (); 15use Coro 3.61 ();
16use Coro::State;
17use Coro::Handle;
14use Coro::Event; 18use Coro::Event;
15use Coro::Timer; 19use Coro::Timer;
16use Coro::Signal; 20use Coro::Signal;
17use Coro::Semaphore; 21use Coro::Semaphore;
18use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable;
19 24
25use BDB ();
20use Data::Dumper; 26use Data::Dumper;
21use Digest::MD5; 27use Digest::MD5;
22use Fcntl; 28use Fcntl;
29use YAML::Syck ();
23use IO::AIO 2.32 (); 30use IO::AIO 2.32 ();
24use YAML::Syck ();
25use Time::HiRes; 31use Time::HiRes;
32use Compress::LZF;
26 33
34# configure various modules to our taste
35#
36$Storable::canonical = 1; # reduce rsync transfers
37Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
38Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
39
27use Event; $Event::Eval = 1; # no idea why this is required, but it is 40$Event::Eval = 1; # no idea why this is required, but it is
28
29sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
30 41
31# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 42# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
32$YAML::Syck::ImplicitUnicode = 1; 43$YAML::Syck::ImplicitUnicode = 1;
33 44
34$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 45$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
46
47sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
35 48
36our %COMMAND = (); 49our %COMMAND = ();
37our %COMMAND_TIME = (); 50our %COMMAND_TIME = ();
38 51
39our @EXTS = (); # list of extension package names 52our @EXTS = (); # list of extension package names
40our %EXTCMD = (); 53our %EXTCMD = ();
41our %EXT_CORO = (); # coroutines bound to extensions 54our %EXT_CORO = (); # coroutines bound to extensions
42our %EXT_MAP = (); # pluggable maps 55our %EXT_MAP = (); # pluggable maps
43 56
57our $RELOAD; # number of reloads so far
44our @EVENT; 58our @EVENT;
45our $LIBDIR = datadir . "/ext";
46 59
47our $TICK = MAX_TIME * 1e-6; 60our $CONFDIR = confdir;
61our $DATADIR = datadir;
62our $LIBDIR = "$DATADIR/ext";
63our $PODDIR = "$DATADIR/pod";
64our $MAPDIR = "$DATADIR/" . mapdir;
65our $LOCALDIR = localdir;
66our $TMPDIR = "$LOCALDIR/" . tmpdir;
67our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
68our $PLAYERDIR = "$LOCALDIR/" . playerdir;
69our $RANDOMDIR = "$LOCALDIR/random";
70our $BDBDIR = "$LOCALDIR/db";
71
72our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
48our $TICK_WATCHER; 73our $TICK_WATCHER;
74our $AIO_POLL_WATCHER;
75our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
49our $NEXT_TICK; 76our $NEXT_TICK;
50our $NOW; 77our $NOW;
78our $USE_FSYNC = 1; # use fsync to write maps - default off
79
80our $BDB_POLL_WATCHER;
81our $DB_ENV;
51 82
52our %CFG; 83our %CFG;
53 84
54our $UPTIME; $UPTIME ||= time; 85our $UPTIME; $UPTIME ||= time;
55our $RUNTIME; 86our $RUNTIME;
56 87
57our %PLAYER; # all users 88our %PLAYER; # all users
58our %MAP; # all maps 89our %MAP; # all maps
59our $LINK_MAP; # the special {link} map, which is always available 90our $LINK_MAP; # the special {link} map, which is always available
60our $RANDOM_MAPS = cf::localdir . "/random";
61
62our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
63our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
64 91
65# used to convert map paths into valid unix filenames by replacing / by ∕ 92# used to convert map paths into valid unix filenames by replacing / by ∕
66our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
67 94
68binmode STDOUT; 95binmode STDOUT;
69binmode STDERR; 96binmode STDERR;
70 97
71# read virtual server time, if available 98# read virtual server time, if available
72unless ($RUNTIME || !-e cf::localdir . "/runtime") { 99unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
73 open my $fh, "<", cf::localdir . "/runtime" 100 open my $fh, "<", "$LOCALDIR/runtime"
74 or die "unable to read runtime file: $!"; 101 or die "unable to read runtime file: $!";
75 $RUNTIME = <$fh> + 0.; 102 $RUNTIME = <$fh> + 0.;
76} 103}
77 104
78mkdir cf::localdir; 105mkdir $_
79mkdir cf::localdir . "/" . cf::playerdir; 106 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
80mkdir cf::localdir . "/" . cf::tmpdir;
81mkdir cf::localdir . "/" . cf::uniquedir;
82mkdir $RANDOM_MAPS;
83 107
84our $EMERGENCY_POSITION; 108our $EMERGENCY_POSITION;
109
110sub cf::map::normalise;
85 111
86############################################################################# 112#############################################################################
87 113
88=head2 GLOBAL VARIABLES 114=head2 GLOBAL VARIABLES
89 115
96=item $cf::RUNTIME 122=item $cf::RUNTIME
97 123
98The time this server has run, starts at 0 and is increased by $cf::TICK on 124The time this server has run, starts at 0 and is increased by $cf::TICK on
99every server tick. 125every server tick.
100 126
101=item $cf::LIBDIR 127=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
128$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
129$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
102 130
103The perl library directory, where extensions and cf-specific modules can 131Various directories - "/etc", read-only install directory, perl-library
104be found. It will be added to C<@INC> automatically. 132directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
133unique-items directory, player file directory, random maps directory and
134database environment.
105 135
106=item $cf::NOW 136=item $cf::NOW
107 137
108The time of the last (current) server tick. 138The time of the last (current) server tick.
109 139
114=item %cf::CFG 144=item %cf::CFG
115 145
116Configuration for the server, loaded from C</etc/crossfire/config>, or 146Configuration for the server, loaded from C</etc/crossfire/config>, or
117from wherever your confdir points to. 147from wherever your confdir points to.
118 148
119=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE 149=item cf::wait_for_tick, cf::wait_for_tick_begin
120 150
121These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK) 151These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
122or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick 152returns directly I<after> the tick processing (and consequently, can only wake one process
123processing has been done. Call C<< ->wait >> on them to maximise the 153per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
124window of cpu time available, or simply to synchronise to the server tick.
125 154
126=back 155=back
127 156
128=cut 157=cut
129 158
130BEGIN { 159BEGIN {
131 *CORE::GLOBAL::warn = sub { 160 *CORE::GLOBAL::warn = sub {
132 my $msg = join "", @_; 161 my $msg = join "", @_;
133 utf8::encode $msg;
134 162
135 $msg .= "\n" 163 $msg .= "\n"
136 unless $msg =~ /\n$/; 164 unless $msg =~ /\n$/;
137 165
166 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
167
168 utf8::encode $msg;
138 LOG llevError, $msg; 169 LOG llevError, $msg;
139 }; 170 };
140} 171}
141 172
142@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 173@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
188 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 219 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
189 $d 220 $d
190 } || "[unable to dump $_[0]: '$@']"; 221 } || "[unable to dump $_[0]: '$@']";
191} 222}
192 223
193use JSON::Syck (); # TODO# replace by JSON::PC once working 224use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
194 225
195=item $ref = cf::from_json $json 226=item $ref = cf::from_json $json
196 227
197Converts a JSON string into the corresponding perl data structure. 228Converts a JSON string into the corresponding perl data structure.
198 229
199=cut
200
201sub from_json($) {
202 $JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
203 JSON::Syck::Load $_[0]
204}
205
206=item $json = cf::to_json $ref 230=item $json = cf::to_json $ref
207 231
208Converts a perl data structure into its JSON representation. 232Converts a perl data structure into its JSON representation.
209
210=cut
211
212sub to_json($) {
213 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
214 JSON::Syck::Dump $_[0]
215}
216 233
217=item cf::lock_wait $string 234=item cf::lock_wait $string
218 235
219Wait until the given lock is available. See cf::lock_acquire. 236Wait until the given lock is available. See cf::lock_acquire.
220 237
226returned. 243returned.
227 244
228Lock names should begin with a unique identifier (for example, cf::map::find 245Lock names should begin with a unique identifier (for example, cf::map::find
229uses map_find and cf::map::load uses map_load). 246uses map_find and cf::map::load uses map_load).
230 247
248=item $locked = cf::lock_active $string
249
250Return true if the lock is currently active, i.e. somebody has locked it.
251
231=cut 252=cut
232 253
233our %LOCK; 254our %LOCK;
234 255
235sub lock_wait($) { 256sub lock_wait($) {
254 # wake up all waiters, to be on the safe side 275 # wake up all waiters, to be on the safe side
255 $_->ready for @{ delete $LOCK{$key} }; 276 $_->ready for @{ delete $LOCK{$key} };
256 } 277 }
257} 278}
258 279
280sub lock_active($) {
281 my ($key) = @_;
282
283 ! ! $LOCK{$key}
284}
285
259sub freeze_mainloop { 286sub freeze_mainloop {
260 return unless $TICK_WATCHER->is_active; 287 return unless $TICK_WATCHER->is_active;
261 288
262 my $guard = Coro::guard { $TICK_WATCHER->start }; 289 my $guard = Coro::guard {
290 $TICK_WATCHER->start;
291 };
263 $TICK_WATCHER->stop; 292 $TICK_WATCHER->stop;
264 $guard 293 $guard
265} 294}
266 295
267=item cf::async { BLOCK } 296=item cf::async { BLOCK }
338 367
339 $coro 368 $coro
340} 369}
341 370
342sub write_runtime { 371sub write_runtime {
343 return unless $TICK_WATCHER->is_active; 372 my $guard = cf::lock_acquire "write_runtime";
344 373
345 my $runtime = cf::localdir . "/runtime"; 374 my $runtime = "$LOCALDIR/runtime";
346 375
347 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 376 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
348 or return; 377 or return;
349 378
379 my $value = $cf::RUNTIME + 90 + 10;
350 my $value = $cf::RUNTIME + 1 + 10; # 10 is the runtime save interval, for a monotonic clock 380 # 10 is the runtime save interval, for a monotonic clock
381 # 60 allows for the watchdog to kill the server.
382
351 (aio_write $fh, 0, (length $value), $value, 0) <= 0 383 (aio_write $fh, 0, (length $value), $value, 0) <= 0
352 and return; 384 and return;
353 385
386 # always fsync - this file is important
354 aio_fsync $fh 387 aio_fsync $fh
355 and return; 388 and return;
356 389
357 close $fh 390 close $fh
358 or return; 391 or return;
359 392
360 aio_rename "$runtime~", $runtime 393 aio_rename "$runtime~", $runtime
361 and return; 394 and return;
362 395
363 1 396 1
397}
398
399=item cf::datalog type => key => value, ...
400
401Log a datalog packet of the given type with the given key-value pairs.
402
403=cut
404
405sub datalog($@) {
406 my ($type, %kv) = @_;
407 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
364} 408}
365 409
366=back 410=back
367 411
368=cut 412=cut
499our @CB_TYPE = (); # registry for type (cf-object class) based events 543our @CB_TYPE = (); # registry for type (cf-object class) based events
500our @CB_MAP = (); 544our @CB_MAP = ();
501 545
502my %attachment; 546my %attachment;
503 547
548sub cf::attachable::thawer_merge {
549 # simply override everything except _meta
550 local $_[0]{_meta};
551 %{$_[0]} = %{$_[1]};
552}
553
504sub _attach_cb($$$$) { 554sub _attach_cb($$$$) {
505 my ($registry, $event, $prio, $cb) = @_; 555 my ($registry, $event, $prio, $cb) = @_;
506 556
507 use sort 'stable'; 557 use sort 'stable';
508 558
679# object support 729# object support
680 730
681sub reattach { 731sub reattach {
682 # basically do the same as instantiate, without calling instantiate 732 # basically do the same as instantiate, without calling instantiate
683 my ($obj) = @_; 733 my ($obj) = @_;
734
735 bless $obj, ref $obj; # re-bless in case extensions have been reloaded
684 736
685 my $registry = $obj->registry; 737 my $registry = $obj->registry;
686 738
687 @$registry = (); 739 @$registry = ();
688 740
735 $filename, length $$rdata, scalar @$objs; 787 $filename, length $$rdata, scalar @$objs;
736 788
737 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 789 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
738 chmod SAVE_MODE, $fh; 790 chmod SAVE_MODE, $fh;
739 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 791 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
740 aio_fsync $fh; 792 aio_fsync $fh if $cf::USE_FSYNC;
741 close $fh; 793 close $fh;
742 794
743 if (@$objs) { 795 if (@$objs) {
744 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 796 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
745 chmod SAVE_MODE, $fh; 797 chmod SAVE_MODE, $fh;
746 my $data = Storable::nfreeze { version => 1, objs => $objs }; 798 my $data = Storable::nfreeze { version => 1, objs => $objs };
747 aio_write $fh, 0, (length $data), $data, 0; 799 aio_write $fh, 0, (length $data), $data, 0;
748 aio_fsync $fh; 800 aio_fsync $fh if $cf::USE_FSYNC;
749 close $fh; 801 close $fh;
750 aio_rename "$filename.pst~", "$filename.pst"; 802 aio_rename "$filename.pst~", "$filename.pst";
751 } 803 }
752 } else { 804 } else {
753 aio_unlink "$filename.pst"; 805 aio_unlink "$filename.pst";
922Returns the given player object, loading it if necessary (might block). 974Returns the given player object, loading it if necessary (might block).
923 975
924=cut 976=cut
925 977
926sub playerdir($) { 978sub playerdir($) {
927 cf::localdir 979 "$PLAYERDIR/"
928 . "/"
929 . cf::playerdir
930 . "/"
931 . (ref $_[0] ? $_[0]->ob->name : $_[0]) 980 . (ref $_[0] ? $_[0]->ob->name : $_[0])
932} 981}
933 982
934sub path($) { 983sub path($) {
935 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 984 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
936 985
937 (playerdir $login) . "/$login.pl" 986 (playerdir $login) . "/playerdata"
938} 987}
939 988
940sub find_active($) { 989sub find_active($) {
941 $cf::PLAYER{$_[0]} 990 $cf::PLAYER{$_[0]}
942 and $cf::PLAYER{$_[0]}->active 991 and $cf::PLAYER{$_[0]}->active
945 994
946sub exists($) { 995sub exists($) {
947 my ($login) = @_; 996 my ($login) = @_;
948 997
949 $cf::PLAYER{$login} 998 $cf::PLAYER{$login}
950 or cf::sync_job { !aio_stat $login } 999 or cf::sync_job { !aio_stat path $login }
951} 1000}
952 1001
953sub find($) { 1002sub find($) {
954 return $cf::PLAYER{$_[0]} || do { 1003 return $cf::PLAYER{$_[0]} || do {
955 my $login = $_[0]; 1004 my $login = $_[0];
956 1005
957 my $guard = cf::lock_acquire "user_find:$login"; 1006 my $guard = cf::lock_acquire "user_find:$login";
958 1007
959 $cf::PLAYER{$_[0]} || do { 1008 $cf::PLAYER{$_[0]} || do {
1009 # rename old playerfiles to new ones
1010 #TODO: remove when no longer required
1011 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1012 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1013 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1014 aio_unlink +(playerdir $login) . "/$login.pl";
1015
960 my $pl = load_pl path $login 1016 my $pl = load_pl path $login
961 or return; 1017 or return;
962 $cf::PLAYER{$login} = $pl 1018 $cf::PLAYER{$login} = $pl
963 } 1019 }
964 } 1020 }
1001 1057
1002=cut 1058=cut
1003 1059
1004sub quit_character { 1060sub quit_character {
1005 my ($pl) = @_; 1061 my ($pl) = @_;
1062
1063 my $name = $pl->ob->name;
1006 1064
1007 $pl->{deny_save} = 1; 1065 $pl->{deny_save} = 1;
1008 $pl->password ("*"); # this should lock out the player until we nuked the dir 1066 $pl->password ("*"); # this should lock out the player until we nuked the dir
1009 1067
1010 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1068 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1015 my $path = playerdir $pl; 1073 my $path = playerdir $pl;
1016 my $temp = "$path~$cf::RUNTIME~deleting~"; 1074 my $temp = "$path~$cf::RUNTIME~deleting~";
1017 aio_rename $path, $temp; 1075 aio_rename $path, $temp;
1018 delete $cf::PLAYER{$pl->ob->name}; 1076 delete $cf::PLAYER{$pl->ob->name};
1019 $pl->destroy; 1077 $pl->destroy;
1078
1079 my $prefix = qr<^~\Q$name\E/>;
1080
1081 # nuke player maps
1082 $cf::MAP{$_}->nuke for grep /$prefix/, keys %cf::MAP;
1083
1020 IO::AIO::aio_rmtree $temp; 1084 IO::AIO::aio_rmtree $temp;
1085}
1086
1087=item $pl->kick
1088
1089Kicks a player out of the game. This destroys the connection.
1090
1091=cut
1092
1093sub kick {
1094 my ($pl, $kicker) = @_;
1095
1096 $pl->invoke (cf::EVENT_PLAYER_KICK, $kicker);
1097 $pl->killer ("kicked");
1098 $pl->ns->destroy;
1021} 1099}
1022 1100
1023=item cf::player::list_logins 1101=item cf::player::list_logins
1024 1102
1025Returns am arrayref of all valid playernames in the system, can take a 1103Returns am arrayref of all valid playernames in the system, can take a
1026while and may block, so not sync_job-capable, ever. 1104while and may block, so not sync_job-capable, ever.
1027 1105
1028=cut 1106=cut
1029 1107
1030sub list_logins { 1108sub list_logins {
1031 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir 1109 my $dirs = aio_readdir $PLAYERDIR
1032 or return []; 1110 or return [];
1033 1111
1034 my @logins; 1112 my @logins;
1035 1113
1036 for my $login (@$dirs) { 1114 for my $login (@$dirs) {
1053=cut 1131=cut
1054 1132
1055sub maps($) { 1133sub maps($) {
1056 my ($pl) = @_; 1134 my ($pl) = @_;
1057 1135
1136 $pl = ref $pl ? $pl->ob->name : $pl;
1137
1058 my $files = aio_readdir playerdir $pl 1138 my $files = aio_readdir playerdir $pl
1059 or return; 1139 or return;
1060 1140
1061 my @paths; 1141 my @paths;
1062 1142
1063 for (@$files) { 1143 for (@$files) {
1064 utf8::decode $_; 1144 utf8::decode $_;
1065 next if /\.(?:pl|pst)$/; 1145 next if /\.(?:pl|pst)$/;
1066 next unless /^$PATH_SEP/o; 1146 next unless /^$PATH_SEP/o;
1067 1147
1068 s/\.map$//; 1148 push @paths, cf::map::normalise "~$pl/$_";
1069 push @paths, "~" . $pl->ob->name . "/" . $_;
1070 } 1149 }
1071 1150
1072 \@paths 1151 \@paths
1073} 1152}
1074 1153
1075=item $player->ext_reply ($msgid, $msgtype, %msg) 1154=item $player->ext_reply ($msgid, %msg)
1076 1155
1077Sends an ext reply to the player. 1156Sends an ext reply to the player.
1078 1157
1079=cut 1158=cut
1080 1159
1081sub ext_reply($$$%) { 1160sub ext_reply($$%) {
1082 my ($self, $id, %msg) = @_; 1161 my ($self, $id, %msg) = @_;
1083 1162
1084 $msg{msgid} = $id; 1163 $msg{msgid} = $id;
1085 1164
1086 $self->send ("ext " . cf::to_json \%msg); 1165 $self->send ("ext " . cf::to_json \%msg);
1087} 1166}
1088 1167
1089package cf; 1168=item $player->ext_event ($type, %msg)
1169
1170Sends an ext event to the client.
1171
1172=cut
1173
1174sub ext_event($$%) {
1175 my ($self, $type, %msg) = @_;
1176
1177 $self->ns->ext_event ($type, %msg);
1178}
1179
1180=head3 cf::region
1181
1182=over 4
1183
1184=cut
1185
1186package cf::region;
1187
1188=item cf::region::find_by_path $path
1189
1190Tries to decuce the probable region for a map knowing only its path.
1191
1192=cut
1193
1194sub find_by_path($) {
1195 my ($path) = @_;
1196
1197 my ($match, $specificity);
1198
1199 for my $region (list) {
1200 if ($region->match && $path =~ $region->match) {
1201 ($match, $specificity) = ($region, $region->specificity)
1202 if $region->specificity > $specificity;
1203 }
1204 }
1205
1206 $match
1207}
1090 1208
1091=back 1209=back
1092
1093 1210
1094=head3 cf::map 1211=head3 cf::map
1095 1212
1096=over 4 1213=over 4
1097 1214
1101 1218
1102use Fcntl; 1219use Fcntl;
1103use Coro::AIO; 1220use Coro::AIO;
1104 1221
1105use overload 1222use overload
1106 '""' => \&as_string; 1223 '""' => \&as_string,
1224 fallback => 1;
1107 1225
1108our $MAX_RESET = 3600; 1226our $MAX_RESET = 3600;
1109our $DEFAULT_RESET = 3000; 1227our $DEFAULT_RESET = 3000;
1110 1228
1111sub generate_random_map { 1229sub generate_random_map {
1112 my ($self, $rmp) = @_; 1230 my ($self, $rmp) = @_;
1113
1114 # mit "rum" bekleckern, nicht 1231 # mit "rum" bekleckern, nicht
1115 $self->_create_random_map ( 1232 $self->_create_random_map (
1116 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1233 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1117 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1234 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1118 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1235 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1125 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1242 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1126 (cf::region::find $rmp->{region}), $rmp->{custom} 1243 (cf::region::find $rmp->{region}), $rmp->{custom}
1127 ) 1244 )
1128} 1245}
1129 1246
1247=item cf::map->register ($regex, $prio)
1248
1249Register a handler for the map path matching the given regex at the
1250givne priority (higher is better, built-in handlers have priority 0, the
1251default).
1252
1253=cut
1254
1130sub register { 1255sub register {
1131 my (undef, $regex) = @_; 1256 my (undef, $regex, $prio) = @_;
1132 my $pkg = caller; 1257 my $pkg = caller;
1133 1258
1134 no strict; 1259 no strict;
1135 push @{"$pkg\::ISA"}, __PACKAGE__; 1260 push @{"$pkg\::ISA"}, __PACKAGE__;
1136 1261
1137 $EXT_MAP{$pkg} = qr<$regex>; 1262 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1138} 1263}
1139 1264
1140# also paths starting with '/' 1265# also paths starting with '/'
1141$EXT_MAP{"cf::map"} = qr{^(?=/)}; 1266$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1267
1268sub thawer_merge {
1269 my ($self, $merge) = @_;
1270
1271 # we have to keep some variables in memory intact
1272 local $self->{path};
1273 local $self->{load_path};
1274 local $self->{deny_save};
1275 local $self->{deny_reset};
1276
1277 $self->SUPER::thawer_merge ($merge);
1278}
1142 1279
1143sub normalise { 1280sub normalise {
1144 my ($path, $base) = @_; 1281 my ($path, $base) = @_;
1282
1283 $path = "$path"; # make sure its a string
1284
1285 $path =~ s/\.map$//;
1145 1286
1146 # map plan: 1287 # map plan:
1147 # 1288 #
1148 # /! non-realised random map exit (special hack!) 1289 # /! non-realised random map exit (special hack!)
1149 # {... are special paths that are not being touched 1290 # {... are special paths that are not being touched
1177 1318
1178 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object 1319 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1179 1320
1180 $path = normalise $path, $base; 1321 $path = normalise $path, $base;
1181 1322
1182 for my $pkg (keys %EXT_MAP) { 1323 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1183 if ($path =~ $EXT_MAP{$pkg}) { 1324 if ($path =~ $EXT_MAP{$pkg}[1]) {
1184 my $self = bless cf::map::new, $pkg; 1325 my $self = bless cf::map::new, $pkg;
1185 $self->{path} = $path; $self->path ($path); 1326 $self->{path} = $path; $self->path ($path);
1186 $self->init; # pass $1 etc. 1327 $self->init; # pass $1 etc.
1187 return $self; 1328 return $self;
1188 } 1329 }
1189 } 1330 }
1190 1331
1191 Carp::carp "unable to resolve path '$path'."; 1332 Carp::carp "unable to resolve path '$path' (base '$base').";
1192 () 1333 ()
1193} 1334}
1194 1335
1195sub init { 1336sub init {
1196 my ($self) = @_; 1337 my ($self) = @_;
1211 1352
1212# the original (read-only) location 1353# the original (read-only) location
1213sub load_path { 1354sub load_path {
1214 my ($self) = @_; 1355 my ($self) = @_;
1215 1356
1216 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1357 "$MAPDIR/$self->{path}.map"
1217} 1358}
1218 1359
1219# the temporary/swap location 1360# the temporary/swap location
1220sub save_path { 1361sub save_path {
1221 my ($self) = @_; 1362 my ($self) = @_;
1222 1363
1223 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1364 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1224 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path 1365 "$TMPDIR/$path.map"
1225} 1366}
1226 1367
1227# the unique path, undef == no special unique path 1368# the unique path, undef == no special unique path
1228sub uniq_path { 1369sub uniq_path {
1229 my ($self) = @_; 1370 my ($self) = @_;
1230 1371
1231 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1372 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1232 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1373 "$UNIQUEDIR/$path"
1233} 1374}
1234 1375
1235# and all this just because we cannot iterate over 1376# and all this just because we cannot iterate over
1236# all maps in C++... 1377# all maps in C++...
1237sub change_all_map_light { 1378sub change_all_map_light {
1243 1384
1244sub unlink_save { 1385sub unlink_save {
1245 my ($self) = @_; 1386 my ($self) = @_;
1246 1387
1247 utf8::encode (my $save = $self->save_path); 1388 utf8::encode (my $save = $self->save_path);
1248 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink $save; 1389 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1249 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$save.pst"; 1390 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1250} 1391}
1251 1392
1252sub load_header_from($) { 1393sub load_header_from($) {
1253 my ($self, $path) = @_; 1394 my ($self, $path) = @_;
1254 1395
1255 utf8::encode $path; 1396 utf8::encode $path;
1256 aio_open $path, O_RDONLY, 0 1397 #aio_open $path, O_RDONLY, 0
1257 or return; 1398 # or return;
1258 1399
1259 $self->_load_header ($path) 1400 $self->_load_header ($path)
1260 or return; 1401 or return;
1261 1402
1262 $self->{load_path} = $path; 1403 $self->{load_path} = $path;
1263 1404
1264 1 1405 1
1265} 1406}
1266 1407
1267sub load_orig { 1408sub load_header_orig {
1268 my ($self) = @_; 1409 my ($self) = @_;
1269 1410
1270 $self->load_header_from ($self->load_path) 1411 $self->load_header_from ($self->load_path)
1271} 1412}
1272 1413
1273sub load_temp { 1414sub load_header_temp {
1274 my ($self) = @_; 1415 my ($self) = @_;
1275 1416
1276 $self->load_header_from ($self->save_path) 1417 $self->load_header_from ($self->save_path)
1418}
1419
1420sub prepare_temp {
1421 my ($self) = @_;
1422
1423 $self->last_access ((delete $self->{last_access})
1424 || $cf::RUNTIME); #d#
1425 # safety
1426 $self->{instantiate_time} = $cf::RUNTIME
1427 if $self->{instantiate_time} > $cf::RUNTIME;
1428}
1429
1430sub prepare_orig {
1431 my ($self) = @_;
1432
1433 $self->{load_original} = 1;
1434 $self->{instantiate_time} = $cf::RUNTIME;
1435 $self->last_access ($cf::RUNTIME);
1436 $self->instantiate;
1277} 1437}
1278 1438
1279sub load_header { 1439sub load_header {
1280 my ($self) = @_; 1440 my ($self) = @_;
1281 1441
1282 if ($self->load_temp) { 1442 if ($self->load_header_temp) {
1283 $self->last_access ((delete $self->{last_access}) 1443 $self->prepare_temp;
1284 || $cf::RUNTIME); #d#
1285 # safety
1286 $self->{instantiate_time} = $cf::RUNTIME
1287 if $self->{instantiate_time} > $cf::RUNTIME;
1288 } else { 1444 } else {
1289 $self->load_orig 1445 $self->load_header_orig
1290 or return; 1446 or return;
1291 1447 $self->prepare_orig;
1292 $self->{load_original} = 1;
1293 $self->{instantiate_time} = $cf::RUNTIME;
1294 $self->last_access ($cf::RUNTIME);
1295 $self->instantiate;
1296 } 1448 }
1449
1450 $self->default_region (cf::region::find_by_path $self->{path})
1451 unless $self->default_region;
1297 1452
1298 1 1453 1
1299} 1454}
1300 1455
1301sub find; 1456sub find;
1314 $map->{last_save} = $cf::RUNTIME; 1469 $map->{last_save} = $cf::RUNTIME;
1315 1470
1316 $map->load_header 1471 $map->load_header
1317 or return; 1472 or return;
1318 1473
1319 if ($map->should_reset) { 1474 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)
1475 # doing this can freeze the server in a sync job, obviously
1476 #$cf::WAIT_FOR_TICK->wait;
1320 $map->reset; 1477 $map->reset;
1321 undef $guard; 1478 undef $guard;
1322 $map = find $path 1479 return find $path;
1323 or return;
1324 } 1480 }
1325 1481
1326 $cf::MAP{$path} = $map 1482 $cf::MAP{$path} = $map
1327 } 1483 }
1328} 1484}
1485
1486sub pre_load { }
1487sub post_load { }
1329 1488
1330sub load { 1489sub load {
1331 my ($self) = @_; 1490 my ($self) = @_;
1332 1491
1492 local $self->{deny_reset} = 1; # loading can take a long time
1493
1333 my $path = $self->{path}; 1494 my $path = $self->{path};
1334 my $guard = cf::lock_acquire "map_load:$path"; 1495 my $guard = cf::lock_acquire "map_load:$path";
1335 1496
1336 return if $self->in_memory != cf::MAP_SWAPPED; 1497 return if $self->in_memory != cf::MAP_SWAPPED;
1337 1498
1338 $self->in_memory (cf::MAP_LOADING); 1499 $self->in_memory (cf::MAP_LOADING);
1339 1500
1340 $self->alloc; 1501 $self->alloc;
1502
1503 $self->pre_load;
1504 Coro::cede;
1505
1341 $self->_load_objects ($self->{load_path}, 1) 1506 $self->_load_objects ($self->{load_path}, 1)
1342 or return; 1507 or return;
1343 1508
1344 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1509 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1345 if delete $self->{load_original}; 1510 if delete $self->{load_original};
1351 $self->_load_objects ($uniq, 0); 1516 $self->_load_objects ($uniq, 0);
1352 } 1517 }
1353 } 1518 }
1354 1519
1355 Coro::cede; 1520 Coro::cede;
1356
1357 # now do the right thing for maps 1521 # now do the right thing for maps
1358 $self->link_multipart_objects; 1522 $self->link_multipart_objects;
1523 Coro::cede;
1359 1524
1360 unless ($self->{deny_activate}) { 1525 unless ($self->{deny_activate}) {
1361 $self->decay_objects; 1526 $self->decay_objects;
1362 $self->fix_auto_apply; 1527 $self->fix_auto_apply;
1363 $self->update_buttons; 1528 $self->update_buttons;
1365 $self->set_darkness_map; 1530 $self->set_darkness_map;
1366 $self->difficulty ($self->estimate_difficulty) 1531 $self->difficulty ($self->estimate_difficulty)
1367 unless $self->difficulty; 1532 unless $self->difficulty;
1368 Coro::cede; 1533 Coro::cede;
1369 $self->activate; 1534 $self->activate;
1535 Coro::cede;
1370 } 1536 }
1537
1538 $self->post_load;
1539 Coro::cede;
1371 1540
1372 $self->in_memory (cf::MAP_IN_MEMORY); 1541 $self->in_memory (cf::MAP_IN_MEMORY);
1373} 1542}
1374 1543
1375sub customise_for { 1544sub customise_for {
1416 1585
1417 cf::sync_job { $map->load }; 1586 cf::sync_job { $map->load };
1418} 1587}
1419 1588
1420our %MAP_PREFETCH; 1589our %MAP_PREFETCH;
1421our $MAP_PREFETCHER = Coro::async { 1590our $MAP_PREFETCHER = undef;
1422 while () {
1423 for my $path (keys %MAP_PREFETCH) {
1424 my $map = find $path
1425 or next;
1426 $map->load;
1427
1428 delete $MAP_PREFETCH{$path};
1429 }
1430 Coro::schedule;
1431 }
1432};
1433 1591
1434sub find_async { 1592sub find_async {
1435 my ($path, $origin) = @_; 1593 my ($path, $origin) = @_;
1436 1594
1437 $path = normalise $path, $origin && $origin->{path}; 1595 $path = normalise $path, $origin && $origin->{path};
1438 1596
1439 if (my $map = $cf::MAP{$path}) { 1597 if (my $map = $cf::MAP{$path}) {
1440 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1598 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1441 } 1599 }
1442 1600
1443 $MAP_PREFETCH{$path} = 0; 1601 undef $MAP_PREFETCH{$path};
1602 $MAP_PREFETCHER ||= cf::async {
1603 while (%MAP_PREFETCH) {
1604 for my $path (keys %MAP_PREFETCH) {
1605 my $map = find $path
1606 or next;
1607 $map->load;
1608
1609 delete $MAP_PREFETCH{$path};
1610 }
1611 }
1612 undef $MAP_PREFETCHER;
1613 };
1444 $MAP_PREFETCHER->ready; 1614 $MAP_PREFETCHER->prio (6);
1445 1615
1446 () 1616 ()
1447} 1617}
1448 1618
1449sub save { 1619sub save {
1494 1664
1495sub reset_at { 1665sub reset_at {
1496 my ($self) = @_; 1666 my ($self) = @_;
1497 1667
1498 # TODO: safety, remove and allow resettable per-player maps 1668 # TODO: safety, remove and allow resettable per-player maps
1499 return 1e99 if $self->isa ("ext::map_per_player"); 1669 return 1e99 if $self->isa ("ext::map_per_player");#d#
1500 return 1e99 if $self->{deny_reset}; 1670 return 1e99 if $self->{deny_reset};
1501 1671
1502 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1672 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1503 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1673 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1504 1674
1509 my ($self) = @_; 1679 my ($self) = @_;
1510 1680
1511 $self->reset_at <= $cf::RUNTIME 1681 $self->reset_at <= $cf::RUNTIME
1512} 1682}
1513 1683
1514sub rename {
1515 my ($self, $new_path) = @_;
1516
1517 normalise $new_path;
1518
1519 $self->unlink_save;
1520
1521 delete $cf::MAP{$self->path};
1522 $self->{path} = $new_path; $self->path ($self->{path});
1523 $cf::MAP{$self->path} = $self;
1524
1525 $self->save;
1526}
1527
1528sub reset { 1684sub reset {
1529 my ($self) = @_; 1685 my ($self) = @_;
1530 1686
1531 my $lock = cf::lock_acquire "map_data:$self->{path}"; 1687 my $lock = cf::lock_acquire "map_data:$self->{path}";
1532 1688
1533 return if $self->players; 1689 return if $self->players;
1534 return if $self->isa ("ext::map_per_player");#d# 1690 return if $self->isa ("ext::map_per_player");#d#
1535 1691
1536 warn "resetting map ", $self->path;#d# 1692 warn "resetting map ", $self->path;#d#
1537 1693
1694 $self->in_memory (cf::MAP_SWAPPED);
1695
1696 # need to save uniques path
1697 unless ($self->{deny_save}) {
1698 my $uniq = $self->uniq_path; utf8::encode $uniq;
1699
1700 $self->_save_objects ($uniq, cf::IO_UNIQUES)
1701 if $uniq;
1702 }
1703
1538 delete $cf::MAP{$self->path}; 1704 delete $cf::MAP{$self->path};
1539 1705
1540 $self->in_memory (cf::MAP_SWAPPED);
1541 $self->clear; 1706 $self->clear;
1542 1707
1543 $_->clear_links_to ($self) for values %cf::MAP; 1708 $_->clear_links_to ($self) for values %cf::MAP;
1544 1709
1545 $self->unlink_save; 1710 $self->unlink_save;
1549my $nuke_counter = "aaaa"; 1714my $nuke_counter = "aaaa";
1550 1715
1551sub nuke { 1716sub nuke {
1552 my ($self) = @_; 1717 my ($self) = @_;
1553 1718
1719 delete $cf::MAP{$self->path};
1720
1721 $self->unlink_save;
1722
1723 bless $self, "cf::map";
1724 delete $self->{deny_reset};
1554 $self->{deny_save} = 1; 1725 $self->{deny_save} = 1;
1555 $self->reset_timeout (1); 1726 $self->reset_timeout (1);
1556 $self->rename ("{nuke}/" . ($nuke_counter++)); 1727 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1728
1729 $cf::MAP{$self->path} = $self;
1730
1557 $self->reset; # polite request, might not happen 1731 $self->reset; # polite request, might not happen
1558} 1732}
1559 1733
1560=item cf::map::unique_maps 1734=item cf::map::unique_maps
1561 1735
1563instantiated unique items. May block. 1737instantiated unique items. May block.
1564 1738
1565=cut 1739=cut
1566 1740
1567sub unique_maps() { 1741sub unique_maps() {
1568 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 1742 my $files = aio_readdir $UNIQUEDIR
1569 or return; 1743 or return;
1570 1744
1571 my @paths; 1745 my @paths;
1572 1746
1573 for (@$files) { 1747 for (@$files) {
1574 utf8::decode $_; 1748 utf8::decode $_;
1575 next if /\.pst$/; 1749 next if /\.pst$/;
1576 next unless /^$PATH_SEP/o; 1750 next unless /^$PATH_SEP/o;
1577 1751
1578 s/\.map$//; 1752 push @paths, cf::map::normalise $_;
1579 push @paths, $_;
1580 } 1753 }
1581 1754
1582 \@paths 1755 \@paths
1583} 1756}
1584 1757
1678=cut 1851=cut
1679 1852
1680sub link_map { 1853sub link_map {
1681 unless ($LINK_MAP) { 1854 unless ($LINK_MAP) {
1682 $LINK_MAP = cf::map::find "{link}" 1855 $LINK_MAP = cf::map::find "{link}"
1683 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 1856 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1684 $LINK_MAP->load; 1857 $LINK_MAP->load;
1685 } 1858 }
1686 1859
1687 $LINK_MAP 1860 $LINK_MAP
1688} 1861}
1695 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1868 return if UNIVERSAL::isa $self->map, "ext::map_link";
1696 1869
1697 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1870 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1698 if $self->map; 1871 if $self->map;
1699 1872
1700 $self->enter_map ($LINK_MAP || link_map, 20, 20); 1873 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1701} 1874}
1702 1875
1703sub cf::object::player::leave_link { 1876sub cf::object::player::leave_link {
1704 my ($self, $map, $x, $y) = @_; 1877 my ($self, $map, $x, $y) = @_;
1705 1878
1727 $map->load; 1900 $map->load;
1728 $map->load_diag; 1901 $map->load_diag;
1729 1902
1730 return unless $self->contr->active; 1903 return unless $self->contr->active;
1731 $self->activate_recursive; 1904 $self->activate_recursive;
1905
1906 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1732 $self->enter_map ($map, $x, $y); 1907 $self->enter_map ($map, $x, $y);
1733} 1908}
1734 1909
1735cf::player->attach ( 1910cf::player->attach (
1736 on_logout => sub { 1911 on_logout => sub {
1749 # try to abort aborted map switching on player login :) 1924 # try to abort aborted map switching on player login :)
1750 # should happen only on crashes 1925 # should happen only on crashes
1751 if ($pl->ob->{_link_pos}) { 1926 if ($pl->ob->{_link_pos}) {
1752 $pl->ob->enter_link; 1927 $pl->ob->enter_link;
1753 (async { 1928 (async {
1754 # we need this sleep as the login has a concurrent enter_exit running
1755 # and this sleep increases chances of the player not ending up in scorn
1756 $pl->ob->reply (undef, 1929 $pl->ob->reply (undef,
1757 "There was an internal problem at your last logout, " 1930 "There was an internal problem at your last logout, "
1758 . "the server will try to bring you to your intended destination in a second.", 1931 . "the server will try to bring you to your intended destination in a second.",
1759 cf::NDI_RED); 1932 cf::NDI_RED);
1933 # we need this sleep as the login has a concurrent enter_exit running
1934 # and this sleep increases chances of the player not ending up in scorn
1760 Coro::Timer::sleep 1; 1935 Coro::Timer::sleep 1;
1761 $pl->ob->leave_link; 1936 $pl->ob->leave_link;
1762 })->prio (2); 1937 })->prio (2);
1763 } 1938 }
1764 }, 1939 },
1772 my ($self, $path, $x, $y) = @_; 1947 my ($self, $path, $x, $y) = @_;
1773 1948
1774 $self->enter_link; 1949 $self->enter_link;
1775 1950
1776 (async { 1951 (async {
1952 my $map = eval {
1777 my $map = cf::map::find $path; 1953 my $map = cf::map::find $path;
1778 $map = $map->customise_for ($self) if $map; 1954 $map = $map->customise_for ($self) if $map;
1779 1955 $map
1780# warn "entering ", $map->path, " at ($x, $y)\n" 1956 } or
1781# if $map;
1782
1783 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1957 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1784 1958
1785 $self->leave_link ($map, $x, $y); 1959 $self->leave_link ($map, $x, $y);
1786 })->prio (1); 1960 })->prio (1);
1787} 1961}
1788 1962
1792 1966
1793sub parse_random_map_params { 1967sub parse_random_map_params {
1794 my ($spec) = @_; 1968 my ($spec) = @_;
1795 1969
1796 my $rmp = { # defaults 1970 my $rmp = { # defaults
1797 xsize => 10, 1971 xsize => (cf::rndm 15, 40),
1798 ysize => 10, 1972 ysize => (cf::rndm 15, 40),
1973 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1974 #layout => string,
1799 }; 1975 };
1800 1976
1801 for (split /\n/, $spec) { 1977 for (split /\n/, $spec) {
1802 my ($k, $v) = split /\s+/, $_, 2; 1978 my ($k, $v) = split /\s+/, $_, 2;
1803 1979
1807 $rmp 1983 $rmp
1808} 1984}
1809 1985
1810sub prepare_random_map { 1986sub prepare_random_map {
1811 my ($exit) = @_; 1987 my ($exit) = @_;
1988
1989 my $guard = cf::lock_acquire "exit_prepare:$exit";
1812 1990
1813 # all this does is basically replace the /! path by 1991 # all this does is basically replace the /! path by
1814 # a new random map path (?random/...) with a seed 1992 # a new random map path (?random/...) with a seed
1815 # that depends on the exit object 1993 # that depends on the exit object
1816 1994
1817 my $rmp = parse_random_map_params $exit->msg; 1995 my $rmp = parse_random_map_params $exit->msg;
1818 1996
1819 if ($exit->map) { 1997 if ($exit->map) {
1820 $rmp->{region} = $exit->map->region_name; 1998 $rmp->{region} = $exit->region->name;
1821 $rmp->{origin_map} = $exit->map->path; 1999 $rmp->{origin_map} = $exit->map->path;
1822 $rmp->{origin_x} = $exit->x; 2000 $rmp->{origin_x} = $exit->x;
1823 $rmp->{origin_y} = $exit->y; 2001 $rmp->{origin_y} = $exit->y;
1824 } 2002 }
1825 2003
1826 $rmp->{random_seed} ||= $exit->random_seed; 2004 $rmp->{random_seed} ||= $exit->random_seed;
1827 2005
1828 my $data = cf::to_json $rmp; 2006 my $data = cf::to_json $rmp;
1829 my $md5 = Digest::MD5::md5_hex $data; 2007 my $md5 = Digest::MD5::md5_hex $data;
2008 my $meta = "$RANDOMDIR/$md5.meta";
1830 2009
1831 if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) { 2010 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1832 aio_write $fh, 0, (length $data), $data, 0; 2011 aio_write $fh, 0, (length $data), $data, 0;
2012 undef $fh;
2013 aio_rename "$meta~", $meta;
1833 2014
1834 $exit->slaying ("?random/$md5"); 2015 $exit->slaying ("?random/$md5");
1835 $exit->msg (undef); 2016 $exit->msg (undef);
1836 } 2017 }
1837} 2018}
1838 2019
1839sub cf::object::player::enter_exit { 2020sub cf::object::player::enter_exit {
1840 my ($self, $exit) = @_; 2021 my ($self, $exit) = @_;
1841 2022
1842 return unless $self->type == cf::PLAYER; 2023 return unless $self->type == cf::PLAYER;
2024
2025 if ($exit->slaying eq "/!") {
2026 #TODO: this should de-fi-ni-te-ly not be a sync-job
2027 # the problem is that $exit might not survive long enough
2028 # so it needs to be done right now, right here
2029 cf::sync_job { prepare_random_map $exit };
2030 }
2031
2032 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2033 my $hp = $exit->stats->hp;
2034 my $sp = $exit->stats->sp;
1843 2035
1844 $self->enter_link; 2036 $self->enter_link;
1845 2037
1846 (async { 2038 (async {
1847 $self->deactivate_recursive; # just to be sure 2039 $self->deactivate_recursive; # just to be sure
1848 unless (eval { 2040 unless (eval {
1849 prepare_random_map $exit 2041 $self->goto ($slaying, $hp, $sp);
1850 if $exit->slaying eq "/!";
1851
1852 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1853 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1854 2042
1855 1; 2043 1;
1856 }) { 2044 }) {
1857 $self->message ("Something went wrong deep within the crossfire server. " 2045 $self->message ("Something went wrong deep within the crossfire server. "
1858 . "I'll try to bring you back to the map you were before. " 2046 . "I'll try to bring you back to the map you were before. "
1859 . "Please report this to the dungeon master!", 2047 . "Please report this to the dungeon master!",
1860 cf::NDI_UNIQUE | cf::NDI_RED); 2048 cf::NDI_UNIQUE | cf::NDI_RED);
1861 2049
1862 warn "ERROR in enter_exit: $@"; 2050 warn "ERROR in enter_exit: $@";
1863 $self->leave_link; 2051 $self->leave_link;
1864 } 2052 }
1865 })->prio (1); 2053 })->prio (1);
1878 2066
1879sub cf::client::send_drawinfo { 2067sub cf::client::send_drawinfo {
1880 my ($self, $text, $flags) = @_; 2068 my ($self, $text, $flags) = @_;
1881 2069
1882 utf8::encode $text; 2070 utf8::encode $text;
1883 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text); 2071 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1884} 2072}
1885 2073
2074=item $client->ext_event ($type, %msg)
2075
2076Sends an exti event to the client.
2077
2078=cut
2079
2080sub cf::client::ext_event($$%) {
2081 my ($self, $type, %msg) = @_;
2082
2083 $msg{msgtype} = "event_$type";
2084 $self->send_packet ("ext " . cf::to_json \%msg);
2085}
1886 2086
1887=item $success = $client->query ($flags, "text", \&cb) 2087=item $success = $client->query ($flags, "text", \&cb)
1888 2088
1889Queues a query to the client, calling the given callback with 2089Queues a query to the client, calling the given callback with
1890the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2090the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
1919 # get handled first 2119 # get handled first
1920 my $queue = delete $ns->{query_queue} 2120 my $queue = delete $ns->{query_queue}
1921 or return; # be conservative, not sure how that can happen, but we saw a crash here 2121 or return; # be conservative, not sure how that can happen, but we saw a crash here
1922 2122
1923 (shift @$queue)->[1]->($msg); 2123 (shift @$queue)->[1]->($msg);
2124 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1924 2125
1925 push @{ $ns->{query_queue} }, @$queue; 2126 push @{ $ns->{query_queue} }, @$queue;
1926 2127
1927 if (@{ $ns->{query_queue} } == @$queue) { 2128 if (@{ $ns->{query_queue} } == @$queue) {
1928 if (@$queue) { 2129 if (@$queue) {
1986 2187
1987# here we export the classes and methods available to script code 2188# here we export the classes and methods available to script code
1988 2189
1989=pod 2190=pod
1990 2191
1991The following fucntions and emthods are available within a safe environment: 2192The following functions and methods are available within a safe environment:
1992 2193
1993 cf::object contr pay_amount pay_player map 2194 cf::object contr pay_amount pay_player map
1994 cf::object::player player 2195 cf::object::player player
1995 cf::player peaceful 2196 cf::player peaceful
1996 cf::map trigger 2197 cf::map trigger
2081############################################################################# 2282#############################################################################
2082 2283
2083=head2 EXTENSION DATABASE SUPPORT 2284=head2 EXTENSION DATABASE SUPPORT
2084 2285
2085Crossfire maintains a very simple database for extension use. It can 2286Crossfire maintains a very simple database for extension use. It can
2086currently store anything that can be serialised using Storable, which 2287currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2087excludes objects. 2288convert to/from binary).
2088 2289
2089The parameter C<$family> should best start with the name of the extension 2290The parameter C<$family> should best start with the name of the extension
2090using it, it should be unique. 2291using it, it should be unique.
2091 2292
2092=over 4 2293=over 4
2093 2294
2094=item $hashref = cf::db_get $family
2095
2096Return a hashref for use by the extension C<$family>, which can be
2097modified. After modifications, you have to call C<cf::db_dirty> or
2098C<cf::db_sync>.
2099
2100=item $value = cf::db_get $family => $key 2295=item $value = cf::db_get $family => $key
2101 2296
2102Returns a single value from the database 2297Returns a single value from the database.
2103
2104=item cf::db_put $family => $hashref
2105
2106Stores the given family hashref into the database. Updates are delayed, if
2107you want the data to be synced to disk immediately, use C<cf::db_sync>.
2108 2298
2109=item cf::db_put $family => $key => $value 2299=item cf::db_put $family => $key => $value
2110 2300
2111Stores the given C<$value> in the family hash. Updates are delayed, if you 2301Stores the given C<$value> in the family.
2112want the data to be synced to disk immediately, use C<cf::db_sync>.
2113
2114=item cf::db_dirty
2115
2116Marks the database as dirty, to be updated at a later time.
2117
2118=item cf::db_sync
2119
2120Immediately write the database to disk I<if it is dirty>.
2121 2302
2122=cut 2303=cut
2123 2304
2124our $DB; 2305our $DB;
2125 2306
2126{ 2307sub db_init {
2127 my $path = cf::localdir . "/database.pst"; 2308 unless ($DB) {
2309 $DB = BDB::db_create $DB_ENV;
2128 2310
2129 sub db_load() { 2311 cf::sync_job {
2130 $DB = stat $path ? Storable::retrieve $path : { }; 2312 eval {
2131 } 2313 $DB->set_flags (BDB::CHKSUM);
2132 2314
2133 my $pid; 2315 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2134 2316 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2135 sub db_save() { 2317 cf::cleanup "db_open(db): $!" if $!;
2136 waitpid $pid, 0 if $pid; 2318 };
2137 if (0 == ($pid = fork)) { 2319 cf::cleanup "db_open(db): $@" if $@;
2138 $DB->{_meta}{version} = 1;
2139 Storable::nstore $DB, "$path~";
2140 rename "$path~", $path;
2141 cf::_exit 0 if defined $pid;
2142 } 2320 };
2143 }
2144
2145 my $dirty;
2146
2147 sub db_sync() {
2148 db_save if $dirty;
2149 undef $dirty;
2150 }
2151
2152 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub {
2153 db_sync;
2154 }); 2321 }
2322}
2155 2323
2156 sub db_dirty() {
2157 $dirty = 1;
2158 $idle->start;
2159 }
2160
2161 sub db_get($;$) { 2324sub db_get($$) {
2162 @_ >= 2 2325 my $key = "$_[0]/$_[1]";
2163 ? $DB->{$_[0]}{$_[1]}
2164 : ($DB->{$_[0]} ||= { })
2165 }
2166 2326
2327 cf::sync_job {
2328 BDB::db_get $DB, undef, $key, my $data;
2329
2330 $! ? ()
2331 : $data
2332 }
2333}
2334
2167 sub db_put($$;$) { 2335sub db_put($$$) {
2168 if (@_ >= 3) { 2336 BDB::dbreq_pri 4;
2169 $DB->{$_[0]}{$_[1]} = $_[2]; 2337 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2170 } else { 2338}
2171 $DB->{$_[0]} = $_[1];
2172 }
2173 db_dirty;
2174 }
2175 2339
2176 cf::global->attach ( 2340=item cf::cache $id => [$paths...], $processversion => $process
2177 prio => 10000, 2341
2178 on_cleanup => sub { 2342Generic caching function that returns the value of the resource $id,
2179 db_sync; 2343caching and regenerating as required.
2344
2345This function can block.
2346
2347=cut
2348
2349sub cache {
2350 my ($id, $src, $processversion, $process) = @_;
2351
2352 my $meta =
2353 join "\x00",
2354 $processversion,
2355 map {
2356 aio_stat $_
2357 and Carp::croak "$_: $!";
2358
2359 ($_, (stat _)[7,9])
2360 } @$src;
2361
2362 my $dbmeta = db_get cache => "$id/meta";
2363 if ($dbmeta ne $meta) {
2364 # changed, we may need to process
2365
2366 my @data;
2367 my $md5;
2368
2369 for (0 .. $#$src) {
2370 0 <= aio_load $src->[$_], $data[$_]
2371 or Carp::croak "$src->[$_]: $!";
2180 }, 2372 }
2181 ); 2373
2374 # if processing is expensive, check
2375 # checksum first
2376 if (1) {
2377 $md5 =
2378 join "\x00",
2379 $processversion,
2380 map {
2381 Coro::cede;
2382 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2383 } 0.. $#$src;
2384
2385
2386 my $dbmd5 = db_get cache => "$id/md5";
2387 if ($dbmd5 eq $md5) {
2388 db_put cache => "$id/meta", $meta;
2389
2390 return db_get cache => "$id/data";
2391 }
2392 }
2393
2394 my $t1 = Time::HiRes::time;
2395 my $data = $process->(\@data);
2396 my $t2 = Time::HiRes::time;
2397
2398 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2399
2400 db_put cache => "$id/data", $data;
2401 db_put cache => "$id/md5" , $md5;
2402 db_put cache => "$id/meta", $meta;
2403
2404 return $data;
2405 }
2406
2407 db_get cache => "$id/data"
2182} 2408}
2409
2410=item fork_call { }, $args
2411
2412Executes the given code block with the given arguments in a seperate
2413process, returning the results. Everything must be serialisable with
2414Coro::Storable. May, of course, block. Note that the executed sub may
2415never block itself or use any form of Event handling.
2416
2417=cut
2418
2419sub fork_call(&@) {
2420 my ($cb, @args) = @_;
2421
2422# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2423# or die "socketpair: $!";
2424 pipe my $fh1, my $fh2
2425 or die "pipe: $!";
2426
2427 if (my $pid = fork) {
2428 close $fh2;
2429
2430 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2431 $res = Coro::Storable::thaw $res;
2432
2433 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2434
2435 die $$res unless "ARRAY" eq ref $res;
2436
2437 return wantarray ? @$res : $res->[-1];
2438 } else {
2439 local $SIG{__WARN__};
2440 eval {
2441 local $SIG{__DIE__};
2442 close $fh1;
2443
2444 my @res = eval { $cb->(@args) };
2445 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2446 };
2447
2448 warn $@ if $@;
2449 _exit 0;
2450 }
2451}
2452
2453
2183 2454
2184############################################################################# 2455#############################################################################
2185# the server's main() 2456# the server's init and main functions
2457
2458sub load_facedata($) {
2459 my ($path) = @_;
2460
2461 warn "loading facedata from $path\n";
2462
2463 my $facedata;
2464 0 < aio_load $path, $facedata
2465 or die "$path: $!";
2466
2467 $facedata = Coro::Storable::thaw $facedata;
2468
2469 $facedata->{version} == 2
2470 or cf::cleanup "$path: version mismatch, cannot proceed.";
2471
2472 {
2473 my $faces = $facedata->{faceinfo};
2474
2475 while (my ($face, $info) = each %$faces) {
2476 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2477 cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2478 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2479 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2480 Coro::cede;
2481 }
2482
2483 while (my ($face, $info) = each %$faces) {
2484 next unless $info->{smooth};
2485 my $idx = cf::face::find $face
2486 or next;
2487 if (my $smooth = cf::face::find $info->{smooth}) {
2488 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};
2489 } else {
2490 warn "smooth face '$info->{smooth}' not found for face '$face'";
2491 }
2492 Coro::cede;
2493 }
2494 }
2495
2496 {
2497 my $anims = $facedata->{animinfo};
2498
2499 while (my ($anim, $info) = each %$anims) {
2500 cf::anim::set $anim, $info->{frames}, $info->{facings};
2501 Coro::cede;
2502 }
2503
2504 cf::anim::invalidate_all; # d'oh
2505 }
2506
2507 1
2508}
2509
2510sub reload_regions {
2511 load_resource_file "$MAPDIR/regions"
2512 or die "unable to load regions file\n";
2513}
2514
2515sub reload_facedata {
2516 load_facedata "$DATADIR/facedata"
2517 or die "unable to load facedata\n";
2518}
2519
2520sub reload_archetypes {
2521 load_resource_file "$DATADIR/archetypes"
2522 or die "unable to load archetypes\n";
2523}
2524
2525sub reload_treasures {
2526 load_resource_file "$DATADIR/treasures"
2527 or die "unable to load treasurelists\n";
2528}
2529
2530sub reload_resources {
2531 warn "reloading resource files...\n";
2532
2533 reload_regions;
2534 reload_facedata;
2535 reload_archetypes;
2536 reload_treasures;
2537
2538 warn "finished reloading resource files\n";
2539}
2540
2541sub init {
2542 reload_resources;
2543}
2186 2544
2187sub cfg_load { 2545sub cfg_load {
2188 open my $fh, "<:utf8", cf::confdir . "/config" 2546 open my $fh, "<:utf8", "$CONFDIR/config"
2189 or return; 2547 or return;
2190 2548
2191 local $/; 2549 local $/;
2192 *CFG = YAML::Syck::Load <$fh>; 2550 *CFG = YAML::Syck::Load <$fh>;
2193 2551
2207 2565
2208sub main { 2566sub main {
2209 # we must not ever block the main coroutine 2567 # we must not ever block the main coroutine
2210 local $Coro::idle = sub { 2568 local $Coro::idle = sub {
2211 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2569 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2570 (async {
2212 async { Event::one_event }; 2571 Event::one_event;
2572 })->prio (Coro::PRIO_MAX);
2213 }; 2573 };
2214 2574
2215 cfg_load; 2575 cfg_load;
2216 db_load; 2576 db_init;
2217 load_extensions; 2577 load_extensions;
2578
2579 $TICK_WATCHER->start;
2218 Event::loop; 2580 Event::loop;
2219} 2581}
2220 2582
2221############################################################################# 2583#############################################################################
2222# initialisation and cleanup 2584# initialisation and cleanup
2223 2585
2224# install some emergency cleanup handlers 2586# install some emergency cleanup handlers
2225BEGIN { 2587BEGIN {
2226 for my $signal (qw(INT HUP TERM)) { 2588 for my $signal (qw(INT HUP TERM)) {
2227 Event->signal ( 2589 Event->signal (
2590 reentrant => 0,
2228 data => WF_AUTOCANCEL, 2591 data => WF_AUTOCANCEL,
2229 signal => $signal, 2592 signal => $signal,
2593 prio => 0,
2230 cb => sub { 2594 cb => sub {
2231 cf::cleanup "SIG$signal"; 2595 cf::cleanup "SIG$signal";
2232 }, 2596 },
2233 ); 2597 );
2234 } 2598 }
2235} 2599}
2256 my $map = $cf::MAP{$path} or next; 2620 my $map = $cf::MAP{$path} or next;
2257 $map->valid or next; 2621 $map->valid or next;
2258 $map->save; 2622 $map->save;
2259 } 2623 }
2260 warn "end emergency map save\n"; 2624 warn "end emergency map save\n";
2625
2626 warn "begin emergency database checkpoint\n";
2627 BDB::db_env_txn_checkpoint $DB_ENV;
2628 warn "end emergency database checkpoint\n";
2261 }; 2629 };
2262 2630
2263 warn "leave emergency perl save\n"; 2631 warn "leave emergency perl save\n";
2264} 2632}
2265 2633
2634sub post_cleanup {
2635 my ($make_core) = @_;
2636
2637 warn Carp::longmess "post_cleanup backtrace"
2638 if $make_core;
2639}
2640
2266sub reload() { 2641sub do_reload_perl() {
2267 # can/must only be called in main 2642 # can/must only be called in main
2268 if ($Coro::current != $Coro::main) { 2643 if ($Coro::current != $Coro::main) {
2269 warn "can only reload from main coroutine\n"; 2644 warn "can only reload from main coroutine";
2270 return; 2645 return;
2271 } 2646 }
2272 2647
2273 warn "reloading..."; 2648 warn "reloading...";
2274 2649
2275 warn "freezing server"; 2650 warn "entering sync_job";
2276 my $guard = freeze_mainloop; 2651
2652 cf::sync_job {
2653 cf::write_runtime; # external watchdog should not bark
2277 cf::emergency_save; 2654 cf::emergency_save;
2655 cf::write_runtime; # external watchdog should not bark
2278 2656
2279 warn "sync database to disk"; 2657 warn "syncing database to disk";
2280 cf::db_sync; 2658 BDB::db_env_txn_checkpoint $DB_ENV;
2281 IO::AIO::flush;
2282 2659
2283 eval {
2284 # if anything goes wrong in here, we should simply crash as we already saved 2660 # if anything goes wrong in here, we should simply crash as we already saved
2285 2661
2286 warn "cancel all watchers"; 2662 warn "cancelling all WF_AUTOCANCEL watchers";
2287 for (Event::all_watchers) { 2663 for (Event::all_watchers) {
2288 $_->cancel if $_->data & WF_AUTOCANCEL; 2664 $_->cancel if $_->data & WF_AUTOCANCEL;
2289 } 2665 }
2290 2666
2667 warn "flushing outstanding aio requests";
2668 for (;;) {
2669 BDB::flush;
2670 IO::AIO::flush;
2671 Coro::cede;
2672 last unless IO::AIO::nreqs || BDB::nreqs;
2673 warn "iterate...";
2674 }
2675
2676 ++$RELOAD;
2677
2291 warn "cancel all extension coros"; 2678 warn "cancelling all extension coros";
2292 $_->cancel for values %EXT_CORO; 2679 $_->cancel for values %EXT_CORO;
2293 %EXT_CORO = (); 2680 %EXT_CORO = ();
2294 2681
2295 warn "remove commands"; 2682 warn "removing commands";
2296 %COMMAND = (); 2683 %COMMAND = ();
2297 2684
2298 warn "remove ext commands"; 2685 warn "removing ext commands";
2299 %EXTCMD = (); 2686 %EXTCMD = ();
2300 2687
2301 warn "unload/nuke all extensions"; 2688 warn "unloading/nuking all extensions";
2302 for my $pkg (@EXTS) { 2689 for my $pkg (@EXTS) {
2303 warn "... unloading $pkg"; 2690 warn "... unloading $pkg";
2304 2691
2305 if (my $cb = $pkg->can ("unload")) { 2692 if (my $cb = $pkg->can ("unload")) {
2306 eval { 2693 eval {
2311 2698
2312 warn "... nuking $pkg"; 2699 warn "... nuking $pkg";
2313 Symbol::delete_package $pkg; 2700 Symbol::delete_package $pkg;
2314 } 2701 }
2315 2702
2316 warn "unload all perl modules loaded from $LIBDIR"; 2703 warn "unloading all perl modules loaded from $LIBDIR";
2317 while (my ($k, $v) = each %INC) { 2704 while (my ($k, $v) = each %INC) {
2318 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2705 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2319 2706
2320 warn "removing <$k>"; 2707 warn "... unloading $k";
2321 delete $INC{$k}; 2708 delete $INC{$k};
2322 2709
2323 $k =~ s/\.pm$//; 2710 $k =~ s/\.pm$//;
2324 $k =~ s/\//::/g; 2711 $k =~ s/\//::/g;
2325 2712
2328 } 2715 }
2329 2716
2330 Symbol::delete_package $k; 2717 Symbol::delete_package $k;
2331 } 2718 }
2332 2719
2333 warn "get rid of safe::, as good as possible"; 2720 warn "getting rid of safe::, as good as possible";
2334 Symbol::delete_package "safe::$_" 2721 Symbol::delete_package "safe::$_"
2335 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2722 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2336 2723
2337 warn "unload cf.pm \"a bit\""; 2724 warn "unloading cf.pm \"a bit\"";
2338 delete $INC{"cf.pm"}; 2725 delete $INC{"cf.pm"};
2726 delete $INC{"cf/pod.pm"};
2339 2727
2340 # don't, removes xs symbols, too, 2728 # don't, removes xs symbols, too,
2341 # and global variables created in xs 2729 # and global variables created in xs
2342 #Symbol::delete_package __PACKAGE__; 2730 #Symbol::delete_package __PACKAGE__;
2343 2731
2732 warn "unload completed, starting to reload now";
2733
2344 warn "reloading cf.pm"; 2734 warn "reloading cf.pm";
2345 require cf; 2735 require cf;
2346 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2736 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2347 2737
2348 warn "load config and database again"; 2738 warn "loading config and database again";
2349 cf::cfg_load; 2739 cf::cfg_load;
2350 cf::db_load;
2351 2740
2352 warn "load extensions"; 2741 warn "loading extensions";
2353 cf::load_extensions; 2742 cf::load_extensions;
2354 2743
2355 warn "reattach attachments to objects/players"; 2744 warn "reattaching attachments to objects/players";
2356 _global_reattach; 2745 _global_reattach; # objects, sockets
2357 warn "reattach attachments to maps"; 2746 warn "reattaching attachments to maps";
2358 reattach $_ for values %MAP; 2747 reattach $_ for values %MAP;
2359 }; 2748 warn "reattaching attachments to players";
2749 reattach $_ for values %PLAYER;
2360 2750
2361 if ($@) { 2751 warn "leaving sync_job";
2752
2753 1
2754 } or do {
2362 warn $@; 2755 warn $@;
2363 warn "error while reloading, exiting."; 2756 warn "error while reloading, exiting.";
2364 exit 1; 2757 exit 1;
2365 } 2758 };
2366 2759
2367 warn "reloaded"; 2760 warn "reloaded";
2368}; 2761};
2369 2762
2763our $RELOAD_WATCHER; # used only during reload
2764
2765sub reload_perl() {
2766 # doing reload synchronously and two reloads happen back-to-back,
2767 # coro crashes during coro_state_free->destroy here.
2768
2769 $RELOAD_WATCHER ||= Event->timer (
2770 reentrant => 0,
2771 after => 0,
2772 data => WF_AUTOCANCEL,
2773 cb => sub {
2774 do_reload_perl;
2775 undef $RELOAD_WATCHER;
2776 },
2777 );
2778}
2779
2370register_command "reload" => sub { 2780register_command "reload" => sub {
2371 my ($who, $arg) = @_; 2781 my ($who, $arg) = @_;
2372 2782
2373 if ($who->flag (FLAG_WIZ)) { 2783 if ($who->flag (FLAG_WIZ)) {
2374 $who->message ("start of reload.");
2375 reload;
2376 $who->message ("end of reload."); 2784 $who->message ("reloading server.");
2785 async { reload_perl };
2377 } 2786 }
2378}; 2787};
2379 2788
2380unshift @INC, $LIBDIR; 2789unshift @INC, $LIBDIR;
2790
2791my $bug_warning = 0;
2792
2793our @WAIT_FOR_TICK;
2794our @WAIT_FOR_TICK_BEGIN;
2795
2796sub wait_for_tick {
2797 return unless $TICK_WATCHER->is_active;
2798 return if $Coro::current == $Coro::main;
2799
2800 my $signal = new Coro::Signal;
2801 push @WAIT_FOR_TICK, $signal;
2802 $signal->wait;
2803}
2804
2805sub wait_for_tick_begin {
2806 return unless $TICK_WATCHER->is_active;
2807 return if $Coro::current == $Coro::main;
2808
2809 my $signal = new Coro::Signal;
2810 push @WAIT_FOR_TICK_BEGIN, $signal;
2811 $signal->wait;
2812}
2381 2813
2382$TICK_WATCHER = Event->timer ( 2814$TICK_WATCHER = Event->timer (
2383 reentrant => 0, 2815 reentrant => 0,
2816 parked => 1,
2384 prio => 0, 2817 prio => 0,
2385 at => $NEXT_TICK || $TICK, 2818 at => $NEXT_TICK || $TICK,
2386 data => WF_AUTOCANCEL, 2819 data => WF_AUTOCANCEL,
2387 cb => sub { 2820 cb => sub {
2821 if ($Coro::current != $Coro::main) {
2822 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2823 unless ++$bug_warning > 10;
2824 return;
2825 }
2826
2388 $NOW = Event::time; 2827 $NOW = Event::time;
2389 2828
2390 cf::server_tick; # one server iteration 2829 cf::server_tick; # one server iteration
2830
2391 $RUNTIME += $TICK; 2831 $RUNTIME += $TICK;
2392 $NEXT_TICK += $TICK; 2832 $NEXT_TICK += $TICK;
2393 2833
2394 $WAIT_FOR_TICK->broadcast; 2834 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2395 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2835 $NEXT_RUNTIME_WRITE = $NOW + 10;
2836 Coro::async_pool {
2837 write_runtime
2838 or warn "ERROR: unable to write runtime file: $!";
2839 };
2840 }
2841
2842# my $AFTER = Event::time;
2843# warn $AFTER - $NOW;#d#
2396 2844
2397 # if we are delayed by four ticks or more, skip them all 2845 # if we are delayed by four ticks or more, skip them all
2398 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2846 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2399 2847
2400 $TICK_WATCHER->at ($NEXT_TICK); 2848 $TICK_WATCHER->at ($NEXT_TICK);
2401 $TICK_WATCHER->start; 2849 $TICK_WATCHER->start;
2850
2851 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2852 $sig->send;
2853 }
2854 while (my $sig = shift @WAIT_FOR_TICK) {
2855 $sig->send;
2856 }
2857
2858 _post_tick;
2402 }, 2859 },
2403); 2860);
2404 2861
2862{
2405IO::AIO::max_poll_time $TICK * 0.2; 2863 BDB::max_poll_time $TICK * 0.1;
2406 2864 $BDB_POLL_WATCHER = Event->io (
2407Event->io ( 2865 reentrant => 0,
2408 fd => IO::AIO::poll_fileno, 2866 fd => BDB::poll_fileno,
2409 poll => 'r', 2867 poll => 'r',
2410 prio => 5, 2868 prio => 0,
2411 data => WF_AUTOCANCEL,
2412 cb => \&IO::AIO::poll_cb,
2413);
2414
2415Event->timer (
2416 data => WF_AUTOCANCEL, 2869 data => WF_AUTOCANCEL,
2417 after => 0, 2870 cb => \&BDB::poll_cb,
2418 interval => 10, 2871 );
2419 cb => sub { 2872 BDB::min_parallel 8;
2420 (Coro::unblock_sub { 2873
2421 write_runtime 2874 BDB::set_sync_prepare {
2422 or warn "ERROR: unable to write runtime file: $!"; 2875 my $status;
2876 my $current = $Coro::current;
2877 (
2878 sub {
2879 $status = $!;
2880 $current->ready; undef $current;
2881 },
2882 sub {
2883 Coro::schedule while defined $current;
2884 $! = $status;
2885 },
2886 )
2887 };
2888
2889 unless ($DB_ENV) {
2890 $DB_ENV = BDB::db_env_create;
2891
2892 cf::sync_job {
2893 eval {
2894 BDB::db_env_open
2895 $DB_ENV,
2896 $BDBDIR,
2897 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2898 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2899 0666;
2900
2901 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2902
2903 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2904 $DB_ENV->set_lk_detect;
2905 };
2906
2907 cf::cleanup "db_env_open(db): $@" if $@;
2423 })->(); 2908 };
2424 }, 2909 }
2425); 2910}
2911
2912{
2913 IO::AIO::min_parallel 8;
2914
2915 undef $Coro::AIO::WATCHER;
2916 IO::AIO::max_poll_time $TICK * 0.1;
2917 $AIO_POLL_WATCHER = Event->io (
2918 reentrant => 0,
2919 data => WF_AUTOCANCEL,
2920 fd => IO::AIO::poll_fileno,
2921 poll => 'r',
2922 prio => 6,
2923 cb => \&IO::AIO::poll_cb,
2924 );
2925}
2926
2927# load additional modules
2928use cf::pod;
2426 2929
2427END { cf::emergency_save } 2930END { cf::emergency_save }
2428 2931
24291 29321
2430 2933

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines