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.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.
… …
197=cut 255=cut
198 256
199sub sync_job(&) { 257sub sync_job(&) {
200 my ($job) = @_; 258 my ($job) = @_;
201 259
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) { 260 if ($Coro::current == $Coro::main) {
261 # this is the main coro, too bad, we have to block
262 # till the operation succeeds, freezing the server :/
263
212 # TODO: use suspend/resume instead 264 # TODO: use suspend/resume instead
213 local $FREEZE = 1; 265 # (but this is cancel-safe)
266 my $freeze_guard = freeze_mainloop;
267
268 my $busy = 1;
269 my @res;
270
271 (async {
272 @res = eval { $job->() };
273 warn $@ if $@;
274 undef $busy;
214 $coro->prio (Coro::PRIO_MAX); 275 })->prio (Coro::PRIO_MAX);
276
215 while ($busy) { 277 while ($busy) {
216 Coro::cede_notself; 278 Coro::cede or Event::one_event;
217 Event::one_event unless Coro::nready;
218 } 279 }
280
281 wantarray ? @res : $res[0]
219 } else { 282 } else {
220 $coro->join; 283 # we are in another coroutine, how wonderful, everything just works
284
285 $job->()
221 } 286 }
222
223 wantarray ? @res : $res[0]
224} 287}
225 288
226=item $coro = cf::coro { BLOCK } 289=item $coro = cf::async_ext { BLOCK }
227 290
228Creates and returns a new coro. This coro is automcatially being canceled 291Like async, but this coro is automcatially being canceled when the
229when the extension calling this is being unloaded. 292extension calling this is being unloaded.
230 293
231=cut 294=cut
232 295
233sub coro(&) { 296sub async_ext(&) {
234 my $cb = shift; 297 my $cb = shift;
235 298
236 my $coro; $coro = async { 299 my $coro = &Coro::async ($cb);
237 eval {
238 $cb->();
239 };
240 warn $@ if $@;
241 };
242 300
243 $coro->on_destroy (sub { 301 $coro->on_destroy (sub {
244 delete $EXT_CORO{$coro+0}; 302 delete $EXT_CORO{$coro+0};
245 }); 303 });
246 $EXT_CORO{$coro+0} = $coro; 304 $EXT_CORO{$coro+0} = $coro;
… …
252 my $runtime = cf::localdir . "/runtime"; 310 my $runtime = cf::localdir . "/runtime";
253 311
254 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 312 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
255 or return; 313 or return;
256 314
257 my $value = $cf::RUNTIME; 315 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 316 (aio_write $fh, 0, (length $value), $value, 0) <= 0
259 and return; 317 and return;
260 318
261 aio_fsync $fh 319 aio_fsync $fh
262 and return; 320 and return;
… …
283 341
284 $path = $path->as_string if ref $path; 342 $path = $path->as_string if ref $path;
285 343
286 my $self = bless { }, $class; 344 my $self = bless { }, $class;
287 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
288 if ($path =~ s{^\?random/}{}) { 356 } elsif ($path =~ s{^\?random/}{}) {
289 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data; 357 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;
290 $self->{random} = cf::from_json $data; 358 $self->{random} = cf::from_json $data;
291 } else { 359 } else {
292 if ($path =~ s{^~([^/]+)?}{}) { 360 if ($path =~ s{^~([^/]+)?}{}) {
293 $self->{user_rel} = 1; 361 $self->{user_rel} = 1;
… …
798 or return; 866 or return;
799 867
800 unless (aio_stat "$filename.pst") { 868 unless (aio_stat "$filename.pst") {
801 (aio_load "$filename.pst", $av) >= 0 869 (aio_load "$filename.pst", $av) >= 0
802 or return; 870 or return;
803 $av = eval { (Storable::thaw <$av>)->{objs} }; 871 $av = eval { (Storable::thaw $av)->{objs} };
804 } 872 }
805 873
874 warn sprintf "loading %s (%d)\n",
875 $filename, length $data, scalar @{$av || []};#d#
806 return ($data, $av); 876 return ($data, $av);
807} 877}
808 878
809############################################################################# 879#############################################################################
810# command handling &c 880# command handling &c
… …
1044package cf::map; 1114package cf::map;
1045 1115
1046use Fcntl; 1116use Fcntl;
1047use Coro::AIO; 1117use Coro::AIO;
1048 1118
1049our $MAX_RESET = 7200; 1119our $MAX_RESET = 3600;
1050our $DEFAULT_RESET = 3600; 1120our $DEFAULT_RESET = 3000;
1051$MAX_RESET = 10;#d#
1052$DEFAULT_RESET = 10;#d#
1053 1121
1054sub generate_random_map { 1122sub generate_random_map {
1055 my ($path, $rmp) = @_; 1123 my ($path, $rmp) = @_;
1056 1124
1057 # mit "rum" bekleckern, nicht 1125 # mit "rum" bekleckern, nicht
… …
1073# and all this just because we cannot iterate over 1141# and all this just because we cannot iterate over
1074# all maps in C++... 1142# all maps in C++...
1075sub change_all_map_light { 1143sub change_all_map_light {
1076 my ($change) = @_; 1144 my ($change) = @_;
1077 1145
1078 $_->change_map_light ($change) for values %cf::MAP; 1146 $_->change_map_light ($change)
1147 for grep $_->outdoor, values %cf::MAP;
1079} 1148}
1080 1149
1081sub try_load_header($) { 1150sub try_load_header($) {
1082 my ($path) = @_; 1151 my ($path) = @_;
1083 1152
… …
1086 or return; 1155 or return;
1087 1156
1088 my $map = cf::map::new 1157 my $map = cf::map::new
1089 or return; 1158 or return;
1090 1159
1160 # for better error messages only, will be overwritten
1161 $map->path ($path);
1162
1091 $map->load_header ($path) 1163 $map->load_header ($path)
1092 or return; 1164 or return;
1093 1165
1094 $map->{load_path} = $path; 1166 $map->{load_path} = $path;
1095 use Data::Dumper; warn Dumper $map;#d#
1096 1167
1097 $map 1168 $map
1098} 1169}
1099 1170
1171sub find;
1100sub find_map { 1172sub find {
1101 my ($path, $origin) = @_; 1173 my ($path, $origin) = @_;
1102 1174
1103 #warn "find_map<$path,$origin>\n";#d# 1175 #warn "find<$path,$origin>\n";#d#
1104 1176
1105 $path = ref $path ? $path : new cf::path $path, $origin && $origin->path; 1177 $path = new cf::path $path, $origin && $origin->path;
1106 my $key = $path->as_string; 1178 my $key = $path->as_string;
1107 1179
1180 cf::lock_wait "map_find:$key";
1181
1108 $cf::MAP{$key} || do { 1182 $cf::MAP{$key} || do {
1183 my $guard = cf::lock_acquire "map_find:$key";
1184
1109 # do it the slow way 1185 # do it the slow way
1110 my $map = try_load_header $path->save_path; 1186 my $map = try_load_header $path->save_path;
1111 1187
1188 Coro::cede;
1189
1112 if ($map) { 1190 if ($map) {
1191 $map->last_access ((delete $map->{last_access})
1192 || $cf::RUNTIME); #d#
1113 # safety 1193 # safety
1114 $map->{instantiate_time} = $cf::RUNTIME 1194 $map->{instantiate_time} = $cf::RUNTIME
1115 if $map->{instantiate_time} > $cf::RUNTIME; 1195 if $map->{instantiate_time} > $cf::RUNTIME;
1116 } else { 1196 } else {
1117 if (my $rmp = $path->random_map_params) { 1197 if (my $rmp = $path->random_map_params) {
… …
1122 1202
1123 $map or return; 1203 $map or return;
1124 1204
1125 $map->{load_original} = 1; 1205 $map->{load_original} = 1;
1126 $map->{instantiate_time} = $cf::RUNTIME; 1206 $map->{instantiate_time} = $cf::RUNTIME;
1207 $map->last_access ($cf::RUNTIME);
1127 $map->instantiate; 1208 $map->instantiate;
1128 1209
1129 # per-player maps become, after loading, normal maps 1210 # per-player maps become, after loading, normal maps
1130 $map->per_player (0) if $path->{user_rel}; 1211 $map->per_player (0) if $path->{user_rel};
1131 } 1212 }
1132 1213
1133 $map->path ($key); 1214 $map->path ($key);
1134 $map->{path} = $path; 1215 $map->{path} = $path;
1135 $map->last_access ($cf::RUNTIME); 1216 $map->{last_save} = $cf::RUNTIME;
1136 1217
1218 Coro::cede;
1219
1137 $map->reset if $map->should_reset; 1220 if ($map->should_reset) {
1221 $map->reset;
1222 undef $guard;
1223 $map = find $path
1224 or return;
1225 }
1138 1226
1139 $cf::MAP{$key} = $map 1227 $cf::MAP{$key} = $map
1140 } 1228 }
1141} 1229}
1142 1230
1143sub load { 1231sub load {
1144 my ($self) = @_; 1232 my ($self) = @_;
1145 1233
1234 my $path = $self->{path};
1235 my $guard = cf::lock_acquire "map_load:" . $path->as_string;
1236
1146 return if $self->in_memory != cf::MAP_SWAPPED; 1237 return if $self->in_memory != cf::MAP_SWAPPED;
1147 1238
1148 $self->in_memory (cf::MAP_LOADING); 1239 $self->in_memory (cf::MAP_LOADING);
1149
1150 my $path = $self->{path};
1151 1240
1152 $self->alloc; 1241 $self->alloc;
1153 $self->load_objects ($self->{load_path}, 1) 1242 $self->load_objects ($self->{load_path}, 1)
1154 or return; 1243 or return;
1155 1244
1156 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) if delete $self->{load_original}; 1245 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1246 if delete $self->{load_original};
1157 1247
1158 if (my $uniq = $path->uniq_path) { 1248 if (my $uniq = $path->uniq_path) {
1159 utf8::encode $uniq; 1249 utf8::encode $uniq;
1160 if (aio_open $uniq, O_RDONLY, 0) { 1250 if (aio_open $uniq, O_RDONLY, 0) {
1161 $self->clear_unique_items; 1251 $self->clear_unique_items;
1162 $self->load_objects ($uniq, 0); 1252 $self->load_objects ($uniq, 0);
1163 } 1253 }
1164 } 1254 }
1255
1256 Coro::cede;
1165 1257
1166 # now do the right thing for maps 1258 # now do the right thing for maps
1167 $self->link_multipart_objects; 1259 $self->link_multipart_objects;
1168 1260
1169 if ($self->{path}->is_style_map) { 1261 if ($self->{path}->is_style_map) {
… …
1177 $self->difficulty ($self->estimate_difficulty) 1269 $self->difficulty ($self->estimate_difficulty)
1178 unless $self->difficulty; 1270 unless $self->difficulty;
1179 $self->activate; 1271 $self->activate;
1180 } 1272 }
1181 1273
1274 Coro::cede;
1275
1182 $self->in_memory (cf::MAP_IN_MEMORY); 1276 $self->in_memory (cf::MAP_IN_MEMORY);
1183} 1277}
1184 1278
1185sub load_map_sync { 1279sub find_sync {
1186 my ($path, $origin) = @_; 1280 my ($path, $origin) = @_;
1187 1281
1188 #warn "load_map_sync<$path, $origin>\n";#d# 1282 cf::sync_job { cf::map::find $path, $origin }
1283}
1189 1284
1190 cf::sync_job { 1285sub do_load_sync {
1191 my $map = cf::map::find_map $path, $origin 1286 my ($map) = @_;
1192 or return; 1287
1193 $map->load; 1288 cf::sync_job { $map->load };
1194 $map
1195 }
1196} 1289}
1197 1290
1198sub save { 1291sub save {
1199 my ($self) = @_; 1292 my ($self) = @_;
1200 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
1201 my $save = $self->{path}->save_path; utf8::encode $save; 1300 my $save = $self->{path}->save_path; utf8::encode $save;
1202 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1301 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;
1203 1302
1204 $self->{last_save} = $cf::RUNTIME;
1205
1206 return unless $self->dirty;
1207
1208 $self->{load_path} = $save; 1303 $self->{load_path} = $save;
1209 1304
1210 return if $self->{deny_save}; 1305 return if $self->{deny_save};
1211 1306
1212 warn "saving map ", $self->path; 1307 local $self->{last_access} = $self->last_access;#d#
1213 1308
1214 if ($uniq) { 1309 if ($uniq) {
1215 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1310 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1216 $self->save_objects ($uniq, cf::IO_UNIQUES); 1311 $self->save_objects ($uniq, cf::IO_UNIQUES);
1217 } else { 1312 } else {
… …
1220} 1315}
1221 1316
1222sub swap_out { 1317sub swap_out {
1223 my ($self) = @_; 1318 my ($self) = @_;
1224 1319
1320 # save first because save cedes
1321 $self->save;
1322
1323 my $lock = cf::lock_acquire "map_data:" . $self->path;
1324
1225 return if $self->players; 1325 return if $self->players;
1226 return if $self->in_memory != cf::MAP_IN_MEMORY; 1326 return if $self->in_memory != cf::MAP_IN_MEMORY;
1227 return if $self->{deny_save}; 1327 return if $self->{deny_save};
1228 1328
1229 $self->save;
1230 $self->clear; 1329 $self->clear;
1231 $self->in_memory (cf::MAP_SWAPPED); 1330 $self->in_memory (cf::MAP_SWAPPED);
1232} 1331}
1233 1332
1333sub reset_at {
1334 my ($self) = @_;
1335
1336 # TODO: safety, remove and allow resettable per-player maps
1337 return 1e99 if $self->{path}{user_rel};
1338 return 1e99 if $self->{deny_reset};
1339
1340 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1341 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1342
1343 $time + $to
1344}
1345
1234sub should_reset { 1346sub should_reset {
1235 my ($map) = @_; 1347 my ($self) = @_;
1236 1348
1237 # TODO: safety, remove and allow resettable per-player maps 1349 $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} 1350}
1248 1351
1249sub unlink_save { 1352sub unlink_save {
1250 my ($self) = @_; 1353 my ($self) = @_;
1251 1354
1252 utf8::encode (my $save = $self->{path}->save_path); 1355 utf8::encode (my $save = $self->{path}->save_path);
1253 aioreq_pri 3; IO::AIO::aio_unlink $save; 1356 aioreq_pri 3; IO::AIO::aio_unlink $save;
1254 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst"; 1357 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
1255} 1358}
1256 1359
1360sub rename {
1361 my ($self, $new_path) = @_;
1362
1363 $self->unlink_save;
1364
1365 delete $cf::MAP{$self->path};
1366 $self->{path} = new cf::path $new_path;
1367 $self->path ($self->{path}->as_string);
1368 $cf::MAP{$self->path} = $self;
1369
1370 $self->save;
1371}
1372
1257sub reset { 1373sub reset {
1258 my ($self) = @_; 1374 my ($self) = @_;
1259 1375
1376 my $lock = cf::lock_acquire "map_data:" . $self->path;
1377
1260 return if $self->players; 1378 return if $self->players;
1261 return if $self->{path}{user_rel};#d# 1379 return if $self->{path}{user_rel};#d#
1262 1380
1263 warn "resetting map ", $self->path;#d# 1381 warn "resetting map ", $self->path;#d#
1264 1382
… …
1268 1386
1269 $self->unlink_save; 1387 $self->unlink_save;
1270 $self->destroy; 1388 $self->destroy;
1271} 1389}
1272 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
1273sub customise_for { 1402sub customise_for {
1274 my ($map, $ob) = @_; 1403 my ($map, $ob) = @_;
1275 1404
1276 if ($map->per_player) { 1405 if ($map->per_player) {
1277 return cf::map::find_map "~" . $ob->name . "/" . $map->{path}{path}; 1406 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1278 } 1407 }
1279 1408
1280 $map 1409 $map
1281} 1410}
1282 1411
1283sub emergency_save { 1412sub emergency_save {
1284 local $cf::FREEZE = 1; 1413 my $freeze_guard = cf::freeze_mainloop;
1285 1414
1286 warn "enter emergency map save\n"; 1415 warn "enter emergency map save\n";
1287 1416
1288 cf::sync_job { 1417 cf::sync_job {
1289 warn "begin emergency map save\n"; 1418 warn "begin emergency map save\n";
… …
1340 (ref $cf::CFG{"may_$access"} 1469 (ref $cf::CFG{"may_$access"}
1341 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}} 1470 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}}
1342 : $cf::CFG{"may_$access"}) 1471 : $cf::CFG{"may_$access"})
1343} 1472}
1344 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
1345sub cf::object::player::enter_link { 1492sub cf::object::player::enter_link {
1346 my ($self) = @_; 1493 my ($self) = @_;
1347 1494
1495 $self->deactivate_recursive;
1496
1348 return if $self->map == $LINK_MAP; 1497 return if $self->map == $LINK_MAP;
1349 1498
1350 $self->{_link_pos} = [$self->map->{path}, $self->x, $self->y] 1499 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1351 if $self->map; 1500 if $self->map;
1352 1501
1353 $self->enter_map ($LINK_MAP, 20, 20); 1502 $self->enter_map ($LINK_MAP, 20, 20);
1354 $self->deactivate_recursive;
1355} 1503}
1356 1504
1357sub cf::object::player::leave_link { 1505sub cf::object::player::leave_link {
1358 my ($self, $map, $x, $y) = @_; 1506 my ($self, $map, $x, $y) = @_;
1359 1507
1360 my $link_pos = delete $self->{_link_pos}; 1508 my $link_pos = delete $self->{_link_pos};
1361 1509
1362 unless ($map) { 1510 unless ($map) {
1363 $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1364
1365 # restore original map position 1511 # restore original map position
1366 ($map, $x, $y) = @{ $link_pos || [] }; 1512 ($map, $x, $y) = @{ $link_pos || [] };
1367 $map = cf::map::find_map $map; 1513 $map = cf::map::find $map;
1368 1514
1369 unless ($map) { 1515 unless ($map) {
1370 ($map, $x, $y) = @$EMERGENCY_POSITION; 1516 ($map, $x, $y) = @$EMERGENCY_POSITION;
1371 $map = cf::map::find_map $map 1517 $map = cf::map::find $map
1372 or die "FATAL: cannot load emergency map\n"; 1518 or die "FATAL: cannot load emergency map\n";
1373 } 1519 }
1374 } 1520 }
1375 1521
1376 ($x, $y) = (-1, -1) 1522 ($x, $y) = (-1, -1)
… …
1384 1530
1385 $self->activate_recursive; 1531 $self->activate_recursive;
1386 $self->enter_map ($map, $x, $y); 1532 $self->enter_map ($map, $x, $y);
1387} 1533}
1388 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
1389=item $player_object->goto_map ($map, $x, $y) 1568=item $player_object->goto ($path, $x, $y)
1390 1569
1391=cut 1570=cut
1392 1571
1393sub cf::object::player::goto_map { 1572sub cf::object::player::goto {
1394 my ($self, $path, $x, $y) = @_; 1573 my ($self, $path, $x, $y) = @_;
1395 1574
1396 $self->enter_link; 1575 $self->enter_link;
1397 1576
1398 (Coro::async { 1577 (async {
1399 $path = new cf::path $path; 1578 $path = new cf::path $path;
1400 1579
1401 my $map = cf::map::find_map $path->as_string; 1580 my $map = cf::map::find $path->as_string;
1402 $map = $map->customise_for ($self) if $map; 1581 $map = $map->customise_for ($self) if $map;
1403 1582
1404 warn "entering ", $map->path, " at ($x, $y)\n" 1583# warn "entering ", $map->path, " at ($x, $y)\n"
1405 if $map; 1584# if $map;
1585
1586 $map or $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1406 1587
1407 $self->leave_link ($map, $x, $y); 1588 $self->leave_link ($map, $x, $y);
1408 })->prio (1); 1589 })->prio (1);
1409} 1590}
1410 1591
… …
1463 1644
1464 return unless $self->type == cf::PLAYER; 1645 return unless $self->type == cf::PLAYER;
1465 1646
1466 $self->enter_link; 1647 $self->enter_link;
1467 1648
1468 (Coro::async { 1649 (async {
1650 $self->deactivate_recursive; # just to be sure
1469 unless (eval { 1651 unless (eval {
1470
1471 prepare_random_map $exit 1652 prepare_random_map $exit
1472 if $exit->slaying eq "/!"; 1653 if $exit->slaying eq "/!";
1473 1654
1474 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;
1475 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp); 1656 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1476 1657
1477 1; 1658 1;
1478 }) { 1659 }) {
1479 $self->message ("Something went wrong deep within the crossfire server. " 1660 $self->message ("Something went wrong deep within the crossfire server. "
1480 . "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. "
… …
1537 on_reply => sub { 1718 on_reply => sub {
1538 my ($ns, $msg) = @_; 1719 my ($ns, $msg) = @_;
1539 1720
1540 # this weird shuffling is so that direct followup queries 1721 # this weird shuffling is so that direct followup queries
1541 # get handled first 1722 # get handled first
1542 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
1543 1725
1544 (shift @$queue)->[1]->($msg); 1726 (shift @$queue)->[1]->($msg);
1545 1727
1546 push @{ $ns->{query_queue} }, @$queue; 1728 push @{ $ns->{query_queue} }, @$queue;
1547 1729
… …
1553 } 1735 }
1554 } 1736 }
1555 }, 1737 },
1556); 1738);
1557 1739
1558=item $client->coro (\&cb) 1740=item $client->async (\&cb)
1559 1741
1560Create a new coroutine, running the specified callback. The coroutine will 1742Create a new coroutine, running the specified callback. The coroutine will
1561be automatically cancelled when the client gets destroyed (e.g. on logout, 1743be automatically cancelled when the client gets destroyed (e.g. on logout,
1562or loss of connection). 1744or loss of connection).
1563 1745
1564=cut 1746=cut
1565 1747
1566sub cf::client::coro { 1748sub cf::client::async {
1567 my ($self, $cb) = @_; 1749 my ($self, $cb) = @_;
1568 1750
1569 my $coro; $coro = async { 1751 my $coro = &Coro::async ($cb);
1570 eval {
1571 $cb->();
1572 };
1573 warn $@ if $@;
1574 };
1575 1752
1576 $coro->on_destroy (sub { 1753 $coro->on_destroy (sub {
1577 delete $self->{_coro}{$coro+0}; 1754 delete $self->{_coro}{$coro+0};
1578 }); 1755 });
1579 1756
… …
1751 1928
1752{ 1929{
1753 my $path = cf::localdir . "/database.pst"; 1930 my $path = cf::localdir . "/database.pst";
1754 1931
1755 sub db_load() { 1932 sub db_load() {
1756 warn "loading database $path\n";#d# remove later
1757 $DB = stat $path ? Storable::retrieve $path : { }; 1933 $DB = stat $path ? Storable::retrieve $path : { };
1758 } 1934 }
1759 1935
1760 my $pid; 1936 my $pid;
1761 1937
1762 sub db_save() { 1938 sub db_save() {
1763 warn "saving database $path\n";#d# remove later
1764 waitpid $pid, 0 if $pid; 1939 waitpid $pid, 0 if $pid;
1765 if (0 == ($pid = fork)) { 1940 if (0 == ($pid = fork)) {
1766 $DB->{_meta}{version} = 1; 1941 $DB->{_meta}{version} = 1;
1767 Storable::nstore $DB, "$path~"; 1942 Storable::nstore $DB, "$path~";
1768 rename "$path~", $path; 1943 rename "$path~", $path;
… …
1816 open my $fh, "<:utf8", cf::confdir . "/config" 1991 open my $fh, "<:utf8", cf::confdir . "/config"
1817 or return; 1992 or return;
1818 1993
1819 local $/; 1994 local $/;
1820 *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 }
1821} 2009}
1822 2010
1823sub main { 2011sub main {
1824 # we must not ever block the main coroutine 2012 # we must not ever block the main coroutine
1825 local $Coro::idle = sub { 2013 local $Coro::idle = sub {
1826 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#
1827 (Coro::unblock_sub {
1828 Event::one_event; 2015 async { Event::one_event };
1829 })->();
1830 }; 2016 };
1831 2017
1832 cfg_load; 2018 cfg_load;
1833 db_load; 2019 db_load;
1834 load_extensions; 2020 load_extensions;
… …
1845 return; 2031 return;
1846 } 2032 }
1847 2033
1848 warn "reloading..."; 2034 warn "reloading...";
1849 2035
1850 local $FREEZE = 1; 2036 my $guard = freeze_mainloop;
1851 cf::emergency_save; 2037 cf::emergency_save;
1852 2038
1853 eval { 2039 eval {
1854 # 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
1855 2041
… …
1991 reentrant => 0, 2177 reentrant => 0,
1992 prio => 0, 2178 prio => 0,
1993 at => $NEXT_TICK || $TICK, 2179 at => $NEXT_TICK || $TICK,
1994 data => WF_AUTOCANCEL, 2180 data => WF_AUTOCANCEL,
1995 cb => sub { 2181 cb => sub {
1996 unless ($FREEZE) {
1997 cf::server_tick; # one server iteration 2182 cf::server_tick; # one server iteration
1998 $RUNTIME += $TICK; 2183 $RUNTIME += $TICK;
1999 }
2000
2001 $NEXT_TICK += $TICK; 2184 $NEXT_TICK += $TICK;
2002 2185
2003 # 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
2004 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2187 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2005 2188
… …
2028 or warn "ERROR: unable to write runtime file: $!"; 2211 or warn "ERROR: unable to write runtime file: $!";
2029 })->(); 2212 })->();
2030 }, 2213 },
2031); 2214);
2032 2215
2216END { cf::emergency_save }
2217
20331 22181
2034 2219

Diff Legend

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