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.110 by root, Mon Jan 1 11:21:55 2007 UTC vs.
Revision 1.134 by root, Thu Jan 4 17:28:49 2007 UTC

… …
8use Storable; 8use Storable;
9use Opcode; 9use Opcode;
10use Safe; 10use Safe;
11use Safe::Hole; 11use Safe::Hole;
12 12
13use Coro 3.3; 13use Coro 3.3 ();
14use Coro::Event; 14use Coro::Event;
15use Coro::Timer; 15use Coro::Timer;
16use Coro::Signal; 16use Coro::Signal;
17use Coro::Semaphore; 17use Coro::Semaphore;
18use Coro::AIO; 18use Coro::AIO;
… …
49our $UPTIME; $UPTIME ||= time; 49our $UPTIME; $UPTIME ||= time;
50our $RUNTIME; 50our $RUNTIME;
51 51
52our %MAP; # all maps 52our %MAP; # all maps
53our $LINK_MAP; # the special {link} map 53our $LINK_MAP; # the special {link} map
54our $FREEZE;
55our $RANDOM_MAPS = cf::localdir . "/random"; 54our $RANDOM_MAPS = cf::localdir . "/random";
56our %EXT_CORO; 55our %EXT_CORO;
57 56
58binmode STDOUT; 57binmode STDOUT;
59binmode STDERR; 58binmode STDERR;
… …
71mkdir cf::localdir . "/" . cf::uniquedir; 70mkdir cf::localdir . "/" . cf::uniquedir;
72mkdir $RANDOM_MAPS; 71mkdir $RANDOM_MAPS;
73 72
74# a special map that is always available 73# a special map that is always available
75our $LINK_MAP; 74our $LINK_MAP;
76 75our $EMERGENCY_POSITION;
77our $EMERGENCY_POSITION = $cf::CFG{emergency_position} || ["/world/world_105_115", 5, 37];
78 76
79############################################################################# 77#############################################################################
80 78
81=head2 GLOBAL VARIABLES 79=head2 GLOBAL VARIABLES
82 80
… …
181sub to_json($) { 179sub to_json($) {
182 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs 180 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
183 JSON::Syck::Dump $_[0] 181 JSON::Syck::Dump $_[0]
184} 182}
185 183
184=item my $guard = cf::guard { BLOCK }
185
186Run the given callback when the guard object gets destroyed (useful for
187coroutine cancellations).
188
189You can call C<< ->cancel >> on the guard object to stop the block from
190being executed.
191
192=cut
193
194sub guard(&) {
195 bless \(my $cb = $_[0]), cf::guard::;
196}
197
198sub cf::guard::cancel {
199 ${$_[0]} = sub { };
200}
201
202sub cf::guard::DESTROY {
203 ${$_[0]}->();
204}
205
206=item cf::lock_wait $string
207
208Wait until the given lock is available. See cf::lock_acquire.
209
210=item my $lock = cf::lock_acquire $string
211
212Wait until the given lock is available and then acquires it and returns
213a guard object. If the guard object gets destroyed (goes out of scope,
214for example when the coroutine gets canceled), the lock is automatically
215returned.
216
217Lock names should begin with a unique identifier (for example, cf::map::find
218uses map_find and cf::map::load uses map_load).
219
220=cut
221
222our %LOCK;
223
224sub lock_wait($) {
225 my ($key) = @_;
226
227 # wait for lock, if any
228 while ($LOCK{$key}) {
229 push @{ $LOCK{$key} }, $Coro::current;
230 Coro::schedule;
231 }
232}
233
234sub lock_acquire($) {
235 my ($key) = @_;
236
237 # wait, to be sure we are not locked
238 lock_wait $key;
239
240 $LOCK{$key} = [];
241
242 cf::guard {
243 # wake up all waiters, to be on the safe side
244 $_->ready for @{ delete $LOCK{$key} };
245 }
246}
247
248=item cf::async { BLOCK }
249
250Like C<Coro::async>, but runs the given BLOCK in an eval and only logs the
251error instead of exiting the server in case of a problem.
252
253=cut
254
255sub async(&) {
256 my ($cb) = @_;
257
258 Coro::async {
259 eval { $cb->() };
260 warn $@ if $@;
261 }
262}
263
264sub freeze_mainloop {
265 return unless $TICK_WATCHER->is_active;
266
267 my $guard = guard { $TICK_WATCHER->start };
268 $TICK_WATCHER->stop;
269 $guard
270}
271
186=item cf::sync_job { BLOCK } 272=item cf::sync_job { BLOCK }
187 273
188The design of crossfire+ requires that the main coro ($Coro::main) is 274The design of crossfire+ requires that the main coro ($Coro::main) is
189always able to handle events or runnable, as crossfire+ is only partly 275always able to handle events or runnable, as crossfire+ is only partly
190reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. 276reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable.
… …
197=cut 283=cut
198 284
199sub sync_job(&) { 285sub sync_job(&) {
200 my ($job) = @_; 286 my ($job) = @_;
201 287
202 my $busy = 1;
203 my @res;
204
205 my $coro = Coro::async {
206 @res = eval { $job->() };
207 warn $@ if $@;
208 undef $busy;
209 };
210
211 if ($Coro::current == $Coro::main) { 288 if ($Coro::current == $Coro::main) {
289 # this is the main coro, too bad, we have to block
290 # till the operation succeeds, freezing the server :/
291
212 # TODO: use suspend/resume instead 292 # TODO: use suspend/resume instead
213 local $FREEZE = 1; 293 # (but this is cancel-safe)
294 my $freeze_guard = freeze_mainloop;
295
296 my $busy = 1;
297 my @res;
298
299 (Coro::async {
300 @res = eval { $job->() };
301 warn $@ if $@;
302 undef $busy;
214 $coro->prio (Coro::PRIO_MAX); 303 })->prio (Coro::PRIO_MAX);
304
215 while ($busy) { 305 while ($busy) {
216 Coro::cede_notself; 306 Coro::cede_notself;
217 Event::one_event unless Coro::nready; 307 Event::one_event unless Coro::nready;
218 } 308 }
309
310 wantarray ? @res : $res[0]
219 } else { 311 } else {
220 $coro->join; 312 # we are in another coroutine, how wonderful, everything just works
313
314 $job->()
221 } 315 }
222
223 wantarray ? @res : $res[0]
224} 316}
225 317
226=item $coro = cf::coro { BLOCK } 318=item $coro = cf::coro { BLOCK }
227 319
228Creates and returns a new coro. This coro is automcatially being canceled 320Creates and returns a new coro. This coro is automcatially being canceled
… …
231=cut 323=cut
232 324
233sub coro(&) { 325sub coro(&) {
234 my $cb = shift; 326 my $cb = shift;
235 327
236 my $coro; $coro = async { 328 my $coro = &cf::async ($cb);
237 eval {
238 $cb->();
239 };
240 warn $@ if $@;
241 };
242 329
243 $coro->on_destroy (sub { 330 $coro->on_destroy (sub {
244 delete $EXT_CORO{$coro+0}; 331 delete $EXT_CORO{$coro+0};
245 }); 332 });
246 $EXT_CORO{$coro+0} = $coro; 333 $EXT_CORO{$coro+0} = $coro;
… …
252 my $runtime = cf::localdir . "/runtime"; 339 my $runtime = cf::localdir . "/runtime";
253 340
254 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 341 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
255 or return; 342 or return;
256 343
257 my $value = $cf::RUNTIME; 344 my $value = $cf::RUNTIME + 1 + 10; # 10 is the runtime save interval, for a monotonic clock
258 (aio_write $fh, 0, (length $value), $value, 0) <= 0 345 (aio_write $fh, 0, (length $value), $value, 0) <= 0
259 and return; 346 and return;
260 347
261 aio_fsync $fh 348 aio_fsync $fh
262 and return; 349 and return;
… …
283 370
284 $path = $path->as_string if ref $path; 371 $path = $path->as_string if ref $path;
285 372
286 my $self = bless { }, $class; 373 my $self = bless { }, $class;
287 374
375 # {... are special paths that are not touched
376 # ?xxx/... are special absolute paths
377 # ?random/... random maps
378 # /! non-realised random map exit
379 # /... normal maps
380 # ~/... per-player maps without a specific player (DO NOT USE)
381 # ~user/... per-player map of a specific user
382
383 if ($path =~ /^{/) {
384 # fine as it is
288 if ($path =~ s{^\?random/}{}) { 385 } elsif ($path =~ s{^\?random/}{}) {
289 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data; 386 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;
290 $self->{random} = cf::from_json $data; 387 $self->{random} = cf::from_json $data;
291 } else { 388 } else {
292 if ($path =~ s{^~([^/]+)?}{}) { 389 if ($path =~ s{^~([^/]+)?}{}) {
293 $self->{user_rel} = 1; 390 $self->{user_rel} = 1;
… …
798 or return; 895 or return;
799 896
800 unless (aio_stat "$filename.pst") { 897 unless (aio_stat "$filename.pst") {
801 (aio_load "$filename.pst", $av) >= 0 898 (aio_load "$filename.pst", $av) >= 0
802 or return; 899 or return;
803 $av = eval { (Storable::thaw <$av>)->{objs} }; 900 $av = eval { (Storable::thaw $av)->{objs} };
804 } 901 }
805 902
903 warn sprintf "loading %s (%d)\n",
904 $filename, length $data, scalar @{$av || []};#d#
806 return ($data, $av); 905 return ($data, $av);
807} 906}
808 907
809############################################################################# 908#############################################################################
810# command handling &c 909# command handling &c
… …
1044package cf::map; 1143package cf::map;
1045 1144
1046use Fcntl; 1145use Fcntl;
1047use Coro::AIO; 1146use Coro::AIO;
1048 1147
1049our $MAX_RESET = 7200; 1148our $MAX_RESET = 3600;
1050our $DEFAULT_RESET = 3600; 1149our $DEFAULT_RESET = 3000;
1051$MAX_RESET = 10;#d#
1052$DEFAULT_RESET = 10;#d#
1053 1150
1054sub generate_random_map { 1151sub generate_random_map {
1055 my ($path, $rmp) = @_; 1152 my ($path, $rmp) = @_;
1056 1153
1057 # mit "rum" bekleckern, nicht 1154 # mit "rum" bekleckern, nicht
… …
1073# and all this just because we cannot iterate over 1170# and all this just because we cannot iterate over
1074# all maps in C++... 1171# all maps in C++...
1075sub change_all_map_light { 1172sub change_all_map_light {
1076 my ($change) = @_; 1173 my ($change) = @_;
1077 1174
1078 $_->change_map_light ($change) for values %cf::MAP; 1175 $_->change_map_light ($change)
1176 for grep $_->outdoor, values %cf::MAP;
1079} 1177}
1080 1178
1081sub try_load_header($) { 1179sub try_load_header($) {
1082 my ($path) = @_; 1180 my ($path) = @_;
1083 1181
… …
1090 1188
1091 $map->load_header ($path) 1189 $map->load_header ($path)
1092 or return; 1190 or return;
1093 1191
1094 $map->{load_path} = $path; 1192 $map->{load_path} = $path;
1095 use Data::Dumper; warn Dumper $map;#d#
1096 1193
1097 $map 1194 $map
1098} 1195}
1099 1196
1197sub find;
1100sub find_map { 1198sub find {
1101 my ($path, $origin) = @_; 1199 my ($path, $origin) = @_;
1102 1200
1103 #warn "find_map<$path,$origin>\n";#d# 1201 #warn "find<$path,$origin>\n";#d#
1104 1202
1105 $path = ref $path ? $path : new cf::path $path, $origin && $origin->path; 1203 $path = new cf::path $path, $origin && $origin->path;
1106 my $key = $path->as_string; 1204 my $key = $path->as_string;
1107 1205
1206 cf::lock_wait "map_find:$key";
1207
1108 $cf::MAP{$key} || do { 1208 $cf::MAP{$key} || do {
1209 my $guard = cf::lock_acquire "map_find:$key";
1210
1109 # do it the slow way 1211 # do it the slow way
1110 my $map = try_load_header $path->save_path; 1212 my $map = try_load_header $path->save_path;
1111 1213
1214 Coro::cede;
1215
1112 if ($map) { 1216 if ($map) {
1217 $map->last_access ((delete $map->{last_access})
1218 || $cf::RUNTIME); #d#
1113 # safety 1219 # safety
1114 $map->{instantiate_time} = $cf::RUNTIME 1220 $map->{instantiate_time} = $cf::RUNTIME
1115 if $map->{instantiate_time} > $cf::RUNTIME; 1221 if $map->{instantiate_time} > $cf::RUNTIME;
1116 } else { 1222 } else {
1117 if (my $rmp = $path->random_map_params) { 1223 if (my $rmp = $path->random_map_params) {
… …
1120 $map = try_load_header $path->load_path; 1226 $map = try_load_header $path->load_path;
1121 } 1227 }
1122 1228
1123 $map or return; 1229 $map or return;
1124 1230
1231 $map->{load_original} = 1;
1125 $map->{instantiate_time} = $cf::RUNTIME; 1232 $map->{instantiate_time} = $cf::RUNTIME;
1233 $map->last_access ($cf::RUNTIME);
1126 $map->instantiate; 1234 $map->instantiate;
1127 1235
1128 # per-player maps become, after loading, normal maps 1236 # per-player maps become, after loading, normal maps
1129 $map->per_player (0) if $path->{user_rel}; 1237 $map->per_player (0) if $path->{user_rel};
1130 } 1238 }
1131 1239
1132 $map->path ($key); 1240 $map->path ($key);
1133 $map->{path} = $path; 1241 $map->{path} = $path;
1134 $map->last_access ($cf::RUNTIME); 1242 $map->{last_save} = $cf::RUNTIME;
1135 1243
1244 Coro::cede;
1245
1136 $map->reset if $map->should_reset; 1246 if ($map->should_reset) {
1247 $map->reset;
1248 undef $guard;
1249 $map = find $path
1250 or return;
1251 }
1137 1252
1138 $cf::MAP{$key} = $map 1253 $cf::MAP{$key} = $map
1139 } 1254 }
1140} 1255}
1141 1256
1142sub load { 1257sub load {
1143 my ($self) = @_; 1258 my ($self) = @_;
1144 1259
1260 my $path = $self->{path};
1261 my $guard = cf::lock_acquire "map_load:" . $path->as_string;
1262
1145 return if $self->in_memory != cf::MAP_SWAPPED; 1263 return if $self->in_memory != cf::MAP_SWAPPED;
1146 1264
1147 $self->in_memory (cf::MAP_LOADING); 1265 $self->in_memory (cf::MAP_LOADING);
1148
1149 my $path = $self->{path};
1150 1266
1151 $self->alloc; 1267 $self->alloc;
1152 $self->load_objects ($self->{load_path}, 1) 1268 $self->load_objects ($self->{load_path}, 1)
1153 or return; 1269 or return;
1270
1271 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1272 if delete $self->{load_original};
1154 1273
1155 if (my $uniq = $path->uniq_path) { 1274 if (my $uniq = $path->uniq_path) {
1156 utf8::encode $uniq; 1275 utf8::encode $uniq;
1157 if (aio_open $uniq, O_RDONLY, 0) { 1276 if (aio_open $uniq, O_RDONLY, 0) {
1158 $self->clear_unique_items; 1277 $self->clear_unique_items;
1159 $self->load_objects ($uniq, 0); 1278 $self->load_objects ($uniq, 0);
1160 } 1279 }
1161 } 1280 }
1281
1282 Coro::cede;
1162 1283
1163 # now do the right thing for maps 1284 # now do the right thing for maps
1164 $self->link_multipart_objects; 1285 $self->link_multipart_objects;
1165 1286
1166 if ($self->{path}->is_style_map) { 1287 if ($self->{path}->is_style_map) {
… …
1174 $self->difficulty ($self->estimate_difficulty) 1295 $self->difficulty ($self->estimate_difficulty)
1175 unless $self->difficulty; 1296 unless $self->difficulty;
1176 $self->activate; 1297 $self->activate;
1177 } 1298 }
1178 1299
1300 Coro::cede;
1301
1179 $self->in_memory (cf::MAP_IN_MEMORY); 1302 $self->in_memory (cf::MAP_IN_MEMORY);
1180} 1303}
1181 1304
1182sub load_map_sync { 1305sub find_sync {
1183 my ($path, $origin) = @_; 1306 my ($path, $origin) = @_;
1184 1307
1185 #warn "load_map_sync<$path, $origin>\n";#d# 1308 cf::sync_job { cf::map::find $path, $origin }
1309}
1186 1310
1187 cf::sync_job { 1311sub do_load_sync {
1188 my $map = cf::map::find_map $path, $origin 1312 my ($map) = @_;
1189 or return; 1313
1190 $map->load; 1314 cf::sync_job { $map->load };
1191 $map
1192 }
1193} 1315}
1194 1316
1195sub save { 1317sub save {
1196 my ($self) = @_; 1318 my ($self) = @_;
1197 1319
1320 $self->{last_save} = $cf::RUNTIME;
1321
1322 return unless $self->dirty;
1323
1198 my $save = $self->{path}->save_path; utf8::encode $save; 1324 my $save = $self->{path}->save_path; utf8::encode $save;
1199 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1325 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;
1200 1326
1201 $self->{last_save} = $cf::RUNTIME;
1202
1203 return unless $self->dirty;
1204
1205 $self->{load_path} = $save; 1327 $self->{load_path} = $save;
1206 1328
1207 return if $self->{deny_save}; 1329 return if $self->{deny_save};
1208 1330
1209 warn "saving map ", $self->path; 1331 local $self->{last_access} = $self->last_access;#d#
1210 1332
1211 if ($uniq) { 1333 if ($uniq) {
1212 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1334 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1213 $self->save_objects ($uniq, cf::IO_UNIQUES); 1335 $self->save_objects ($uniq, cf::IO_UNIQUES);
1214 } else { 1336 } else {
… …
1217} 1339}
1218 1340
1219sub swap_out { 1341sub swap_out {
1220 my ($self) = @_; 1342 my ($self) = @_;
1221 1343
1344 # save first because save cedes
1345 $self->save;
1346
1222 return if $self->players; 1347 return if $self->players;
1223 return if $self->in_memory != cf::MAP_IN_MEMORY; 1348 return if $self->in_memory != cf::MAP_IN_MEMORY;
1224 return if $self->{deny_save}; 1349 return if $self->{deny_save};
1225 1350
1226 $self->save;
1227 $self->clear; 1351 $self->clear;
1228 $self->in_memory (cf::MAP_SWAPPED); 1352 $self->in_memory (cf::MAP_SWAPPED);
1229} 1353}
1230 1354
1355sub reset_at {
1356 my ($self) = @_;
1357
1358 # TODO: safety, remove and allow resettable per-player maps
1359 return 1e99 if $self->{path}{user_rel};
1360 return 1e99 if $self->{deny_reset};
1361
1362 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1363 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1364
1365 $time + $to
1366}
1367
1231sub should_reset { 1368sub should_reset {
1232 my ($map) = @_;
1233
1234 # TODO: safety, remove and allow resettable per-player maps
1235 return if $map->{path}{user_rel};#d#
1236 return if $map->{deny_reset};
1237 #return unless $map->reset_timeout;
1238
1239 my $time = $map->fixed_resettime ? $map->{instantiate_time} : $map->last_access;
1240
1241 $time + ($map->reset_timeout || $DEFAULT_RESET) < $cf::RUNTIME
1242}
1243
1244sub reset {
1245 my ($self) = @_; 1369 my ($self) = @_;
1246 1370
1247 return if $self->players; 1371 $self->reset_at <= $cf::RUNTIME
1248 return if $self->{path}{user_rel};#d# 1372}
1249 1373
1250 warn "resetting map ", $self->path;#d# 1374sub unlink_save {
1375 my ($self) = @_;
1251 1376
1252 utf8::encode (my $save = $self->{path}->save_path); 1377 utf8::encode (my $save = $self->{path}->save_path);
1253 aioreq_pri 3; IO::AIO::aio_unlink $save; 1378 aioreq_pri 3; IO::AIO::aio_unlink $save;
1254 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst"; 1379 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
1380}
1381
1382sub rename {
1383 my ($self, $new_path) = @_;
1384
1385 $self->unlink_save;
1386
1387 delete $cf::MAP{$self->path};
1388 $self->{path} = new cf::path $new_path;
1389 $self->path ($self->{path}->as_string);
1390 $cf::MAP{$self->path} = $self;
1391
1392 $self->save;
1393}
1394
1395sub reset {
1396 my ($self) = @_;
1397
1398 return if $self->players;
1399 return if $self->{path}{user_rel};#d#
1400
1401 warn "resetting map ", $self->path;#d#
1402
1403 delete $cf::MAP{$self->path};
1255 1404
1256 $_->clear_links_to ($self) for values %cf::MAP; 1405 $_->clear_links_to ($self) for values %cf::MAP;
1257 1406
1407 $self->unlink_save;
1258 $self->clear; 1408 $self->destroy;
1259 $self->in_memory (cf::MAP_SWAPPED); 1409}
1260 utf8::encode ($self->{load_path} = $self->{path}->load_path); 1410
1411my $nuke_counter = "aaaa";
1412
1413sub nuke {
1414 my ($self) = @_;
1415
1416 $self->{deny_save} = 1;
1417 $self->reset_timeout (1);
1418 $self->rename ("{nuke}/" . ($nuke_counter++));
1419 $self->reset; # polite request, might not happen
1261} 1420}
1262 1421
1263sub customise_for { 1422sub customise_for {
1264 my ($map, $ob) = @_; 1423 my ($map, $ob) = @_;
1265 1424
1266 if ($map->per_player) { 1425 if ($map->per_player) {
1267 return cf::map::find_map "~" . $ob->name . "/" . $map->{path}{path}; 1426 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1268 } 1427 }
1269 1428
1270 $map 1429 $map
1271} 1430}
1272 1431
1273sub emergency_save { 1432sub emergency_save {
1274 local $cf::FREEZE = 1; 1433 my $freeze_guard = cf::freeze_mainloop;
1275 1434
1276 warn "enter emergency map save\n"; 1435 warn "enter emergency map save\n";
1277 1436
1278 cf::sync_job { 1437 cf::sync_job {
1279 warn "begin emergency map save\n"; 1438 warn "begin emergency map save\n";
… …
1330 (ref $cf::CFG{"may_$access"} 1489 (ref $cf::CFG{"may_$access"}
1331 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}} 1490 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}}
1332 : $cf::CFG{"may_$access"}) 1491 : $cf::CFG{"may_$access"})
1333} 1492}
1334 1493
1494=item $player_object->enter_link
1495
1496Freezes the player and moves him/her to a special map (C<{link}>).
1497
1498The player should be reaosnably safe there for short amounts of time. You
1499I<MUST> call C<leave_link> as soon as possible, though.
1500
1501=item $player_object->leave_link ($map, $x, $y)
1502
1503Moves the player out of the specila link map onto the given map. If the
1504map is not valid (or omitted), the player will be moved back to the
1505location he/she was before the call to C<enter_link>, or, if that fails,
1506to the emergency map position.
1507
1508Might block.
1509
1510=cut
1511
1335sub cf::object::player::enter_link { 1512sub cf::object::player::enter_link {
1336 my ($self) = @_; 1513 my ($self) = @_;
1337 1514
1515 $self->deactivate_recursive;
1516
1338 return if $self->map == $LINK_MAP; 1517 return if $self->map == $LINK_MAP;
1339 1518
1340 $self->{_link_pos} = [$self->map->{path}, $self->x, $self->y] 1519 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1341 if $self->map; 1520 if $self->map;
1342 1521
1343 $self->enter_map ($LINK_MAP, 20, 20); 1522 $self->enter_map ($LINK_MAP, 20, 20);
1344 $self->deactivate_recursive;
1345} 1523}
1346 1524
1347sub cf::object::player::leave_link { 1525sub cf::object::player::leave_link {
1348 my ($self, $map, $x, $y) = @_; 1526 my ($self, $map, $x, $y) = @_;
1349 1527
1350 my $link_pos = delete $self->{_link_pos}; 1528 my $link_pos = delete $self->{_link_pos};
1351 1529
1352 unless ($map) { 1530 unless ($map) {
1353 $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1354
1355 # restore original map position 1531 # restore original map position
1356 ($map, $x, $y) = @{ $link_pos || [] }; 1532 ($map, $x, $y) = @{ $link_pos || [] };
1357 $map = cf::map::find_map $map; 1533 $map = cf::map::find $map;
1358 1534
1359 unless ($map) { 1535 unless ($map) {
1360 ($map, $x, $y) = @$EMERGENCY_POSITION; 1536 ($map, $x, $y) = @$EMERGENCY_POSITION;
1361 $map = cf::map::find_map $map 1537 $map = cf::map::find $map
1362 or die "FATAL: cannot load emergency map\n"; 1538 or die "FATAL: cannot load emergency map\n";
1363 } 1539 }
1364 } 1540 }
1365 1541
1366 ($x, $y) = (-1, -1) 1542 ($x, $y) = (-1, -1)
… …
1374 1550
1375 $self->activate_recursive; 1551 $self->activate_recursive;
1376 $self->enter_map ($map, $x, $y); 1552 $self->enter_map ($map, $x, $y);
1377} 1553}
1378 1554
1555cf::player->attach (
1556 on_logout => sub {
1557 my ($pl) = @_;
1558
1559 # abort map switching before logout
1560 if ($pl->ob->{_link_pos}) {
1561 cf::sync_job {
1562 $pl->ob->leave_link
1563 };
1564 }
1565 },
1566 on_login => sub {
1567 my ($pl) = @_;
1568
1569 # try to abort aborted map switching on player login :)
1570 # should happen only on crashes
1571 if ($pl->ob->{_link_pos}) {
1572 $pl->ob->enter_link;
1573 cf::async {
1574 # we need this sleep as the login has a concurrent enter_exit running
1575 # and this sleep increases chances of the player not ending up in scorn
1576 Coro::Timer::sleep 1;
1577 $pl->ob->leave_link;
1578 };
1579 }
1580 },
1581);
1582
1379=item $player_object->goto_map ($map, $x, $y) 1583=item $player_object->goto_map ($path, $x, $y)
1380 1584
1381=cut 1585=cut
1382 1586
1383sub cf::object::player::goto_map { 1587sub cf::object::player::goto_map {
1384 my ($self, $path, $x, $y) = @_; 1588 my ($self, $path, $x, $y) = @_;
1385 1589
1386 $self->enter_link; 1590 $self->enter_link;
1387 1591
1388 (Coro::async { 1592 (cf::async {
1389 $path = new cf::path $path; 1593 $path = new cf::path $path;
1390 1594
1391 my $map = cf::map::find_map $path->as_string; 1595 my $map = cf::map::find $path->as_string;
1392 $map = $map->customise_for ($self) if $map; 1596 $map = $map->customise_for ($self) if $map;
1393 1597
1394 warn "entering ", $map->path, " at ($x, $y)\n" 1598# warn "entering ", $map->path, " at ($x, $y)\n"
1395 if $map; 1599# if $map;
1600
1601 $map or $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1396 1602
1397 $self->leave_link ($map, $x, $y); 1603 $self->leave_link ($map, $x, $y);
1398 })->prio (1); 1604 })->prio (1);
1399} 1605}
1400 1606
… …
1453 1659
1454 return unless $self->type == cf::PLAYER; 1660 return unless $self->type == cf::PLAYER;
1455 1661
1456 $self->enter_link; 1662 $self->enter_link;
1457 1663
1458 (Coro::async { 1664 (cf::async {
1665 $self->deactivate_recursive; # just to be sure
1459 unless (eval { 1666 unless (eval {
1460
1461 prepare_random_map $exit 1667 prepare_random_map $exit
1462 if $exit->slaying eq "/!"; 1668 if $exit->slaying eq "/!";
1463 1669
1464 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1670 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1465 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp); 1671 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp);
… …
1527 on_reply => sub { 1733 on_reply => sub {
1528 my ($ns, $msg) = @_; 1734 my ($ns, $msg) = @_;
1529 1735
1530 # this weird shuffling is so that direct followup queries 1736 # this weird shuffling is so that direct followup queries
1531 # get handled first 1737 # get handled first
1532 my $queue = delete $ns->{query_queue}; 1738 my $queue = delete $ns->{query_queue}
1739 or return; # be conservative, not sure how that can happen, but we saw a crash here
1533 1740
1534 (shift @$queue)->[1]->($msg); 1741 (shift @$queue)->[1]->($msg);
1535 1742
1536 push @{ $ns->{query_queue} }, @$queue; 1743 push @{ $ns->{query_queue} }, @$queue;
1537 1744
… …
1554=cut 1761=cut
1555 1762
1556sub cf::client::coro { 1763sub cf::client::coro {
1557 my ($self, $cb) = @_; 1764 my ($self, $cb) = @_;
1558 1765
1559 my $coro; $coro = async { 1766 my $coro = &cf::async ($cb);
1560 eval {
1561 $cb->();
1562 };
1563 warn $@ if $@;
1564 };
1565 1767
1566 $coro->on_destroy (sub { 1768 $coro->on_destroy (sub {
1567 delete $self->{_coro}{$coro+0}; 1769 delete $self->{_coro}{$coro+0};
1568 }); 1770 });
1569 1771
… …
1741 1943
1742{ 1944{
1743 my $path = cf::localdir . "/database.pst"; 1945 my $path = cf::localdir . "/database.pst";
1744 1946
1745 sub db_load() { 1947 sub db_load() {
1746 warn "loading database $path\n";#d# remove later
1747 $DB = stat $path ? Storable::retrieve $path : { }; 1948 $DB = stat $path ? Storable::retrieve $path : { };
1748 } 1949 }
1749 1950
1750 my $pid; 1951 my $pid;
1751 1952
1752 sub db_save() { 1953 sub db_save() {
1753 warn "saving database $path\n";#d# remove later
1754 waitpid $pid, 0 if $pid; 1954 waitpid $pid, 0 if $pid;
1755 if (0 == ($pid = fork)) { 1955 if (0 == ($pid = fork)) {
1756 $DB->{_meta}{version} = 1; 1956 $DB->{_meta}{version} = 1;
1757 Storable::nstore $DB, "$path~"; 1957 Storable::nstore $DB, "$path~";
1758 rename "$path~", $path; 1958 rename "$path~", $path;
… …
1806 open my $fh, "<:utf8", cf::confdir . "/config" 2006 open my $fh, "<:utf8", cf::confdir . "/config"
1807 or return; 2007 or return;
1808 2008
1809 local $/; 2009 local $/;
1810 *CFG = YAML::Syck::Load <$fh>; 2010 *CFG = YAML::Syck::Load <$fh>;
2011
2012 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2013
2014 if (exists $CFG{mlockall}) {
2015 eval {
2016 $CFG{mlockall} ? &mlockall : &munlockall
2017 and die "WARNING: m(un)lockall failed: $!\n";
2018 };
2019 warn $@ if $@;
2020 }
1811} 2021}
1812 2022
1813sub main { 2023sub main {
1814 # we must not ever block the main coroutine 2024 # we must not ever block the main coroutine
1815 local $Coro::idle = sub { 2025 local $Coro::idle = sub {
1816 Carp::cluck "FATAL: Coro::idle was called, major BUG\n";#d# 2026 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
1817 (Coro::unblock_sub { 2027 (Coro::unblock_sub {
1818 Event::one_event; 2028 Event::one_event;
1819 })->(); 2029 })->();
1820 }; 2030 };
1821 2031
… …
1826} 2036}
1827 2037
1828############################################################################# 2038#############################################################################
1829# initialisation 2039# initialisation
1830 2040
1831sub perl_reload() { 2041sub reload() {
1832 # can/must only be called in main 2042 # can/must only be called in main
1833 if ($Coro::current != $Coro::main) { 2043 if ($Coro::current != $Coro::main) {
1834 warn "can only reload from main coroutine\n"; 2044 warn "can only reload from main coroutine\n";
1835 return; 2045 return;
1836 } 2046 }
1837 2047
1838 warn "reloading..."; 2048 warn "reloading...";
1839 2049
1840 local $FREEZE = 1; 2050 my $guard = freeze_mainloop;
1841 cf::emergency_save; 2051 cf::emergency_save;
1842 2052
1843 eval { 2053 eval {
1844 # if anything goes wrong in here, we should simply crash as we already saved 2054 # if anything goes wrong in here, we should simply crash as we already saved
1845 2055
… …
1963 $cf::MAP{$LINK_MAP->path} = $LINK_MAP; 2173 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
1964} 2174}
1965 2175
1966register "<global>", __PACKAGE__; 2176register "<global>", __PACKAGE__;
1967 2177
1968register_command "perl-reload" => sub { 2178register_command "reload" => sub {
1969 my ($who, $arg) = @_; 2179 my ($who, $arg) = @_;
1970 2180
1971 if ($who->flag (FLAG_WIZ)) { 2181 if ($who->flag (FLAG_WIZ)) {
1972 $who->message ("start of reload."); 2182 $who->message ("start of reload.");
1973 perl_reload; 2183 reload;
1974 $who->message ("end of reload."); 2184 $who->message ("end of reload.");
1975 } 2185 }
1976}; 2186};
1977 2187
1978unshift @INC, $LIBDIR; 2188unshift @INC, $LIBDIR;
… …
1981 reentrant => 0, 2191 reentrant => 0,
1982 prio => 0, 2192 prio => 0,
1983 at => $NEXT_TICK || $TICK, 2193 at => $NEXT_TICK || $TICK,
1984 data => WF_AUTOCANCEL, 2194 data => WF_AUTOCANCEL,
1985 cb => sub { 2195 cb => sub {
1986 unless ($FREEZE) {
1987 cf::server_tick; # one server iteration 2196 cf::server_tick; # one server iteration
1988 $RUNTIME += $TICK; 2197 $RUNTIME += $TICK;
1989 }
1990
1991 $NEXT_TICK += $TICK; 2198 $NEXT_TICK += $TICK;
1992 2199
1993 # if we are delayed by four ticks or more, skip them all 2200 # if we are delayed by four ticks or more, skip them all
1994 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2201 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
1995 2202
… …
2018 or warn "ERROR: unable to write runtime file: $!"; 2225 or warn "ERROR: unable to write runtime file: $!";
2019 })->(); 2226 })->();
2020 }, 2227 },
2021); 2228);
2022 2229
2230END { cf::emergency_save }
2231
20231 22321
2024 2233

Diff Legend

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