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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines