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.209 by root, Mon Feb 12 01:25:55 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.5 (); 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
20use BDB (); 25use BDB ();
21use Data::Dumper; 26use Data::Dumper;
22use Digest::MD5; 27use Digest::MD5;
23use Fcntl; 28use Fcntl;
29use YAML::Syck ();
24use IO::AIO 2.32 (); 30use IO::AIO 2.32 ();
25use YAML::Syck ();
26use Time::HiRes; 31use Time::HiRes;
27use Compress::LZF; 32use Compress::LZF;
28 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
29Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 38Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
30 39
31use 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
32
33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
34 41
35# 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?
36$YAML::Syck::ImplicitUnicode = 1; 43$YAML::Syck::ImplicitUnicode = 1;
37 44
38$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
39 48
40our %COMMAND = (); 49our %COMMAND = ();
41our %COMMAND_TIME = (); 50our %COMMAND_TIME = ();
42 51
43our @EXTS = (); # list of extension package names 52our @EXTS = (); # list of extension package names
44our %EXTCMD = (); 53our %EXTCMD = ();
45our %EXT_CORO = (); # coroutines bound to extensions 54our %EXT_CORO = (); # coroutines bound to extensions
46our %EXT_MAP = (); # pluggable maps 55our %EXT_MAP = (); # pluggable maps
47 56
57our $RELOAD; # number of reloads so far
48our @EVENT; 58our @EVENT;
49our $LIBDIR = datadir . "/ext";
50 59
51our $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(!)
52our $TICK_WATCHER; 73our $TICK_WATCHER;
53our $AIO_POLL_WATCHER; 74our $AIO_POLL_WATCHER;
54our $WRITE_RUNTIME_WATCHER; 75our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
55our $NEXT_TICK; 76our $NEXT_TICK;
56our $NOW; 77our $NOW;
57our $USE_FSYNC = 1; # use fsync to write maps - default off 78our $USE_FSYNC = 1; # use fsync to write maps - default off
58 79
59our $BDB_POLL_WATCHER; 80our $BDB_POLL_WATCHER;
65our $RUNTIME; 86our $RUNTIME;
66 87
67our %PLAYER; # all users 88our %PLAYER; # all users
68our %MAP; # all maps 89our %MAP; # all maps
69our $LINK_MAP; # the special {link} map, which is always available 90our $LINK_MAP; # the special {link} map, which is always available
70our $RANDOM_MAPS = cf::localdir . "/random";
71our $BDB_ENV_DIR = cf::localdir . "/db";
72
73our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
74our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
75 91
76# 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 ∕
77our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
78 94
79binmode STDOUT; 95binmode STDOUT;
80binmode STDERR; 96binmode STDERR;
81 97
82# read virtual server time, if available 98# read virtual server time, if available
83unless ($RUNTIME || !-e cf::localdir . "/runtime") { 99unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
84 open my $fh, "<", cf::localdir . "/runtime" 100 open my $fh, "<", "$LOCALDIR/runtime"
85 or die "unable to read runtime file: $!"; 101 or die "unable to read runtime file: $!";
86 $RUNTIME = <$fh> + 0.; 102 $RUNTIME = <$fh> + 0.;
87} 103}
88 104
89mkdir cf::localdir; 105mkdir $_
90mkdir cf::localdir . "/" . cf::playerdir; 106 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
91mkdir cf::localdir . "/" . cf::tmpdir;
92mkdir cf::localdir . "/" . cf::uniquedir;
93mkdir $RANDOM_MAPS;
94mkdir $BDB_ENV_DIR;
95 107
96our $EMERGENCY_POSITION; 108our $EMERGENCY_POSITION;
97 109
98sub cf::map::normalise; 110sub cf::map::normalise;
99 111
110=item $cf::RUNTIME 122=item $cf::RUNTIME
111 123
112The 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
113every server tick. 125every server tick.
114 126
115=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
116 130
117The perl library directory, where extensions and cf-specific modules can 131Various directories - "/etc", read-only install directory, perl-library
118be 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.
119 135
120=item $cf::NOW 136=item $cf::NOW
121 137
122The time of the last (current) server tick. 138The time of the last (current) server tick.
123 139
128=item %cf::CFG 144=item %cf::CFG
129 145
130Configuration for the server, loaded from C</etc/crossfire/config>, or 146Configuration for the server, loaded from C</etc/crossfire/config>, or
131from wherever your confdir points to. 147from wherever your confdir points to.
132 148
133=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE 149=item cf::wait_for_tick, cf::wait_for_tick_begin
134 150
135These 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
136or 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
137processing 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.
138window of cpu time available, or simply to synchronise to the server tick.
139 154
140=back 155=back
141 156
142=cut 157=cut
143 158
144BEGIN { 159BEGIN {
145 *CORE::GLOBAL::warn = sub { 160 *CORE::GLOBAL::warn = sub {
146 my $msg = join "", @_; 161 my $msg = join "", @_;
147 utf8::encode $msg;
148 162
149 $msg .= "\n" 163 $msg .= "\n"
150 unless $msg =~ /\n$/; 164 unless $msg =~ /\n$/;
151 165
166 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
167
168 utf8::encode $msg;
152 LOG llevError, $msg; 169 LOG llevError, $msg;
153 }; 170 };
154} 171}
155 172
156@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 173@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
202 $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;
203 $d 220 $d
204 } || "[unable to dump $_[0]: '$@']"; 221 } || "[unable to dump $_[0]: '$@']";
205} 222}
206 223
207use JSON::Syck (); # TODO# replace by JSON::PC once working 224use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
208 225
209=item $ref = cf::from_json $json 226=item $ref = cf::from_json $json
210 227
211Converts a JSON string into the corresponding perl data structure. 228Converts a JSON string into the corresponding perl data structure.
212 229
213=cut
214
215sub from_json($) {
216 $JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
217 JSON::Syck::Load $_[0]
218}
219
220=item $json = cf::to_json $ref 230=item $json = cf::to_json $ref
221 231
222Converts a perl data structure into its JSON representation. 232Converts a perl data structure into its JSON representation.
223
224=cut
225
226sub to_json($) {
227 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
228 JSON::Syck::Dump $_[0]
229}
230 233
231=item cf::lock_wait $string 234=item cf::lock_wait $string
232 235
233Wait until the given lock is available. See cf::lock_acquire. 236Wait until the given lock is available. See cf::lock_acquire.
234 237
240returned. 243returned.
241 244
242Lock 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
243uses map_find and cf::map::load uses map_load). 246uses map_find and cf::map::load uses map_load).
244 247
248=item $locked = cf::lock_active $string
249
250Return true if the lock is currently active, i.e. somebody has locked it.
251
245=cut 252=cut
246 253
247our %LOCK; 254our %LOCK;
248 255
249sub lock_wait($) { 256sub lock_wait($) {
268 # wake up all waiters, to be on the safe side 275 # wake up all waiters, to be on the safe side
269 $_->ready for @{ delete $LOCK{$key} }; 276 $_->ready for @{ delete $LOCK{$key} };
270 } 277 }
271} 278}
272 279
280sub lock_active($) {
281 my ($key) = @_;
282
283 ! ! $LOCK{$key}
284}
285
273sub freeze_mainloop { 286sub freeze_mainloop {
274 return unless $TICK_WATCHER->is_active; 287 return unless $TICK_WATCHER->is_active;
275 288
276 my $guard = Coro::guard { 289 my $guard = Coro::guard {
277 $TICK_WATCHER->start; 290 $TICK_WATCHER->start;
278 $WRITE_RUNTIME_WATCHER->start;
279 }; 291 };
280 $WRITE_RUNTIME_WATCHER->stop;
281 $TICK_WATCHER->stop; 292 $TICK_WATCHER->stop;
282 $guard 293 $guard
283} 294}
284 295
285=item cf::async { BLOCK } 296=item cf::async { BLOCK }
356 367
357 $coro 368 $coro
358} 369}
359 370
360sub write_runtime { 371sub write_runtime {
361 my $runtime = cf::localdir . "/runtime"; 372 my $guard = cf::lock_acquire "write_runtime";
373
374 my $runtime = "$LOCALDIR/runtime";
362 375
363 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 376 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
364 or return; 377 or return;
365 378
366 my $value = $cf::RUNTIME + 90 + 10; 379 my $value = $cf::RUNTIME + 90 + 10;
379 392
380 aio_rename "$runtime~", $runtime 393 aio_rename "$runtime~", $runtime
381 and return; 394 and return;
382 395
383 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 });
384} 408}
385 409
386=back 410=back
387 411
388=cut 412=cut
787 } 811 }
788 } else { 812 } else {
789 aio_unlink $filename; 813 aio_unlink $filename;
790 aio_unlink "$filename.pst"; 814 aio_unlink "$filename.pst";
791 } 815 }
792
793 #d##TODO# nuke non .map-files if exist
794 if ($filename =~ s/\.map$//) {
795 aio_unlink $filename;
796 aio_unlink "$filename.pst";
797 }
798 } 816 }
799} 817}
800 818
801sub object_freezer_as_string { 819sub object_freezer_as_string {
802 my ($rdata, $objs) = @_; 820 my ($rdata, $objs) = @_;
808 826
809sub object_thawer_load { 827sub object_thawer_load {
810 my ($filename) = @_; 828 my ($filename) = @_;
811 829
812 my ($data, $av); 830 my ($data, $av);
813
814 #d#TODO remove .map if file does not exist
815 aio_stat $filename and $filename =~ s/\.map$//;
816 831
817 (aio_load $filename, $data) >= 0 832 (aio_load $filename, $data) >= 0
818 or return; 833 or return;
819 834
820 unless (aio_stat "$filename.pst") { 835 unless (aio_stat "$filename.pst") {
959Returns the given player object, loading it if necessary (might block). 974Returns the given player object, loading it if necessary (might block).
960 975
961=cut 976=cut
962 977
963sub playerdir($) { 978sub playerdir($) {
964 cf::localdir 979 "$PLAYERDIR/"
965 . "/"
966 . cf::playerdir
967 . "/"
968 . (ref $_[0] ? $_[0]->ob->name : $_[0]) 980 . (ref $_[0] ? $_[0]->ob->name : $_[0])
969} 981}
970 982
971sub path($) { 983sub path($) {
972 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 984 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
973 985
974 (playerdir $login) . "/$login.pl" 986 (playerdir $login) . "/playerdata"
975} 987}
976 988
977sub find_active($) { 989sub find_active($) {
978 $cf::PLAYER{$_[0]} 990 $cf::PLAYER{$_[0]}
979 and $cf::PLAYER{$_[0]}->active 991 and $cf::PLAYER{$_[0]}->active
992 my $login = $_[0]; 1004 my $login = $_[0];
993 1005
994 my $guard = cf::lock_acquire "user_find:$login"; 1006 my $guard = cf::lock_acquire "user_find:$login";
995 1007
996 $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
997 my $pl = load_pl path $login 1016 my $pl = load_pl path $login
998 or return; 1017 or return;
999 $cf::PLAYER{$login} = $pl 1018 $cf::PLAYER{$login} = $pl
1000 } 1019 }
1001 } 1020 }
1038 1057
1039=cut 1058=cut
1040 1059
1041sub quit_character { 1060sub quit_character {
1042 my ($pl) = @_; 1061 my ($pl) = @_;
1062
1063 my $name = $pl->ob->name;
1043 1064
1044 $pl->{deny_save} = 1; 1065 $pl->{deny_save} = 1;
1045 $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
1046 1067
1047 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1068 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1052 my $path = playerdir $pl; 1073 my $path = playerdir $pl;
1053 my $temp = "$path~$cf::RUNTIME~deleting~"; 1074 my $temp = "$path~$cf::RUNTIME~deleting~";
1054 aio_rename $path, $temp; 1075 aio_rename $path, $temp;
1055 delete $cf::PLAYER{$pl->ob->name}; 1076 delete $cf::PLAYER{$pl->ob->name};
1056 $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
1057 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;
1058} 1099}
1059 1100
1060=item cf::player::list_logins 1101=item cf::player::list_logins
1061 1102
1062Returns 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
1063while and may block, so not sync_job-capable, ever. 1104while and may block, so not sync_job-capable, ever.
1064 1105
1065=cut 1106=cut
1066 1107
1067sub list_logins { 1108sub list_logins {
1068 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir 1109 my $dirs = aio_readdir $PLAYERDIR
1069 or return []; 1110 or return [];
1070 1111
1071 my @logins; 1112 my @logins;
1072 1113
1073 for my $login (@$dirs) { 1114 for my $login (@$dirs) {
1108 } 1149 }
1109 1150
1110 \@paths 1151 \@paths
1111} 1152}
1112 1153
1113=item $player->ext_reply ($msgid, $msgtype, %msg) 1154=item $player->ext_reply ($msgid, %msg)
1114 1155
1115Sends an ext reply to the player. 1156Sends an ext reply to the player.
1116 1157
1117=cut 1158=cut
1118 1159
1119sub ext_reply($$$%) { 1160sub ext_reply($$%) {
1120 my ($self, $id, %msg) = @_; 1161 my ($self, $id, %msg) = @_;
1121 1162
1122 $msg{msgid} = $id; 1163 $msg{msgid} = $id;
1123 1164
1124 $self->send ("ext " . cf::to_json \%msg); 1165 $self->send ("ext " . cf::to_json \%msg);
1125} 1166}
1126 1167
1127package 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}
1128 1208
1129=back 1209=back
1130
1131 1210
1132=head3 cf::map 1211=head3 cf::map
1133 1212
1134=over 4 1213=over 4
1135 1214
1273 1352
1274# the original (read-only) location 1353# the original (read-only) location
1275sub load_path { 1354sub load_path {
1276 my ($self) = @_; 1355 my ($self) = @_;
1277 1356
1278 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path} 1357 "$MAPDIR/$self->{path}.map"
1279} 1358}
1280 1359
1281# the temporary/swap location 1360# the temporary/swap location
1282sub save_path { 1361sub save_path {
1283 my ($self) = @_; 1362 my ($self) = @_;
1284 1363
1285 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1364 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1286 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path 1365 "$TMPDIR/$path.map"
1287} 1366}
1288 1367
1289# the unique path, undef == no special unique path 1368# the unique path, undef == no special unique path
1290sub uniq_path { 1369sub uniq_path {
1291 my ($self) = @_; 1370 my ($self) = @_;
1292 1371
1293 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1372 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1294 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1373 "$UNIQUEDIR/$path"
1295} 1374}
1296 1375
1297# and all this just because we cannot iterate over 1376# and all this just because we cannot iterate over
1298# all maps in C++... 1377# all maps in C++...
1299sub change_all_map_light { 1378sub change_all_map_light {
1307 my ($self) = @_; 1386 my ($self) = @_;
1308 1387
1309 utf8::encode (my $save = $self->save_path); 1388 utf8::encode (my $save = $self->save_path);
1310 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1389 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1311 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst"; 1390 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1312
1313 #d#TODO remove .map and also nuke
1314 $save =~ s/\.map// or return;#d#
1315 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;#d#
1316 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";#d#
1317} 1391}
1318 1392
1319sub load_header_from($) { 1393sub load_header_from($) {
1320 my ($self, $path) = @_; 1394 my ($self, $path) = @_;
1321 1395
1371 $self->load_header_orig 1445 $self->load_header_orig
1372 or return; 1446 or return;
1373 $self->prepare_orig; 1447 $self->prepare_orig;
1374 } 1448 }
1375 1449
1450 $self->default_region (cf::region::find_by_path $self->{path})
1451 unless $self->default_region;
1452
1376 1 1453 1
1377} 1454}
1378 1455
1379sub find; 1456sub find;
1380sub find { 1457sub find {
1413 my ($self) = @_; 1490 my ($self) = @_;
1414 1491
1415 local $self->{deny_reset} = 1; # loading can take a long time 1492 local $self->{deny_reset} = 1; # loading can take a long time
1416 1493
1417 my $path = $self->{path}; 1494 my $path = $self->{path};
1495
1496 {
1418 my $guard = cf::lock_acquire "map_load:$path"; 1497 my $guard = cf::lock_acquire "map_load:$path";
1419 1498
1420 return if $self->in_memory != cf::MAP_SWAPPED; 1499 return if $self->in_memory != cf::MAP_SWAPPED;
1421 1500
1422 $self->in_memory (cf::MAP_LOADING); 1501 $self->in_memory (cf::MAP_LOADING);
1423 1502
1424 $self->alloc; 1503 $self->alloc;
1425 1504
1426 $self->pre_load; 1505 $self->pre_load;
1427
1428 $self->_load_objects ($self->{load_path}, 1)
1429 or return;
1430
1431 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1432 if delete $self->{load_original};
1433
1434 if (my $uniq = $self->uniq_path) {
1435 utf8::encode $uniq;
1436 if (aio_open $uniq, O_RDONLY, 0) {
1437 $self->clear_unique_items;
1438 $self->_load_objects ($uniq, 0);
1439 }
1440 }
1441
1442 Coro::cede;
1443
1444 # now do the right thing for maps
1445 $self->link_multipart_objects;
1446
1447 unless ($self->{deny_activate}) {
1448 $self->decay_objects;
1449 $self->fix_auto_apply;
1450 $self->update_buttons;
1451 Coro::cede; 1506 Coro::cede;
1452 $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;
1453 $self->difficulty ($self->estimate_difficulty) 1525 $self->difficulty ($self->estimate_difficulty)
1454 unless $self->difficulty; 1526 unless $self->difficulty;
1455 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;
1456 $self->activate; 1536 $self->activate;
1537 }
1538
1539 $self->in_memory (cf::MAP_IN_MEMORY);
1540
1541 undef $guard;
1457 } 1542 }
1458 1543
1459 $self->post_load; 1544 $self->post_load;
1460
1461 $self->in_memory (cf::MAP_IN_MEMORY);
1462} 1545}
1463 1546
1464sub customise_for { 1547sub customise_for {
1465 my ($self, $ob) = @_; 1548 my ($self, $ob) = @_;
1466 1549
1609 return if $self->players; 1692 return if $self->players;
1610 return if $self->isa ("ext::map_per_player");#d# 1693 return if $self->isa ("ext::map_per_player");#d#
1611 1694
1612 warn "resetting map ", $self->path;#d# 1695 warn "resetting map ", $self->path;#d#
1613 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
1614 delete $cf::MAP{$self->path}; 1707 delete $cf::MAP{$self->path};
1615 1708
1616 $self->in_memory (cf::MAP_SWAPPED);
1617 $self->clear; 1709 $self->clear;
1618 1710
1619 $_->clear_links_to ($self) for values %cf::MAP; 1711 $_->clear_links_to ($self) for values %cf::MAP;
1620 1712
1621 $self->unlink_save; 1713 $self->unlink_save;
1648instantiated unique items. May block. 1740instantiated unique items. May block.
1649 1741
1650=cut 1742=cut
1651 1743
1652sub unique_maps() { 1744sub unique_maps() {
1653 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 1745 my $files = aio_readdir $UNIQUEDIR
1654 or return; 1746 or return;
1655 1747
1656 my @paths; 1748 my @paths;
1657 1749
1658 for (@$files) { 1750 for (@$files) {
1811 $map->load; 1903 $map->load;
1812 $map->load_diag; 1904 $map->load_diag;
1813 1905
1814 return unless $self->contr->active; 1906 return unless $self->contr->active;
1815 $self->activate_recursive; 1907 $self->activate_recursive;
1908
1909 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1816 $self->enter_map ($map, $x, $y); 1910 $self->enter_map ($map, $x, $y);
1817} 1911}
1818 1912
1819cf::player->attach ( 1913cf::player->attach (
1820 on_logout => sub { 1914 on_logout => sub {
1833 # try to abort aborted map switching on player login :) 1927 # try to abort aborted map switching on player login :)
1834 # should happen only on crashes 1928 # should happen only on crashes
1835 if ($pl->ob->{_link_pos}) { 1929 if ($pl->ob->{_link_pos}) {
1836 $pl->ob->enter_link; 1930 $pl->ob->enter_link;
1837 (async { 1931 (async {
1838 # we need this sleep as the login has a concurrent enter_exit running
1839 # and this sleep increases chances of the player not ending up in scorn
1840 $pl->ob->reply (undef, 1932 $pl->ob->reply (undef,
1841 "There was an internal problem at your last logout, " 1933 "There was an internal problem at your last logout, "
1842 . "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.",
1843 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
1844 Coro::Timer::sleep 1; 1938 Coro::Timer::sleep 1;
1845 $pl->ob->leave_link; 1939 $pl->ob->leave_link;
1846 })->prio (2); 1940 })->prio (2);
1847 } 1941 }
1848 }, 1942 },
1912 2006
1913 $rmp->{random_seed} ||= $exit->random_seed; 2007 $rmp->{random_seed} ||= $exit->random_seed;
1914 2008
1915 my $data = cf::to_json $rmp; 2009 my $data = cf::to_json $rmp;
1916 my $md5 = Digest::MD5::md5_hex $data; 2010 my $md5 = Digest::MD5::md5_hex $data;
1917 my $meta = "$cf::RANDOM_MAPS/$md5.meta"; 2011 my $meta = "$RANDOMDIR/$md5.meta";
1918 2012
1919 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2013 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1920 aio_write $fh, 0, (length $data), $data, 0; 2014 aio_write $fh, 0, (length $data), $data, 0;
1921 undef $fh; 2015 undef $fh;
1922 aio_rename "$meta~", $meta; 2016 aio_rename "$meta~", $meta;
1931 2025
1932 return unless $self->type == cf::PLAYER; 2026 return unless $self->type == cf::PLAYER;
1933 2027
1934 if ($exit->slaying eq "/!") { 2028 if ($exit->slaying eq "/!") {
1935 #TODO: this should de-fi-ni-te-ly not be a sync-job 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
1936 cf::sync_job { prepare_random_map $exit }; 2032 cf::sync_job { prepare_random_map $exit };
1937 } 2033 }
1938 2034
1939 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2035 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1940 my $hp = $exit->stats->hp; 2036 my $hp = $exit->stats->hp;
1948 $self->goto ($slaying, $hp, $sp); 2044 $self->goto ($slaying, $hp, $sp);
1949 2045
1950 1; 2046 1;
1951 }) { 2047 }) {
1952 $self->message ("Something went wrong deep within the crossfire server. " 2048 $self->message ("Something went wrong deep within the crossfire server. "
1953 . "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. "
1954 . "Please report this to the dungeon master!", 2050 . "Please report this to the dungeon master!",
1955 cf::NDI_UNIQUE | cf::NDI_RED); 2051 cf::NDI_UNIQUE | cf::NDI_RED);
1956 2052
1957 warn "ERROR in enter_exit: $@"; 2053 warn "ERROR in enter_exit: $@";
1958 $self->leave_link; 2054 $self->leave_link;
1959 } 2055 }
1960 })->prio (1); 2056 })->prio (1);
1973 2069
1974sub cf::client::send_drawinfo { 2070sub cf::client::send_drawinfo {
1975 my ($self, $text, $flags) = @_; 2071 my ($self, $text, $flags) = @_;
1976 2072
1977 utf8::encode $text; 2073 utf8::encode $text;
1978 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text); 2074 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1979} 2075}
1980 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}
1981 2089
1982=item $success = $client->query ($flags, "text", \&cb) 2090=item $success = $client->query ($flags, "text", \&cb)
1983 2091
1984Queues a query to the client, calling the given callback with 2092Queues a query to the client, calling the given callback with
1985the 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>,
2082 2190
2083# here we export the classes and methods available to script code 2191# here we export the classes and methods available to script code
2084 2192
2085=pod 2193=pod
2086 2194
2087The following fucntions and emthods are available within a safe environment: 2195The following functions and methods are available within a safe environment:
2088 2196
2089 cf::object contr pay_amount pay_player map 2197 cf::object contr pay_amount pay_player map
2090 cf::object::player player 2198 cf::object::player player
2091 cf::player peaceful 2199 cf::player peaceful
2092 cf::map trigger 2200 cf::map trigger
2177############################################################################# 2285#############################################################################
2178 2286
2179=head2 EXTENSION DATABASE SUPPORT 2287=head2 EXTENSION DATABASE SUPPORT
2180 2288
2181Crossfire maintains a very simple database for extension use. It can 2289Crossfire maintains a very simple database for extension use. It can
2182currently store anything that can be serialised using Storable, which 2290currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2183excludes objects. 2291convert to/from binary).
2184 2292
2185The 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
2186using it, it should be unique. 2294using it, it should be unique.
2187 2295
2188=over 4 2296=over 4
2197 2305
2198=cut 2306=cut
2199 2307
2200our $DB; 2308our $DB;
2201 2309
2310sub db_init {
2202unless ($DB) { 2311 unless ($DB) {
2203 $DB = BDB::db_create $DB_ENV; 2312 $DB = BDB::db_create $DB_ENV;
2204 2313
2205 cf::sync_job {
2206 eval {
2207 $DB->set_flags (BDB::CHKSUM);
2208
2209 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2210 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2211 cf::cleanup "db_open(db): $!" if $!;
2212 };
2213 cf::cleanup "db_open(db): $@" if $@;
2214 };
2215
2216 my $path = cf::localdir . "/database.pst";
2217 if (stat $path) {
2218 cf::sync_job { 2314 cf::sync_job {
2219 my $pst = Storable::retrieve $path; 2315 eval {
2316 $DB->set_flags (BDB::CHKSUM);
2220 2317
2221 cf::db_put (board => data => $pst->{board}); 2318 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2222 cf::db_put (guildrules => data => $pst->{guildrules}); 2319 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2223 cf::db_put (rent => balance => $pst->{rent}{balance}); 2320 cf::cleanup "db_open(db): $!" if $!;
2224 BDB::db_env_txn_checkpoint $DB_ENV; 2321 };
2225 2322 cf::cleanup "db_open(db): $@" if $@;
2226 unlink $path;
2227 }; 2323 };
2228 } 2324 }
2229} 2325}
2230 2326
2231sub db_get($$) { 2327sub db_get($$) {
2233 2329
2234 cf::sync_job { 2330 cf::sync_job {
2235 BDB::db_get $DB, undef, $key, my $data; 2331 BDB::db_get $DB, undef, $key, my $data;
2236 2332
2237 $! ? () 2333 $! ? ()
2238 : Compress::LZF::sthaw $data 2334 : $data
2239 } 2335 }
2240} 2336}
2241 2337
2242sub db_put($$$) { 2338sub db_put($$$) {
2243 BDB::dbreq_pri 4; 2339 BDB::dbreq_pri 4;
2244 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { }; 2340 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2245} 2341}
2342
2343=item cf::cache $id => [$paths...], $processversion => $process
2344
2345Generic caching function that returns the value of the resource $id,
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->[$_]: $!";
2375 }
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"
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
2246 2457
2247############################################################################# 2458#############################################################################
2248# the server's init and main functions 2459# the server's init and main functions
2249 2460
2250sub load_resources { 2461sub load_facedata($) {
2251 load_regions sprintf "%s/%s/regions", cf::datadir, cf::mapdir 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"
2252 or die "unable to load regions file\n";#d# 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;
2253} 2546}
2254 2547
2255sub cfg_load { 2548sub cfg_load {
2256 open my $fh, "<:utf8", cf::confdir . "/config" 2549 open my $fh, "<:utf8", "$CONFDIR/config"
2257 or return; 2550 or return;
2258 2551
2259 local $/; 2552 local $/;
2260 *CFG = YAML::Syck::Load <$fh>; 2553 *CFG = YAML::Syck::Load <$fh>;
2261 2554
2269 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 2562 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2270 and die "WARNING: m(un)lockall failed: $!\n"; 2563 and die "WARNING: m(un)lockall failed: $!\n";
2271 }; 2564 };
2272 warn $@ if $@; 2565 warn $@ if $@;
2273 } 2566 }
2274}
2275
2276sub init {
2277 load_resources;
2278} 2567}
2279 2568
2280sub main { 2569sub main {
2281 # we must not ever block the main coroutine 2570 # we must not ever block the main coroutine
2282 local $Coro::idle = sub { 2571 local $Coro::idle = sub {
2285 Event::one_event; 2574 Event::one_event;
2286 })->prio (Coro::PRIO_MAX); 2575 })->prio (Coro::PRIO_MAX);
2287 }; 2576 };
2288 2577
2289 cfg_load; 2578 cfg_load;
2579 db_init;
2290 load_extensions; 2580 load_extensions;
2291 2581
2292 $TICK_WATCHER->start; 2582 $TICK_WATCHER->start;
2293 Event::loop; 2583 Event::loop;
2294} 2584}
2342 }; 2632 };
2343 2633
2344 warn "leave emergency perl save\n"; 2634 warn "leave emergency perl save\n";
2345} 2635}
2346 2636
2637sub post_cleanup {
2638 my ($make_core) = @_;
2639
2640 warn Carp::longmess "post_cleanup backtrace"
2641 if $make_core;
2642}
2643
2347sub reload() { 2644sub do_reload_perl() {
2348 # can/must only be called in main 2645 # can/must only be called in main
2349 if ($Coro::current != $Coro::main) { 2646 if ($Coro::current != $Coro::main) {
2350 warn "can only reload from main coroutine"; 2647 warn "can only reload from main coroutine";
2351 return; 2648 return;
2352 } 2649 }
2353 2650
2354 warn "reloading..."; 2651 warn "reloading...";
2355 2652
2356 warn "cancelling server ticker"; 2653 warn "entering sync_job";
2357 $TICK_WATCHER->cancel;
2358 2654
2655 cf::sync_job {
2656 cf::write_runtime; # external watchdog should not bark
2359 cf::emergency_save; 2657 cf::emergency_save;
2658 cf::write_runtime; # external watchdog should not bark
2360 2659
2361 eval { 2660 warn "syncing database to disk";
2661 BDB::db_env_txn_checkpoint $DB_ENV;
2662
2362 # 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
2363 2664
2364 warn "cancelling all WF_AUTOCANCEL watchers"; 2665 warn "cancelling all WF_AUTOCANCEL watchers";
2365 for (Event::all_watchers) { 2666 for (Event::all_watchers) {
2366 $_->cancel if $_->data & WF_AUTOCANCEL; 2667 $_->cancel if $_->data & WF_AUTOCANCEL;
2367 } 2668 }
2368
2369 warn "syncing database to disk";
2370 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
2371 2669
2372 warn "flushing outstanding aio requests"; 2670 warn "flushing outstanding aio requests";
2373 for (;;) { 2671 for (;;) {
2374 BDB::flush; 2672 BDB::flush;
2375 IO::AIO::flush; 2673 IO::AIO::flush;
2376 Coro::cede; 2674 Coro::cede;
2377 last unless IO::AIO::nreqs || BDB::nreqs; 2675 last unless IO::AIO::nreqs || BDB::nreqs;
2378 warn "iterate..."; 2676 warn "iterate...";
2379 } 2677 }
2380 2678
2679 ++$RELOAD;
2680
2381 warn "cancelling all extension coros"; 2681 warn "cancelling all extension coros";
2382 $_->cancel for values %EXT_CORO; 2682 $_->cancel for values %EXT_CORO;
2383 %EXT_CORO = (); 2683 %EXT_CORO = ();
2384 2684
2385 warn "removing commands"; 2685 warn "removing commands";
2424 Symbol::delete_package "safe::$_" 2724 Symbol::delete_package "safe::$_"
2425 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);
2426 2726
2427 warn "unloading cf.pm \"a bit\""; 2727 warn "unloading cf.pm \"a bit\"";
2428 delete $INC{"cf.pm"}; 2728 delete $INC{"cf.pm"};
2729 delete $INC{"cf/pod.pm"};
2429 2730
2430 # don't, removes xs symbols, too, 2731 # don't, removes xs symbols, too,
2431 # and global variables created in xs 2732 # and global variables created in xs
2432 #Symbol::delete_package __PACKAGE__; 2733 #Symbol::delete_package __PACKAGE__;
2433 2734
2442 2743
2443 warn "loading extensions"; 2744 warn "loading extensions";
2444 cf::load_extensions; 2745 cf::load_extensions;
2445 2746
2446 warn "reattaching attachments to objects/players"; 2747 warn "reattaching attachments to objects/players";
2447 _global_reattach; 2748 _global_reattach; # objects, sockets
2448 warn "reattaching attachments to maps"; 2749 warn "reattaching attachments to maps";
2449 reattach $_ for values %MAP; 2750 reattach $_ for values %MAP;
2751 warn "reattaching attachments to players";
2752 reattach $_ for values %PLAYER;
2450 2753
2451 warn "loading reloadable resources"; 2754 warn "leaving sync_job";
2452 load_resources;
2453 2755
2454 warn "restarting server ticker"; 2756 1
2455 2757 } or do {
2456 $TICK_WATCHER->start;
2457 };
2458
2459 if ($@) {
2460 warn $@; 2758 warn $@;
2461 warn "error while reloading, exiting."; 2759 warn "error while reloading, exiting.";
2462 exit 1; 2760 exit 1;
2463 } 2761 };
2464 2762
2465 warn "reloaded"; 2763 warn "reloaded";
2466}; 2764};
2467 2765
2468our $RELOAD_WATCHER; # used only during reload 2766our $RELOAD_WATCHER; # used only during reload
2469 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
2470register_command "reload" => sub { 2783register_command "reload" => sub {
2471 my ($who, $arg) = @_; 2784 my ($who, $arg) = @_;
2472 2785
2473 if ($who->flag (FLAG_WIZ)) { 2786 if ($who->flag (FLAG_WIZ)) {
2474 $who->message ("reloading server."); 2787 $who->message ("reloading server.");
2475 2788 async { reload_perl };
2476 # doing reload synchronously and two reloads happen back-to-back,
2477 # coro crashes during coro_state_free->destroy here.
2478
2479 $RELOAD_WATCHER ||= Event->timer (
2480 reentrant => 0,
2481 after => 0,
2482 data => WF_AUTOCANCEL,
2483 cb => sub {
2484 reload;
2485 undef $RELOAD_WATCHER;
2486 },
2487 );
2488 } 2789 }
2489}; 2790};
2490 2791
2491unshift @INC, $LIBDIR; 2792unshift @INC, $LIBDIR;
2492 2793
2493my $bug_warning = 0; 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}
2494 2816
2495$TICK_WATCHER = Event->timer ( 2817$TICK_WATCHER = Event->timer (
2496 reentrant => 0, 2818 reentrant => 0,
2497 parked => 1, 2819 parked => 1,
2498 prio => 0, 2820 prio => 0,
2506 } 2828 }
2507 2829
2508 $NOW = Event::time; 2830 $NOW = Event::time;
2509 2831
2510 cf::server_tick; # one server iteration 2832 cf::server_tick; # one server iteration
2833
2511 $RUNTIME += $TICK; 2834 $RUNTIME += $TICK;
2512 $NEXT_TICK += $TICK; 2835 $NEXT_TICK += $TICK;
2513 2836
2514 $WAIT_FOR_TICK->broadcast; 2837 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2515 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2838 $NEXT_RUNTIME_WRITE = $NOW + 10;
2516 2839 Coro::async_pool {
2517 Event::sweep; 2840 write_runtime
2518 Coro::cede_notself; 2841 or warn "ERROR: unable to write runtime file: $!";
2842 };
2519 2843 }
2844
2520# my $AFTER = Event::time; 2845# my $AFTER = Event::time;
2521# warn $AFTER - $NOW;#d# 2846# warn $AFTER - $NOW;#d#
2522 2847
2523 # 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
2524 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2849 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2525 2850
2526 $TICK_WATCHER->at ($NEXT_TICK); 2851 $TICK_WATCHER->at ($NEXT_TICK);
2527 $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;
2528 }, 2862 },
2529); 2863);
2530 2864
2531{ 2865{
2532 BDB::max_poll_time $TICK * 0.1; 2866 BDB::max_poll_time $TICK * 0.1;
2560 2894
2561 cf::sync_job { 2895 cf::sync_job {
2562 eval { 2896 eval {
2563 BDB::db_env_open 2897 BDB::db_env_open
2564 $DB_ENV, 2898 $DB_ENV,
2565 $BDB_ENV_DIR, 2899 $BDBDIR,
2566 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 2900 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2567 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 2901 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2568 0666; 2902 0666;
2569 2903
2570 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!; 2904 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2571 2905
2572 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1); 2906 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2573 $DB_ENV->set_lk_detect; 2907 $DB_ENV->set_lk_detect;
2574 }; 2908 };
2575 2909
2583 2917
2584 undef $Coro::AIO::WATCHER; 2918 undef $Coro::AIO::WATCHER;
2585 IO::AIO::max_poll_time $TICK * 0.1; 2919 IO::AIO::max_poll_time $TICK * 0.1;
2586 $AIO_POLL_WATCHER = Event->io ( 2920 $AIO_POLL_WATCHER = Event->io (
2587 reentrant => 0, 2921 reentrant => 0,
2922 data => WF_AUTOCANCEL,
2588 fd => IO::AIO::poll_fileno, 2923 fd => IO::AIO::poll_fileno,
2589 poll => 'r', 2924 poll => 'r',
2590 prio => 6, 2925 prio => 6,
2591 data => WF_AUTOCANCEL,
2592 cb => \&IO::AIO::poll_cb, 2926 cb => \&IO::AIO::poll_cb,
2593 ); 2927 );
2594} 2928}
2595 2929
2596$WRITE_RUNTIME_WATCHER = Event->timer ( 2930# load additional modules
2597 reentrant => 0, 2931use cf::pod;
2598 data => WF_AUTOCANCEL,
2599 after => 1,
2600 interval => 10,
2601 prio => 6, # keep it lowest so it acts like a watchdog
2602 cb => Coro::unblock_sub {
2603 write_runtime
2604 or warn "ERROR: unable to write runtime file: $!";
2605 },
2606);
2607 2932
2608END { cf::emergency_save } 2933END { cf::emergency_save }
2609 2934
26101 29351
2611 2936

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines