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.214 by root, Wed Feb 14 00:40:05 2007 UTC vs.
Revision 1.257 by root, Sat Apr 21 17:34:24 2007 UTC

3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Socket;
8use Storable; 9use Storable;
10use Event;
9use Opcode; 11use Opcode;
10use Safe; 12use Safe;
11use Safe::Hole; 13use Safe::Hole;
12 14
13use Coro 3.5 (); 15use Coro 3.61 ();
16use Coro::State;
17use Coro::Handle;
14use Coro::Event; 18use Coro::Event;
15use Coro::Timer; 19use Coro::Timer;
16use Coro::Signal; 20use Coro::Signal;
17use Coro::Semaphore; 21use Coro::Semaphore;
18use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable;
19 24
20use BDB (); 25use BDB ();
21use Data::Dumper; 26use Data::Dumper;
22use Digest::MD5; 27use Digest::MD5;
23use Fcntl; 28use Fcntl;
29use YAML::Syck ();
24use IO::AIO 2.32 (); 30use IO::AIO 2.32 ();
25use YAML::Syck ();
26use Time::HiRes; 31use Time::HiRes;
27use Compress::LZF; 32use Compress::LZF;
28 33
34# configure various modules to our taste
35#
36$Storable::canonical = 1; # reduce rsync transfers
37Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
29Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 38Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
30 39
31use Event; $Event::Eval = 1; # no idea why this is required, but it is 40$Event::Eval = 1; # no idea why this is required, but it is
32
33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
34 41
35# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 42# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
36$YAML::Syck::ImplicitUnicode = 1; 43$YAML::Syck::ImplicitUnicode = 1;
37 44
38$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 45$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
46
47sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
39 48
40our %COMMAND = (); 49our %COMMAND = ();
41our %COMMAND_TIME = (); 50our %COMMAND_TIME = ();
42 51
43our @EXTS = (); # list of extension package names 52our @EXTS = (); # list of extension package names
44our %EXTCMD = (); 53our %EXTCMD = ();
45our %EXT_CORO = (); # coroutines bound to extensions 54our %EXT_CORO = (); # coroutines bound to extensions
46our %EXT_MAP = (); # pluggable maps 55our %EXT_MAP = (); # pluggable maps
47 56
57our $RELOAD; # number of reloads so far
48our @EVENT; 58our @EVENT;
49our $LIBDIR = datadir . "/ext";
50 59
51our $TICK = MAX_TIME * 1e-6; 60our $CONFDIR = confdir;
61our $DATADIR = datadir;
62our $LIBDIR = "$DATADIR/ext";
63our $PODDIR = "$DATADIR/pod";
64our $MAPDIR = "$DATADIR/" . mapdir;
65our $LOCALDIR = localdir;
66our $TMPDIR = "$LOCALDIR/" . tmpdir;
67our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
68our $PLAYERDIR = "$LOCALDIR/" . playerdir;
69our $RANDOMDIR = "$LOCALDIR/random";
70our $BDBDIR = "$LOCALDIR/db";
71
72our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
52our $TICK_WATCHER; 73our $TICK_WATCHER;
53our $AIO_POLL_WATCHER; 74our $AIO_POLL_WATCHER;
54our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 75our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
55our $NEXT_TICK; 76our $NEXT_TICK;
56our $NOW; 77our $NOW;
65our $RUNTIME; 86our $RUNTIME;
66 87
67our %PLAYER; # all users 88our %PLAYER; # all users
68our %MAP; # all maps 89our %MAP; # all maps
69our $LINK_MAP; # the special {link} map, which is always available 90our $LINK_MAP; # the special {link} map, which is always available
70our $RANDOM_MAPS = cf::localdir . "/random";
71our $BDB_ENV_DIR = cf::localdir . "/db";
72
73our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
74our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
75 91
76# used to convert map paths into valid unix filenames by replacing / by ∕ 92# used to convert map paths into valid unix filenames by replacing / by ∕
77our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
78 94
79binmode STDOUT; 95binmode STDOUT;
80binmode STDERR; 96binmode STDERR;
81 97
82# read virtual server time, if available 98# read virtual server time, if available
83unless ($RUNTIME || !-e cf::localdir . "/runtime") { 99unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
84 open my $fh, "<", cf::localdir . "/runtime" 100 open my $fh, "<", "$LOCALDIR/runtime"
85 or die "unable to read runtime file: $!"; 101 or die "unable to read runtime file: $!";
86 $RUNTIME = <$fh> + 0.; 102 $RUNTIME = <$fh> + 0.;
87} 103}
88 104
89mkdir cf::localdir; 105mkdir $_
90mkdir cf::localdir . "/" . cf::playerdir; 106 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
91mkdir cf::localdir . "/" . cf::tmpdir;
92mkdir cf::localdir . "/" . cf::uniquedir;
93mkdir $RANDOM_MAPS;
94mkdir $BDB_ENV_DIR;
95 107
96our $EMERGENCY_POSITION; 108our $EMERGENCY_POSITION;
97 109
98sub cf::map::normalise; 110sub cf::map::normalise;
99 111
110=item $cf::RUNTIME 122=item $cf::RUNTIME
111 123
112The time this server has run, starts at 0 and is increased by $cf::TICK on 124The time this server has run, starts at 0 and is increased by $cf::TICK on
113every server tick. 125every server tick.
114 126
115=item $cf::LIBDIR 127=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
128$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
129$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
116 130
117The perl library directory, where extensions and cf-specific modules can 131Various directories - "/etc", read-only install directory, perl-library
118be found. It will be added to C<@INC> automatically. 132directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
133unique-items directory, player file directory, random maps directory and
134database environment.
119 135
120=item $cf::NOW 136=item $cf::NOW
121 137
122The time of the last (current) server tick. 138The time of the last (current) server tick.
123 139
128=item %cf::CFG 144=item %cf::CFG
129 145
130Configuration for the server, loaded from C</etc/crossfire/config>, or 146Configuration for the server, loaded from C</etc/crossfire/config>, or
131from wherever your confdir points to. 147from wherever your confdir points to.
132 148
133=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE 149=item cf::wait_for_tick, cf::wait_for_tick_begin
134 150
135These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK) 151These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
136or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick 152returns directly I<after> the tick processing (and consequently, can only wake one process
137processing has been done. Call C<< ->wait >> on them to maximise the 153per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
138window of cpu time available, or simply to synchronise to the server tick.
139 154
140=back 155=back
141 156
142=cut 157=cut
143 158
144BEGIN { 159BEGIN {
145 *CORE::GLOBAL::warn = sub { 160 *CORE::GLOBAL::warn = sub {
146 my $msg = join "", @_; 161 my $msg = join "", @_;
147 utf8::encode $msg;
148 162
149 $msg .= "\n" 163 $msg .= "\n"
150 unless $msg =~ /\n$/; 164 unless $msg =~ /\n$/;
151 165
166 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
167
168 utf8::encode $msg;
152 LOG llevError, $msg; 169 LOG llevError, $msg;
153 }; 170 };
154} 171}
155 172
156@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 173@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
202 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 219 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
203 $d 220 $d
204 } || "[unable to dump $_[0]: '$@']"; 221 } || "[unable to dump $_[0]: '$@']";
205} 222}
206 223
207use JSON::Syck (); # TODO# replace by JSON::PC once working 224use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
208 225
209=item $ref = cf::from_json $json 226=item $ref = cf::from_json $json
210 227
211Converts a JSON string into the corresponding perl data structure. 228Converts a JSON string into the corresponding perl data structure.
212 229
213=cut
214
215sub from_json($) {
216 $JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
217 JSON::Syck::Load $_[0]
218}
219
220=item $json = cf::to_json $ref 230=item $json = cf::to_json $ref
221 231
222Converts a perl data structure into its JSON representation. 232Converts a perl data structure into its JSON representation.
223
224=cut
225
226sub to_json($) {
227 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
228 JSON::Syck::Dump $_[0]
229}
230 233
231=item cf::lock_wait $string 234=item cf::lock_wait $string
232 235
233Wait until the given lock is available. See cf::lock_acquire. 236Wait until the given lock is available. See cf::lock_acquire.
234 237
240returned. 243returned.
241 244
242Lock names should begin with a unique identifier (for example, cf::map::find 245Lock names should begin with a unique identifier (for example, cf::map::find
243uses map_find and cf::map::load uses map_load). 246uses map_find and cf::map::load uses map_load).
244 247
248=item $locked = cf::lock_active $string
249
250Return true if the lock is currently active, i.e. somebody has locked it.
251
245=cut 252=cut
246 253
247our %LOCK; 254our %LOCK;
248 255
249sub lock_wait($) { 256sub lock_wait($) {
266 273
267 Coro::guard { 274 Coro::guard {
268 # wake up all waiters, to be on the safe side 275 # wake up all waiters, to be on the safe side
269 $_->ready for @{ delete $LOCK{$key} }; 276 $_->ready for @{ delete $LOCK{$key} };
270 } 277 }
278}
279
280sub lock_active($) {
281 my ($key) = @_;
282
283 ! ! $LOCK{$key}
271} 284}
272 285
273sub freeze_mainloop { 286sub freeze_mainloop {
274 return unless $TICK_WATCHER->is_active; 287 return unless $TICK_WATCHER->is_active;
275 288
354 367
355 $coro 368 $coro
356} 369}
357 370
358sub write_runtime { 371sub write_runtime {
359 my $runtime = cf::localdir . "/runtime"; 372 my $guard = cf::lock_acquire "write_runtime";
373
374 my $runtime = "$LOCALDIR/runtime";
360 375
361 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 376 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
362 or return; 377 or return;
363 378
364 my $value = $cf::RUNTIME + 90 + 10; 379 my $value = $cf::RUNTIME + 90 + 10;
377 392
378 aio_rename "$runtime~", $runtime 393 aio_rename "$runtime~", $runtime
379 and return; 394 and return;
380 395
381 1 396 1
397}
398
399=item cf::datalog type => key => value, ...
400
401Log a datalog packet of the given type with the given key-value pairs.
402
403=cut
404
405sub datalog($@) {
406 my ($type, %kv) = @_;
407 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
382} 408}
383 409
384=back 410=back
385 411
386=cut 412=cut
785 } 811 }
786 } else { 812 } else {
787 aio_unlink $filename; 813 aio_unlink $filename;
788 aio_unlink "$filename.pst"; 814 aio_unlink "$filename.pst";
789 } 815 }
790
791 #d##TODO# nuke non .map-files if exist
792 if ($filename =~ s/\.map$//) {
793 aio_unlink $filename;
794 aio_unlink "$filename.pst";
795 }
796 } 816 }
797} 817}
798 818
799sub object_freezer_as_string { 819sub object_freezer_as_string {
800 my ($rdata, $objs) = @_; 820 my ($rdata, $objs) = @_;
806 826
807sub object_thawer_load { 827sub object_thawer_load {
808 my ($filename) = @_; 828 my ($filename) = @_;
809 829
810 my ($data, $av); 830 my ($data, $av);
811
812 #d#TODO remove .map if file does not exist
813 aio_stat $filename and $filename =~ s/\.map$//;
814 831
815 (aio_load $filename, $data) >= 0 832 (aio_load $filename, $data) >= 0
816 or return; 833 or return;
817 834
818 unless (aio_stat "$filename.pst") { 835 unless (aio_stat "$filename.pst") {
957Returns the given player object, loading it if necessary (might block). 974Returns the given player object, loading it if necessary (might block).
958 975
959=cut 976=cut
960 977
961sub playerdir($) { 978sub playerdir($) {
962 cf::localdir 979 "$PLAYERDIR/"
963 . "/"
964 . cf::playerdir
965 . "/"
966 . (ref $_[0] ? $_[0]->ob->name : $_[0]) 980 . (ref $_[0] ? $_[0]->ob->name : $_[0])
967} 981}
968 982
969sub path($) { 983sub path($) {
970 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 984 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
971 985
972 (playerdir $login) . "/$login.pl" 986 (playerdir $login) . "/playerdata"
973} 987}
974 988
975sub find_active($) { 989sub find_active($) {
976 $cf::PLAYER{$_[0]} 990 $cf::PLAYER{$_[0]}
977 and $cf::PLAYER{$_[0]}->active 991 and $cf::PLAYER{$_[0]}->active
990 my $login = $_[0]; 1004 my $login = $_[0];
991 1005
992 my $guard = cf::lock_acquire "user_find:$login"; 1006 my $guard = cf::lock_acquire "user_find:$login";
993 1007
994 $cf::PLAYER{$_[0]} || do { 1008 $cf::PLAYER{$_[0]} || do {
1009 # rename old playerfiles to new ones
1010 #TODO: remove when no longer required
1011 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1012 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1013 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1014 aio_unlink +(playerdir $login) . "/$login.pl";
1015
995 my $pl = load_pl path $login 1016 my $pl = load_pl path $login
996 or return; 1017 or return;
997 $cf::PLAYER{$login} = $pl 1018 $cf::PLAYER{$login} = $pl
998 } 1019 }
999 } 1020 }
1036 1057
1037=cut 1058=cut
1038 1059
1039sub quit_character { 1060sub quit_character {
1040 my ($pl) = @_; 1061 my ($pl) = @_;
1062
1063 my $name = $pl->ob->name;
1041 1064
1042 $pl->{deny_save} = 1; 1065 $pl->{deny_save} = 1;
1043 $pl->password ("*"); # this should lock out the player until we nuked the dir 1066 $pl->password ("*"); # this should lock out the player until we nuked the dir
1044 1067
1045 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1068 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1050 my $path = playerdir $pl; 1073 my $path = playerdir $pl;
1051 my $temp = "$path~$cf::RUNTIME~deleting~"; 1074 my $temp = "$path~$cf::RUNTIME~deleting~";
1052 aio_rename $path, $temp; 1075 aio_rename $path, $temp;
1053 delete $cf::PLAYER{$pl->ob->name}; 1076 delete $cf::PLAYER{$pl->ob->name};
1054 $pl->destroy; 1077 $pl->destroy;
1078
1079 my $prefix = qr<^~\Q$name\E/>;
1080
1081 # nuke player maps
1082 $cf::MAP{$_}->nuke for grep /$prefix/, keys %cf::MAP;
1083
1055 IO::AIO::aio_rmtree $temp; 1084 IO::AIO::aio_rmtree $temp;
1085}
1086
1087=item $pl->kick
1088
1089Kicks a player out of the game. This destroys the connection.
1090
1091=cut
1092
1093sub kick {
1094 my ($pl, $kicker) = @_;
1095
1096 $pl->invoke (cf::EVENT_PLAYER_KICK, $kicker);
1097 $pl->killer ("kicked");
1098 $pl->ns->destroy;
1056} 1099}
1057 1100
1058=item cf::player::list_logins 1101=item cf::player::list_logins
1059 1102
1060Returns am arrayref of all valid playernames in the system, can take a 1103Returns am arrayref of all valid playernames in the system, can take a
1061while and may block, so not sync_job-capable, ever. 1104while and may block, so not sync_job-capable, ever.
1062 1105
1063=cut 1106=cut
1064 1107
1065sub list_logins { 1108sub list_logins {
1066 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir 1109 my $dirs = aio_readdir $PLAYERDIR
1067 or return []; 1110 or return [];
1068 1111
1069 my @logins; 1112 my @logins;
1070 1113
1071 for my $login (@$dirs) { 1114 for my $login (@$dirs) {
1106 } 1149 }
1107 1150
1108 \@paths 1151 \@paths
1109} 1152}
1110 1153
1111=item $player->ext_reply ($msgid, $msgtype, %msg) 1154=item $player->ext_reply ($msgid, %msg)
1112 1155
1113Sends an ext reply to the player. 1156Sends an ext reply to the player.
1114 1157
1115=cut 1158=cut
1116 1159
1117sub ext_reply($$$%) { 1160sub ext_reply($$%) {
1118 my ($self, $id, %msg) = @_; 1161 my ($self, $id, %msg) = @_;
1119 1162
1120 $msg{msgid} = $id; 1163 $msg{msgid} = $id;
1121 1164
1122 $self->send ("ext " . cf::to_json \%msg); 1165 $self->send ("ext " . cf::to_json \%msg);
1123} 1166}
1124 1167
1125package cf; 1168=item $player->ext_event ($type, %msg)
1169
1170Sends an ext event to the client.
1171
1172=cut
1173
1174sub ext_event($$%) {
1175 my ($self, $type, %msg) = @_;
1176
1177 $self->ns->ext_event ($type, %msg);
1178}
1179
1180=head3 cf::region
1181
1182=over 4
1183
1184=cut
1185
1186package cf::region;
1187
1188=item cf::region::find_by_path $path
1189
1190Tries to decuce the probable region for a map knowing only its path.
1191
1192=cut
1193
1194sub find_by_path($) {
1195 my ($path) = @_;
1196
1197 my ($match, $specificity);
1198
1199 for my $region (list) {
1200 if ($region->match && $path =~ $region->match) {
1201 ($match, $specificity) = ($region, $region->specificity)
1202 if $region->specificity > $specificity;
1203 }
1204 }
1205
1206 $match
1207}
1126 1208
1127=back 1209=back
1128
1129 1210
1130=head3 cf::map 1211=head3 cf::map
1131 1212
1132=over 4 1213=over 4
1133 1214
1271 1352
1272# the original (read-only) location 1353# the original (read-only) location
1273sub load_path { 1354sub load_path {
1274 my ($self) = @_; 1355 my ($self) = @_;
1275 1356
1276 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path} 1357 "$MAPDIR/$self->{path}.map"
1277} 1358}
1278 1359
1279# the temporary/swap location 1360# the temporary/swap location
1280sub save_path { 1361sub save_path {
1281 my ($self) = @_; 1362 my ($self) = @_;
1282 1363
1283 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1364 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1284 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path 1365 "$TMPDIR/$path.map"
1285} 1366}
1286 1367
1287# the unique path, undef == no special unique path 1368# the unique path, undef == no special unique path
1288sub uniq_path { 1369sub uniq_path {
1289 my ($self) = @_; 1370 my ($self) = @_;
1290 1371
1291 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1372 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1292 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1373 "$UNIQUEDIR/$path"
1293} 1374}
1294 1375
1295# and all this just because we cannot iterate over 1376# and all this just because we cannot iterate over
1296# all maps in C++... 1377# all maps in C++...
1297sub change_all_map_light { 1378sub change_all_map_light {
1305 my ($self) = @_; 1386 my ($self) = @_;
1306 1387
1307 utf8::encode (my $save = $self->save_path); 1388 utf8::encode (my $save = $self->save_path);
1308 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1389 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1309 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst"; 1390 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1310
1311 #d#TODO remove .map and also nuke
1312 $save =~ s/\.map// or return;#d#
1313 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;#d#
1314 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";#d#
1315} 1391}
1316 1392
1317sub load_header_from($) { 1393sub load_header_from($) {
1318 my ($self, $path) = @_; 1394 my ($self, $path) = @_;
1319 1395
1369 $self->load_header_orig 1445 $self->load_header_orig
1370 or return; 1446 or return;
1371 $self->prepare_orig; 1447 $self->prepare_orig;
1372 } 1448 }
1373 1449
1450 $self->default_region (cf::region::find_by_path $self->{path})
1451 unless $self->default_region;
1452
1374 1 1453 1
1375} 1454}
1376 1455
1377sub find; 1456sub find;
1378sub find { 1457sub find {
1411 my ($self) = @_; 1490 my ($self) = @_;
1412 1491
1413 local $self->{deny_reset} = 1; # loading can take a long time 1492 local $self->{deny_reset} = 1; # loading can take a long time
1414 1493
1415 my $path = $self->{path}; 1494 my $path = $self->{path};
1495
1496 {
1416 my $guard = cf::lock_acquire "map_load:$path"; 1497 my $guard = cf::lock_acquire "map_load:$path";
1417 1498
1418 return if $self->in_memory != cf::MAP_SWAPPED; 1499 return if $self->in_memory != cf::MAP_SWAPPED;
1419 1500
1420 $self->in_memory (cf::MAP_LOADING); 1501 $self->in_memory (cf::MAP_LOADING);
1421 1502
1422 $self->alloc; 1503 $self->alloc;
1423 1504
1424 $self->pre_load; 1505 $self->pre_load;
1425
1426 $self->_load_objects ($self->{load_path}, 1)
1427 or return;
1428
1429 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1430 if delete $self->{load_original};
1431
1432 if (my $uniq = $self->uniq_path) {
1433 utf8::encode $uniq;
1434 if (aio_open $uniq, O_RDONLY, 0) {
1435 $self->clear_unique_items;
1436 $self->_load_objects ($uniq, 0);
1437 }
1438 }
1439
1440 Coro::cede;
1441
1442 # now do the right thing for maps
1443 $self->link_multipart_objects;
1444
1445 unless ($self->{deny_activate}) {
1446 $self->decay_objects;
1447 $self->fix_auto_apply;
1448 $self->update_buttons;
1449 Coro::cede; 1506 Coro::cede;
1450 $self->set_darkness_map; 1507
1508 $self->_load_objects ($self->{load_path}, 1)
1509 or return;
1510
1511 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1512 if delete $self->{load_original};
1513
1514 if (my $uniq = $self->uniq_path) {
1515 utf8::encode $uniq;
1516 if (aio_open $uniq, O_RDONLY, 0) {
1517 $self->clear_unique_items;
1518 $self->_load_objects ($uniq, 0);
1519 }
1520 }
1521
1522 Coro::cede;
1523 # now do the right thing for maps
1524 $self->link_multipart_objects;
1451 $self->difficulty ($self->estimate_difficulty) 1525 $self->difficulty ($self->estimate_difficulty)
1452 unless $self->difficulty; 1526 unless $self->difficulty;
1453 Coro::cede; 1527 Coro::cede;
1528
1529 unless ($self->{deny_activate}) {
1530 $self->decay_objects;
1531 $self->fix_auto_apply;
1532 $self->update_buttons;
1533 Coro::cede;
1534 $self->set_darkness_map;
1535 Coro::cede;
1454 $self->activate; 1536 $self->activate;
1537 }
1538
1539 $self->in_memory (cf::MAP_IN_MEMORY);
1455 } 1540 }
1456 1541
1457 $self->post_load; 1542 $self->post_load;
1458
1459 $self->in_memory (cf::MAP_IN_MEMORY);
1460} 1543}
1461 1544
1462sub customise_for { 1545sub customise_for {
1463 my ($self, $ob) = @_; 1546 my ($self, $ob) = @_;
1464 1547
1655instantiated unique items. May block. 1738instantiated unique items. May block.
1656 1739
1657=cut 1740=cut
1658 1741
1659sub unique_maps() { 1742sub unique_maps() {
1660 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 1743 my $files = aio_readdir $UNIQUEDIR
1661 or return; 1744 or return;
1662 1745
1663 my @paths; 1746 my @paths;
1664 1747
1665 for (@$files) { 1748 for (@$files) {
1779} 1862}
1780 1863
1781sub cf::object::player::enter_link { 1864sub cf::object::player::enter_link {
1782 my ($self) = @_; 1865 my ($self) = @_;
1783 1866
1784 $self->deactivate_recursive;
1785
1786 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1867 return if UNIVERSAL::isa $self->map, "ext::map_link";
1787 1868
1788 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1869 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1789 if $self->map; 1870 if $self->map;
1790 1871
1818 $map->load; 1899 $map->load;
1819 $map->load_diag; 1900 $map->load_diag;
1820 1901
1821 return unless $self->contr->active; 1902 return unless $self->contr->active;
1822 $self->activate_recursive; 1903 $self->activate_recursive;
1904
1905 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1823 $self->enter_map ($map, $x, $y); 1906 $self->enter_map ($map, $x, $y);
1824} 1907}
1825 1908
1826cf::player->attach ( 1909cf::player->attach (
1827 on_logout => sub { 1910 on_logout => sub {
1840 # try to abort aborted map switching on player login :) 1923 # try to abort aborted map switching on player login :)
1841 # should happen only on crashes 1924 # should happen only on crashes
1842 if ($pl->ob->{_link_pos}) { 1925 if ($pl->ob->{_link_pos}) {
1843 $pl->ob->enter_link; 1926 $pl->ob->enter_link;
1844 (async { 1927 (async {
1845 # we need this sleep as the login has a concurrent enter_exit running
1846 # and this sleep increases chances of the player not ending up in scorn
1847 $pl->ob->reply (undef, 1928 $pl->ob->reply (undef,
1848 "There was an internal problem at your last logout, " 1929 "There was an internal problem at your last logout, "
1849 . "the server will try to bring you to your intended destination in a second.", 1930 . "the server will try to bring you to your intended destination in a second.",
1850 cf::NDI_RED); 1931 cf::NDI_RED);
1932 # we need this sleep as the login has a concurrent enter_exit running
1933 # and this sleep increases chances of the player not ending up in scorn
1851 Coro::Timer::sleep 1; 1934 Coro::Timer::sleep 1;
1852 $pl->ob->leave_link; 1935 $pl->ob->leave_link;
1853 })->prio (2); 1936 })->prio (2);
1854 } 1937 }
1855 }, 1938 },
1919 2002
1920 $rmp->{random_seed} ||= $exit->random_seed; 2003 $rmp->{random_seed} ||= $exit->random_seed;
1921 2004
1922 my $data = cf::to_json $rmp; 2005 my $data = cf::to_json $rmp;
1923 my $md5 = Digest::MD5::md5_hex $data; 2006 my $md5 = Digest::MD5::md5_hex $data;
1924 my $meta = "$cf::RANDOM_MAPS/$md5.meta"; 2007 my $meta = "$RANDOMDIR/$md5.meta";
1925 2008
1926 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2009 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1927 aio_write $fh, 0, (length $data), $data, 0; 2010 aio_write $fh, 0, (length $data), $data, 0;
1928 undef $fh; 2011 undef $fh;
1929 aio_rename "$meta~", $meta; 2012 aio_rename "$meta~", $meta;
1938 2021
1939 return unless $self->type == cf::PLAYER; 2022 return unless $self->type == cf::PLAYER;
1940 2023
1941 if ($exit->slaying eq "/!") { 2024 if ($exit->slaying eq "/!") {
1942 #TODO: this should de-fi-ni-te-ly not be a sync-job 2025 #TODO: this should de-fi-ni-te-ly not be a sync-job
2026 # the problem is that $exit might not survive long enough
2027 # so it needs to be done right now, right here
1943 cf::sync_job { prepare_random_map $exit }; 2028 cf::sync_job { prepare_random_map $exit };
1944 } 2029 }
1945 2030
1946 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2031 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1947 my $hp = $exit->stats->hp; 2032 my $hp = $exit->stats->hp;
1955 $self->goto ($slaying, $hp, $sp); 2040 $self->goto ($slaying, $hp, $sp);
1956 2041
1957 1; 2042 1;
1958 }) { 2043 }) {
1959 $self->message ("Something went wrong deep within the crossfire server. " 2044 $self->message ("Something went wrong deep within the crossfire server. "
1960 . "I'll try to bring you back to the map you were before. " 2045 . "I'll try to bring you back to the map you were before. "
1961 . "Please report this to the dungeon master!", 2046 . "Please report this to the dungeon master!",
1962 cf::NDI_UNIQUE | cf::NDI_RED); 2047 cf::NDI_UNIQUE | cf::NDI_RED);
1963 2048
1964 warn "ERROR in enter_exit: $@"; 2049 warn "ERROR in enter_exit: $@";
1965 $self->leave_link; 2050 $self->leave_link;
1966 } 2051 }
1967 })->prio (1); 2052 })->prio (1);
1980 2065
1981sub cf::client::send_drawinfo { 2066sub cf::client::send_drawinfo {
1982 my ($self, $text, $flags) = @_; 2067 my ($self, $text, $flags) = @_;
1983 2068
1984 utf8::encode $text; 2069 utf8::encode $text;
1985 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text); 2070 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1986} 2071}
1987 2072
2073=item $client->ext_event ($type, %msg)
2074
2075Sends an exti event to the client.
2076
2077=cut
2078
2079sub cf::client::ext_event($$%) {
2080 my ($self, $type, %msg) = @_;
2081
2082 $msg{msgtype} = "event_$type";
2083 $self->send_packet ("ext " . cf::to_json \%msg);
2084}
1988 2085
1989=item $success = $client->query ($flags, "text", \&cb) 2086=item $success = $client->query ($flags, "text", \&cb)
1990 2087
1991Queues a query to the client, calling the given callback with 2088Queues a query to the client, calling the given callback with
1992the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2089the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2089 2186
2090# here we export the classes and methods available to script code 2187# here we export the classes and methods available to script code
2091 2188
2092=pod 2189=pod
2093 2190
2094The following fucntions and emthods are available within a safe environment: 2191The following functions and methods are available within a safe environment:
2095 2192
2096 cf::object contr pay_amount pay_player map 2193 cf::object contr pay_amount pay_player map
2097 cf::object::player player 2194 cf::object::player player
2098 cf::player peaceful 2195 cf::player peaceful
2099 cf::map trigger 2196 cf::map trigger
2184############################################################################# 2281#############################################################################
2185 2282
2186=head2 EXTENSION DATABASE SUPPORT 2283=head2 EXTENSION DATABASE SUPPORT
2187 2284
2188Crossfire maintains a very simple database for extension use. It can 2285Crossfire maintains a very simple database for extension use. It can
2189currently store anything that can be serialised using Storable, which 2286currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2190excludes objects. 2287convert to/from binary).
2191 2288
2192The parameter C<$family> should best start with the name of the extension 2289The parameter C<$family> should best start with the name of the extension
2193using it, it should be unique. 2290using it, it should be unique.
2194 2291
2195=over 4 2292=over 4
2218 BDB::CREATE | BDB::AUTO_COMMIT, 0666; 2315 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2219 cf::cleanup "db_open(db): $!" if $!; 2316 cf::cleanup "db_open(db): $!" if $!;
2220 }; 2317 };
2221 cf::cleanup "db_open(db): $@" if $@; 2318 cf::cleanup "db_open(db): $@" if $@;
2222 }; 2319 };
2223
2224 my $path = cf::localdir . "/database.pst";
2225 if (stat $path) {
2226 cf::sync_job {
2227 my $pst = Storable::retrieve $path;
2228
2229 cf::db_put (board => data => $pst->{board});
2230 cf::db_put (guildrules => data => $pst->{guildrules});
2231 cf::db_put (rent => balance => $pst->{rent}{balance});
2232 BDB::db_env_txn_checkpoint $DB_ENV;
2233
2234 unlink $path;
2235 };
2236 }
2237 } 2320 }
2238} 2321}
2239 2322
2240sub db_get($$) { 2323sub db_get($$) {
2241 my $key = "$_[0]/$_[1]"; 2324 my $key = "$_[0]/$_[1]";
2242 2325
2243 cf::sync_job { 2326 cf::sync_job {
2244 BDB::db_get $DB, undef, $key, my $data; 2327 BDB::db_get $DB, undef, $key, my $data;
2245 2328
2246 $! ? () 2329 $! ? ()
2247 : Compress::LZF::sthaw $data 2330 : $data
2248 } 2331 }
2249} 2332}
2250 2333
2251sub db_put($$$) { 2334sub db_put($$$) {
2252 BDB::dbreq_pri 4; 2335 BDB::dbreq_pri 4;
2253 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { }; 2336 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2254} 2337}
2338
2339=item cf::cache $id => [$paths...], $processversion => $process
2340
2341Generic caching function that returns the value of the resource $id,
2342caching and regenerating as required.
2343
2344This function can block.
2345
2346=cut
2347
2348sub cache {
2349 my ($id, $src, $processversion, $process) = @_;
2350
2351 my $meta =
2352 join "\x00",
2353 $processversion,
2354 map {
2355 aio_stat $_
2356 and Carp::croak "$_: $!";
2357
2358 ($_, (stat _)[7,9])
2359 } @$src;
2360
2361 my $dbmeta = db_get cache => "$id/meta";
2362 if ($dbmeta ne $meta) {
2363 # changed, we may need to process
2364
2365 my @data;
2366 my $md5;
2367
2368 for (0 .. $#$src) {
2369 0 <= aio_load $src->[$_], $data[$_]
2370 or Carp::croak "$src->[$_]: $!";
2371 }
2372
2373 # if processing is expensive, check
2374 # checksum first
2375 if (1) {
2376 $md5 =
2377 join "\x00",
2378 $processversion,
2379 map {
2380 Coro::cede;
2381 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2382 } 0.. $#$src;
2383
2384
2385 my $dbmd5 = db_get cache => "$id/md5";
2386 if ($dbmd5 eq $md5) {
2387 db_put cache => "$id/meta", $meta;
2388
2389 return db_get cache => "$id/data";
2390 }
2391 }
2392
2393 my $t1 = Time::HiRes::time;
2394 my $data = $process->(\@data);
2395 my $t2 = Time::HiRes::time;
2396
2397 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2398
2399 db_put cache => "$id/data", $data;
2400 db_put cache => "$id/md5" , $md5;
2401 db_put cache => "$id/meta", $meta;
2402
2403 return $data;
2404 }
2405
2406 db_get cache => "$id/data"
2407}
2408
2409=item fork_call { }, $args
2410
2411Executes the given code block with the given arguments in a seperate
2412process, returning the results. Everything must be serialisable with
2413Coro::Storable. May, of course, block. Note that the executed sub may
2414never block itself or use any form of Event handling.
2415
2416=cut
2417
2418sub fork_call(&@) {
2419 my ($cb, @args) = @_;
2420
2421# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2422# or die "socketpair: $!";
2423 pipe my $fh1, my $fh2
2424 or die "pipe: $!";
2425
2426 if (my $pid = fork) {
2427 close $fh2;
2428
2429 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2430 $res = Coro::Storable::thaw $res;
2431
2432 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2433
2434 die $$res unless "ARRAY" eq ref $res;
2435
2436 return wantarray ? @$res : $res->[-1];
2437 } else {
2438 local $SIG{__WARN__};
2439 eval {
2440 local $SIG{__DIE__};
2441 close $fh1;
2442
2443 my @res = eval { $cb->(@args) };
2444 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2445 };
2446
2447 warn $@ if $@;
2448 _exit 0;
2449 }
2450}
2451
2452
2255 2453
2256############################################################################# 2454#############################################################################
2257# the server's init and main functions 2455# the server's init and main functions
2258 2456
2259sub load_resources { 2457sub load_facedata($) {
2260 load_regions sprintf "%s/%s/regions", cf::datadir, cf::mapdir 2458 my ($path) = @_;
2459
2460 warn "loading facedata from $path\n";
2461
2462 my $facedata;
2463 0 < aio_load $path, $facedata
2464 or die "$path: $!";
2465
2466 $facedata = Coro::Storable::thaw $facedata;
2467
2468 $facedata->{version} == 2
2469 or cf::cleanup "$path: version mismatch, cannot proceed.";
2470
2471 {
2472 my $faces = $facedata->{faceinfo};
2473
2474 while (my ($face, $info) = each %$faces) {
2475 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2476 cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2477 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2478 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2479 Coro::cede;
2480 }
2481
2482 while (my ($face, $info) = each %$faces) {
2483 next unless $info->{smooth};
2484 my $idx = cf::face::find $face
2485 or next;
2486 if (my $smooth = cf::face::find $info->{smooth}) {
2487 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};
2488 } else {
2489 warn "smooth face '$info->{smooth}' not found for face '$face'";
2490 }
2491 Coro::cede;
2492 }
2493 }
2494
2495 {
2496 my $anims = $facedata->{animinfo};
2497
2498 while (my ($anim, $info) = each %$anims) {
2499 cf::anim::set $anim, $info->{frames}, $info->{facings};
2500 Coro::cede;
2501 }
2502
2503 cf::anim::invalidate_all; # d'oh
2504 }
2505
2506 1
2507}
2508
2509sub reload_regions {
2510 load_resource_file "$MAPDIR/regions"
2261 or die "unable to load regions file\n";#d# 2511 or die "unable to load regions file\n";
2512}
2513
2514sub reload_facedata {
2515 load_facedata "$DATADIR/facedata"
2516 or die "unable to load facedata\n";
2517}
2518
2519sub reload_archetypes {
2520 load_resource_file "$DATADIR/archetypes"
2521 or die "unable to load archetypes\n";
2522}
2523
2524sub reload_treasures {
2525 load_resource_file "$DATADIR/treasures"
2526 or die "unable to load treasurelists\n";
2527}
2528
2529sub reload_resources {
2530 warn "reloading resource files...\n";
2531
2532 reload_regions;
2533 reload_facedata;
2534 reload_archetypes;
2535 reload_treasures;
2536
2537 warn "finished reloading resource files\n";
2538}
2539
2540sub init {
2541 reload_resources;
2262} 2542}
2263 2543
2264sub cfg_load { 2544sub cfg_load {
2265 open my $fh, "<:utf8", cf::confdir . "/config" 2545 open my $fh, "<:utf8", "$CONFDIR/config"
2266 or return; 2546 or return;
2267 2547
2268 local $/; 2548 local $/;
2269 *CFG = YAML::Syck::Load <$fh>; 2549 *CFG = YAML::Syck::Load <$fh>;
2270 2550
2278 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 2558 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2279 and die "WARNING: m(un)lockall failed: $!\n"; 2559 and die "WARNING: m(un)lockall failed: $!\n";
2280 }; 2560 };
2281 warn $@ if $@; 2561 warn $@ if $@;
2282 } 2562 }
2283}
2284
2285sub init {
2286 load_resources;
2287} 2563}
2288 2564
2289sub main { 2565sub main {
2290 # we must not ever block the main coroutine 2566 # we must not ever block the main coroutine
2291 local $Coro::idle = sub { 2567 local $Coro::idle = sub {
2359 2635
2360 warn Carp::longmess "post_cleanup backtrace" 2636 warn Carp::longmess "post_cleanup backtrace"
2361 if $make_core; 2637 if $make_core;
2362} 2638}
2363 2639
2364sub reload() { 2640sub do_reload_perl() {
2365 # can/must only be called in main 2641 # can/must only be called in main
2366 if ($Coro::current != $Coro::main) { 2642 if ($Coro::current != $Coro::main) {
2367 warn "can only reload from main coroutine"; 2643 warn "can only reload from main coroutine";
2368 return; 2644 return;
2369 } 2645 }
2394 Coro::cede; 2670 Coro::cede;
2395 last unless IO::AIO::nreqs || BDB::nreqs; 2671 last unless IO::AIO::nreqs || BDB::nreqs;
2396 warn "iterate..."; 2672 warn "iterate...";
2397 } 2673 }
2398 2674
2675 ++$RELOAD;
2676
2399 warn "cancelling all extension coros"; 2677 warn "cancelling all extension coros";
2400 $_->cancel for values %EXT_CORO; 2678 $_->cancel for values %EXT_CORO;
2401 %EXT_CORO = (); 2679 %EXT_CORO = ();
2402 2680
2403 warn "removing commands"; 2681 warn "removing commands";
2442 Symbol::delete_package "safe::$_" 2720 Symbol::delete_package "safe::$_"
2443 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2721 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2444 2722
2445 warn "unloading cf.pm \"a bit\""; 2723 warn "unloading cf.pm \"a bit\"";
2446 delete $INC{"cf.pm"}; 2724 delete $INC{"cf.pm"};
2725 delete $INC{"cf/pod.pm"};
2447 2726
2448 # don't, removes xs symbols, too, 2727 # don't, removes xs symbols, too,
2449 # and global variables created in xs 2728 # and global variables created in xs
2450 #Symbol::delete_package __PACKAGE__; 2729 #Symbol::delete_package __PACKAGE__;
2451 2730
2460 2739
2461 warn "loading extensions"; 2740 warn "loading extensions";
2462 cf::load_extensions; 2741 cf::load_extensions;
2463 2742
2464 warn "reattaching attachments to objects/players"; 2743 warn "reattaching attachments to objects/players";
2465 _global_reattach; 2744 _global_reattach; # objects, sockets
2466 warn "reattaching attachments to maps"; 2745 warn "reattaching attachments to maps";
2467 reattach $_ for values %MAP; 2746 reattach $_ for values %MAP;
2468 2747 warn "reattaching attachments to players";
2469 warn "loading reloadable resources"; 2748 reattach $_ for values %PLAYER;
2470 load_resources;
2471 2749
2472 warn "leaving sync_job"; 2750 warn "leaving sync_job";
2473 2751
2474 1 2752 1
2475 } or do { 2753 } or do {
2481 warn "reloaded"; 2759 warn "reloaded";
2482}; 2760};
2483 2761
2484our $RELOAD_WATCHER; # used only during reload 2762our $RELOAD_WATCHER; # used only during reload
2485 2763
2764sub reload_perl() {
2765 # doing reload synchronously and two reloads happen back-to-back,
2766 # coro crashes during coro_state_free->destroy here.
2767
2768 $RELOAD_WATCHER ||= Event->timer (
2769 reentrant => 0,
2770 after => 0,
2771 data => WF_AUTOCANCEL,
2772 cb => sub {
2773 do_reload_perl;
2774 undef $RELOAD_WATCHER;
2775 },
2776 );
2777}
2778
2486register_command "reload" => sub { 2779register_command "reload" => sub {
2487 my ($who, $arg) = @_; 2780 my ($who, $arg) = @_;
2488 2781
2489 if ($who->flag (FLAG_WIZ)) { 2782 if ($who->flag (FLAG_WIZ)) {
2490 $who->message ("reloading server."); 2783 $who->message ("reloading server.");
2491 2784 async { reload_perl };
2492 # doing reload synchronously and two reloads happen back-to-back,
2493 # coro crashes during coro_state_free->destroy here.
2494
2495 $RELOAD_WATCHER ||= Event->timer (
2496 reentrant => 0,
2497 after => 0,
2498 data => WF_AUTOCANCEL,
2499 cb => sub {
2500 reload;
2501 undef $RELOAD_WATCHER;
2502 },
2503 );
2504 } 2785 }
2505}; 2786};
2506 2787
2507unshift @INC, $LIBDIR; 2788unshift @INC, $LIBDIR;
2508 2789
2509my $bug_warning = 0; 2790my $bug_warning = 0;
2791
2792our @WAIT_FOR_TICK;
2793our @WAIT_FOR_TICK_BEGIN;
2794
2795sub wait_for_tick {
2796 return unless $TICK_WATCHER->is_active;
2797 return if $Coro::current == $Coro::main;
2798
2799 my $signal = new Coro::Signal;
2800 push @WAIT_FOR_TICK, $signal;
2801 $signal->wait;
2802}
2803
2804sub wait_for_tick_begin {
2805 return unless $TICK_WATCHER->is_active;
2806 return if $Coro::current == $Coro::main;
2807
2808 my $signal = new Coro::Signal;
2809 push @WAIT_FOR_TICK_BEGIN, $signal;
2810 $signal->wait;
2811}
2510 2812
2511$TICK_WATCHER = Event->timer ( 2813$TICK_WATCHER = Event->timer (
2512 reentrant => 0, 2814 reentrant => 0,
2513 parked => 1, 2815 parked => 1,
2514 prio => 0, 2816 prio => 0,
2522 } 2824 }
2523 2825
2524 $NOW = Event::time; 2826 $NOW = Event::time;
2525 2827
2526 cf::server_tick; # one server iteration 2828 cf::server_tick; # one server iteration
2829
2527 $RUNTIME += $TICK; 2830 $RUNTIME += $TICK;
2528 $NEXT_TICK += $TICK; 2831 $NEXT_TICK += $TICK;
2529 2832
2530 if ($NOW >= $NEXT_RUNTIME_WRITE) { 2833 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2531 $NEXT_RUNTIME_WRITE = $NOW + 10; 2834 $NEXT_RUNTIME_WRITE = $NOW + 10;
2533 write_runtime 2836 write_runtime
2534 or warn "ERROR: unable to write runtime file: $!"; 2837 or warn "ERROR: unable to write runtime file: $!";
2535 }; 2838 };
2536 } 2839 }
2537 2840
2538
2539 $WAIT_FOR_TICK->broadcast;
2540 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2541
2542# my $AFTER = Event::time; 2841# my $AFTER = Event::time;
2543# warn $AFTER - $NOW;#d# 2842# warn $AFTER - $NOW;#d#
2544 2843
2545 # if we are delayed by four ticks or more, skip them all 2844 # if we are delayed by four ticks or more, skip them all
2546 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2845 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2547 2846
2548 $TICK_WATCHER->at ($NEXT_TICK); 2847 $TICK_WATCHER->at ($NEXT_TICK);
2549 $TICK_WATCHER->start; 2848 $TICK_WATCHER->start;
2849
2850 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2851 $sig->send;
2852 }
2853 while (my $sig = shift @WAIT_FOR_TICK) {
2854 $sig->send;
2855 }
2856
2857 _post_tick;
2550 }, 2858 },
2551); 2859);
2552 2860
2553{ 2861{
2554 BDB::max_poll_time $TICK * 0.1; 2862 BDB::max_poll_time $TICK * 0.1;
2582 2890
2583 cf::sync_job { 2891 cf::sync_job {
2584 eval { 2892 eval {
2585 BDB::db_env_open 2893 BDB::db_env_open
2586 $DB_ENV, 2894 $DB_ENV,
2587 $BDB_ENV_DIR, 2895 $BDBDIR,
2588 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 2896 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2589 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 2897 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2590 0666; 2898 0666;
2591 2899
2592 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!; 2900 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2593 2901
2594 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1); 2902 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2595 $DB_ENV->set_lk_detect; 2903 $DB_ENV->set_lk_detect;
2596 }; 2904 };
2597 2905
2613 prio => 6, 2921 prio => 6,
2614 cb => \&IO::AIO::poll_cb, 2922 cb => \&IO::AIO::poll_cb,
2615 ); 2923 );
2616} 2924}
2617 2925
2926# load additional modules
2927use cf::pod;
2928
2618END { cf::emergency_save } 2929END { cf::emergency_save }
2619 2930
26201 29311
2621 2932

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines