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.111 by root, Mon Jan 1 12:28:47 2007 UTC vs.
Revision 1.139 by root, Fri Jan 5 19:12:03 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
186=item cf::sync_job { BLOCK } 234=item cf::sync_job { BLOCK }
187 235
188The design of crossfire+ requires that the main coro ($Coro::main) is 236The design of crossfire+ requires that the main coro ($Coro::main) is
189always able to handle events or runnable, as crossfire+ is only partly 237always 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. 238reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable.
… …
197=cut 245=cut
198 246
199sub sync_job(&) { 247sub sync_job(&) {
200 my ($job) = @_; 248 my ($job) = @_;
201 249
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) { 250 if ($Coro::current == $Coro::main) {
251 # this is the main coro, too bad, we have to block
252 # till the operation succeeds, freezing the server :/
253
212 # TODO: use suspend/resume instead 254 # TODO: use suspend/resume instead
213 local $FREEZE = 1; 255 # (but this is cancel-safe)
256 my $freeze_guard = freeze_mainloop;
257
258 my $busy = 1;
259 my @res;
260
261 (Coro::async_pool {
262 @res = eval { $job->() };
263 warn $@ if $@;
264 undef $busy;
214 $coro->prio (Coro::PRIO_MAX); 265 })->prio (Coro::PRIO_MAX);
266
215 while ($busy) { 267 while ($busy) {
216 Coro::cede_notself; 268 unless (Coro::cede) {
217 Event::one_event unless Coro::nready; 269 Coro::nready ? Event::one_event 0 : Event::one_event;
270 Coro::cede_notself unless Coro::cede;
218 } 271 }
272 }
273
274 wantarray ? @res : $res[0]
219 } else { 275 } else {
220 $coro->join; 276 # we are in another coroutine, how wonderful, everything just works
277
278 $job->()
221 } 279 }
222
223 wantarray ? @res : $res[0]
224} 280}
225 281
226=item $coro = cf::coro { BLOCK } 282=item $coro = cf::coro { BLOCK }
227 283
228Creates and returns a new coro. This coro is automcatially being canceled 284Creates (and readies) and returns a new coro. This coro is automcatially
229when the extension calling this is being unloaded. 285being canceled when the extension calling this is being unloaded.
230 286
231=cut 287=cut
232 288
233sub coro(&) { 289sub coro(&) {
234 my $cb = shift; 290 my $cb = shift;
235 291
236 my $coro; $coro = async { 292 my $coro = &Coro::async_pool ($cb);
237 eval {
238 $cb->();
239 };
240 warn $@ if $@;
241 };
242 293
243 $coro->on_destroy (sub { 294 $coro->on_destroy (sub {
244 delete $EXT_CORO{$coro+0}; 295 delete $EXT_CORO{$coro+0};
245 }); 296 });
246 $EXT_CORO{$coro+0} = $coro; 297 $EXT_CORO{$coro+0} = $coro;
… …
252 my $runtime = cf::localdir . "/runtime"; 303 my $runtime = cf::localdir . "/runtime";
253 304
254 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 305 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
255 or return; 306 or return;
256 307
257 my $value = $cf::RUNTIME; 308 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 309 (aio_write $fh, 0, (length $value), $value, 0) <= 0
259 and return; 310 and return;
260 311
261 aio_fsync $fh 312 aio_fsync $fh
262 and return; 313 and return;
… …
283 334
284 $path = $path->as_string if ref $path; 335 $path = $path->as_string if ref $path;
285 336
286 my $self = bless { }, $class; 337 my $self = bless { }, $class;
287 338
339 # {... are special paths that are not touched
340 # ?xxx/... are special absolute paths
341 # ?random/... random maps
342 # /! non-realised random map exit
343 # /... normal maps
344 # ~/... per-player maps without a specific player (DO NOT USE)
345 # ~user/... per-player map of a specific user
346
347 if ($path =~ /^{/) {
348 # fine as it is
288 if ($path =~ s{^\?random/}{}) { 349 } elsif ($path =~ s{^\?random/}{}) {
289 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data; 350 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;
290 $self->{random} = cf::from_json $data; 351 $self->{random} = cf::from_json $data;
291 } else { 352 } else {
292 if ($path =~ s{^~([^/]+)?}{}) { 353 if ($path =~ s{^~([^/]+)?}{}) {
293 $self->{user_rel} = 1; 354 $self->{user_rel} = 1;
… …
798 or return; 859 or return;
799 860
800 unless (aio_stat "$filename.pst") { 861 unless (aio_stat "$filename.pst") {
801 (aio_load "$filename.pst", $av) >= 0 862 (aio_load "$filename.pst", $av) >= 0
802 or return; 863 or return;
803 $av = eval { (Storable::thaw <$av>)->{objs} }; 864 $av = eval { (Storable::thaw $av)->{objs} };
804 } 865 }
805 866
867 warn sprintf "loading %s (%d)\n",
868 $filename, length $data, scalar @{$av || []};#d#
806 return ($data, $av); 869 return ($data, $av);
807} 870}
808 871
809############################################################################# 872#############################################################################
810# command handling &c 873# command handling &c
… …
1044package cf::map; 1107package cf::map;
1045 1108
1046use Fcntl; 1109use Fcntl;
1047use Coro::AIO; 1110use Coro::AIO;
1048 1111
1049our $MAX_RESET = 7200; 1112our $MAX_RESET = 3600;
1050our $DEFAULT_RESET = 3600; 1113our $DEFAULT_RESET = 3000;
1051$MAX_RESET = 10;#d#
1052$DEFAULT_RESET = 10;#d#
1053 1114
1054sub generate_random_map { 1115sub generate_random_map {
1055 my ($path, $rmp) = @_; 1116 my ($path, $rmp) = @_;
1056 1117
1057 # mit "rum" bekleckern, nicht 1118 # mit "rum" bekleckern, nicht
… …
1073# and all this just because we cannot iterate over 1134# and all this just because we cannot iterate over
1074# all maps in C++... 1135# all maps in C++...
1075sub change_all_map_light { 1136sub change_all_map_light {
1076 my ($change) = @_; 1137 my ($change) = @_;
1077 1138
1078 $_->change_map_light ($change) for values %cf::MAP; 1139 $_->change_map_light ($change)
1140 for grep $_->outdoor, values %cf::MAP;
1079} 1141}
1080 1142
1081sub try_load_header($) { 1143sub try_load_header($) {
1082 my ($path) = @_; 1144 my ($path) = @_;
1083 1145
… …
1086 or return; 1148 or return;
1087 1149
1088 my $map = cf::map::new 1150 my $map = cf::map::new
1089 or return; 1151 or return;
1090 1152
1153 # for better error messages only, will be overwritten
1154 $map->path ($path);
1155
1091 $map->load_header ($path) 1156 $map->load_header ($path)
1092 or return; 1157 or return;
1093 1158
1094 $map->{load_path} = $path; 1159 $map->{load_path} = $path;
1095 use Data::Dumper; warn Dumper $map;#d#
1096 1160
1097 $map 1161 $map
1098} 1162}
1099 1163
1164sub find;
1100sub find_map { 1165sub find {
1101 my ($path, $origin) = @_; 1166 my ($path, $origin) = @_;
1102 1167
1103 #warn "find_map<$path,$origin>\n";#d# 1168 #warn "find<$path,$origin>\n";#d#
1104 1169
1105 $path = ref $path ? $path : new cf::path $path, $origin && $origin->path; 1170 $path = new cf::path $path, $origin && $origin->path;
1106 my $key = $path->as_string; 1171 my $key = $path->as_string;
1107 1172
1173 cf::lock_wait "map_find:$key";
1174
1108 $cf::MAP{$key} || do { 1175 $cf::MAP{$key} || do {
1176 my $guard = cf::lock_acquire "map_find:$key";
1177
1109 # do it the slow way 1178 # do it the slow way
1110 my $map = try_load_header $path->save_path; 1179 my $map = try_load_header $path->save_path;
1111 1180
1181 Coro::cede;
1182
1112 if ($map) { 1183 if ($map) {
1184 $map->last_access ((delete $map->{last_access})
1185 || $cf::RUNTIME); #d#
1113 # safety 1186 # safety
1114 $map->{instantiate_time} = $cf::RUNTIME 1187 $map->{instantiate_time} = $cf::RUNTIME
1115 if $map->{instantiate_time} > $cf::RUNTIME; 1188 if $map->{instantiate_time} > $cf::RUNTIME;
1116 } else { 1189 } else {
1117 if (my $rmp = $path->random_map_params) { 1190 if (my $rmp = $path->random_map_params) {
… …
1122 1195
1123 $map or return; 1196 $map or return;
1124 1197
1125 $map->{load_original} = 1; 1198 $map->{load_original} = 1;
1126 $map->{instantiate_time} = $cf::RUNTIME; 1199 $map->{instantiate_time} = $cf::RUNTIME;
1200 $map->last_access ($cf::RUNTIME);
1127 $map->instantiate; 1201 $map->instantiate;
1128 1202
1129 # per-player maps become, after loading, normal maps 1203 # per-player maps become, after loading, normal maps
1130 $map->per_player (0) if $path->{user_rel}; 1204 $map->per_player (0) if $path->{user_rel};
1131 } 1205 }
1132 1206
1133 $map->path ($key); 1207 $map->path ($key);
1134 $map->{path} = $path; 1208 $map->{path} = $path;
1135 $map->last_access ($cf::RUNTIME); 1209 $map->{last_save} = $cf::RUNTIME;
1136 1210
1211 Coro::cede;
1212
1137 $map->reset if $map->should_reset; 1213 if ($map->should_reset) {
1214 $map->reset;
1215 undef $guard;
1216 $map = find $path
1217 or return;
1218 }
1138 1219
1139 $cf::MAP{$key} = $map 1220 $cf::MAP{$key} = $map
1140 } 1221 }
1141} 1222}
1142 1223
1143sub load { 1224sub load {
1144 my ($self) = @_; 1225 my ($self) = @_;
1145 1226
1227 my $path = $self->{path};
1228 my $guard = cf::lock_acquire "map_load:" . $path->as_string;
1229
1146 return if $self->in_memory != cf::MAP_SWAPPED; 1230 return if $self->in_memory != cf::MAP_SWAPPED;
1147 1231
1148 $self->in_memory (cf::MAP_LOADING); 1232 $self->in_memory (cf::MAP_LOADING);
1149
1150 my $path = $self->{path};
1151 1233
1152 $self->alloc; 1234 $self->alloc;
1153 $self->load_objects ($self->{load_path}, 1) 1235 $self->load_objects ($self->{load_path}, 1)
1154 or return; 1236 or return;
1155 1237
1156 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) if delete $self->{load_original}; 1238 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1239 if delete $self->{load_original};
1157 1240
1158 if (my $uniq = $path->uniq_path) { 1241 if (my $uniq = $path->uniq_path) {
1159 utf8::encode $uniq; 1242 utf8::encode $uniq;
1160 if (aio_open $uniq, O_RDONLY, 0) { 1243 if (aio_open $uniq, O_RDONLY, 0) {
1161 $self->clear_unique_items; 1244 $self->clear_unique_items;
1162 $self->load_objects ($uniq, 0); 1245 $self->load_objects ($uniq, 0);
1163 } 1246 }
1164 } 1247 }
1248
1249 Coro::cede;
1165 1250
1166 # now do the right thing for maps 1251 # now do the right thing for maps
1167 $self->link_multipart_objects; 1252 $self->link_multipart_objects;
1168 1253
1169 if ($self->{path}->is_style_map) { 1254 if ($self->{path}->is_style_map) {
… …
1177 $self->difficulty ($self->estimate_difficulty) 1262 $self->difficulty ($self->estimate_difficulty)
1178 unless $self->difficulty; 1263 unless $self->difficulty;
1179 $self->activate; 1264 $self->activate;
1180 } 1265 }
1181 1266
1267 Coro::cede;
1268
1182 $self->in_memory (cf::MAP_IN_MEMORY); 1269 $self->in_memory (cf::MAP_IN_MEMORY);
1183} 1270}
1184 1271
1185sub load_map_sync { 1272sub find_sync {
1186 my ($path, $origin) = @_; 1273 my ($path, $origin) = @_;
1187 1274
1188 #warn "load_map_sync<$path, $origin>\n";#d#
1189
1190 cf::sync_job { 1275 cf::sync_job {
1191 my $map = cf::map::find_map $path, $origin 1276 my $map = cf::map::find $path, $origin;
1192 or return;
1193 $map->load;
1194 $map 1277 $map
1195 } 1278 }
1279}
1280
1281sub do_load_sync {
1282 my ($map) = @_;
1283
1284 cf::sync_job { $map->load };
1196} 1285}
1197 1286
1198sub save { 1287sub save {
1199 my ($self) = @_; 1288 my ($self) = @_;
1200 1289
1290 my $lock = cf::lock_acquire "map_data:" . $self->path;
1291
1292 $self->{last_save} = $cf::RUNTIME;
1293
1294 return unless $self->dirty;
1295
1201 my $save = $self->{path}->save_path; utf8::encode $save; 1296 my $save = $self->{path}->save_path; utf8::encode $save;
1202 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1297 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;
1203 1298
1204 $self->{last_save} = $cf::RUNTIME;
1205
1206 return unless $self->dirty;
1207
1208 $self->{load_path} = $save; 1299 $self->{load_path} = $save;
1209 1300
1210 return if $self->{deny_save}; 1301 return if $self->{deny_save};
1211 1302
1212 warn "saving map ", $self->path; 1303 local $self->{last_access} = $self->last_access;#d#
1213 1304
1214 if ($uniq) { 1305 if ($uniq) {
1215 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1306 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1216 $self->save_objects ($uniq, cf::IO_UNIQUES); 1307 $self->save_objects ($uniq, cf::IO_UNIQUES);
1217 } else { 1308 } else {
… …
1220} 1311}
1221 1312
1222sub swap_out { 1313sub swap_out {
1223 my ($self) = @_; 1314 my ($self) = @_;
1224 1315
1316 # save first because save cedes
1317 $self->save;
1318
1319 my $lock = cf::lock_acquire "map_data:" . $self->path;
1320
1225 return if $self->players; 1321 return if $self->players;
1226 return if $self->in_memory != cf::MAP_IN_MEMORY; 1322 return if $self->in_memory != cf::MAP_IN_MEMORY;
1227 return if $self->{deny_save}; 1323 return if $self->{deny_save};
1228 1324
1229 $self->save;
1230 $self->clear; 1325 $self->clear;
1231 $self->in_memory (cf::MAP_SWAPPED); 1326 $self->in_memory (cf::MAP_SWAPPED);
1232} 1327}
1233 1328
1329sub reset_at {
1330 my ($self) = @_;
1331
1332 # TODO: safety, remove and allow resettable per-player maps
1333 return 1e99 if $self->{path}{user_rel};
1334 return 1e99 if $self->{deny_reset};
1335
1336 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1337 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1338
1339 $time + $to
1340}
1341
1234sub should_reset { 1342sub should_reset {
1235 my ($map) = @_; 1343 my ($self) = @_;
1236 1344
1237 # TODO: safety, remove and allow resettable per-player maps 1345 $self->reset_at <= $cf::RUNTIME
1238 return if $map->{path}{user_rel};#d#
1239 return if $map->{deny_reset};
1240 #return unless $map->reset_timeout;
1241
1242 my $time = $map->fixed_resettime ? $map->{instantiate_time} : $map->last_access;
1243 my $to = $map->reset_timeout || $DEFAULT_RESET;
1244 $to = $MAX_RESET if $to > $MAX_RESET;
1245
1246 $time + $to < $cf::RUNTIME
1247} 1346}
1248 1347
1249sub unlink_save { 1348sub unlink_save {
1250 my ($self) = @_; 1349 my ($self) = @_;
1251 1350
1252 utf8::encode (my $save = $self->{path}->save_path); 1351 utf8::encode (my $save = $self->{path}->save_path);
1253 aioreq_pri 3; IO::AIO::aio_unlink $save; 1352 aioreq_pri 3; IO::AIO::aio_unlink $save;
1254 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst"; 1353 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
1255} 1354}
1256 1355
1356sub rename {
1357 my ($self, $new_path) = @_;
1358
1359 $self->unlink_save;
1360
1361 delete $cf::MAP{$self->path};
1362 $self->{path} = new cf::path $new_path;
1363 $self->path ($self->{path}->as_string);
1364 $cf::MAP{$self->path} = $self;
1365
1366 $self->save;
1367}
1368
1257sub reset { 1369sub reset {
1258 my ($self) = @_; 1370 my ($self) = @_;
1259 1371
1372 my $lock = cf::lock_acquire "map_data:" . $self->path;
1373
1260 return if $self->players; 1374 return if $self->players;
1261 return if $self->{path}{user_rel};#d# 1375 return if $self->{path}{user_rel};#d#
1262 1376
1263 warn "resetting map ", $self->path;#d# 1377 warn "resetting map ", $self->path;#d#
1264 1378
… …
1268 1382
1269 $self->unlink_save; 1383 $self->unlink_save;
1270 $self->destroy; 1384 $self->destroy;
1271} 1385}
1272 1386
1387my $nuke_counter = "aaaa";
1388
1389sub nuke {
1390 my ($self) = @_;
1391
1392 $self->{deny_save} = 1;
1393 $self->reset_timeout (1);
1394 $self->rename ("{nuke}/" . ($nuke_counter++));
1395 $self->reset; # polite request, might not happen
1396}
1397
1273sub customise_for { 1398sub customise_for {
1274 my ($map, $ob) = @_; 1399 my ($map, $ob) = @_;
1275 1400
1276 if ($map->per_player) { 1401 if ($map->per_player) {
1277 return cf::map::find_map "~" . $ob->name . "/" . $map->{path}{path}; 1402 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1278 } 1403 }
1279 1404
1280 $map 1405 $map
1281} 1406}
1282 1407
1283sub emergency_save { 1408sub emergency_save {
1284 local $cf::FREEZE = 1; 1409 my $freeze_guard = cf::freeze_mainloop;
1285 1410
1286 warn "enter emergency map save\n"; 1411 warn "enter emergency map save\n";
1287 1412
1288 cf::sync_job { 1413 cf::sync_job {
1289 warn "begin emergency map save\n"; 1414 warn "begin emergency map save\n";
… …
1340 (ref $cf::CFG{"may_$access"} 1465 (ref $cf::CFG{"may_$access"}
1341 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}} 1466 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}}
1342 : $cf::CFG{"may_$access"}) 1467 : $cf::CFG{"may_$access"})
1343} 1468}
1344 1469
1470=item $player_object->enter_link
1471
1472Freezes the player and moves him/her to a special map (C<{link}>).
1473
1474The player should be reaosnably safe there for short amounts of time. You
1475I<MUST> call C<leave_link> as soon as possible, though.
1476
1477=item $player_object->leave_link ($map, $x, $y)
1478
1479Moves the player out of the specila link map onto the given map. If the
1480map is not valid (or omitted), the player will be moved back to the
1481location he/she was before the call to C<enter_link>, or, if that fails,
1482to the emergency map position.
1483
1484Might block.
1485
1486=cut
1487
1345sub cf::object::player::enter_link { 1488sub cf::object::player::enter_link {
1346 my ($self) = @_; 1489 my ($self) = @_;
1347 1490
1491 $self->deactivate_recursive;
1492
1348 return if $self->map == $LINK_MAP; 1493 return if $self->map == $LINK_MAP;
1349 1494
1350 $self->{_link_pos} = [$self->map->{path}, $self->x, $self->y] 1495 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1351 if $self->map; 1496 if $self->map;
1352 1497
1353 $self->enter_map ($LINK_MAP, 20, 20); 1498 $self->enter_map ($LINK_MAP, 20, 20);
1354 $self->deactivate_recursive;
1355} 1499}
1356 1500
1357sub cf::object::player::leave_link { 1501sub cf::object::player::leave_link {
1358 my ($self, $map, $x, $y) = @_; 1502 my ($self, $map, $x, $y) = @_;
1359 1503
1360 my $link_pos = delete $self->{_link_pos}; 1504 my $link_pos = delete $self->{_link_pos};
1361 1505
1362 unless ($map) { 1506 unless ($map) {
1363 $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1364
1365 # restore original map position 1507 # restore original map position
1366 ($map, $x, $y) = @{ $link_pos || [] }; 1508 ($map, $x, $y) = @{ $link_pos || [] };
1367 $map = cf::map::find_map $map; 1509 $map = cf::map::find $map;
1368 1510
1369 unless ($map) { 1511 unless ($map) {
1370 ($map, $x, $y) = @$EMERGENCY_POSITION; 1512 ($map, $x, $y) = @$EMERGENCY_POSITION;
1371 $map = cf::map::find_map $map 1513 $map = cf::map::find $map
1372 or die "FATAL: cannot load emergency map\n"; 1514 or die "FATAL: cannot load emergency map\n";
1373 } 1515 }
1374 } 1516 }
1375 1517
1376 ($x, $y) = (-1, -1) 1518 ($x, $y) = (-1, -1)
… …
1384 1526
1385 $self->activate_recursive; 1527 $self->activate_recursive;
1386 $self->enter_map ($map, $x, $y); 1528 $self->enter_map ($map, $x, $y);
1387} 1529}
1388 1530
1531cf::player->attach (
1532 on_logout => sub {
1533 my ($pl) = @_;
1534
1535 # abort map switching before logout
1536 if ($pl->ob->{_link_pos}) {
1537 cf::sync_job {
1538 $pl->ob->leave_link
1539 };
1540 }
1541 },
1542 on_login => sub {
1543 my ($pl) = @_;
1544
1545 # try to abort aborted map switching on player login :)
1546 # should happen only on crashes
1547 if ($pl->ob->{_link_pos}) {
1548
1549 $pl->ob->enter_link;
1550 (Coro::async_pool {
1551 # we need this sleep as the login has a concurrent enter_exit running
1552 # and this sleep increases chances of the player not ending up in scorn
1553 Coro::Timer::sleep 1;
1554 $pl->ob->leave_link;
1555 })->prio (2);
1556 }
1557 },
1558);
1559
1389=item $player_object->goto_map ($map, $x, $y) 1560=item $player_object->goto ($path, $x, $y)
1390 1561
1391=cut 1562=cut
1392 1563
1393sub cf::object::player::goto_map { 1564sub cf::object::player::goto {
1394 my ($self, $path, $x, $y) = @_; 1565 my ($self, $path, $x, $y) = @_;
1395 1566
1396 $self->enter_link; 1567 $self->enter_link;
1397 1568
1398 (Coro::async { 1569 (Coro::async_pool {
1399 $path = new cf::path $path; 1570 $path = new cf::path $path;
1400 1571
1401 my $map = cf::map::find_map $path->as_string; 1572 my $map = cf::map::find $path->as_string;
1402 $map = $map->customise_for ($self) if $map; 1573 $map = $map->customise_for ($self) if $map;
1403 1574
1404 warn "entering ", $map->path, " at ($x, $y)\n" 1575# warn "entering ", $map->path, " at ($x, $y)\n"
1405 if $map; 1576# if $map;
1577
1578 $map or $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1406 1579
1407 $self->leave_link ($map, $x, $y); 1580 $self->leave_link ($map, $x, $y);
1408 })->prio (1); 1581 })->prio (1);
1409} 1582}
1410 1583
… …
1463 1636
1464 return unless $self->type == cf::PLAYER; 1637 return unless $self->type == cf::PLAYER;
1465 1638
1466 $self->enter_link; 1639 $self->enter_link;
1467 1640
1468 (Coro::async { 1641 (Coro::async_pool {
1642 $self->deactivate_recursive; # just to be sure
1469 unless (eval { 1643 unless (eval {
1470
1471 prepare_random_map $exit 1644 prepare_random_map $exit
1472 if $exit->slaying eq "/!"; 1645 if $exit->slaying eq "/!";
1473 1646
1474 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1647 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1475 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp); 1648 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1476 1649
1477 1; 1650 1;
1478 }) { 1651 }) {
1479 $self->message ("Something went wrong deep within the crossfire server. " 1652 $self->message ("Something went wrong deep within the crossfire server. "
1480 . "I'll try to bring you back to the map you were before. " 1653 . "I'll try to bring you back to the map you were before. "
… …
1537 on_reply => sub { 1710 on_reply => sub {
1538 my ($ns, $msg) = @_; 1711 my ($ns, $msg) = @_;
1539 1712
1540 # this weird shuffling is so that direct followup queries 1713 # this weird shuffling is so that direct followup queries
1541 # get handled first 1714 # get handled first
1542 my $queue = delete $ns->{query_queue}; 1715 my $queue = delete $ns->{query_queue}
1716 or return; # be conservative, not sure how that can happen, but we saw a crash here
1543 1717
1544 (shift @$queue)->[1]->($msg); 1718 (shift @$queue)->[1]->($msg);
1545 1719
1546 push @{ $ns->{query_queue} }, @$queue; 1720 push @{ $ns->{query_queue} }, @$queue;
1547 1721
… …
1564=cut 1738=cut
1565 1739
1566sub cf::client::coro { 1740sub cf::client::coro {
1567 my ($self, $cb) = @_; 1741 my ($self, $cb) = @_;
1568 1742
1569 my $coro; $coro = async { 1743 my $coro = &Coro::async_pool ($cb);
1570 eval {
1571 $cb->();
1572 };
1573 warn $@ if $@;
1574 };
1575 1744
1576 $coro->on_destroy (sub { 1745 $coro->on_destroy (sub {
1577 delete $self->{_coro}{$coro+0}; 1746 delete $self->{_coro}{$coro+0};
1578 }); 1747 });
1579 1748
… …
1751 1920
1752{ 1921{
1753 my $path = cf::localdir . "/database.pst"; 1922 my $path = cf::localdir . "/database.pst";
1754 1923
1755 sub db_load() { 1924 sub db_load() {
1756 warn "loading database $path\n";#d# remove later
1757 $DB = stat $path ? Storable::retrieve $path : { }; 1925 $DB = stat $path ? Storable::retrieve $path : { };
1758 } 1926 }
1759 1927
1760 my $pid; 1928 my $pid;
1761 1929
1762 sub db_save() { 1930 sub db_save() {
1763 warn "saving database $path\n";#d# remove later
1764 waitpid $pid, 0 if $pid; 1931 waitpid $pid, 0 if $pid;
1765 if (0 == ($pid = fork)) { 1932 if (0 == ($pid = fork)) {
1766 $DB->{_meta}{version} = 1; 1933 $DB->{_meta}{version} = 1;
1767 Storable::nstore $DB, "$path~"; 1934 Storable::nstore $DB, "$path~";
1768 rename "$path~", $path; 1935 rename "$path~", $path;
… …
1816 open my $fh, "<:utf8", cf::confdir . "/config" 1983 open my $fh, "<:utf8", cf::confdir . "/config"
1817 or return; 1984 or return;
1818 1985
1819 local $/; 1986 local $/;
1820 *CFG = YAML::Syck::Load <$fh>; 1987 *CFG = YAML::Syck::Load <$fh>;
1988
1989 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
1990
1991 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
1992 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
1993
1994 if (exists $CFG{mlockall}) {
1995 eval {
1996 $CFG{mlockall} ? &mlockall : &munlockall
1997 and die "WARNING: m(un)lockall failed: $!\n";
1998 };
1999 warn $@ if $@;
2000 }
1821} 2001}
1822 2002
1823sub main { 2003sub main {
1824 # we must not ever block the main coroutine 2004 # we must not ever block the main coroutine
1825 local $Coro::idle = sub { 2005 local $Coro::idle = sub {
1826 Carp::cluck "FATAL: Coro::idle was called, major BUG\n";#d# 2006 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
1827 (Coro::unblock_sub { 2007 Coro::async_pool { Event::one_event };
1828 Event::one_event;
1829 })->();
1830 }; 2008 };
1831 2009
1832 cfg_load; 2010 cfg_load;
1833 db_load; 2011 db_load;
1834 load_extensions; 2012 load_extensions;
… …
1845 return; 2023 return;
1846 } 2024 }
1847 2025
1848 warn "reloading..."; 2026 warn "reloading...";
1849 2027
1850 local $FREEZE = 1; 2028 my $guard = freeze_mainloop;
1851 cf::emergency_save; 2029 cf::emergency_save;
1852 2030
1853 eval { 2031 eval {
1854 # if anything goes wrong in here, we should simply crash as we already saved 2032 # if anything goes wrong in here, we should simply crash as we already saved
1855 2033
… …
1991 reentrant => 0, 2169 reentrant => 0,
1992 prio => 0, 2170 prio => 0,
1993 at => $NEXT_TICK || $TICK, 2171 at => $NEXT_TICK || $TICK,
1994 data => WF_AUTOCANCEL, 2172 data => WF_AUTOCANCEL,
1995 cb => sub { 2173 cb => sub {
1996 unless ($FREEZE) {
1997 cf::server_tick; # one server iteration 2174 cf::server_tick; # one server iteration
1998 $RUNTIME += $TICK; 2175 $RUNTIME += $TICK;
1999 }
2000
2001 $NEXT_TICK += $TICK; 2176 $NEXT_TICK += $TICK;
2002 2177
2003 # if we are delayed by four ticks or more, skip them all 2178 # if we are delayed by four ticks or more, skip them all
2004 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2179 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2005 2180
… …
2028 or warn "ERROR: unable to write runtime file: $!"; 2203 or warn "ERROR: unable to write runtime file: $!";
2029 })->(); 2204 })->();
2030 }, 2205 },
2031); 2206);
2032 2207
2208END { cf::emergency_save }
2209
20331 22101
2034 2211

Diff Legend

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