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

Diff Legend

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