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.113 by root, Mon Jan 1 15:32:40 2007 UTC vs.
Revision 1.140 by root, Fri Jan 5 20:04:02 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;
… …
26use Event; $Event::Eval = 1; # no idea why this is required, but it is 26use Event; $Event::Eval = 1; # no idea why this is required, but it is
27 27
28# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 28# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
29$YAML::Syck::ImplicitUnicode = 1; 29$YAML::Syck::ImplicitUnicode = 1;
30 30
31$Coro::main->prio (2); # run main coroutine ("the server") with very high priority 31$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
32 32
33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
34 34
35our %COMMAND = (); 35our %COMMAND = ();
36our %COMMAND_TIME = (); 36our %COMMAND_TIME = ();
… …
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 cf::lock_wait $string
185
186Wait until the given lock is available. See cf::lock_acquire.
187
188=item my $lock = cf::lock_acquire $string
189
190Wait until the given lock is available and then acquires it and returns
191a Coro::guard object. If the guard object gets destroyed (goes out of scope,
192for example when the coroutine gets canceled), the lock is automatically
193returned.
194
195Lock names should begin with a unique identifier (for example, cf::map::find
196uses map_find and cf::map::load uses map_load).
197
198=cut
199
200our %LOCK;
201
202sub lock_wait($) {
203 my ($key) = @_;
204
205 # wait for lock, if any
206 while ($LOCK{$key}) {
207 push @{ $LOCK{$key} }, $Coro::current;
208 Coro::schedule;
209 }
210}
211
212sub lock_acquire($) {
213 my ($key) = @_;
214
215 # wait, to be sure we are not locked
216 lock_wait $key;
217
218 $LOCK{$key} = [];
219
220 Coro::guard {
221 # wake up all waiters, to be on the safe side
222 $_->ready for @{ delete $LOCK{$key} };
223 }
224}
225
226sub freeze_mainloop {
227 return unless $TICK_WATCHER->is_active;
228
229 my $guard = Coro::guard { $TICK_WATCHER->start };
230 $TICK_WATCHER->stop;
231 $guard
232}
233
234=item cf::async { BLOCK }
235
236Currently the same as Coro::async_pool, meaning you cannot use
237C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
238thing you are allowed to do is call C<prio> on it.
239
240=cut
241
242BEGIN { *async = \&Coro::async_pool }
243
186=item cf::sync_job { BLOCK } 244=item cf::sync_job { BLOCK }
187 245
188The design of crossfire+ requires that the main coro ($Coro::main) is 246The design of crossfire+ requires that the main coro ($Coro::main) is
189always able to handle events or runnable, as crossfire+ is only partly 247always 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. 248reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable.
… …
203 # this is the main coro, too bad, we have to block 261 # this is the main coro, too bad, we have to block
204 # till the operation succeeds, freezing the server :/ 262 # till the operation succeeds, freezing the server :/
205 263
206 # TODO: use suspend/resume instead 264 # TODO: use suspend/resume instead
207 # (but this is cancel-safe) 265 # (but this is cancel-safe)
208 local $FREEZE = 1; 266 my $freeze_guard = freeze_mainloop;
209 267
210 my $busy = 1; 268 my $busy = 1;
211 my @res; 269 my @res;
212 270
213 (Coro::async { 271 (async {
214 @res = eval { $job->() }; 272 @res = eval { $job->() };
215 warn $@ if $@; 273 warn $@ if $@;
216 undef $busy; 274 undef $busy;
217 })->prio (Coro::PRIO_MAX); 275 })->prio (Coro::PRIO_MAX);
218 276
219 while ($busy) { 277 while ($busy) {
220 Coro::cede_notself; 278 unless (Coro::cede) {
221 Event::one_event unless Coro::nready; 279 Coro::nready ? Event::one_event 0 : Event::one_event;
280 Coro::cede_notself unless Coro::cede;
281 }
222 } 282 }
223 283
224 wantarray ? @res : $res[0] 284 wantarray ? @res : $res[0]
225 } else { 285 } else {
226 # we are in another coroutine, how wonderful, everything just works 286 # we are in another coroutine, how wonderful, everything just works
227 287
228 $job->() 288 $job->()
229 } 289 }
230} 290}
231 291
232=item $coro = cf::coro { BLOCK } 292=item $coro = cf::async_ext { BLOCK }
233 293
234Creates and returns a new coro. This coro is automcatially being canceled 294Like async, but this coro is automcatially being canceled when the
235when the extension calling this is being unloaded. 295extension calling this is being unloaded.
236 296
237=cut 297=cut
238 298
239sub coro(&) { 299sub async_ext(&) {
240 my $cb = shift; 300 my $cb = shift;
241 301
242 my $coro; $coro = async { 302 my $coro = &Coro::async ($cb);
243 eval {
244 $cb->();
245 };
246 warn $@ if $@;
247 };
248 303
249 $coro->on_destroy (sub { 304 $coro->on_destroy (sub {
250 delete $EXT_CORO{$coro+0}; 305 delete $EXT_CORO{$coro+0};
251 }); 306 });
252 $EXT_CORO{$coro+0} = $coro; 307 $EXT_CORO{$coro+0} = $coro;
… …
289 344
290 $path = $path->as_string if ref $path; 345 $path = $path->as_string if ref $path;
291 346
292 my $self = bless { }, $class; 347 my $self = bless { }, $class;
293 348
349 # {... are special paths that are not touched
350 # ?xxx/... are special absolute paths
351 # ?random/... random maps
352 # /! non-realised random map exit
353 # /... normal maps
354 # ~/... per-player maps without a specific player (DO NOT USE)
355 # ~user/... per-player map of a specific user
356
357 if ($path =~ /^{/) {
358 # fine as it is
294 if ($path =~ s{^\?random/}{}) { 359 } elsif ($path =~ s{^\?random/}{}) {
295 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data; 360 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;
296 $self->{random} = cf::from_json $data; 361 $self->{random} = cf::from_json $data;
297 } else { 362 } else {
298 if ($path =~ s{^~([^/]+)?}{}) { 363 if ($path =~ s{^~([^/]+)?}{}) {
299 $self->{user_rel} = 1; 364 $self->{user_rel} = 1;
… …
807 (aio_load "$filename.pst", $av) >= 0 872 (aio_load "$filename.pst", $av) >= 0
808 or return; 873 or return;
809 $av = eval { (Storable::thaw $av)->{objs} }; 874 $av = eval { (Storable::thaw $av)->{objs} };
810 } 875 }
811 876
877 warn sprintf "loading %s (%d)\n",
878 $filename, length $data, scalar @{$av || []};#d#
812 return ($data, $av); 879 return ($data, $av);
813} 880}
814 881
815############################################################################# 882#############################################################################
816# command handling &c 883# command handling &c
… …
1050package cf::map; 1117package cf::map;
1051 1118
1052use Fcntl; 1119use Fcntl;
1053use Coro::AIO; 1120use Coro::AIO;
1054 1121
1055our $MAX_RESET = 7200; 1122our $MAX_RESET = 3600;
1056our $DEFAULT_RESET = 3600; 1123our $DEFAULT_RESET = 3000;
1057 1124
1058sub generate_random_map { 1125sub generate_random_map {
1059 my ($path, $rmp) = @_; 1126 my ($path, $rmp) = @_;
1060 1127
1061 # mit "rum" bekleckern, nicht 1128 # mit "rum" bekleckern, nicht
… …
1077# and all this just because we cannot iterate over 1144# and all this just because we cannot iterate over
1078# all maps in C++... 1145# all maps in C++...
1079sub change_all_map_light { 1146sub change_all_map_light {
1080 my ($change) = @_; 1147 my ($change) = @_;
1081 1148
1082 $_->change_map_light ($change) for values %cf::MAP; 1149 $_->change_map_light ($change)
1150 for grep $_->outdoor, values %cf::MAP;
1083} 1151}
1084 1152
1085sub try_load_header($) { 1153sub try_load_header($) {
1086 my ($path) = @_; 1154 my ($path) = @_;
1087 1155
… …
1090 or return; 1158 or return;
1091 1159
1092 my $map = cf::map::new 1160 my $map = cf::map::new
1093 or return; 1161 or return;
1094 1162
1163 # for better error messages only, will be overwritten
1164 $map->path ($path);
1165
1095 $map->load_header ($path) 1166 $map->load_header ($path)
1096 or return; 1167 or return;
1097 1168
1098 $map->{load_path} = $path; 1169 $map->{load_path} = $path;
1099 1170
1100 $map 1171 $map
1101} 1172}
1102 1173
1174sub find;
1103sub find_map { 1175sub find {
1104 my ($path, $origin) = @_; 1176 my ($path, $origin) = @_;
1105 1177
1106 #warn "find_map<$path,$origin>\n";#d# 1178 #warn "find<$path,$origin>\n";#d#
1107 1179
1108 $path = new cf::path $path, $origin && $origin->path; 1180 $path = new cf::path $path, $origin && $origin->path;
1109 my $key = $path->as_string; 1181 my $key = $path->as_string;
1110 1182
1183 cf::lock_wait "map_find:$key";
1184
1111 $cf::MAP{$key} || do { 1185 $cf::MAP{$key} || do {
1186 my $guard = cf::lock_acquire "map_find:$key";
1187
1112 # do it the slow way 1188 # do it the slow way
1113 my $map = try_load_header $path->save_path; 1189 my $map = try_load_header $path->save_path;
1114 1190
1191 Coro::cede;
1192
1115 if ($map) { 1193 if ($map) {
1194 $map->last_access ((delete $map->{last_access})
1195 || $cf::RUNTIME); #d#
1116 # safety 1196 # safety
1117 $map->{instantiate_time} = $cf::RUNTIME 1197 $map->{instantiate_time} = $cf::RUNTIME
1118 if $map->{instantiate_time} > $cf::RUNTIME; 1198 if $map->{instantiate_time} > $cf::RUNTIME;
1119 } else { 1199 } else {
1120 if (my $rmp = $path->random_map_params) { 1200 if (my $rmp = $path->random_map_params) {
… …
1125 1205
1126 $map or return; 1206 $map or return;
1127 1207
1128 $map->{load_original} = 1; 1208 $map->{load_original} = 1;
1129 $map->{instantiate_time} = $cf::RUNTIME; 1209 $map->{instantiate_time} = $cf::RUNTIME;
1210 $map->last_access ($cf::RUNTIME);
1130 $map->instantiate; 1211 $map->instantiate;
1131 1212
1132 # per-player maps become, after loading, normal maps 1213 # per-player maps become, after loading, normal maps
1133 $map->per_player (0) if $path->{user_rel}; 1214 $map->per_player (0) if $path->{user_rel};
1134 } 1215 }
1135 1216
1136 $map->path ($key); 1217 $map->path ($key);
1137 $map->{path} = $path; 1218 $map->{path} = $path;
1138 $map->last_access ($cf::RUNTIME); 1219 $map->{last_save} = $cf::RUNTIME;
1220
1221 Coro::cede;
1139 1222
1140 if ($map->should_reset) { 1223 if ($map->should_reset) {
1141 $map->reset; 1224 $map->reset;
1225 undef $guard;
1142 $map = find_map $path; 1226 $map = find $path
1227 or return;
1143 } 1228 }
1144 1229
1145 $cf::MAP{$key} = $map 1230 $cf::MAP{$key} = $map
1146 } 1231 }
1147} 1232}
1148 1233
1149sub load { 1234sub load {
1150 my ($self) = @_; 1235 my ($self) = @_;
1151 1236
1237 my $path = $self->{path};
1238 my $guard = cf::lock_acquire "map_load:" . $path->as_string;
1239
1152 return if $self->in_memory != cf::MAP_SWAPPED; 1240 return if $self->in_memory != cf::MAP_SWAPPED;
1153 1241
1154 $self->in_memory (cf::MAP_LOADING); 1242 $self->in_memory (cf::MAP_LOADING);
1155
1156 my $path = $self->{path};
1157 1243
1158 $self->alloc; 1244 $self->alloc;
1159 $self->load_objects ($self->{load_path}, 1) 1245 $self->load_objects ($self->{load_path}, 1)
1160 or return; 1246 or return;
1161 1247
… …
1167 if (aio_open $uniq, O_RDONLY, 0) { 1253 if (aio_open $uniq, O_RDONLY, 0) {
1168 $self->clear_unique_items; 1254 $self->clear_unique_items;
1169 $self->load_objects ($uniq, 0); 1255 $self->load_objects ($uniq, 0);
1170 } 1256 }
1171 } 1257 }
1258
1259 Coro::cede;
1172 1260
1173 # now do the right thing for maps 1261 # now do the right thing for maps
1174 $self->link_multipart_objects; 1262 $self->link_multipart_objects;
1175 1263
1176 if ($self->{path}->is_style_map) { 1264 if ($self->{path}->is_style_map) {
… …
1184 $self->difficulty ($self->estimate_difficulty) 1272 $self->difficulty ($self->estimate_difficulty)
1185 unless $self->difficulty; 1273 unless $self->difficulty;
1186 $self->activate; 1274 $self->activate;
1187 } 1275 }
1188 1276
1277 Coro::cede;
1278
1189 $self->in_memory (cf::MAP_IN_MEMORY); 1279 $self->in_memory (cf::MAP_IN_MEMORY);
1190} 1280}
1191 1281
1192sub load_map_sync { 1282sub find_sync {
1193 my ($path, $origin) = @_; 1283 my ($path, $origin) = @_;
1194 1284
1195 #warn "load_map_sync<$path, $origin>\n";#d# 1285 cf::sync_job { cf::map::find $path, $origin }
1286}
1196 1287
1197 cf::sync_job { 1288sub do_load_sync {
1198 my $map = cf::map::find_map $path, $origin 1289 my ($map) = @_;
1199 or return; 1290
1200 $map->load; 1291 cf::sync_job { $map->load };
1201 $map
1202 }
1203} 1292}
1204 1293
1205sub save { 1294sub save {
1206 my ($self) = @_; 1295 my ($self) = @_;
1207 1296
1297 my $lock = cf::lock_acquire "map_data:" . $self->path;
1298
1299 $self->{last_save} = $cf::RUNTIME;
1300
1301 return unless $self->dirty;
1302
1208 my $save = $self->{path}->save_path; utf8::encode $save; 1303 my $save = $self->{path}->save_path; utf8::encode $save;
1209 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1304 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;
1210 1305
1211 $self->{last_save} = $cf::RUNTIME;
1212
1213 return unless $self->dirty;
1214
1215 $self->{load_path} = $save; 1306 $self->{load_path} = $save;
1216 1307
1217 return if $self->{deny_save}; 1308 return if $self->{deny_save};
1309
1310 local $self->{last_access} = $self->last_access;#d#
1218 1311
1219 if ($uniq) { 1312 if ($uniq) {
1220 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1313 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1221 $self->save_objects ($uniq, cf::IO_UNIQUES); 1314 $self->save_objects ($uniq, cf::IO_UNIQUES);
1222 } else { 1315 } else {
… …
1225} 1318}
1226 1319
1227sub swap_out { 1320sub swap_out {
1228 my ($self) = @_; 1321 my ($self) = @_;
1229 1322
1323 # save first because save cedes
1324 $self->save;
1325
1326 my $lock = cf::lock_acquire "map_data:" . $self->path;
1327
1230 return if $self->players; 1328 return if $self->players;
1231 return if $self->in_memory != cf::MAP_IN_MEMORY; 1329 return if $self->in_memory != cf::MAP_IN_MEMORY;
1232 return if $self->{deny_save}; 1330 return if $self->{deny_save};
1233 1331
1234 $self->save;
1235 $self->clear; 1332 $self->clear;
1236 $self->in_memory (cf::MAP_SWAPPED); 1333 $self->in_memory (cf::MAP_SWAPPED);
1237} 1334}
1238 1335
1239sub reset_at { 1336sub reset_at {
1240 my ($self) = @_; 1337 my ($self) = @_;
1241 1338
1242 # TODO: safety, remove and allow resettable per-player maps 1339 # TODO: safety, remove and allow resettable per-player maps
1243 return 1e100 if $self->{path}{user_rel}; 1340 return 1e99 if $self->{path}{user_rel};
1244 return 1e100 if $self->{deny_reset}; 1341 return 1e99 if $self->{deny_reset};
1245 1342
1246 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1343 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1247 my $to = $self->reset_timeout || $DEFAULT_RESET; 1344 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1248 $to = $MAX_RESET if $to > $MAX_RESET;
1249 1345
1250 $time + $to 1346 $time + $to
1251} 1347}
1252 1348
1253sub should_reset { 1349sub should_reset {
… …
1269 1365
1270 $self->unlink_save; 1366 $self->unlink_save;
1271 1367
1272 delete $cf::MAP{$self->path}; 1368 delete $cf::MAP{$self->path};
1273 $self->{path} = new cf::path $new_path; 1369 $self->{path} = new cf::path $new_path;
1274 $self->path ($self->{path}->path); 1370 $self->path ($self->{path}->as_string);
1275 $cf::MAP{$self->path} = $self; 1371 $cf::MAP{$self->path} = $self;
1276 1372
1277 $self->save; 1373 $self->save;
1278} 1374}
1279 1375
1280sub reset { 1376sub reset {
1281 my ($self) = @_; 1377 my ($self) = @_;
1282 1378
1379 my $lock = cf::lock_acquire "map_data:" . $self->path;
1380
1283 return if $self->players; 1381 return if $self->players;
1284 return if $self->{path}{user_rel};#d# 1382 return if $self->{path}{user_rel};#d#
1285 1383
1286 warn "resetting map ", $self->path;#d# 1384 warn "resetting map ", $self->path;#d#
1287 1385
… …
1291 1389
1292 $self->unlink_save; 1390 $self->unlink_save;
1293 $self->destroy; 1391 $self->destroy;
1294} 1392}
1295 1393
1394my $nuke_counter = "aaaa";
1395
1396sub nuke {
1397 my ($self) = @_;
1398
1399 $self->{deny_save} = 1;
1400 $self->reset_timeout (1);
1401 $self->rename ("{nuke}/" . ($nuke_counter++));
1402 $self->reset; # polite request, might not happen
1403}
1404
1296sub customise_for { 1405sub customise_for {
1297 my ($map, $ob) = @_; 1406 my ($map, $ob) = @_;
1298 1407
1299 if ($map->per_player) { 1408 if ($map->per_player) {
1300 return cf::map::find_map "~" . $ob->name . "/" . $map->{path}{path}; 1409 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1301 } 1410 }
1302 1411
1303 $map 1412 $map
1304} 1413}
1305 1414
1306sub emergency_save { 1415sub emergency_save {
1307 local $cf::FREEZE = 1; 1416 my $freeze_guard = cf::freeze_mainloop;
1308 1417
1309 warn "enter emergency map save\n"; 1418 warn "enter emergency map save\n";
1310 1419
1311 cf::sync_job { 1420 cf::sync_job {
1312 warn "begin emergency map save\n"; 1421 warn "begin emergency map save\n";
… …
1363 (ref $cf::CFG{"may_$access"} 1472 (ref $cf::CFG{"may_$access"}
1364 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}} 1473 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}}
1365 : $cf::CFG{"may_$access"}) 1474 : $cf::CFG{"may_$access"})
1366} 1475}
1367 1476
1477=item $player_object->enter_link
1478
1479Freezes the player and moves him/her to a special map (C<{link}>).
1480
1481The player should be reaosnably safe there for short amounts of time. You
1482I<MUST> call C<leave_link> as soon as possible, though.
1483
1484=item $player_object->leave_link ($map, $x, $y)
1485
1486Moves the player out of the specila link map onto the given map. If the
1487map is not valid (or omitted), the player will be moved back to the
1488location he/she was before the call to C<enter_link>, or, if that fails,
1489to the emergency map position.
1490
1491Might block.
1492
1493=cut
1494
1368sub cf::object::player::enter_link { 1495sub cf::object::player::enter_link {
1369 my ($self) = @_; 1496 my ($self) = @_;
1370 1497
1498 $self->deactivate_recursive;
1499
1371 return if $self->map == $LINK_MAP; 1500 return if $self->map == $LINK_MAP;
1372 1501
1373 $self->{_link_pos} = [$self->map->{path}, $self->x, $self->y] 1502 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1374 if $self->map; 1503 if $self->map;
1375 1504
1376 $self->enter_map ($LINK_MAP, 20, 20); 1505 $self->enter_map ($LINK_MAP, 20, 20);
1377 $self->deactivate_recursive;
1378} 1506}
1379 1507
1380sub cf::object::player::leave_link { 1508sub cf::object::player::leave_link {
1381 my ($self, $map, $x, $y) = @_; 1509 my ($self, $map, $x, $y) = @_;
1382 1510
1383 my $link_pos = delete $self->{_link_pos}; 1511 my $link_pos = delete $self->{_link_pos};
1384 1512
1385 unless ($map) { 1513 unless ($map) {
1386 $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1387
1388 # restore original map position 1514 # restore original map position
1389 ($map, $x, $y) = @{ $link_pos || [] }; 1515 ($map, $x, $y) = @{ $link_pos || [] };
1390 $map = cf::map::find_map $map; 1516 $map = cf::map::find $map;
1391 1517
1392 unless ($map) { 1518 unless ($map) {
1393 ($map, $x, $y) = @$EMERGENCY_POSITION; 1519 ($map, $x, $y) = @$EMERGENCY_POSITION;
1394 $map = cf::map::find_map $map 1520 $map = cf::map::find $map
1395 or die "FATAL: cannot load emergency map\n"; 1521 or die "FATAL: cannot load emergency map\n";
1396 } 1522 }
1397 } 1523 }
1398 1524
1399 ($x, $y) = (-1, -1) 1525 ($x, $y) = (-1, -1)
… …
1407 1533
1408 $self->activate_recursive; 1534 $self->activate_recursive;
1409 $self->enter_map ($map, $x, $y); 1535 $self->enter_map ($map, $x, $y);
1410} 1536}
1411 1537
1538cf::player->attach (
1539 on_logout => sub {
1540 my ($pl) = @_;
1541
1542 # abort map switching before logout
1543 if ($pl->ob->{_link_pos}) {
1544 cf::sync_job {
1545 $pl->ob->leave_link
1546 };
1547 }
1548 },
1549 on_login => sub {
1550 my ($pl) = @_;
1551
1552 # try to abort aborted map switching on player login :)
1553 # should happen only on crashes
1554 if ($pl->ob->{_link_pos}) {
1555
1556 $pl->ob->enter_link;
1557 (async {
1558 # we need this sleep as the login has a concurrent enter_exit running
1559 # and this sleep increases chances of the player not ending up in scorn
1560 $pl->ob->reply (undef,
1561 "There was an internal problem at your last logout, "
1562 . "the server will try to bring you to your intended destination in a second.",
1563 cf::NDI_RED);
1564 Coro::Timer::sleep 1;
1565 $pl->ob->leave_link;
1566 })->prio (2);
1567 }
1568 },
1569);
1570
1412=item $player_object->goto_map ($map, $x, $y) 1571=item $player_object->goto ($path, $x, $y)
1413 1572
1414=cut 1573=cut
1415 1574
1416sub cf::object::player::goto_map { 1575sub cf::object::player::goto {
1417 my ($self, $path, $x, $y) = @_; 1576 my ($self, $path, $x, $y) = @_;
1418 1577
1419 $self->enter_link; 1578 $self->enter_link;
1420 1579
1421 (Coro::async { 1580 (async {
1422 $path = new cf::path $path; 1581 $path = new cf::path $path;
1423 1582
1424 my $map = cf::map::find_map $path->as_string; 1583 my $map = cf::map::find $path->as_string;
1425 $map = $map->customise_for ($self) if $map; 1584 $map = $map->customise_for ($self) if $map;
1426 1585
1427 warn "entering ", $map->path, " at ($x, $y)\n" 1586# warn "entering ", $map->path, " at ($x, $y)\n"
1428 if $map; 1587# if $map;
1588
1589 $map or $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1429 1590
1430 $self->leave_link ($map, $x, $y); 1591 $self->leave_link ($map, $x, $y);
1431 })->prio (1); 1592 })->prio (1);
1432} 1593}
1433 1594
… …
1486 1647
1487 return unless $self->type == cf::PLAYER; 1648 return unless $self->type == cf::PLAYER;
1488 1649
1489 $self->enter_link; 1650 $self->enter_link;
1490 1651
1491 (Coro::async { 1652 (async {
1653 $self->deactivate_recursive; # just to be sure
1492 unless (eval { 1654 unless (eval {
1493
1494 prepare_random_map $exit 1655 prepare_random_map $exit
1495 if $exit->slaying eq "/!"; 1656 if $exit->slaying eq "/!";
1496 1657
1497 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1658 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1498 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp); 1659 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1499 1660
1500 1; 1661 1;
1501 }) { 1662 }) {
1502 $self->message ("Something went wrong deep within the crossfire server. " 1663 $self->message ("Something went wrong deep within the crossfire server. "
1503 . "I'll try to bring you back to the map you were before. " 1664 . "I'll try to bring you back to the map you were before. "
… …
1560 on_reply => sub { 1721 on_reply => sub {
1561 my ($ns, $msg) = @_; 1722 my ($ns, $msg) = @_;
1562 1723
1563 # this weird shuffling is so that direct followup queries 1724 # this weird shuffling is so that direct followup queries
1564 # get handled first 1725 # get handled first
1565 my $queue = delete $ns->{query_queue}; 1726 my $queue = delete $ns->{query_queue}
1727 or return; # be conservative, not sure how that can happen, but we saw a crash here
1566 1728
1567 (shift @$queue)->[1]->($msg); 1729 (shift @$queue)->[1]->($msg);
1568 1730
1569 push @{ $ns->{query_queue} }, @$queue; 1731 push @{ $ns->{query_queue} }, @$queue;
1570 1732
… …
1576 } 1738 }
1577 } 1739 }
1578 }, 1740 },
1579); 1741);
1580 1742
1581=item $client->coro (\&cb) 1743=item $client->async (\&cb)
1582 1744
1583Create a new coroutine, running the specified callback. The coroutine will 1745Create a new coroutine, running the specified callback. The coroutine will
1584be automatically cancelled when the client gets destroyed (e.g. on logout, 1746be automatically cancelled when the client gets destroyed (e.g. on logout,
1585or loss of connection). 1747or loss of connection).
1586 1748
1587=cut 1749=cut
1588 1750
1589sub cf::client::coro { 1751sub cf::client::async {
1590 my ($self, $cb) = @_; 1752 my ($self, $cb) = @_;
1591 1753
1592 my $coro; $coro = async { 1754 my $coro = &Coro::async ($cb);
1593 eval {
1594 $cb->();
1595 };
1596 warn $@ if $@;
1597 };
1598 1755
1599 $coro->on_destroy (sub { 1756 $coro->on_destroy (sub {
1600 delete $self->{_coro}{$coro+0}; 1757 delete $self->{_coro}{$coro+0};
1601 }); 1758 });
1602 1759
… …
1774 1931
1775{ 1932{
1776 my $path = cf::localdir . "/database.pst"; 1933 my $path = cf::localdir . "/database.pst";
1777 1934
1778 sub db_load() { 1935 sub db_load() {
1779 warn "loading database $path\n";#d# remove later
1780 $DB = stat $path ? Storable::retrieve $path : { }; 1936 $DB = stat $path ? Storable::retrieve $path : { };
1781 } 1937 }
1782 1938
1783 my $pid; 1939 my $pid;
1784 1940
1785 sub db_save() { 1941 sub db_save() {
1786 warn "saving database $path\n";#d# remove later
1787 waitpid $pid, 0 if $pid; 1942 waitpid $pid, 0 if $pid;
1788 if (0 == ($pid = fork)) { 1943 if (0 == ($pid = fork)) {
1789 $DB->{_meta}{version} = 1; 1944 $DB->{_meta}{version} = 1;
1790 Storable::nstore $DB, "$path~"; 1945 Storable::nstore $DB, "$path~";
1791 rename "$path~", $path; 1946 rename "$path~", $path;
… …
1839 open my $fh, "<:utf8", cf::confdir . "/config" 1994 open my $fh, "<:utf8", cf::confdir . "/config"
1840 or return; 1995 or return;
1841 1996
1842 local $/; 1997 local $/;
1843 *CFG = YAML::Syck::Load <$fh>; 1998 *CFG = YAML::Syck::Load <$fh>;
1999
2000 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2001
2002 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2003 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2004
2005 if (exists $CFG{mlockall}) {
2006 eval {
2007 $CFG{mlockall} ? &mlockall : &munlockall
2008 and die "WARNING: m(un)lockall failed: $!\n";
2009 };
2010 warn $@ if $@;
2011 }
1844} 2012}
1845 2013
1846sub main { 2014sub main {
1847 # we must not ever block the main coroutine 2015 # we must not ever block the main coroutine
1848 local $Coro::idle = sub { 2016 local $Coro::idle = sub {
1849 Carp::cluck "FATAL: Coro::idle was called, major BUG\n";#d# 2017 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
1850 (Coro::unblock_sub {
1851 Event::one_event; 2018 async { Event::one_event };
1852 })->();
1853 }; 2019 };
1854 2020
1855 cfg_load; 2021 cfg_load;
1856 db_load; 2022 db_load;
1857 load_extensions; 2023 load_extensions;
… …
1868 return; 2034 return;
1869 } 2035 }
1870 2036
1871 warn "reloading..."; 2037 warn "reloading...";
1872 2038
1873 local $FREEZE = 1; 2039 my $guard = freeze_mainloop;
1874 cf::emergency_save; 2040 cf::emergency_save;
1875 2041
1876 eval { 2042 eval {
1877 # if anything goes wrong in here, we should simply crash as we already saved 2043 # if anything goes wrong in here, we should simply crash as we already saved
1878 2044
… …
2014 reentrant => 0, 2180 reentrant => 0,
2015 prio => 0, 2181 prio => 0,
2016 at => $NEXT_TICK || $TICK, 2182 at => $NEXT_TICK || $TICK,
2017 data => WF_AUTOCANCEL, 2183 data => WF_AUTOCANCEL,
2018 cb => sub { 2184 cb => sub {
2019 unless ($FREEZE) {
2020 cf::server_tick; # one server iteration 2185 cf::server_tick; # one server iteration
2021 $RUNTIME += $TICK; 2186 $RUNTIME += $TICK;
2022 }
2023
2024 $NEXT_TICK += $TICK; 2187 $NEXT_TICK += $TICK;
2025 2188
2026 # if we are delayed by four ticks or more, skip them all 2189 # if we are delayed by four ticks or more, skip them all
2027 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2190 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2028 2191
… …
2051 or warn "ERROR: unable to write runtime file: $!"; 2214 or warn "ERROR: unable to write runtime file: $!";
2052 })->(); 2215 })->();
2053 }, 2216 },
2054); 2217);
2055 2218
2219END { cf::emergency_save }
2220
20561 22211
2057 2222

Diff Legend

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