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.188 by root, Sat Jan 20 23:30:16 2007 UTC vs.
Revision 1.245 by root, Tue Apr 17 10:06:33 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.4 (); 14use Coro 3.61 ();
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;
21use Coro::Storable;
19 22
23use BDB ();
20use Data::Dumper; 24use Data::Dumper;
21use Digest::MD5; 25use Digest::MD5;
22use Fcntl; 26use Fcntl;
27use YAML::Syck ();
23use IO::AIO 2.32 (); 28use IO::AIO 2.32 ();
24use YAML::Syck ();
25use Time::HiRes; 29use Time::HiRes;
30use Compress::LZF;
26 31
32# configure various modules to our taste
33#
34$Storable::canonical = 1; # reduce rsync transfers
35Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
36Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
37
27use Event; $Event::Eval = 1; # no idea why this is required, but it is 38$Event::Eval = 1; # no idea why this is required, but it is
28
29sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
30 39
31# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 40# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
32$YAML::Syck::ImplicitUnicode = 1; 41$YAML::Syck::ImplicitUnicode = 1;
33 42
34$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 43$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
44
45sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
35 46
36our %COMMAND = (); 47our %COMMAND = ();
37our %COMMAND_TIME = (); 48our %COMMAND_TIME = ();
38 49
39our @EXTS = (); # list of extension package names 50our @EXTS = (); # list of extension package names
40our %EXTCMD = (); 51our %EXTCMD = ();
41our %EXT_CORO = (); # coroutines bound to extensions 52our %EXT_CORO = (); # coroutines bound to extensions
42our %EXT_MAP = (); # pluggable maps 53our %EXT_MAP = (); # pluggable maps
43 54
55our $RELOAD; # number of reloads so far
44our @EVENT; 56our @EVENT;
45our $LIBDIR = datadir . "/ext"; 57our $LIBDIR = datadir . "/ext";
46 58
47our $TICK = MAX_TIME * 1e-6; 59our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
48our $TICK_WATCHER; 60our $TICK_WATCHER;
49our $AIO_POLL_WATCHER; 61our $AIO_POLL_WATCHER;
50our $WRITE_RUNTIME_WATCHER; 62our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
51our $NEXT_TICK; 63our $NEXT_TICK;
52our $NOW; 64our $NOW;
65our $USE_FSYNC = 1; # use fsync to write maps - default off
66
67our $BDB_POLL_WATCHER;
68our $DB_ENV;
53 69
54our %CFG; 70our %CFG;
55 71
56our $UPTIME; $UPTIME ||= time; 72our $UPTIME; $UPTIME ||= time;
57our $RUNTIME; 73our $RUNTIME;
58 74
59our %PLAYER; # all users 75our %PLAYER; # all users
60our %MAP; # all maps 76our %MAP; # all maps
61our $LINK_MAP; # the special {link} map, which is always available 77our $LINK_MAP; # the special {link} map, which is always available
62our $RANDOM_MAPS = cf::localdir . "/random"; 78our $RANDOM_MAPS = cf::localdir . "/random";
63 79our $BDB_ENV_DIR = cf::localdir . "/db";
64our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
65our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
66 80
67# used to convert map paths into valid unix filenames by replacing / by ∕ 81# used to convert map paths into valid unix filenames by replacing / by ∕
68our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 82our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
69 83
70binmode STDOUT; 84binmode STDOUT;
80mkdir cf::localdir; 94mkdir cf::localdir;
81mkdir cf::localdir . "/" . cf::playerdir; 95mkdir cf::localdir . "/" . cf::playerdir;
82mkdir cf::localdir . "/" . cf::tmpdir; 96mkdir cf::localdir . "/" . cf::tmpdir;
83mkdir cf::localdir . "/" . cf::uniquedir; 97mkdir cf::localdir . "/" . cf::uniquedir;
84mkdir $RANDOM_MAPS; 98mkdir $RANDOM_MAPS;
99mkdir $BDB_ENV_DIR;
85 100
86our $EMERGENCY_POSITION; 101our $EMERGENCY_POSITION;
102
103sub cf::map::normalise;
87 104
88############################################################################# 105#############################################################################
89 106
90=head2 GLOBAL VARIABLES 107=head2 GLOBAL VARIABLES
91 108
116=item %cf::CFG 133=item %cf::CFG
117 134
118Configuration for the server, loaded from C</etc/crossfire/config>, or 135Configuration for the server, loaded from C</etc/crossfire/config>, or
119from wherever your confdir points to. 136from wherever your confdir points to.
120 137
121=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE 138=item cf::wait_for_tick, cf::wait_for_tick_begin
122 139
123These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK) 140These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
124or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick 141returns directly I<after> the tick processing (and consequently, can only wake one process
125processing has been done. Call C<< ->wait >> on them to maximise the 142per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
126window of cpu time available, or simply to synchronise to the server tick.
127 143
128=back 144=back
129 145
130=cut 146=cut
131 147
190 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 206 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
191 $d 207 $d
192 } || "[unable to dump $_[0]: '$@']"; 208 } || "[unable to dump $_[0]: '$@']";
193} 209}
194 210
195use JSON::Syck (); # TODO# replace by JSON::PC once working 211use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
196 212
197=item $ref = cf::from_json $json 213=item $ref = cf::from_json $json
198 214
199Converts a JSON string into the corresponding perl data structure. 215Converts a JSON string into the corresponding perl data structure.
200 216
201=cut
202
203sub from_json($) {
204 $JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
205 JSON::Syck::Load $_[0]
206}
207
208=item $json = cf::to_json $ref 217=item $json = cf::to_json $ref
209 218
210Converts a perl data structure into its JSON representation. 219Converts a perl data structure into its JSON representation.
211
212=cut
213
214sub to_json($) {
215 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
216 JSON::Syck::Dump $_[0]
217}
218 220
219=item cf::lock_wait $string 221=item cf::lock_wait $string
220 222
221Wait until the given lock is available. See cf::lock_acquire. 223Wait until the given lock is available. See cf::lock_acquire.
222 224
261sub freeze_mainloop { 263sub freeze_mainloop {
262 return unless $TICK_WATCHER->is_active; 264 return unless $TICK_WATCHER->is_active;
263 265
264 my $guard = Coro::guard { 266 my $guard = Coro::guard {
265 $TICK_WATCHER->start; 267 $TICK_WATCHER->start;
266 $WRITE_RUNTIME_WATCHER->start;
267 }; 268 };
268 $WRITE_RUNTIME_WATCHER->stop;
269 $TICK_WATCHER->stop; 269 $TICK_WATCHER->stop;
270 $guard 270 $guard
271} 271}
272 272
273=item cf::async { BLOCK } 273=item cf::async { BLOCK }
344 344
345 $coro 345 $coro
346} 346}
347 347
348sub write_runtime { 348sub write_runtime {
349 my $guard = cf::lock_acquire "write_runtime";
350
349 my $runtime = cf::localdir . "/runtime"; 351 my $runtime = cf::localdir . "/runtime";
350 352
351 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 353 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
352 or return; 354 or return;
353 355
356 # 60 allows for the watchdog to kill the server. 358 # 60 allows for the watchdog to kill the server.
357 359
358 (aio_write $fh, 0, (length $value), $value, 0) <= 0 360 (aio_write $fh, 0, (length $value), $value, 0) <= 0
359 and return; 361 and return;
360 362
363 # always fsync - this file is important
361 aio_fsync $fh 364 aio_fsync $fh
362 and return; 365 and return;
363 366
364 close $fh 367 close $fh
365 or return; 368 or return;
366 369
367 aio_rename "$runtime~", $runtime 370 aio_rename "$runtime~", $runtime
368 and return; 371 and return;
369 372
370 1 373 1
374}
375
376=item cf::datalog type => key => value, ...
377
378Log a datalog packet of the given type with the given key-value pairs.
379
380=cut
381
382sub datalog($@) {
383 my ($type, %kv) = @_;
384 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
371} 385}
372 386
373=back 387=back
374 388
375=cut 389=cut
750 $filename, length $$rdata, scalar @$objs; 764 $filename, length $$rdata, scalar @$objs;
751 765
752 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 766 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
753 chmod SAVE_MODE, $fh; 767 chmod SAVE_MODE, $fh;
754 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 768 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
755 aio_fsync $fh; 769 aio_fsync $fh if $cf::USE_FSYNC;
756 close $fh; 770 close $fh;
757 771
758 if (@$objs) { 772 if (@$objs) {
759 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 773 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
760 chmod SAVE_MODE, $fh; 774 chmod SAVE_MODE, $fh;
761 my $data = Storable::nfreeze { version => 1, objs => $objs }; 775 my $data = Storable::nfreeze { version => 1, objs => $objs };
762 aio_write $fh, 0, (length $data), $data, 0; 776 aio_write $fh, 0, (length $data), $data, 0;
763 aio_fsync $fh; 777 aio_fsync $fh if $cf::USE_FSYNC;
764 close $fh; 778 close $fh;
765 aio_rename "$filename.pst~", "$filename.pst"; 779 aio_rename "$filename.pst~", "$filename.pst";
766 } 780 }
767 } else { 781 } else {
768 aio_unlink "$filename.pst"; 782 aio_unlink "$filename.pst";
947} 961}
948 962
949sub path($) { 963sub path($) {
950 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 964 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
951 965
952 (playerdir $login) . "/$login.pl" 966 (playerdir $login) . "/playerdata"
953} 967}
954 968
955sub find_active($) { 969sub find_active($) {
956 $cf::PLAYER{$_[0]} 970 $cf::PLAYER{$_[0]}
957 and $cf::PLAYER{$_[0]}->active 971 and $cf::PLAYER{$_[0]}->active
970 my $login = $_[0]; 984 my $login = $_[0];
971 985
972 my $guard = cf::lock_acquire "user_find:$login"; 986 my $guard = cf::lock_acquire "user_find:$login";
973 987
974 $cf::PLAYER{$_[0]} || do { 988 $cf::PLAYER{$_[0]} || do {
989 # rename old playerfiles to new ones
990 #TODO: remove when no longer required
991 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
992 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
993 aio_unlink +(playerdir $login) . "/$login.pl.pst";
994 aio_unlink +(playerdir $login) . "/$login.pl";
995
975 my $pl = load_pl path $login 996 my $pl = load_pl path $login
976 or return; 997 or return;
977 $cf::PLAYER{$login} = $pl 998 $cf::PLAYER{$login} = $pl
978 } 999 }
979 } 1000 }
1016 1037
1017=cut 1038=cut
1018 1039
1019sub quit_character { 1040sub quit_character {
1020 my ($pl) = @_; 1041 my ($pl) = @_;
1042
1043 my $name = $pl->ob->name;
1021 1044
1022 $pl->{deny_save} = 1; 1045 $pl->{deny_save} = 1;
1023 $pl->password ("*"); # this should lock out the player until we nuked the dir 1046 $pl->password ("*"); # this should lock out the player until we nuked the dir
1024 1047
1025 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1048 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1030 my $path = playerdir $pl; 1053 my $path = playerdir $pl;
1031 my $temp = "$path~$cf::RUNTIME~deleting~"; 1054 my $temp = "$path~$cf::RUNTIME~deleting~";
1032 aio_rename $path, $temp; 1055 aio_rename $path, $temp;
1033 delete $cf::PLAYER{$pl->ob->name}; 1056 delete $cf::PLAYER{$pl->ob->name};
1034 $pl->destroy; 1057 $pl->destroy;
1058
1059 my $prefix = qr<^~\Q$name\E/>;
1060
1061 # nuke player maps
1062 $cf::MAP{$_}->nuke for grep /$prefix/, keys %cf::MAP;
1063
1035 IO::AIO::aio_rmtree $temp; 1064 IO::AIO::aio_rmtree $temp;
1065}
1066
1067=item $pl->kick
1068
1069Kicks a player out of the game. This destroys the connection.
1070
1071=cut
1072
1073sub kick {
1074 my ($pl, $kicker) = @_;
1075
1076 $pl->invoke (cf::EVENT_PLAYER_KICK, $kicker);
1077 $pl->killer ("kicked");
1078 $pl->ns->destroy;
1036} 1079}
1037 1080
1038=item cf::player::list_logins 1081=item cf::player::list_logins
1039 1082
1040Returns am arrayref of all valid playernames in the system, can take a 1083Returns am arrayref of all valid playernames in the system, can take a
1068=cut 1111=cut
1069 1112
1070sub maps($) { 1113sub maps($) {
1071 my ($pl) = @_; 1114 my ($pl) = @_;
1072 1115
1116 $pl = ref $pl ? $pl->ob->name : $pl;
1117
1073 my $files = aio_readdir playerdir $pl 1118 my $files = aio_readdir playerdir $pl
1074 or return; 1119 or return;
1075 1120
1076 my @paths; 1121 my @paths;
1077 1122
1078 for (@$files) { 1123 for (@$files) {
1079 utf8::decode $_; 1124 utf8::decode $_;
1080 next if /\.(?:pl|pst)$/; 1125 next if /\.(?:pl|pst)$/;
1081 next unless /^$PATH_SEP/o; 1126 next unless /^$PATH_SEP/o;
1082 1127
1083 s/\.map$//; 1128 push @paths, cf::map::normalise "~$pl/$_";
1084 push @paths, "~" . $pl->ob->name . "/" . $_;
1085 } 1129 }
1086 1130
1087 \@paths 1131 \@paths
1088} 1132}
1089 1133
1090=item $player->ext_reply ($msgid, $msgtype, %msg) 1134=item $player->ext_reply ($msgid, %msg)
1091 1135
1092Sends an ext reply to the player. 1136Sends an ext reply to the player.
1093 1137
1094=cut 1138=cut
1095 1139
1096sub ext_reply($$$%) { 1140sub ext_reply($$%) {
1097 my ($self, $id, %msg) = @_; 1141 my ($self, $id, %msg) = @_;
1098 1142
1099 $msg{msgid} = $id; 1143 $msg{msgid} = $id;
1100 1144
1101 $self->send ("ext " . cf::to_json \%msg); 1145 $self->send ("ext " . cf::to_json \%msg);
1102} 1146}
1103 1147
1104package cf; 1148=item $player->ext_event ($type, %msg)
1149
1150Sends an ext event to the client.
1151
1152=cut
1153
1154sub ext_event($$%) {
1155 my ($self, $type, %msg) = @_;
1156
1157 $self->ns->ext_event ($type, %msg);
1158}
1159
1160=head3 cf::region
1161
1162=over 4
1163
1164=cut
1165
1166package cf::region;
1167
1168=item cf::region::find_by_path $path
1169
1170Tries to decuce the probable region for a map knowing only its path.
1171
1172=cut
1173
1174sub find_by_path($) {
1175 my ($path) = @_;
1176
1177 my ($match, $specificity);
1178
1179 for my $region (list) {
1180 if ($region->match && $path =~ $region->match) {
1181 ($match, $specificity) = ($region, $region->specificity)
1182 if $region->specificity > $specificity;
1183 }
1184 }
1185
1186 $match
1187}
1105 1188
1106=back 1189=back
1107
1108 1190
1109=head3 cf::map 1191=head3 cf::map
1110 1192
1111=over 4 1193=over 4
1112 1194
1176} 1258}
1177 1259
1178sub normalise { 1260sub normalise {
1179 my ($path, $base) = @_; 1261 my ($path, $base) = @_;
1180 1262
1263 $path = "$path"; # make sure its a string
1264
1265 $path =~ s/\.map$//;
1266
1181 # map plan: 1267 # map plan:
1182 # 1268 #
1183 # /! non-realised random map exit (special hack!) 1269 # /! non-realised random map exit (special hack!)
1184 # {... are special paths that are not being touched 1270 # {... are special paths that are not being touched
1185 # ?xxx/... are special absolute paths 1271 # ?xxx/... are special absolute paths
1221 $self->init; # pass $1 etc. 1307 $self->init; # pass $1 etc.
1222 return $self; 1308 return $self;
1223 } 1309 }
1224 } 1310 }
1225 1311
1226 Carp::carp "unable to resolve path '$path'."; 1312 Carp::carp "unable to resolve path '$path' (base '$base').";
1227 () 1313 ()
1228} 1314}
1229 1315
1230sub init { 1316sub init {
1231 my ($self) = @_; 1317 my ($self) = @_;
1246 1332
1247# the original (read-only) location 1333# the original (read-only) location
1248sub load_path { 1334sub load_path {
1249 my ($self) = @_; 1335 my ($self) = @_;
1250 1336
1251 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1337 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}
1252} 1338}
1253 1339
1254# the temporary/swap location 1340# the temporary/swap location
1255sub save_path { 1341sub save_path {
1256 my ($self) = @_; 1342 my ($self) = @_;
1257 1343
1258 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1344 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1259 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path 1345 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path
1260} 1346}
1261 1347
1262# the unique path, undef == no special unique path 1348# the unique path, undef == no special unique path
1263sub uniq_path { 1349sub uniq_path {
1264 my ($self) = @_; 1350 my ($self) = @_;
1286 1372
1287sub load_header_from($) { 1373sub load_header_from($) {
1288 my ($self, $path) = @_; 1374 my ($self, $path) = @_;
1289 1375
1290 utf8::encode $path; 1376 utf8::encode $path;
1291 aio_open $path, O_RDONLY, 0 1377 #aio_open $path, O_RDONLY, 0
1292 or return; 1378 # or return;
1293 1379
1294 $self->_load_header ($path) 1380 $self->_load_header ($path)
1295 or return; 1381 or return;
1296 1382
1297 $self->{load_path} = $path; 1383 $self->{load_path} = $path;
1339 $self->load_header_orig 1425 $self->load_header_orig
1340 or return; 1426 or return;
1341 $self->prepare_orig; 1427 $self->prepare_orig;
1342 } 1428 }
1343 1429
1430 $self->default_region (cf::region::find_by_path $self->{path})
1431 unless $self->default_region;
1432
1344 1 1433 1
1345} 1434}
1346 1435
1347sub find; 1436sub find;
1348sub find { 1437sub find {
1360 $map->{last_save} = $cf::RUNTIME; 1449 $map->{last_save} = $cf::RUNTIME;
1361 1450
1362 $map->load_header 1451 $map->load_header
1363 or return; 1452 or return;
1364 1453
1365 if ($map->should_reset) { 1454 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)
1366 # doing this can freeze the server in a sync job, obviously 1455 # doing this can freeze the server in a sync job, obviously
1367 #$cf::WAIT_FOR_TICK->wait; 1456 #$cf::WAIT_FOR_TICK->wait;
1368 $map->reset; 1457 $map->reset;
1369 undef $guard; 1458 undef $guard;
1370 $map = find $path 1459 return find $path;
1371 or return;
1372 } 1460 }
1373 1461
1374 $cf::MAP{$path} = $map 1462 $cf::MAP{$path} = $map
1375 } 1463 }
1376} 1464}
1379sub post_load { } 1467sub post_load { }
1380 1468
1381sub load { 1469sub load {
1382 my ($self) = @_; 1470 my ($self) = @_;
1383 1471
1472 local $self->{deny_reset} = 1; # loading can take a long time
1473
1384 my $path = $self->{path}; 1474 my $path = $self->{path};
1385 my $guard = cf::lock_acquire "map_load:$path"; 1475 my $guard = cf::lock_acquire "map_load:$path";
1386 1476
1387 return if $self->in_memory != cf::MAP_SWAPPED; 1477 return if $self->in_memory != cf::MAP_SWAPPED;
1388 1478
1389 $self->in_memory (cf::MAP_LOADING); 1479 $self->in_memory (cf::MAP_LOADING);
1390 1480
1391 $self->alloc; 1481 $self->alloc;
1392 1482
1393 $self->pre_load; 1483 $self->pre_load;
1484 Coro::cede;
1394 1485
1395 $self->_load_objects ($self->{load_path}, 1) 1486 $self->_load_objects ($self->{load_path}, 1)
1396 or return; 1487 or return;
1397 1488
1398 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1489 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1405 $self->_load_objects ($uniq, 0); 1496 $self->_load_objects ($uniq, 0);
1406 } 1497 }
1407 } 1498 }
1408 1499
1409 Coro::cede; 1500 Coro::cede;
1410
1411 # now do the right thing for maps 1501 # now do the right thing for maps
1412 $self->link_multipart_objects; 1502 $self->link_multipart_objects;
1503 Coro::cede;
1413 1504
1414 unless ($self->{deny_activate}) { 1505 unless ($self->{deny_activate}) {
1415 $self->decay_objects; 1506 $self->decay_objects;
1416 $self->fix_auto_apply; 1507 $self->fix_auto_apply;
1417 $self->update_buttons; 1508 $self->update_buttons;
1419 $self->set_darkness_map; 1510 $self->set_darkness_map;
1420 $self->difficulty ($self->estimate_difficulty) 1511 $self->difficulty ($self->estimate_difficulty)
1421 unless $self->difficulty; 1512 unless $self->difficulty;
1422 Coro::cede; 1513 Coro::cede;
1423 $self->activate; 1514 $self->activate;
1515 Coro::cede;
1424 } 1516 }
1425 1517
1426 $self->post_load; 1518 $self->post_load;
1519 Coro::cede;
1427 1520
1428 $self->in_memory (cf::MAP_IN_MEMORY); 1521 $self->in_memory (cf::MAP_IN_MEMORY);
1429} 1522}
1430 1523
1431sub customise_for { 1524sub customise_for {
1496 delete $MAP_PREFETCH{$path}; 1589 delete $MAP_PREFETCH{$path};
1497 } 1590 }
1498 } 1591 }
1499 undef $MAP_PREFETCHER; 1592 undef $MAP_PREFETCHER;
1500 }; 1593 };
1594 $MAP_PREFETCHER->prio (6);
1501 1595
1502 () 1596 ()
1503} 1597}
1504 1598
1505sub save { 1599sub save {
1575 return if $self->players; 1669 return if $self->players;
1576 return if $self->isa ("ext::map_per_player");#d# 1670 return if $self->isa ("ext::map_per_player");#d#
1577 1671
1578 warn "resetting map ", $self->path;#d# 1672 warn "resetting map ", $self->path;#d#
1579 1673
1674 $self->in_memory (cf::MAP_SWAPPED);
1675
1676 # need to save uniques path
1677 unless ($self->{deny_save}) {
1678 my $uniq = $self->uniq_path; utf8::encode $uniq;
1679
1680 $self->_save_objects ($uniq, cf::IO_UNIQUES)
1681 if $uniq;
1682 }
1683
1580 delete $cf::MAP{$self->path}; 1684 delete $cf::MAP{$self->path};
1581 1685
1582 $self->in_memory (cf::MAP_SWAPPED);
1583 $self->clear; 1686 $self->clear;
1584 1687
1585 $_->clear_links_to ($self) for values %cf::MAP; 1688 $_->clear_links_to ($self) for values %cf::MAP;
1586 1689
1587 $self->unlink_save; 1690 $self->unlink_save;
1624 for (@$files) { 1727 for (@$files) {
1625 utf8::decode $_; 1728 utf8::decode $_;
1626 next if /\.pst$/; 1729 next if /\.pst$/;
1627 next unless /^$PATH_SEP/o; 1730 next unless /^$PATH_SEP/o;
1628 1731
1629 s/\.map$//; 1732 push @paths, cf::map::normalise $_;
1630 push @paths, $_;
1631 } 1733 }
1632 1734
1633 \@paths 1735 \@paths
1634} 1736}
1635 1737
1729=cut 1831=cut
1730 1832
1731sub link_map { 1833sub link_map {
1732 unless ($LINK_MAP) { 1834 unless ($LINK_MAP) {
1733 $LINK_MAP = cf::map::find "{link}" 1835 $LINK_MAP = cf::map::find "{link}"
1734 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 1836 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1735 $LINK_MAP->load; 1837 $LINK_MAP->load;
1736 } 1838 }
1737 1839
1738 $LINK_MAP 1840 $LINK_MAP
1739} 1841}
1746 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1848 return if UNIVERSAL::isa $self->map, "ext::map_link";
1747 1849
1748 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1850 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1749 if $self->map; 1851 if $self->map;
1750 1852
1751 $self->enter_map ($LINK_MAP || link_map, 20, 20); 1853 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1752} 1854}
1753 1855
1754sub cf::object::player::leave_link { 1856sub cf::object::player::leave_link {
1755 my ($self, $map, $x, $y) = @_; 1857 my ($self, $map, $x, $y) = @_;
1756 1858
1778 $map->load; 1880 $map->load;
1779 $map->load_diag; 1881 $map->load_diag;
1780 1882
1781 return unless $self->contr->active; 1883 return unless $self->contr->active;
1782 $self->activate_recursive; 1884 $self->activate_recursive;
1885
1886 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1783 $self->enter_map ($map, $x, $y); 1887 $self->enter_map ($map, $x, $y);
1784} 1888}
1785 1889
1786cf::player->attach ( 1890cf::player->attach (
1787 on_logout => sub { 1891 on_logout => sub {
1800 # try to abort aborted map switching on player login :) 1904 # try to abort aborted map switching on player login :)
1801 # should happen only on crashes 1905 # should happen only on crashes
1802 if ($pl->ob->{_link_pos}) { 1906 if ($pl->ob->{_link_pos}) {
1803 $pl->ob->enter_link; 1907 $pl->ob->enter_link;
1804 (async { 1908 (async {
1805 # we need this sleep as the login has a concurrent enter_exit running
1806 # and this sleep increases chances of the player not ending up in scorn
1807 $pl->ob->reply (undef, 1909 $pl->ob->reply (undef,
1808 "There was an internal problem at your last logout, " 1910 "There was an internal problem at your last logout, "
1809 . "the server will try to bring you to your intended destination in a second.", 1911 . "the server will try to bring you to your intended destination in a second.",
1810 cf::NDI_RED); 1912 cf::NDI_RED);
1913 # we need this sleep as the login has a concurrent enter_exit running
1914 # and this sleep increases chances of the player not ending up in scorn
1811 Coro::Timer::sleep 1; 1915 Coro::Timer::sleep 1;
1812 $pl->ob->leave_link; 1916 $pl->ob->leave_link;
1813 })->prio (2); 1917 })->prio (2);
1814 } 1918 }
1815 }, 1919 },
1823 my ($self, $path, $x, $y) = @_; 1927 my ($self, $path, $x, $y) = @_;
1824 1928
1825 $self->enter_link; 1929 $self->enter_link;
1826 1930
1827 (async { 1931 (async {
1932 my $map = eval {
1828 my $map = cf::map::find $path; 1933 my $map = cf::map::find $path;
1829 $map = $map->customise_for ($self) if $map; 1934 $map = $map->customise_for ($self) if $map;
1830 1935 $map
1831# warn "entering ", $map->path, " at ($x, $y)\n" 1936 } or
1832# if $map;
1833
1834 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1937 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1835 1938
1836 $self->leave_link ($map, $x, $y); 1939 $self->leave_link ($map, $x, $y);
1837 })->prio (1); 1940 })->prio (1);
1838} 1941}
1839 1942
1870 # that depends on the exit object 1973 # that depends on the exit object
1871 1974
1872 my $rmp = parse_random_map_params $exit->msg; 1975 my $rmp = parse_random_map_params $exit->msg;
1873 1976
1874 if ($exit->map) { 1977 if ($exit->map) {
1875 $rmp->{region} = $exit->map->region_name; 1978 $rmp->{region} = $exit->region->name;
1876 $rmp->{origin_map} = $exit->map->path; 1979 $rmp->{origin_map} = $exit->map->path;
1877 $rmp->{origin_x} = $exit->x; 1980 $rmp->{origin_x} = $exit->x;
1878 $rmp->{origin_y} = $exit->y; 1981 $rmp->{origin_y} = $exit->y;
1879 } 1982 }
1880 1983
1897sub cf::object::player::enter_exit { 2000sub cf::object::player::enter_exit {
1898 my ($self, $exit) = @_; 2001 my ($self, $exit) = @_;
1899 2002
1900 return unless $self->type == cf::PLAYER; 2003 return unless $self->type == cf::PLAYER;
1901 2004
2005 if ($exit->slaying eq "/!") {
2006 #TODO: this should de-fi-ni-te-ly not be a sync-job
2007 # the problem is that $exit might not survive long enough
2008 # so it needs to be done right now, right here
2009 cf::sync_job { prepare_random_map $exit };
2010 }
2011
2012 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2013 my $hp = $exit->stats->hp;
2014 my $sp = $exit->stats->sp;
2015
1902 $self->enter_link; 2016 $self->enter_link;
1903 2017
1904 (async { 2018 (async {
1905 $self->deactivate_recursive; # just to be sure 2019 $self->deactivate_recursive; # just to be sure
1906 unless (eval { 2020 unless (eval {
1907 prepare_random_map $exit 2021 $self->goto ($slaying, $hp, $sp);
1908 if $exit->slaying eq "/!";
1909
1910 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1911 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1912 2022
1913 1; 2023 1;
1914 }) { 2024 }) {
1915 $self->message ("Something went wrong deep within the crossfire server. " 2025 $self->message ("Something went wrong deep within the crossfire server. "
1916 . "I'll try to bring you back to the map you were before. " 2026 . "I'll try to bring you back to the map you were before. "
1917 . "Please report this to the dungeon master!", 2027 . "Please report this to the dungeon master!",
1918 cf::NDI_UNIQUE | cf::NDI_RED); 2028 cf::NDI_UNIQUE | cf::NDI_RED);
1919 2029
1920 warn "ERROR in enter_exit: $@"; 2030 warn "ERROR in enter_exit: $@";
1921 $self->leave_link; 2031 $self->leave_link;
1922 } 2032 }
1923 })->prio (1); 2033 })->prio (1);
1936 2046
1937sub cf::client::send_drawinfo { 2047sub cf::client::send_drawinfo {
1938 my ($self, $text, $flags) = @_; 2048 my ($self, $text, $flags) = @_;
1939 2049
1940 utf8::encode $text; 2050 utf8::encode $text;
1941 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text); 2051 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1942} 2052}
1943 2053
2054=item $client->ext_event ($type, %msg)
2055
2056Sends an exti event to the client.
2057
2058=cut
2059
2060sub cf::client::ext_event($$%) {
2061 my ($self, $type, %msg) = @_;
2062
2063 $msg{msgtype} = "event_$type";
2064 $self->send_packet ("ext " . cf::to_json \%msg);
2065}
1944 2066
1945=item $success = $client->query ($flags, "text", \&cb) 2067=item $success = $client->query ($flags, "text", \&cb)
1946 2068
1947Queues a query to the client, calling the given callback with 2069Queues a query to the client, calling the given callback with
1948the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2070the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
1977 # get handled first 2099 # get handled first
1978 my $queue = delete $ns->{query_queue} 2100 my $queue = delete $ns->{query_queue}
1979 or return; # be conservative, not sure how that can happen, but we saw a crash here 2101 or return; # be conservative, not sure how that can happen, but we saw a crash here
1980 2102
1981 (shift @$queue)->[1]->($msg); 2103 (shift @$queue)->[1]->($msg);
2104 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1982 2105
1983 push @{ $ns->{query_queue} }, @$queue; 2106 push @{ $ns->{query_queue} }, @$queue;
1984 2107
1985 if (@{ $ns->{query_queue} } == @$queue) { 2108 if (@{ $ns->{query_queue} } == @$queue) {
1986 if (@$queue) { 2109 if (@$queue) {
2044 2167
2045# here we export the classes and methods available to script code 2168# here we export the classes and methods available to script code
2046 2169
2047=pod 2170=pod
2048 2171
2049The following fucntions and emthods are available within a safe environment: 2172The following functions and methods are available within a safe environment:
2050 2173
2051 cf::object contr pay_amount pay_player map 2174 cf::object contr pay_amount pay_player map
2052 cf::object::player player 2175 cf::object::player player
2053 cf::player peaceful 2176 cf::player peaceful
2054 cf::map trigger 2177 cf::map trigger
2147The parameter C<$family> should best start with the name of the extension 2270The parameter C<$family> should best start with the name of the extension
2148using it, it should be unique. 2271using it, it should be unique.
2149 2272
2150=over 4 2273=over 4
2151 2274
2152=item $hashref = cf::db_get $family
2153
2154Return a hashref for use by the extension C<$family>, which can be
2155modified. After modifications, you have to call C<cf::db_dirty> or
2156C<cf::db_sync>.
2157
2158=item $value = cf::db_get $family => $key 2275=item $value = cf::db_get $family => $key
2159 2276
2160Returns a single value from the database 2277Returns a single value from the database.
2161
2162=item cf::db_put $family => $hashref
2163
2164Stores the given family hashref into the database. Updates are delayed, if
2165you want the data to be synced to disk immediately, use C<cf::db_sync>.
2166 2278
2167=item cf::db_put $family => $key => $value 2279=item cf::db_put $family => $key => $value
2168 2280
2169Stores the given C<$value> in the family hash. Updates are delayed, if you 2281Stores the given C<$value> in the family.
2170want the data to be synced to disk immediately, use C<cf::db_sync>.
2171
2172=item cf::db_dirty
2173
2174Marks the database as dirty, to be updated at a later time.
2175
2176=item cf::db_sync
2177
2178Immediately write the database to disk I<if it is dirty>.
2179 2282
2180=cut 2283=cut
2181 2284
2182our $DB; 2285our $DB;
2183 2286
2184{ 2287sub db_init {
2288 unless ($DB) {
2289 $DB = BDB::db_create $DB_ENV;
2290
2291 cf::sync_job {
2292 eval {
2293 $DB->set_flags (BDB::CHKSUM);
2294
2295 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2296 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2297 cf::cleanup "db_open(db): $!" if $!;
2298 };
2299 cf::cleanup "db_open(db): $@" if $@;
2300 };
2301
2185 my $path = cf::localdir . "/database.pst"; 2302 my $path = cf::localdir . "/database.pst";
2303 if (stat $path) {
2304 cf::sync_job {
2305 my $pst = Storable::retrieve $path;
2186 2306
2187 sub db_load() { 2307 cf::db_put (board => data => $pst->{board});
2188 $DB = stat $path ? Storable::retrieve $path : { }; 2308 cf::db_put (guildrules => data => $pst->{guildrules});
2189 } 2309 cf::db_put (rent => balance => $pst->{rent}{balance});
2310 BDB::db_env_txn_checkpoint $DB_ENV;
2190 2311
2191 my $pid; 2312 unlink $path;
2192
2193 sub db_save() {
2194 waitpid $pid, 0 if $pid;
2195 if (0 == ($pid = fork)) {
2196 $DB->{_meta}{version} = 1;
2197 Storable::nstore $DB, "$path~";
2198 rename "$path~", $path;
2199 cf::_exit 0 if defined $pid;
2200 } 2313 };
2201 }
2202
2203 my $dirty;
2204
2205 sub db_sync() {
2206 db_save if $dirty;
2207 undef $dirty;
2208 }
2209
2210 my $idle = Event->idle (min => 10, max => 20, repeat => 0, data => WF_AUTOCANCEL, cb => sub {
2211 db_sync;
2212 });
2213
2214 sub db_dirty() {
2215 $dirty = 1;
2216 $idle->start;
2217 }
2218
2219 sub db_get($;$) {
2220 @_ >= 2
2221 ? $DB->{$_[0]}{$_[1]}
2222 : ($DB->{$_[0]} ||= { })
2223 }
2224
2225 sub db_put($$;$) {
2226 if (@_ >= 3) {
2227 $DB->{$_[0]}{$_[1]} = $_[2];
2228 } else {
2229 $DB->{$_[0]} = $_[1];
2230 }
2231 db_dirty;
2232 }
2233
2234 cf::global->attach (
2235 prio => 10000,
2236 on_cleanup => sub {
2237 db_sync;
2238 }, 2314 }
2239 ); 2315 }
2316}
2317
2318sub db_get($$) {
2319 my $key = "$_[0]/$_[1]";
2320
2321 cf::sync_job {
2322 BDB::db_get $DB, undef, $key, my $data;
2323
2324 $! ? ()
2325 : Compress::LZF::sthaw $data
2326 }
2327}
2328
2329sub db_put($$$) {
2330 BDB::dbreq_pri 4;
2331 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2240} 2332}
2241 2333
2242############################################################################# 2334#############################################################################
2243# the server's main() 2335# the server's init and main functions
2336
2337sub load_facedata {
2338 my $path = sprintf "%s/facedata", cf::datadir;
2339
2340 warn "loading facedata from $path\n";
2341
2342 my $facedata;
2343 0 < aio_load $path, $facedata
2344 or die "$path: $!";
2345
2346 $facedata = Coro::Storable::thaw $facedata;
2347
2348 $facedata->{version} == 2
2349 or cf::cleanup "$path: version mismatch, cannot proceed.";
2350
2351 {
2352 my $faces = $facedata->{faceinfo};
2353
2354 while (my ($face, $info) = each %$faces) {
2355 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2356 cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2357 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2358 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2359 Coro::cede;
2360 }
2361
2362 while (my ($face, $info) = each %$faces) {
2363 next unless $info->{smooth};
2364 my $idx = cf::face::find $face
2365 or next;
2366 if (my $smooth = cf::face::find $info->{smooth}) {
2367 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};
2368 } else {
2369 warn "smooth face '$info->{smooth}' not found for face '$face'";
2370 }
2371 Coro::cede;
2372 }
2373 }
2374
2375 {
2376 my $anims = $facedata->{animinfo};
2377
2378 while (my ($anim, $info) = each %$anims) {
2379 cf::anim::set $anim, $info->{frames}, $info->{facings};
2380 Coro::cede;
2381 }
2382
2383 cf::anim::invalidate_all; # d'oh
2384 }
2385
2386 1
2387}
2388
2389sub load_archetypes {
2390 load_archetype_file sprintf "%s/archetypes", cf::datadir; # remove when stable
2391 load_archetype_file sprintf "%s/archetypes", cf::datadir
2392}
2393
2394sub load_treasures {
2395 load_treasure_file sprintf "%s/treasures", cf::datadir
2396}
2397
2398sub reload_resources {
2399 warn "reloading resource files...\n";
2400
2401 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2402 or die "unable to load regions file\n";
2403 load_facedata
2404 or die "unable to load facedata\n";
2405 load_archetypes
2406 or die "unable to load archetypes\n";
2407 load_treasures
2408 or die "unable to load treasurelists\n";
2409
2410 warn "finished reloading resource files\n";
2411}
2412
2413sub init {
2414 reload_resources;
2415}
2244 2416
2245sub cfg_load { 2417sub cfg_load {
2246 open my $fh, "<:utf8", cf::confdir . "/config" 2418 open my $fh, "<:utf8", cf::confdir . "/config"
2247 or return; 2419 or return;
2248 2420
2271 Event::one_event; 2443 Event::one_event;
2272 })->prio (Coro::PRIO_MAX); 2444 })->prio (Coro::PRIO_MAX);
2273 }; 2445 };
2274 2446
2275 cfg_load; 2447 cfg_load;
2276 db_load; 2448 db_init;
2277 load_extensions; 2449 load_extensions;
2278 2450
2279 $TICK_WATCHER->start; 2451 $TICK_WATCHER->start;
2280 Event::loop; 2452 Event::loop;
2281} 2453}
2285 2457
2286# install some emergency cleanup handlers 2458# install some emergency cleanup handlers
2287BEGIN { 2459BEGIN {
2288 for my $signal (qw(INT HUP TERM)) { 2460 for my $signal (qw(INT HUP TERM)) {
2289 Event->signal ( 2461 Event->signal (
2462 reentrant => 0,
2290 data => WF_AUTOCANCEL, 2463 data => WF_AUTOCANCEL,
2291 signal => $signal, 2464 signal => $signal,
2465 prio => 0,
2292 cb => sub { 2466 cb => sub {
2293 cf::cleanup "SIG$signal"; 2467 cf::cleanup "SIG$signal";
2294 }, 2468 },
2295 ); 2469 );
2296 } 2470 }
2297} 2471}
2318 my $map = $cf::MAP{$path} or next; 2492 my $map = $cf::MAP{$path} or next;
2319 $map->valid or next; 2493 $map->valid or next;
2320 $map->save; 2494 $map->save;
2321 } 2495 }
2322 warn "end emergency map save\n"; 2496 warn "end emergency map save\n";
2497
2498 warn "begin emergency database checkpoint\n";
2499 BDB::db_env_txn_checkpoint $DB_ENV;
2500 warn "end emergency database checkpoint\n";
2323 }; 2501 };
2324 2502
2325 warn "leave emergency perl save\n"; 2503 warn "leave emergency perl save\n";
2504}
2505
2506sub post_cleanup {
2507 my ($make_core) = @_;
2508
2509 warn Carp::longmess "post_cleanup backtrace"
2510 if $make_core;
2326} 2511}
2327 2512
2328sub reload() { 2513sub reload() {
2329 # can/must only be called in main 2514 # can/must only be called in main
2330 if ($Coro::current != $Coro::main) { 2515 if ($Coro::current != $Coro::main) {
2332 return; 2517 return;
2333 } 2518 }
2334 2519
2335 warn "reloading..."; 2520 warn "reloading...";
2336 2521
2337 warn "cancelling server ticker"; 2522 warn "entering sync_job";
2338 $TICK_WATCHER->cancel;
2339 2523
2524 cf::sync_job {
2525 cf::write_runtime; # external watchdog should not bark
2340 cf::emergency_save; 2526 cf::emergency_save;
2527 cf::write_runtime; # external watchdog should not bark
2341 2528
2342 eval { 2529 warn "syncing database to disk";
2530 BDB::db_env_txn_checkpoint $DB_ENV;
2531
2343 # if anything goes wrong in here, we should simply crash as we already saved 2532 # if anything goes wrong in here, we should simply crash as we already saved
2344
2345 warn "syncing database to disk";
2346 cf::db_sync;
2347 2533
2348 warn "cancelling all WF_AUTOCANCEL watchers"; 2534 warn "cancelling all WF_AUTOCANCEL watchers";
2349 for (Event::all_watchers) { 2535 for (Event::all_watchers) {
2350 $_->cancel if $_->data & WF_AUTOCANCEL; 2536 $_->cancel if $_->data & WF_AUTOCANCEL;
2351 } 2537 }
2352 2538
2353 warn "flushing outstanding aio requests"; 2539 warn "flushing outstanding aio requests";
2354 for (;;) { 2540 for (;;) {
2541 BDB::flush;
2355 IO::AIO::flush; 2542 IO::AIO::flush;
2356 Coro::cede; 2543 Coro::cede;
2357 last unless IO::AIO::nreqs; 2544 last unless IO::AIO::nreqs || BDB::nreqs;
2358 warn "iterate..."; 2545 warn "iterate...";
2359 } 2546 }
2547
2548 ++$RELOAD;
2360 2549
2361 warn "cancelling all extension coros"; 2550 warn "cancelling all extension coros";
2362 $_->cancel for values %EXT_CORO; 2551 $_->cancel for values %EXT_CORO;
2363 %EXT_CORO = (); 2552 %EXT_CORO = ();
2364 2553
2417 require cf; 2606 require cf;
2418 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2607 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2419 2608
2420 warn "loading config and database again"; 2609 warn "loading config and database again";
2421 cf::cfg_load; 2610 cf::cfg_load;
2422 cf::db_load;
2423 2611
2424 warn "loading extensions"; 2612 warn "loading extensions";
2425 cf::load_extensions; 2613 cf::load_extensions;
2426 2614
2427 warn "reattaching attachments to objects/players"; 2615 warn "reattaching attachments to objects/players";
2428 _global_reattach; 2616 _global_reattach; # objects, sockets
2429 warn "reattaching attachments to maps"; 2617 warn "reattaching attachments to maps";
2430 reattach $_ for values %MAP; 2618 reattach $_ for values %MAP;
2619 warn "reattaching attachments to players";
2620 reattach $_ for values %PLAYER;
2431 2621
2432 warn "restarting server ticker"; 2622 warn "loading reloadable resources";
2623 reload_resources;
2433 2624
2434 $TICK_WATCHER->start; 2625 warn "leaving sync_job";
2435 };
2436 2626
2437 if ($@) { 2627 1
2628 } or do {
2438 warn $@; 2629 warn $@;
2439 warn "error while reloading, exiting."; 2630 warn "error while reloading, exiting.";
2440 exit 1; 2631 exit 1;
2441 } 2632 };
2442 2633
2443 warn "reloaded"; 2634 warn "reloaded";
2444}; 2635};
2445 2636
2446our $RELOAD_WATCHER; # used only during reload 2637our $RELOAD_WATCHER; # used only during reload
2452 $who->message ("reloading server."); 2643 $who->message ("reloading server.");
2453 2644
2454 # doing reload synchronously and two reloads happen back-to-back, 2645 # doing reload synchronously and two reloads happen back-to-back,
2455 # coro crashes during coro_state_free->destroy here. 2646 # coro crashes during coro_state_free->destroy here.
2456 2647
2457 $RELOAD_WATCHER ||= Event->timer (after => 0, data => WF_AUTOCANCEL, cb => sub { 2648 $RELOAD_WATCHER ||= Event->timer (
2649 reentrant => 0,
2650 after => 0,
2651 data => WF_AUTOCANCEL,
2652 cb => sub {
2458 reload; 2653 reload;
2459 undef $RELOAD_WATCHER; 2654 undef $RELOAD_WATCHER;
2655 },
2460 }); 2656 );
2461 } 2657 }
2462}; 2658};
2463 2659
2464unshift @INC, $LIBDIR; 2660unshift @INC, $LIBDIR;
2465 2661
2466my $bug_warning = 0; 2662my $bug_warning = 0;
2663
2664our @WAIT_FOR_TICK;
2665our @WAIT_FOR_TICK_BEGIN;
2666
2667sub wait_for_tick {
2668 return unless $TICK_WATCHER->is_active;
2669 return if $Coro::current == $Coro::main;
2670
2671 my $signal = new Coro::Signal;
2672 push @WAIT_FOR_TICK, $signal;
2673 $signal->wait;
2674}
2675
2676sub wait_for_tick_begin {
2677 return unless $TICK_WATCHER->is_active;
2678 return if $Coro::current == $Coro::main;
2679
2680 my $signal = new Coro::Signal;
2681 push @WAIT_FOR_TICK_BEGIN, $signal;
2682 $signal->wait;
2683}
2467 2684
2468$TICK_WATCHER = Event->timer ( 2685$TICK_WATCHER = Event->timer (
2469 reentrant => 0, 2686 reentrant => 0,
2470 parked => 1, 2687 parked => 1,
2471 prio => 0, 2688 prio => 0,
2479 } 2696 }
2480 2697
2481 $NOW = Event::time; 2698 $NOW = Event::time;
2482 2699
2483 cf::server_tick; # one server iteration 2700 cf::server_tick; # one server iteration
2701
2484 $RUNTIME += $TICK; 2702 $RUNTIME += $TICK;
2485 $NEXT_TICK += $TICK; 2703 $NEXT_TICK += $TICK;
2486 2704
2487 $WAIT_FOR_TICK->broadcast; 2705 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2488 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2706 $NEXT_RUNTIME_WRITE = $NOW + 10;
2707 Coro::async_pool {
2708 write_runtime
2709 or warn "ERROR: unable to write runtime file: $!";
2710 };
2711 }
2712
2713# my $AFTER = Event::time;
2714# warn $AFTER - $NOW;#d#
2489 2715
2490 # if we are delayed by four ticks or more, skip them all 2716 # if we are delayed by four ticks or more, skip them all
2491 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2717 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2492 2718
2493 $TICK_WATCHER->at ($NEXT_TICK); 2719 $TICK_WATCHER->at ($NEXT_TICK);
2494 $TICK_WATCHER->start; 2720 $TICK_WATCHER->start;
2721
2722 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2723 $sig->send;
2724 }
2725 while (my $sig = shift @WAIT_FOR_TICK) {
2726 $sig->send;
2727 }
2728
2729 _post_tick;
2495 }, 2730 },
2496); 2731);
2497 2732
2733{
2734 BDB::max_poll_time $TICK * 0.1;
2735 $BDB_POLL_WATCHER = Event->io (
2736 reentrant => 0,
2737 fd => BDB::poll_fileno,
2738 poll => 'r',
2739 prio => 0,
2740 data => WF_AUTOCANCEL,
2741 cb => \&BDB::poll_cb,
2742 );
2743 BDB::min_parallel 8;
2744
2745 BDB::set_sync_prepare {
2746 my $status;
2747 my $current = $Coro::current;
2748 (
2749 sub {
2750 $status = $!;
2751 $current->ready; undef $current;
2752 },
2753 sub {
2754 Coro::schedule while defined $current;
2755 $! = $status;
2756 },
2757 )
2758 };
2759
2760 unless ($DB_ENV) {
2761 $DB_ENV = BDB::db_env_create;
2762
2763 cf::sync_job {
2764 eval {
2765 BDB::db_env_open
2766 $DB_ENV,
2767 $BDB_ENV_DIR,
2768 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2769 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2770 0666;
2771
2772 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!;
2773
2774 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2775 $DB_ENV->set_lk_detect;
2776 };
2777
2778 cf::cleanup "db_env_open(db): $@" if $@;
2779 };
2780 }
2781}
2782
2783{
2784 IO::AIO::min_parallel 8;
2785
2786 undef $Coro::AIO::WATCHER;
2498IO::AIO::max_poll_time $TICK * 0.2; 2787 IO::AIO::max_poll_time $TICK * 0.1;
2499
2500$AIO_POLL_WATCHER = Event->io ( 2788 $AIO_POLL_WATCHER = Event->io (
2501 fd => IO::AIO::poll_fileno, 2789 reentrant => 0,
2502 poll => 'r',
2503 prio => 5,
2504 data => WF_AUTOCANCEL,
2505 cb => \&IO::AIO::poll_cb,
2506);
2507
2508$WRITE_RUNTIME_WATCHER = Event->timer (
2509 data => WF_AUTOCANCEL, 2790 data => WF_AUTOCANCEL,
2510 after => 1, 2791 fd => IO::AIO::poll_fileno,
2511 interval => 10, 2792 poll => 'r',
2512 prio => 6, # keep it lowest so it acts like a watchdog 2793 prio => 6,
2513 cb => Coro::unblock_sub { 2794 cb => \&IO::AIO::poll_cb,
2514 write_runtime 2795 );
2515 or warn "ERROR: unable to write runtime file: $!"; 2796}
2516 },
2517);
2518 2797
2519END { cf::emergency_save } 2798END { cf::emergency_save }
2520 2799
25211 28001
2522 2801

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines