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.168 by root, Sun Jan 14 00:37:14 2007 UTC vs.
Revision 1.225 by root, Wed Mar 14 00:04:58 2007 UTC

… …
4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Storable; 8use Storable;
9use Event;
9use Opcode; 10use Opcode;
10use Safe; 11use Safe;
11use Safe::Hole; 12use Safe::Hole;
12 13
13use Coro 3.3 (); 14use Coro 3.52 ();
15use Coro::State;
14use Coro::Event; 16use Coro::Event;
15use Coro::Timer; 17use Coro::Timer;
16use Coro::Signal; 18use Coro::Signal;
17use Coro::Semaphore; 19use Coro::Semaphore;
18use Coro::AIO; 20use Coro::AIO;
19 21
22use BDB ();
20use Data::Dumper; 23use Data::Dumper;
21use Digest::MD5; 24use Digest::MD5;
22use Fcntl; 25use Fcntl;
23use IO::AIO 2.32 (); 26use IO::AIO 2.32 ();
24use YAML::Syck (); 27use YAML::Syck ();
25use Time::HiRes; 28use Time::HiRes;
29use Compress::LZF;
26 30
31Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
32Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
27use Event; $Event::Eval = 1; # no idea why this is required, but it is 33$Event::Eval = 1; # no idea why this is required, but it is
28 34
29sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 35sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
30 36
31# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 37# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
32$YAML::Syck::ImplicitUnicode = 1; 38$YAML::Syck::ImplicitUnicode = 1;
… …
39our @EXTS = (); # list of extension package names 45our @EXTS = (); # list of extension package names
40our %EXTCMD = (); 46our %EXTCMD = ();
41our %EXT_CORO = (); # coroutines bound to extensions 47our %EXT_CORO = (); # coroutines bound to extensions
42our %EXT_MAP = (); # pluggable maps 48our %EXT_MAP = (); # pluggable maps
43 49
50our $RELOAD; # number of reloads so far
44our @EVENT; 51our @EVENT;
45our $LIBDIR = datadir . "/ext"; 52our $LIBDIR = datadir . "/ext";
46 53
47our $TICK = MAX_TIME * 1e-6; 54our $TICK = MAX_TIME * 1e-6;
48our $TICK_WATCHER; 55our $TICK_WATCHER;
49our $AIO_POLL_WATCHER; 56our $AIO_POLL_WATCHER;
50our $WRITE_RUNTIME_WATCHER; 57our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
51our $NEXT_TICK; 58our $NEXT_TICK;
52our $NOW; 59our $NOW;
60our $USE_FSYNC = 1; # use fsync to write maps - default off
61
62our $BDB_POLL_WATCHER;
63our $DB_ENV;
53 64
54our %CFG; 65our %CFG;
55 66
56our $UPTIME; $UPTIME ||= time; 67our $UPTIME; $UPTIME ||= time;
57our $RUNTIME; 68our $RUNTIME;
58 69
59our %PLAYER; # all users 70our %PLAYER; # all users
60our %MAP; # all maps 71our %MAP; # all maps
61our $LINK_MAP; # the special {link} map, which is always available 72our $LINK_MAP; # the special {link} map, which is always available
62our $RANDOM_MAPS = cf::localdir . "/random"; 73our $RANDOM_MAPS = cf::localdir . "/random";
74our $BDB_ENV_DIR = cf::localdir . "/db";
63 75
64our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal; 76our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
65our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal; 77our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
66 78
67# used to convert map paths into valid unix filenames by replacing / by ∕ 79# used to convert map paths into valid unix filenames by replacing / by ∕
… …
80mkdir cf::localdir; 92mkdir cf::localdir;
81mkdir cf::localdir . "/" . cf::playerdir; 93mkdir cf::localdir . "/" . cf::playerdir;
82mkdir cf::localdir . "/" . cf::tmpdir; 94mkdir cf::localdir . "/" . cf::tmpdir;
83mkdir cf::localdir . "/" . cf::uniquedir; 95mkdir cf::localdir . "/" . cf::uniquedir;
84mkdir $RANDOM_MAPS; 96mkdir $RANDOM_MAPS;
97mkdir $BDB_ENV_DIR;
85 98
86our $EMERGENCY_POSITION; 99our $EMERGENCY_POSITION;
100
101sub cf::map::normalise;
87 102
88############################################################################# 103#############################################################################
89 104
90=head2 GLOBAL VARIABLES 105=head2 GLOBAL VARIABLES
91 106
… …
261sub freeze_mainloop { 276sub freeze_mainloop {
262 return unless $TICK_WATCHER->is_active; 277 return unless $TICK_WATCHER->is_active;
263 278
264 my $guard = Coro::guard { 279 my $guard = Coro::guard {
265 $TICK_WATCHER->start; 280 $TICK_WATCHER->start;
266 $WRITE_RUNTIME_WATCHER->start;
267 }; 281 };
268 $WRITE_RUNTIME_WATCHER->stop;
269 $TICK_WATCHER->stop; 282 $TICK_WATCHER->stop;
270 $guard 283 $guard
271} 284}
272 285
273=item cf::async { BLOCK } 286=item cf::async { BLOCK }
… …
344 357
345 $coro 358 $coro
346} 359}
347 360
348sub write_runtime { 361sub write_runtime {
362 my $guard = cf::lock_acquire "write_runtime";
363
349 my $runtime = cf::localdir . "/runtime"; 364 my $runtime = cf::localdir . "/runtime";
350 365
351 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 366 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
352 or return; 367 or return;
353 368
369 my $value = $cf::RUNTIME + 90 + 10;
354 my $value = $cf::RUNTIME + 1 + 10; # 10 is the runtime save interval, for a monotonic clock 370 # 10 is the runtime save interval, for a monotonic clock
371 # 60 allows for the watchdog to kill the server.
372
355 (aio_write $fh, 0, (length $value), $value, 0) <= 0 373 (aio_write $fh, 0, (length $value), $value, 0) <= 0
356 and return; 374 and return;
357 375
376 # always fsync - this file is important
358 aio_fsync $fh 377 aio_fsync $fh
359 and return; 378 and return;
360 379
361 close $fh 380 close $fh
362 or return; 381 or return;
… …
503our @CB_TYPE = (); # registry for type (cf-object class) based events 522our @CB_TYPE = (); # registry for type (cf-object class) based events
504our @CB_MAP = (); 523our @CB_MAP = ();
505 524
506my %attachment; 525my %attachment;
507 526
527sub cf::attachable::thawer_merge {
528 # simply override everything except _meta
529 local $_[0]{_meta};
530 %{$_[0]} = %{$_[1]};
531}
532
508sub _attach_cb($$$$) { 533sub _attach_cb($$$$) {
509 my ($registry, $event, $prio, $cb) = @_; 534 my ($registry, $event, $prio, $cb) = @_;
510 535
511 use sort 'stable'; 536 use sort 'stable';
512 537
… …
683# object support 708# object support
684 709
685sub reattach { 710sub reattach {
686 # basically do the same as instantiate, without calling instantiate 711 # basically do the same as instantiate, without calling instantiate
687 my ($obj) = @_; 712 my ($obj) = @_;
713
714 bless $obj, ref $obj; # re-bless in case extensions have been reloaded
688 715
689 my $registry = $obj->registry; 716 my $registry = $obj->registry;
690 717
691 @$registry = (); 718 @$registry = ();
692 719
… …
739 $filename, length $$rdata, scalar @$objs; 766 $filename, length $$rdata, scalar @$objs;
740 767
741 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 768 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
742 chmod SAVE_MODE, $fh; 769 chmod SAVE_MODE, $fh;
743 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 770 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
744 aio_fsync $fh; 771 aio_fsync $fh if $cf::USE_FSYNC;
745 close $fh; 772 close $fh;
746 773
747 if (@$objs) { 774 if (@$objs) {
748 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 775 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
749 chmod SAVE_MODE, $fh; 776 chmod SAVE_MODE, $fh;
750 my $data = Storable::nfreeze { version => 1, objs => $objs }; 777 my $data = Storable::nfreeze { version => 1, objs => $objs };
751 aio_write $fh, 0, (length $data), $data, 0; 778 aio_write $fh, 0, (length $data), $data, 0;
752 aio_fsync $fh; 779 aio_fsync $fh if $cf::USE_FSYNC;
753 close $fh; 780 close $fh;
754 aio_rename "$filename.pst~", "$filename.pst"; 781 aio_rename "$filename.pst~", "$filename.pst";
755 } 782 }
756 } else { 783 } else {
757 aio_unlink "$filename.pst"; 784 aio_unlink "$filename.pst";
… …
949 976
950sub exists($) { 977sub exists($) {
951 my ($login) = @_; 978 my ($login) = @_;
952 979
953 $cf::PLAYER{$login} 980 $cf::PLAYER{$login}
954 or cf::sync_job { !aio_stat $login } 981 or cf::sync_job { !aio_stat path $login }
955} 982}
956 983
957sub find($) { 984sub find($) {
958 return $cf::PLAYER{$_[0]} || do { 985 return $cf::PLAYER{$_[0]} || do {
959 my $login = $_[0]; 986 my $login = $_[0];
… …
1005 1032
1006=cut 1033=cut
1007 1034
1008sub quit_character { 1035sub quit_character {
1009 my ($pl) = @_; 1036 my ($pl) = @_;
1037
1038 my $name = $pl->ob->name;
1010 1039
1011 $pl->{deny_save} = 1; 1040 $pl->{deny_save} = 1;
1012 $pl->password ("*"); # this should lock out the player until we nuked the dir 1041 $pl->password ("*"); # this should lock out the player until we nuked the dir
1013 1042
1014 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1043 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
… …
1019 my $path = playerdir $pl; 1048 my $path = playerdir $pl;
1020 my $temp = "$path~$cf::RUNTIME~deleting~"; 1049 my $temp = "$path~$cf::RUNTIME~deleting~";
1021 aio_rename $path, $temp; 1050 aio_rename $path, $temp;
1022 delete $cf::PLAYER{$pl->ob->name}; 1051 delete $cf::PLAYER{$pl->ob->name};
1023 $pl->destroy; 1052 $pl->destroy;
1053
1054 my $prefix = qr<^~\Q$name\E/>;
1055
1056 # nuke player maps
1057 $cf::MAP{$_}->nuke for grep /$prefix/, keys %cf::MAP;
1058
1024 IO::AIO::aio_rmtree $temp; 1059 IO::AIO::aio_rmtree $temp;
1060}
1061
1062=item $pl->kick
1063
1064Kicks a player out of the game. This destroys the connection.
1065
1066=cut
1067
1068sub kick {
1069 my ($pl, $kicker) = @_;
1070
1071 $pl->invoke (cf::EVENT_PLAYER_KICK, $kicker);
1072 $pl->killer ("kicked");
1073 $pl->ns->destroy;
1025} 1074}
1026 1075
1027=item cf::player::list_logins 1076=item cf::player::list_logins
1028 1077
1029Returns am arrayref of all valid playernames in the system, can take a 1078Returns am arrayref of all valid playernames in the system, can take a
… …
1057=cut 1106=cut
1058 1107
1059sub maps($) { 1108sub maps($) {
1060 my ($pl) = @_; 1109 my ($pl) = @_;
1061 1110
1111 $pl = ref $pl ? $pl->ob->name : $pl;
1112
1062 my $files = aio_readdir playerdir $pl 1113 my $files = aio_readdir playerdir $pl
1063 or return; 1114 or return;
1064 1115
1065 my @paths; 1116 my @paths;
1066 1117
1067 for (@$files) { 1118 for (@$files) {
1068 utf8::decode $_; 1119 utf8::decode $_;
1069 next if /\.(?:pl|pst)$/; 1120 next if /\.(?:pl|pst)$/;
1070 next unless /^$PATH_SEP/o; 1121 next unless /^$PATH_SEP/o;
1071 1122
1072 s/\.map$//; 1123 push @paths, cf::map::normalise "~$pl/$_";
1073 push @paths, "~" . $pl->ob->name . "/" . $_;
1074 } 1124 }
1075 1125
1076 \@paths 1126 \@paths
1077} 1127}
1078 1128
… …
1105 1155
1106use Fcntl; 1156use Fcntl;
1107use Coro::AIO; 1157use Coro::AIO;
1108 1158
1109use overload 1159use overload
1110 '""' => \&as_string; 1160 '""' => \&as_string,
1161 fallback => 1;
1111 1162
1112our $MAX_RESET = 3600; 1163our $MAX_RESET = 3600;
1113our $DEFAULT_RESET = 3000; 1164our $DEFAULT_RESET = 3000;
1114 1165
1115sub generate_random_map { 1166sub generate_random_map {
1116 my ($self, $rmp) = @_; 1167 my ($self, $rmp) = @_;
1117
1118 # mit "rum" bekleckern, nicht 1168 # mit "rum" bekleckern, nicht
1119 $self->_create_random_map ( 1169 $self->_create_random_map (
1120 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1170 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1121 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1171 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1122 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1172 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1129 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1179 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1130 (cf::region::find $rmp->{region}), $rmp->{custom} 1180 (cf::region::find $rmp->{region}), $rmp->{custom}
1131 ) 1181 )
1132} 1182}
1133 1183
1184=item cf::map->register ($regex, $prio)
1185
1186Register a handler for the map path matching the given regex at the
1187givne priority (higher is better, built-in handlers have priority 0, the
1188default).
1189
1190=cut
1191
1134sub register { 1192sub register {
1135 my (undef, $regex) = @_; 1193 my (undef, $regex, $prio) = @_;
1136 my $pkg = caller; 1194 my $pkg = caller;
1137 1195
1138 no strict; 1196 no strict;
1139 push @{"$pkg\::ISA"}, __PACKAGE__; 1197 push @{"$pkg\::ISA"}, __PACKAGE__;
1140 1198
1141 $EXT_MAP{$pkg} = qr<$regex>; 1199 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1142} 1200}
1143 1201
1144# also paths starting with '/' 1202# also paths starting with '/'
1145$EXT_MAP{"cf::map"} = qr{^(?=/)}; 1203$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1204
1205sub thawer_merge {
1206 my ($self, $merge) = @_;
1207
1208 # we have to keep some variables in memory intact
1209 local $self->{path};
1210 local $self->{load_path};
1211 local $self->{deny_save};
1212 local $self->{deny_reset};
1213
1214 $self->SUPER::thawer_merge ($merge);
1215}
1146 1216
1147sub normalise { 1217sub normalise {
1148 my ($path, $base) = @_; 1218 my ($path, $base) = @_;
1219
1220 $path = "$path"; # make sure its a string
1221
1222 $path =~ s/\.map$//;
1149 1223
1150 # map plan: 1224 # map plan:
1151 # 1225 #
1152 # /! non-realised random map exit (special hack!) 1226 # /! non-realised random map exit (special hack!)
1153 # {... are special paths that are not being touched 1227 # {... are special paths that are not being touched
… …
1181 1255
1182 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object 1256 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1183 1257
1184 $path = normalise $path, $base; 1258 $path = normalise $path, $base;
1185 1259
1186 for my $pkg (keys %EXT_MAP) { 1260 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1187 if ($path =~ $EXT_MAP{$pkg}) { 1261 if ($path =~ $EXT_MAP{$pkg}[1]) {
1188 my $self = bless cf::map::new, $pkg; 1262 my $self = bless cf::map::new, $pkg;
1189 $self->{path} = $path; $self->path ($path); 1263 $self->{path} = $path; $self->path ($path);
1190 $self->init; # pass $1 etc. 1264 $self->init; # pass $1 etc.
1191 return $self; 1265 return $self;
1192 } 1266 }
1193 } 1267 }
1194 1268
1195 Carp::carp "unable to resolve path '$path'."; 1269 Carp::carp "unable to resolve path '$path' (base '$base').";
1196 () 1270 ()
1197} 1271}
1198 1272
1199sub init { 1273sub init {
1200 my ($self) = @_; 1274 my ($self) = @_;
… …
1215 1289
1216# the original (read-only) location 1290# the original (read-only) location
1217sub load_path { 1291sub load_path {
1218 my ($self) = @_; 1292 my ($self) = @_;
1219 1293
1220 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1294 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}
1221} 1295}
1222 1296
1223# the temporary/swap location 1297# the temporary/swap location
1224sub save_path { 1298sub save_path {
1225 my ($self) = @_; 1299 my ($self) = @_;
1226 1300
1227 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1301 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1228 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path 1302 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path
1229} 1303}
1230 1304
1231# the unique path, undef == no special unique path 1305# the unique path, undef == no special unique path
1232sub uniq_path { 1306sub uniq_path {
1233 my ($self) = @_; 1307 my ($self) = @_;
… …
1247 1321
1248sub unlink_save { 1322sub unlink_save {
1249 my ($self) = @_; 1323 my ($self) = @_;
1250 1324
1251 utf8::encode (my $save = $self->save_path); 1325 utf8::encode (my $save = $self->save_path);
1252 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink $save; 1326 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1253 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$save.pst"; 1327 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1254} 1328}
1255 1329
1256sub load_header_from($) { 1330sub load_header_from($) {
1257 my ($self, $path) = @_; 1331 my ($self, $path) = @_;
1258 1332
1259 utf8::encode $path; 1333 utf8::encode $path;
1260 aio_open $path, O_RDONLY, 0 1334 #aio_open $path, O_RDONLY, 0
1261 or return; 1335 # or return;
1262 1336
1263 $self->_load_header ($path) 1337 $self->_load_header ($path)
1264 or return; 1338 or return;
1265 1339
1266 $self->{load_path} = $path; 1340 $self->{load_path} = $path;
1267 1341
1268 1 1342 1
1269} 1343}
1270 1344
1271sub load_orig { 1345sub load_header_orig {
1272 my ($self) = @_; 1346 my ($self) = @_;
1273 1347
1274 $self->load_header_from ($self->load_path) 1348 $self->load_header_from ($self->load_path)
1275} 1349}
1276 1350
1277sub load_temp { 1351sub load_header_temp {
1278 my ($self) = @_; 1352 my ($self) = @_;
1279 1353
1280 $self->load_header_from ($self->save_path) 1354 $self->load_header_from ($self->save_path)
1355}
1356
1357sub prepare_temp {
1358 my ($self) = @_;
1359
1360 $self->last_access ((delete $self->{last_access})
1361 || $cf::RUNTIME); #d#
1362 # safety
1363 $self->{instantiate_time} = $cf::RUNTIME
1364 if $self->{instantiate_time} > $cf::RUNTIME;
1365}
1366
1367sub prepare_orig {
1368 my ($self) = @_;
1369
1370 $self->{load_original} = 1;
1371 $self->{instantiate_time} = $cf::RUNTIME;
1372 $self->last_access ($cf::RUNTIME);
1373 $self->instantiate;
1281} 1374}
1282 1375
1283sub load_header { 1376sub load_header {
1284 my ($self) = @_; 1377 my ($self) = @_;
1285 1378
1286 if ($self->load_temp) { 1379 if ($self->load_header_temp) {
1287 $self->last_access ((delete $self->{last_access}) 1380 $self->prepare_temp;
1288 || $cf::RUNTIME); #d#
1289 # safety
1290 $self->{instantiate_time} = $cf::RUNTIME
1291 if $self->{instantiate_time} > $cf::RUNTIME;
1292 } else { 1381 } else {
1293 $self->load_orig 1382 $self->load_header_orig
1294 or return; 1383 or return;
1295 1384 $self->prepare_orig;
1296 $self->{load_original} = 1;
1297 $self->{instantiate_time} = $cf::RUNTIME;
1298 $self->last_access ($cf::RUNTIME);
1299 $self->instantiate;
1300 } 1385 }
1301 1386
1302 1 1387 1
1303} 1388}
1304 1389
… …
1318 $map->{last_save} = $cf::RUNTIME; 1403 $map->{last_save} = $cf::RUNTIME;
1319 1404
1320 $map->load_header 1405 $map->load_header
1321 or return; 1406 or return;
1322 1407
1323 if ($map->should_reset) { 1408 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)
1409 # doing this can freeze the server in a sync job, obviously
1410 #$cf::WAIT_FOR_TICK->wait;
1324 $map->reset; 1411 $map->reset;
1325 undef $guard; 1412 undef $guard;
1326 $map = find $path 1413 return find $path;
1327 or return;
1328 } 1414 }
1329 1415
1330 $cf::MAP{$path} = $map 1416 $cf::MAP{$path} = $map
1331 } 1417 }
1332} 1418}
1419
1420sub pre_load { }
1421sub post_load { }
1333 1422
1334sub load { 1423sub load {
1335 my ($self) = @_; 1424 my ($self) = @_;
1336 1425
1426 local $self->{deny_reset} = 1; # loading can take a long time
1427
1337 my $path = $self->{path}; 1428 my $path = $self->{path};
1338 my $guard = cf::lock_acquire "map_load:$path"; 1429 my $guard = cf::lock_acquire "map_load:$path";
1339 1430
1340 return if $self->in_memory != cf::MAP_SWAPPED; 1431 return if $self->in_memory != cf::MAP_SWAPPED;
1341 1432
1342 $self->in_memory (cf::MAP_LOADING); 1433 $self->in_memory (cf::MAP_LOADING);
1343 1434
1344 $self->alloc; 1435 $self->alloc;
1436
1437 $self->pre_load;
1438
1345 $self->_load_objects ($self->{load_path}, 1) 1439 $self->_load_objects ($self->{load_path}, 1)
1346 or return; 1440 or return;
1347 1441
1348 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1442 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1349 if delete $self->{load_original}; 1443 if delete $self->{load_original};
… …
1371 unless $self->difficulty; 1465 unless $self->difficulty;
1372 Coro::cede; 1466 Coro::cede;
1373 $self->activate; 1467 $self->activate;
1374 } 1468 }
1375 1469
1470 $self->post_load;
1471
1376 $self->in_memory (cf::MAP_IN_MEMORY); 1472 $self->in_memory (cf::MAP_IN_MEMORY);
1377} 1473}
1378 1474
1379sub customise_for { 1475sub customise_for {
1380 my ($self, $ob) = @_; 1476 my ($self, $ob) = @_;
… …
1420 1516
1421 cf::sync_job { $map->load }; 1517 cf::sync_job { $map->load };
1422} 1518}
1423 1519
1424our %MAP_PREFETCH; 1520our %MAP_PREFETCH;
1425our $MAP_PREFETCHER = Coro::async { 1521our $MAP_PREFETCHER = undef;
1426 while () {
1427 for my $path (keys %MAP_PREFETCH) {
1428 my $map = find $path
1429 or next;
1430 $map->load;
1431
1432 delete $MAP_PREFETCH{$path};
1433 }
1434 Coro::schedule;
1435 }
1436};
1437 1522
1438sub find_async { 1523sub find_async {
1439 my ($path, $origin) = @_; 1524 my ($path, $origin) = @_;
1440 1525
1441 $path = normalise $path, $origin && $origin->{path}; 1526 $path = normalise $path, $origin && $origin->{path};
1442 1527
1443 if (my $map = $cf::MAP{$path}) { 1528 if (my $map = $cf::MAP{$path}) {
1444 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1529 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1445 } 1530 }
1446 1531
1447 $MAP_PREFETCH{$path} = 0; 1532 undef $MAP_PREFETCH{$path};
1533 $MAP_PREFETCHER ||= cf::async {
1534 while (%MAP_PREFETCH) {
1535 for my $path (keys %MAP_PREFETCH) {
1536 my $map = find $path
1537 or next;
1538 $map->load;
1539
1540 delete $MAP_PREFETCH{$path};
1541 }
1542 }
1543 undef $MAP_PREFETCHER;
1544 };
1448 $MAP_PREFETCHER->ready; 1545 $MAP_PREFETCHER->prio (6);
1449 1546
1450 () 1547 ()
1451} 1548}
1452 1549
1453sub save { 1550sub save {
… …
1498 1595
1499sub reset_at { 1596sub reset_at {
1500 my ($self) = @_; 1597 my ($self) = @_;
1501 1598
1502 # TODO: safety, remove and allow resettable per-player maps 1599 # TODO: safety, remove and allow resettable per-player maps
1503 return 1e99 if $self->isa ("ext::map_per_player"); 1600 return 1e99 if $self->isa ("ext::map_per_player");#d#
1504 return 1e99 if $self->{deny_reset}; 1601 return 1e99 if $self->{deny_reset};
1505 1602
1506 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1603 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1507 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1604 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1508 1605
… …
1513 my ($self) = @_; 1610 my ($self) = @_;
1514 1611
1515 $self->reset_at <= $cf::RUNTIME 1612 $self->reset_at <= $cf::RUNTIME
1516} 1613}
1517 1614
1518sub rename {
1519 my ($self, $new_path) = @_;
1520
1521 normalise $new_path;
1522
1523 $self->unlink_save;
1524
1525 delete $cf::MAP{$self->path};
1526 $self->{path} = $new_path; $self->path ($self->{path});
1527 $cf::MAP{$self->path} = $self;
1528
1529 $self->save;
1530}
1531
1532sub reset { 1615sub reset {
1533 my ($self) = @_; 1616 my ($self) = @_;
1534 1617
1535 my $lock = cf::lock_acquire "map_data:$self->{path}"; 1618 my $lock = cf::lock_acquire "map_data:$self->{path}";
1536 1619
1537 return if $self->players; 1620 return if $self->players;
1538 return if $self->isa ("ext::map_per_player");#d# 1621 return if $self->isa ("ext::map_per_player");#d#
1539 1622
1540 warn "resetting map ", $self->path;#d# 1623 warn "resetting map ", $self->path;#d#
1541 1624
1625 $self->in_memory (cf::MAP_SWAPPED);
1626
1627 # need to save uniques path
1628 unless ($self->{deny_save}) {
1629 my $uniq = $self->uniq_path; utf8::encode $uniq;
1630
1631 $self->_save_objects ($uniq, cf::IO_UNIQUES)
1632 if $uniq;
1633 }
1634
1542 delete $cf::MAP{$self->path}; 1635 delete $cf::MAP{$self->path};
1543 1636
1544 $self->in_memory (cf::MAP_SWAPPED);
1545 $self->clear; 1637 $self->clear;
1546 1638
1547 $_->clear_links_to ($self) for values %cf::MAP; 1639 $_->clear_links_to ($self) for values %cf::MAP;
1548 1640
1549 $self->unlink_save; 1641 $self->unlink_save;
… …
1553my $nuke_counter = "aaaa"; 1645my $nuke_counter = "aaaa";
1554 1646
1555sub nuke { 1647sub nuke {
1556 my ($self) = @_; 1648 my ($self) = @_;
1557 1649
1650 delete $cf::MAP{$self->path};
1651
1652 $self->unlink_save;
1653
1654 bless $self, "cf::map";
1655 delete $self->{deny_reset};
1558 $self->{deny_save} = 1; 1656 $self->{deny_save} = 1;
1559 $self->reset_timeout (1); 1657 $self->reset_timeout (1);
1560 $self->rename ("{nuke}/" . ($nuke_counter++)); 1658 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1659
1660 $cf::MAP{$self->path} = $self;
1661
1561 $self->reset; # polite request, might not happen 1662 $self->reset; # polite request, might not happen
1562} 1663}
1563 1664
1564=item cf::map::unique_maps 1665=item cf::map::unique_maps
1565 1666
… …
1577 for (@$files) { 1678 for (@$files) {
1578 utf8::decode $_; 1679 utf8::decode $_;
1579 next if /\.pst$/; 1680 next if /\.pst$/;
1580 next unless /^$PATH_SEP/o; 1681 next unless /^$PATH_SEP/o;
1581 1682
1582 s/\.map$//; 1683 push @paths, cf::map::normalise $_;
1583 push @paths, $_;
1584 } 1684 }
1585 1685
1586 \@paths 1686 \@paths
1587} 1687}
1588 1688
… …
1682=cut 1782=cut
1683 1783
1684sub link_map { 1784sub link_map {
1685 unless ($LINK_MAP) { 1785 unless ($LINK_MAP) {
1686 $LINK_MAP = cf::map::find "{link}" 1786 $LINK_MAP = cf::map::find "{link}"
1687 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 1787 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1688 $LINK_MAP->load; 1788 $LINK_MAP->load;
1689 } 1789 }
1690 1790
1691 $LINK_MAP 1791 $LINK_MAP
1692} 1792}
… …
1699 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1799 return if UNIVERSAL::isa $self->map, "ext::map_link";
1700 1800
1701 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1801 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1702 if $self->map; 1802 if $self->map;
1703 1803
1704 $self->enter_map ($LINK_MAP || link_map, 20, 20); 1804 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1705} 1805}
1706 1806
1707sub cf::object::player::leave_link { 1807sub cf::object::player::leave_link {
1708 my ($self, $map, $x, $y) = @_; 1808 my ($self, $map, $x, $y) = @_;
1709 1809
… …
1731 $map->load; 1831 $map->load;
1732 $map->load_diag; 1832 $map->load_diag;
1733 1833
1734 return unless $self->contr->active; 1834 return unless $self->contr->active;
1735 $self->activate_recursive; 1835 $self->activate_recursive;
1836
1837 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1736 $self->enter_map ($map, $x, $y); 1838 $self->enter_map ($map, $x, $y);
1737} 1839}
1738 1840
1739cf::player->attach ( 1841cf::player->attach (
1740 on_logout => sub { 1842 on_logout => sub {
… …
1753 # try to abort aborted map switching on player login :) 1855 # try to abort aborted map switching on player login :)
1754 # should happen only on crashes 1856 # should happen only on crashes
1755 if ($pl->ob->{_link_pos}) { 1857 if ($pl->ob->{_link_pos}) {
1756 $pl->ob->enter_link; 1858 $pl->ob->enter_link;
1757 (async { 1859 (async {
1758 # we need this sleep as the login has a concurrent enter_exit running
1759 # and this sleep increases chances of the player not ending up in scorn
1760 $pl->ob->reply (undef, 1860 $pl->ob->reply (undef,
1761 "There was an internal problem at your last logout, " 1861 "There was an internal problem at your last logout, "
1762 . "the server will try to bring you to your intended destination in a second.", 1862 . "the server will try to bring you to your intended destination in a second.",
1763 cf::NDI_RED); 1863 cf::NDI_RED);
1864 # we need this sleep as the login has a concurrent enter_exit running
1865 # and this sleep increases chances of the player not ending up in scorn
1764 Coro::Timer::sleep 1; 1866 Coro::Timer::sleep 1;
1765 $pl->ob->leave_link; 1867 $pl->ob->leave_link;
1766 })->prio (2); 1868 })->prio (2);
1767 } 1869 }
1768 }, 1870 },
… …
1776 my ($self, $path, $x, $y) = @_; 1878 my ($self, $path, $x, $y) = @_;
1777 1879
1778 $self->enter_link; 1880 $self->enter_link;
1779 1881
1780 (async { 1882 (async {
1883 my $map = eval {
1781 my $map = cf::map::find $path; 1884 my $map = cf::map::find $path;
1782 $map = $map->customise_for ($self) if $map; 1885 $map = $map->customise_for ($self) if $map;
1783 1886 $map
1784# warn "entering ", $map->path, " at ($x, $y)\n" 1887 } or
1785# if $map;
1786
1787 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1888 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1788 1889
1789 $self->leave_link ($map, $x, $y); 1890 $self->leave_link ($map, $x, $y);
1790 })->prio (1); 1891 })->prio (1);
1791} 1892}
1792 1893
… …
1796 1897
1797sub parse_random_map_params { 1898sub parse_random_map_params {
1798 my ($spec) = @_; 1899 my ($spec) = @_;
1799 1900
1800 my $rmp = { # defaults 1901 my $rmp = { # defaults
1801 xsize => 10, 1902 xsize => (cf::rndm 15, 40),
1802 ysize => 10, 1903 ysize => (cf::rndm 15, 40),
1904 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1905 #layout => string,
1803 }; 1906 };
1804 1907
1805 for (split /\n/, $spec) { 1908 for (split /\n/, $spec) {
1806 my ($k, $v) = split /\s+/, $_, 2; 1909 my ($k, $v) = split /\s+/, $_, 2;
1807 1910
… …
1811 $rmp 1914 $rmp
1812} 1915}
1813 1916
1814sub prepare_random_map { 1917sub prepare_random_map {
1815 my ($exit) = @_; 1918 my ($exit) = @_;
1919
1920 my $guard = cf::lock_acquire "exit_prepare:$exit";
1816 1921
1817 # all this does is basically replace the /! path by 1922 # all this does is basically replace the /! path by
1818 # a new random map path (?random/...) with a seed 1923 # a new random map path (?random/...) with a seed
1819 # that depends on the exit object 1924 # that depends on the exit object
1820 1925
1821 my $rmp = parse_random_map_params $exit->msg; 1926 my $rmp = parse_random_map_params $exit->msg;
1822 1927
1823 if ($exit->map) { 1928 if ($exit->map) {
1824 $rmp->{region} = $exit->map->region_name; 1929 $rmp->{region} = $exit->region->name;
1825 $rmp->{origin_map} = $exit->map->path; 1930 $rmp->{origin_map} = $exit->map->path;
1826 $rmp->{origin_x} = $exit->x; 1931 $rmp->{origin_x} = $exit->x;
1827 $rmp->{origin_y} = $exit->y; 1932 $rmp->{origin_y} = $exit->y;
1828 } 1933 }
1829 1934
1830 $rmp->{random_seed} ||= $exit->random_seed; 1935 $rmp->{random_seed} ||= $exit->random_seed;
1831 1936
1832 my $data = cf::to_json $rmp; 1937 my $data = cf::to_json $rmp;
1833 my $md5 = Digest::MD5::md5_hex $data; 1938 my $md5 = Digest::MD5::md5_hex $data;
1939 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1834 1940
1835 if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) { 1941 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1836 aio_write $fh, 0, (length $data), $data, 0; 1942 aio_write $fh, 0, (length $data), $data, 0;
1943 undef $fh;
1944 aio_rename "$meta~", $meta;
1837 1945
1838 $exit->slaying ("?random/$md5"); 1946 $exit->slaying ("?random/$md5");
1839 $exit->msg (undef); 1947 $exit->msg (undef);
1840 } 1948 }
1841} 1949}
1842 1950
1843sub cf::object::player::enter_exit { 1951sub cf::object::player::enter_exit {
1844 my ($self, $exit) = @_; 1952 my ($self, $exit) = @_;
1845 1953
1846 return unless $self->type == cf::PLAYER; 1954 return unless $self->type == cf::PLAYER;
1955
1956 if ($exit->slaying eq "/!") {
1957 #TODO: this should de-fi-ni-te-ly not be a sync-job
1958 cf::sync_job { prepare_random_map $exit };
1959 }
1960
1961 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1962 my $hp = $exit->stats->hp;
1963 my $sp = $exit->stats->sp;
1847 1964
1848 $self->enter_link; 1965 $self->enter_link;
1849 1966
1850 (async { 1967 (async {
1851 $self->deactivate_recursive; # just to be sure 1968 $self->deactivate_recursive; # just to be sure
1852 unless (eval { 1969 unless (eval {
1853 prepare_random_map $exit 1970 $self->goto ($slaying, $hp, $sp);
1854 if $exit->slaying eq "/!";
1855
1856 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1857 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1858 1971
1859 1; 1972 1;
1860 }) { 1973 }) {
1861 $self->message ("Something went wrong deep within the crossfire server. " 1974 $self->message ("Something went wrong deep within the crossfire server. "
1862 . "I'll try to bring you back to the map you were before. " 1975 . "I'll try to bring you back to the map you were before. "
… …
1882 1995
1883sub cf::client::send_drawinfo { 1996sub cf::client::send_drawinfo {
1884 my ($self, $text, $flags) = @_; 1997 my ($self, $text, $flags) = @_;
1885 1998
1886 utf8::encode $text; 1999 utf8::encode $text;
1887 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text); 2000 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1888} 2001}
1889 2002
1890 2003
1891=item $success = $client->query ($flags, "text", \&cb) 2004=item $success = $client->query ($flags, "text", \&cb)
1892 2005
… …
1923 # get handled first 2036 # get handled first
1924 my $queue = delete $ns->{query_queue} 2037 my $queue = delete $ns->{query_queue}
1925 or return; # be conservative, not sure how that can happen, but we saw a crash here 2038 or return; # be conservative, not sure how that can happen, but we saw a crash here
1926 2039
1927 (shift @$queue)->[1]->($msg); 2040 (shift @$queue)->[1]->($msg);
2041 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1928 2042
1929 push @{ $ns->{query_queue} }, @$queue; 2043 push @{ $ns->{query_queue} }, @$queue;
1930 2044
1931 if (@{ $ns->{query_queue} } == @$queue) { 2045 if (@{ $ns->{query_queue} } == @$queue) {
1932 if (@$queue) { 2046 if (@$queue) {
… …
2093The parameter C<$family> should best start with the name of the extension 2207The parameter C<$family> should best start with the name of the extension
2094using it, it should be unique. 2208using it, it should be unique.
2095 2209
2096=over 4 2210=over 4
2097 2211
2098=item $hashref = cf::db_get $family
2099
2100Return a hashref for use by the extension C<$family>, which can be
2101modified. After modifications, you have to call C<cf::db_dirty> or
2102C<cf::db_sync>.
2103
2104=item $value = cf::db_get $family => $key 2212=item $value = cf::db_get $family => $key
2105 2213
2106Returns a single value from the database 2214Returns a single value from the database.
2107
2108=item cf::db_put $family => $hashref
2109
2110Stores the given family hashref into the database. Updates are delayed, if
2111you want the data to be synced to disk immediately, use C<cf::db_sync>.
2112 2215
2113=item cf::db_put $family => $key => $value 2216=item cf::db_put $family => $key => $value
2114 2217
2115Stores the given C<$value> in the family hash. Updates are delayed, if you 2218Stores the given C<$value> in the family.
2116want the data to be synced to disk immediately, use C<cf::db_sync>.
2117
2118=item cf::db_dirty
2119
2120Marks the database as dirty, to be updated at a later time.
2121
2122=item cf::db_sync
2123
2124Immediately write the database to disk I<if it is dirty>.
2125 2219
2126=cut 2220=cut
2127 2221
2128our $DB; 2222our $DB;
2129 2223
2130{ 2224sub db_init {
2225 unless ($DB) {
2226 $DB = BDB::db_create $DB_ENV;
2227
2228 cf::sync_job {
2229 eval {
2230 $DB->set_flags (BDB::CHKSUM);
2231
2232 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2233 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2234 cf::cleanup "db_open(db): $!" if $!;
2235 };
2236 cf::cleanup "db_open(db): $@" if $@;
2237 };
2238
2131 my $path = cf::localdir . "/database.pst"; 2239 my $path = cf::localdir . "/database.pst";
2240 if (stat $path) {
2241 cf::sync_job {
2242 my $pst = Storable::retrieve $path;
2132 2243
2133 sub db_load() { 2244 cf::db_put (board => data => $pst->{board});
2134 $DB = stat $path ? Storable::retrieve $path : { }; 2245 cf::db_put (guildrules => data => $pst->{guildrules});
2135 } 2246 cf::db_put (rent => balance => $pst->{rent}{balance});
2247 BDB::db_env_txn_checkpoint $DB_ENV;
2136 2248
2137 my $pid; 2249 unlink $path;
2138
2139 sub db_save() {
2140 waitpid $pid, 0 if $pid;
2141 if (0 == ($pid = fork)) {
2142 $DB->{_meta}{version} = 1;
2143 Storable::nstore $DB, "$path~";
2144 rename "$path~", $path;
2145 cf::_exit 0 if defined $pid;
2146 } 2250 };
2147 } 2251 }
2148
2149 my $dirty;
2150
2151 sub db_sync() {
2152 db_save if $dirty;
2153 undef $dirty;
2154 }
2155
2156 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub {
2157 db_sync;
2158 }); 2252 }
2253}
2159 2254
2160 sub db_dirty() {
2161 $dirty = 1;
2162 $idle->start;
2163 }
2164
2165 sub db_get($;$) { 2255sub db_get($$) {
2166 @_ >= 2 2256 my $key = "$_[0]/$_[1]";
2167 ? $DB->{$_[0]}{$_[1]}
2168 : ($DB->{$_[0]} ||= { })
2169 }
2170 2257
2258 cf::sync_job {
2259 BDB::db_get $DB, undef, $key, my $data;
2260
2261 $! ? ()
2262 : Compress::LZF::sthaw $data
2263 }
2264}
2265
2171 sub db_put($$;$) { 2266sub db_put($$$) {
2172 if (@_ >= 3) { 2267 BDB::dbreq_pri 4;
2173 $DB->{$_[0]}{$_[1]} = $_[2]; 2268 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2269}
2270
2271#############################################################################
2272# the server's init and main functions
2273
2274sub load_faces {
2275 my $path = sprintf "%s/faces", cf::datadir;
2276
2277 warn "loading faces from $path\n";
2278
2279 my $faces;
2280 0 < aio_load $path, $faces
2281 or die "$path: $!";
2282
2283 Coro::cede;
2284 $faces = Storable::thaw $faces;
2285 Coro::cede;
2286
2287 while (my ($face, $info) = each %$faces) {
2288 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2289 cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2290 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2291 Coro::cede;
2292 }
2293
2294 while (my ($face, $info) = each %$faces) {
2295 next unless $info->{smooth};
2296 my $idx = cf::face::find $face
2297 or next;
2298 if (my $smooth = cf::face::find $info->{smooth}) {
2299 cf::face::set_smooth $idx, $smooth;
2300 warn "smooth $idx,$smooth ($face,$info->{smooth})\n";#d#
2174 } else { 2301 } else {
2175 $DB->{$_[0]} = $_[1]; 2302 warn "smooth face '$info->{smooth}' not found for face '$face'";
2176 }
2177 db_dirty;
2178 }
2179
2180 cf::global->attach (
2181 prio => 10000,
2182 on_cleanup => sub {
2183 db_sync;
2184 }, 2303 }
2185 ); 2304 Coro::cede;
2186} 2305 }
2187 2306
2188############################################################################# 2307 1
2189# the server's main() 2308}
2309
2310sub reload_resources {
2311 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2312 or die "unable to load regions file\n";#d#
2313 load_faces
2314 or die "unable to load faces\n";#d#
2315}
2316
2317sub init {
2318 reload_resources;
2319}
2190 2320
2191sub cfg_load { 2321sub cfg_load {
2192 open my $fh, "<:utf8", cf::confdir . "/config" 2322 open my $fh, "<:utf8", cf::confdir . "/config"
2193 or return; 2323 or return;
2194 2324
… …
2211 2341
2212sub main { 2342sub main {
2213 # we must not ever block the main coroutine 2343 # we must not ever block the main coroutine
2214 local $Coro::idle = sub { 2344 local $Coro::idle = sub {
2215 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2345 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2346 (async {
2216 async { Event::one_event }; 2347 Event::one_event;
2348 })->prio (Coro::PRIO_MAX);
2217 }; 2349 };
2218 2350
2219 cfg_load; 2351 cfg_load;
2220 db_load; 2352 db_init;
2221 load_extensions; 2353 load_extensions;
2354
2355 $TICK_WATCHER->start;
2222 Event::loop; 2356 Event::loop;
2223} 2357}
2224 2358
2225############################################################################# 2359#############################################################################
2226# initialisation and cleanup 2360# initialisation and cleanup
2227 2361
2228# install some emergency cleanup handlers 2362# install some emergency cleanup handlers
2229BEGIN { 2363BEGIN {
2230 for my $signal (qw(INT HUP TERM)) { 2364 for my $signal (qw(INT HUP TERM)) {
2231 Event->signal ( 2365 Event->signal (
2366 reentrant => 0,
2232 data => WF_AUTOCANCEL, 2367 data => WF_AUTOCANCEL,
2233 signal => $signal, 2368 signal => $signal,
2369 prio => 0,
2234 cb => sub { 2370 cb => sub {
2235 cf::cleanup "SIG$signal"; 2371 cf::cleanup "SIG$signal";
2236 }, 2372 },
2237 ); 2373 );
2238 } 2374 }
2239} 2375}
… …
2260 my $map = $cf::MAP{$path} or next; 2396 my $map = $cf::MAP{$path} or next;
2261 $map->valid or next; 2397 $map->valid or next;
2262 $map->save; 2398 $map->save;
2263 } 2399 }
2264 warn "end emergency map save\n"; 2400 warn "end emergency map save\n";
2401
2402 warn "begin emergency database checkpoint\n";
2403 BDB::db_env_txn_checkpoint $DB_ENV;
2404 warn "end emergency database checkpoint\n";
2265 }; 2405 };
2266 2406
2267 warn "leave emergency perl save\n"; 2407 warn "leave emergency perl save\n";
2408}
2409
2410sub post_cleanup {
2411 my ($make_core) = @_;
2412
2413 warn Carp::longmess "post_cleanup backtrace"
2414 if $make_core;
2268} 2415}
2269 2416
2270sub reload() { 2417sub reload() {
2271 # can/must only be called in main 2418 # can/must only be called in main
2272 if ($Coro::current != $Coro::main) { 2419 if ($Coro::current != $Coro::main) {
2273 warn "can only reload from main coroutine\n"; 2420 warn "can only reload from main coroutine";
2274 return; 2421 return;
2275 } 2422 }
2276 2423
2277 warn "reloading..."; 2424 warn "reloading...";
2278 2425
2279 warn "freezing server"; 2426 warn "entering sync_job";
2280 my $guard = freeze_mainloop; 2427
2428 cf::sync_job {
2429 cf::write_runtime; # external watchdog should not bark
2281 cf::emergency_save; 2430 cf::emergency_save;
2431 cf::write_runtime; # external watchdog should not bark
2282 2432
2283 warn "sync database to disk"; 2433 warn "syncing database to disk";
2284 cf::db_sync; 2434 BDB::db_env_txn_checkpoint $DB_ENV;
2285 IO::AIO::flush;
2286 2435
2287 eval {
2288 # if anything goes wrong in here, we should simply crash as we already saved 2436 # if anything goes wrong in here, we should simply crash as we already saved
2289 2437
2290 warn "cancel all watchers"; 2438 warn "cancelling all WF_AUTOCANCEL watchers";
2291 for (Event::all_watchers) { 2439 for (Event::all_watchers) {
2292 $_->cancel if $_->data & WF_AUTOCANCEL; 2440 $_->cancel if $_->data & WF_AUTOCANCEL;
2293 } 2441 }
2294 2442
2443 warn "flushing outstanding aio requests";
2444 for (;;) {
2445 BDB::flush;
2446 IO::AIO::flush;
2447 Coro::cede;
2448 last unless IO::AIO::nreqs || BDB::nreqs;
2449 warn "iterate...";
2450 }
2451
2452 ++$RELOAD;
2453
2295 warn "cancel all extension coros"; 2454 warn "cancelling all extension coros";
2296 $_->cancel for values %EXT_CORO; 2455 $_->cancel for values %EXT_CORO;
2297 %EXT_CORO = (); 2456 %EXT_CORO = ();
2298 2457
2299 warn "remove commands"; 2458 warn "removing commands";
2300 %COMMAND = (); 2459 %COMMAND = ();
2301 2460
2302 warn "remove ext commands"; 2461 warn "removing ext commands";
2303 %EXTCMD = (); 2462 %EXTCMD = ();
2304 2463
2305 warn "unload/nuke all extensions"; 2464 warn "unloading/nuking all extensions";
2306 for my $pkg (@EXTS) { 2465 for my $pkg (@EXTS) {
2307 warn "... unloading $pkg"; 2466 warn "... unloading $pkg";
2308 2467
2309 if (my $cb = $pkg->can ("unload")) { 2468 if (my $cb = $pkg->can ("unload")) {
2310 eval { 2469 eval {
… …
2315 2474
2316 warn "... nuking $pkg"; 2475 warn "... nuking $pkg";
2317 Symbol::delete_package $pkg; 2476 Symbol::delete_package $pkg;
2318 } 2477 }
2319 2478
2320 warn "unload all perl modules loaded from $LIBDIR"; 2479 warn "unloading all perl modules loaded from $LIBDIR";
2321 while (my ($k, $v) = each %INC) { 2480 while (my ($k, $v) = each %INC) {
2322 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2481 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2323 2482
2324 warn "removing <$k>"; 2483 warn "... unloading $k";
2325 delete $INC{$k}; 2484 delete $INC{$k};
2326 2485
2327 $k =~ s/\.pm$//; 2486 $k =~ s/\.pm$//;
2328 $k =~ s/\//::/g; 2487 $k =~ s/\//::/g;
2329 2488
… …
2332 } 2491 }
2333 2492
2334 Symbol::delete_package $k; 2493 Symbol::delete_package $k;
2335 } 2494 }
2336 2495
2337 warn "get rid of safe::, as good as possible"; 2496 warn "getting rid of safe::, as good as possible";
2338 Symbol::delete_package "safe::$_" 2497 Symbol::delete_package "safe::$_"
2339 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2498 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2340 2499
2341 warn "unload cf.pm \"a bit\""; 2500 warn "unloading cf.pm \"a bit\"";
2342 delete $INC{"cf.pm"}; 2501 delete $INC{"cf.pm"};
2343 2502
2344 # don't, removes xs symbols, too, 2503 # don't, removes xs symbols, too,
2345 # and global variables created in xs 2504 # and global variables created in xs
2346 #Symbol::delete_package __PACKAGE__; 2505 #Symbol::delete_package __PACKAGE__;
2347 2506
2507 warn "unload completed, starting to reload now";
2508
2348 warn "reloading cf.pm"; 2509 warn "reloading cf.pm";
2349 require cf; 2510 require cf;
2350 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2511 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2351 2512
2352 warn "load config and database again"; 2513 warn "loading config and database again";
2353 cf::cfg_load; 2514 cf::cfg_load;
2354 cf::db_load;
2355 2515
2356 warn "load extensions"; 2516 warn "loading extensions";
2357 cf::load_extensions; 2517 cf::load_extensions;
2358 2518
2359 warn "reattach attachments to objects/players"; 2519 warn "reattaching attachments to objects/players";
2360 _global_reattach; 2520 _global_reattach; # objects, sockets
2361 warn "reattach attachments to maps"; 2521 warn "reattaching attachments to maps";
2362 reattach $_ for values %MAP; 2522 reattach $_ for values %MAP;
2363 }; 2523 warn "reattaching attachments to players";
2524 reattach $_ for values %PLAYER;
2364 2525
2365 if ($@) { 2526 warn "loading reloadable resources";
2527 reload_resources;
2528
2529 warn "leaving sync_job";
2530
2531 1
2532 } or do {
2366 warn $@; 2533 warn $@;
2367 warn "error while reloading, exiting."; 2534 warn "error while reloading, exiting.";
2368 exit 1; 2535 exit 1;
2369 } 2536 };
2370 2537
2371 warn "reloaded"; 2538 warn "reloaded";
2372}; 2539};
2373 2540
2541our $RELOAD_WATCHER; # used only during reload
2542
2374register_command "reload" => sub { 2543register_command "reload" => sub {
2375 my ($who, $arg) = @_; 2544 my ($who, $arg) = @_;
2376 2545
2377 if ($who->flag (FLAG_WIZ)) { 2546 if ($who->flag (FLAG_WIZ)) {
2378 $who->message ("start of reload."); 2547 $who->message ("reloading server.");
2548
2549 # doing reload synchronously and two reloads happen back-to-back,
2550 # coro crashes during coro_state_free->destroy here.
2551
2552 $RELOAD_WATCHER ||= Event->timer (
2553 reentrant => 0,
2554 after => 0,
2555 data => WF_AUTOCANCEL,
2556 cb => sub {
2379 reload; 2557 reload;
2380 $who->message ("end of reload."); 2558 undef $RELOAD_WATCHER;
2559 },
2560 );
2381 } 2561 }
2382}; 2562};
2383 2563
2384unshift @INC, $LIBDIR; 2564unshift @INC, $LIBDIR;
2565
2566my $bug_warning = 0;
2385 2567
2386$TICK_WATCHER = Event->timer ( 2568$TICK_WATCHER = Event->timer (
2387 reentrant => 0, 2569 reentrant => 0,
2570 parked => 1,
2388 prio => 0, 2571 prio => 0,
2389 at => $NEXT_TICK || $TICK, 2572 at => $NEXT_TICK || $TICK,
2390 data => WF_AUTOCANCEL, 2573 data => WF_AUTOCANCEL,
2391 cb => sub { 2574 cb => sub {
2575 if ($Coro::current != $Coro::main) {
2576 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2577 unless ++$bug_warning > 10;
2578 return;
2579 }
2580
2392 $NOW = Event::time; 2581 $NOW = Event::time;
2393 2582
2394 cf::server_tick; # one server iteration 2583 cf::server_tick; # one server iteration
2395 $RUNTIME += $TICK; 2584 $RUNTIME += $TICK;
2396 $NEXT_TICK += $TICK; 2585 $NEXT_TICK += $TICK;
2397 2586
2587 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2588 $NEXT_RUNTIME_WRITE = $NOW + 10;
2589 Coro::async_pool {
2590 write_runtime
2591 or warn "ERROR: unable to write runtime file: $!";
2592 };
2593 }
2594
2398 $WAIT_FOR_TICK->broadcast; 2595 $WAIT_FOR_TICK->broadcast;
2399 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2596 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2597
2598# my $AFTER = Event::time;
2599# warn $AFTER - $NOW;#d#
2400 2600
2401 # if we are delayed by four ticks or more, skip them all 2601 # if we are delayed by four ticks or more, skip them all
2402 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2602 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2403 2603
2404 $TICK_WATCHER->at ($NEXT_TICK); 2604 $TICK_WATCHER->at ($NEXT_TICK);
2405 $TICK_WATCHER->start; 2605 $TICK_WATCHER->start;
2406 }, 2606 },
2407); 2607);
2408 2608
2609{
2610 BDB::max_poll_time $TICK * 0.1;
2611 $BDB_POLL_WATCHER = Event->io (
2612 reentrant => 0,
2613 fd => BDB::poll_fileno,
2614 poll => 'r',
2615 prio => 0,
2616 data => WF_AUTOCANCEL,
2617 cb => \&BDB::poll_cb,
2618 );
2619 BDB::min_parallel 8;
2620
2621 BDB::set_sync_prepare {
2622 my $status;
2623 my $current = $Coro::current;
2624 (
2625 sub {
2626 $status = $!;
2627 $current->ready; undef $current;
2628 },
2629 sub {
2630 Coro::schedule while defined $current;
2631 $! = $status;
2632 },
2633 )
2634 };
2635
2636 unless ($DB_ENV) {
2637 $DB_ENV = BDB::db_env_create;
2638
2639 cf::sync_job {
2640 eval {
2641 BDB::db_env_open
2642 $DB_ENV,
2643 $BDB_ENV_DIR,
2644 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2645 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2646 0666;
2647
2648 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!;
2649
2650 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2651 $DB_ENV->set_lk_detect;
2652 };
2653
2654 cf::cleanup "db_env_open(db): $@" if $@;
2655 };
2656 }
2657}
2658
2659{
2660 IO::AIO::min_parallel 8;
2661
2662 undef $Coro::AIO::WATCHER;
2409IO::AIO::max_poll_time $TICK * 0.2; 2663 IO::AIO::max_poll_time $TICK * 0.1;
2410
2411$AIO_POLL_WATCHER = Event->io ( 2664 $AIO_POLL_WATCHER = Event->io (
2412 fd => IO::AIO::poll_fileno, 2665 reentrant => 0,
2413 poll => 'r',
2414 prio => 5,
2415 data => WF_AUTOCANCEL,
2416 cb => \&IO::AIO::poll_cb,
2417);
2418
2419$WRITE_RUNTIME_WATCHER = Event->timer (
2420 data => WF_AUTOCANCEL, 2666 data => WF_AUTOCANCEL,
2421 after => 0, 2667 fd => IO::AIO::poll_fileno,
2422 interval => 10, 2668 poll => 'r',
2423 cb => sub { 2669 prio => 6,
2424 (Coro::unblock_sub { 2670 cb => \&IO::AIO::poll_cb,
2425 write_runtime 2671 );
2426 or warn "ERROR: unable to write runtime file: $!"; 2672}
2427 })->();
2428 },
2429);
2430 2673
2431END { cf::emergency_save } 2674END { cf::emergency_save }
2432 2675
24331 26761
2434 2677

Diff Legend

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