ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.110 by root, Mon Jan 1 11:21:55 2007 UTC vs.
Revision 1.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.
… …
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 unless (Coro::cede) {
217 Event::one_event unless Coro::nready; 279 Coro::nready ? Event::one_event 0 : Event::one_event;
280 Coro::cede_notself unless Coro::cede;
218 } 281 }
282 }
283
284 wantarray ? @res : $res[0]
219 } else { 285 } else {
220 $coro->join; 286 # we are in another coroutine, how wonderful, everything just works
287
288 $job->()
221 } 289 }
222
223 wantarray ? @res : $res[0]
224} 290}
225 291
226=item $coro = cf::coro { BLOCK } 292=item $coro = cf::async_ext { BLOCK }
227 293
228Creates and returns a new coro. This coro is automcatially being canceled 294Like async, but this coro is automcatially being canceled when the
229when the extension calling this is being unloaded. 295extension calling this is being unloaded.
230 296
231=cut 297=cut
232 298
233sub coro(&) { 299sub async_ext(&) {
234 my $cb = shift; 300 my $cb = shift;
235 301
236 my $coro; $coro = async { 302 my $coro = &Coro::async ($cb);
237 eval {
238 $cb->();
239 };
240 warn $@ if $@;
241 };
242 303
243 $coro->on_destroy (sub { 304 $coro->on_destroy (sub {
244 delete $EXT_CORO{$coro+0}; 305 delete $EXT_CORO{$coro+0};
245 }); 306 });
246 $EXT_CORO{$coro+0} = $coro; 307 $EXT_CORO{$coro+0} = $coro;
… …
252 my $runtime = cf::localdir . "/runtime"; 313 my $runtime = cf::localdir . "/runtime";
253 314
254 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 315 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
255 or return; 316 or return;
256 317
257 my $value = $cf::RUNTIME; 318 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 319 (aio_write $fh, 0, (length $value), $value, 0) <= 0
259 and return; 320 and return;
260 321
261 aio_fsync $fh 322 aio_fsync $fh
262 and return; 323 and return;
… …
283 344
284 $path = $path->as_string if ref $path; 345 $path = $path->as_string if ref $path;
285 346
286 my $self = bless { }, $class; 347 my $self = bless { }, $class;
287 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
288 if ($path =~ s{^\?random/}{}) { 359 } elsif ($path =~ s{^\?random/}{}) {
289 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data; 360 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;
290 $self->{random} = cf::from_json $data; 361 $self->{random} = cf::from_json $data;
291 } else { 362 } else {
292 if ($path =~ s{^~([^/]+)?}{}) { 363 if ($path =~ s{^~([^/]+)?}{}) {
293 $self->{user_rel} = 1; 364 $self->{user_rel} = 1;
… …
798 or return; 869 or return;
799 870
800 unless (aio_stat "$filename.pst") { 871 unless (aio_stat "$filename.pst") {
801 (aio_load "$filename.pst", $av) >= 0 872 (aio_load "$filename.pst", $av) >= 0
802 or return; 873 or return;
803 $av = eval { (Storable::thaw <$av>)->{objs} }; 874 $av = eval { (Storable::thaw $av)->{objs} };
804 } 875 }
805 876
877 warn sprintf "loading %s (%d)\n",
878 $filename, length $data, scalar @{$av || []};#d#
806 return ($data, $av); 879 return ($data, $av);
807} 880}
808 881
809############################################################################# 882#############################################################################
810# command handling &c 883# command handling &c
… …
1044package cf::map; 1117package cf::map;
1045 1118
1046use Fcntl; 1119use Fcntl;
1047use Coro::AIO; 1120use Coro::AIO;
1048 1121
1049our $MAX_RESET = 7200; 1122our $MAX_RESET = 3600;
1050our $DEFAULT_RESET = 3600; 1123our $DEFAULT_RESET = 3000;
1051$MAX_RESET = 10;#d#
1052$DEFAULT_RESET = 10;#d#
1053 1124
1054sub generate_random_map { 1125sub generate_random_map {
1055 my ($path, $rmp) = @_; 1126 my ($path, $rmp) = @_;
1056 1127
1057 # mit "rum" bekleckern, nicht 1128 # mit "rum" bekleckern, nicht
… …
1073# and all this just because we cannot iterate over 1144# and all this just because we cannot iterate over
1074# all maps in C++... 1145# all maps in C++...
1075sub change_all_map_light { 1146sub change_all_map_light {
1076 my ($change) = @_; 1147 my ($change) = @_;
1077 1148
1078 $_->change_map_light ($change) for values %cf::MAP; 1149 $_->change_map_light ($change)
1150 for grep $_->outdoor, values %cf::MAP;
1079} 1151}
1080 1152
1081sub try_load_header($) { 1153sub try_load_header($) {
1082 my ($path) = @_; 1154 my ($path) = @_;
1083 1155
… …
1086 or return; 1158 or return;
1087 1159
1088 my $map = cf::map::new 1160 my $map = cf::map::new
1089 or return; 1161 or return;
1090 1162
1163 # for better error messages only, will be overwritten
1164 $map->path ($path);
1165
1091 $map->load_header ($path) 1166 $map->load_header ($path)
1092 or return; 1167 or return;
1093 1168
1094 $map->{load_path} = $path; 1169 $map->{load_path} = $path;
1095 use Data::Dumper; warn Dumper $map;#d#
1096 1170
1097 $map 1171 $map
1098} 1172}
1099 1173
1174sub find;
1100sub find_map { 1175sub find {
1101 my ($path, $origin) = @_; 1176 my ($path, $origin) = @_;
1102 1177
1103 #warn "find_map<$path,$origin>\n";#d# 1178 #warn "find<$path,$origin>\n";#d#
1104 1179
1105 $path = ref $path ? $path : new cf::path $path, $origin && $origin->path; 1180 $path = new cf::path $path, $origin && $origin->path;
1106 my $key = $path->as_string; 1181 my $key = $path->as_string;
1107 1182
1183 cf::lock_wait "map_find:$key";
1184
1108 $cf::MAP{$key} || do { 1185 $cf::MAP{$key} || do {
1186 my $guard = cf::lock_acquire "map_find:$key";
1187
1109 # do it the slow way 1188 # do it the slow way
1110 my $map = try_load_header $path->save_path; 1189 my $map = try_load_header $path->save_path;
1111 1190
1191 Coro::cede;
1192
1112 if ($map) { 1193 if ($map) {
1194 $map->last_access ((delete $map->{last_access})
1195 || $cf::RUNTIME); #d#
1113 # safety 1196 # safety
1114 $map->{instantiate_time} = $cf::RUNTIME 1197 $map->{instantiate_time} = $cf::RUNTIME
1115 if $map->{instantiate_time} > $cf::RUNTIME; 1198 if $map->{instantiate_time} > $cf::RUNTIME;
1116 } else { 1199 } else {
1117 if (my $rmp = $path->random_map_params) { 1200 if (my $rmp = $path->random_map_params) {
… …
1120 $map = try_load_header $path->load_path; 1203 $map = try_load_header $path->load_path;
1121 } 1204 }
1122 1205
1123 $map or return; 1206 $map or return;
1124 1207
1208 $map->{load_original} = 1;
1125 $map->{instantiate_time} = $cf::RUNTIME; 1209 $map->{instantiate_time} = $cf::RUNTIME;
1210 $map->last_access ($cf::RUNTIME);
1126 $map->instantiate; 1211 $map->instantiate;
1127 1212
1128 # per-player maps become, after loading, normal maps 1213 # per-player maps become, after loading, normal maps
1129 $map->per_player (0) if $path->{user_rel}; 1214 $map->per_player (0) if $path->{user_rel};
1130 } 1215 }
1131 1216
1132 $map->path ($key); 1217 $map->path ($key);
1133 $map->{path} = $path; 1218 $map->{path} = $path;
1134 $map->last_access ($cf::RUNTIME); 1219 $map->{last_save} = $cf::RUNTIME;
1135 1220
1221 Coro::cede;
1222
1136 $map->reset if $map->should_reset; 1223 if ($map->should_reset) {
1224 $map->reset;
1225 undef $guard;
1226 $map = find $path
1227 or return;
1228 }
1137 1229
1138 $cf::MAP{$key} = $map 1230 $cf::MAP{$key} = $map
1139 } 1231 }
1140} 1232}
1141 1233
1142sub load { 1234sub load {
1143 my ($self) = @_; 1235 my ($self) = @_;
1144 1236
1237 my $path = $self->{path};
1238 my $guard = cf::lock_acquire "map_load:" . $path->as_string;
1239
1145 return if $self->in_memory != cf::MAP_SWAPPED; 1240 return if $self->in_memory != cf::MAP_SWAPPED;
1146 1241
1147 $self->in_memory (cf::MAP_LOADING); 1242 $self->in_memory (cf::MAP_LOADING);
1148
1149 my $path = $self->{path};
1150 1243
1151 $self->alloc; 1244 $self->alloc;
1152 $self->load_objects ($self->{load_path}, 1) 1245 $self->load_objects ($self->{load_path}, 1)
1153 or return; 1246 or return;
1247
1248 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1249 if delete $self->{load_original};
1154 1250
1155 if (my $uniq = $path->uniq_path) { 1251 if (my $uniq = $path->uniq_path) {
1156 utf8::encode $uniq; 1252 utf8::encode $uniq;
1157 if (aio_open $uniq, O_RDONLY, 0) { 1253 if (aio_open $uniq, O_RDONLY, 0) {
1158 $self->clear_unique_items; 1254 $self->clear_unique_items;
1159 $self->load_objects ($uniq, 0); 1255 $self->load_objects ($uniq, 0);
1160 } 1256 }
1161 } 1257 }
1258
1259 Coro::cede;
1162 1260
1163 # now do the right thing for maps 1261 # now do the right thing for maps
1164 $self->link_multipart_objects; 1262 $self->link_multipart_objects;
1165 1263
1166 if ($self->{path}->is_style_map) { 1264 if ($self->{path}->is_style_map) {
… …
1174 $self->difficulty ($self->estimate_difficulty) 1272 $self->difficulty ($self->estimate_difficulty)
1175 unless $self->difficulty; 1273 unless $self->difficulty;
1176 $self->activate; 1274 $self->activate;
1177 } 1275 }
1178 1276
1277 Coro::cede;
1278
1179 $self->in_memory (cf::MAP_IN_MEMORY); 1279 $self->in_memory (cf::MAP_IN_MEMORY);
1180} 1280}
1181 1281
1182sub load_map_sync { 1282sub find_sync {
1183 my ($path, $origin) = @_; 1283 my ($path, $origin) = @_;
1184 1284
1185 #warn "load_map_sync<$path, $origin>\n";#d# 1285 cf::sync_job { cf::map::find $path, $origin }
1286}
1186 1287
1187 cf::sync_job { 1288sub do_load_sync {
1188 my $map = cf::map::find_map $path, $origin 1289 my ($map) = @_;
1189 or return; 1290
1190 $map->load; 1291 cf::sync_job { $map->load };
1191 $map
1192 }
1193} 1292}
1194 1293
1195sub save { 1294sub save {
1196 my ($self) = @_; 1295 my ($self) = @_;
1197 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
1198 my $save = $self->{path}->save_path; utf8::encode $save; 1303 my $save = $self->{path}->save_path; utf8::encode $save;
1199 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1304 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;
1200 1305
1201 $self->{last_save} = $cf::RUNTIME;
1202
1203 return unless $self->dirty;
1204
1205 $self->{load_path} = $save; 1306 $self->{load_path} = $save;
1206 1307
1207 return if $self->{deny_save}; 1308 return if $self->{deny_save};
1208 1309
1209 warn "saving map ", $self->path; 1310 local $self->{last_access} = $self->last_access;#d#
1210 1311
1211 if ($uniq) { 1312 if ($uniq) {
1212 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1313 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1213 $self->save_objects ($uniq, cf::IO_UNIQUES); 1314 $self->save_objects ($uniq, cf::IO_UNIQUES);
1214 } else { 1315 } else {
… …
1217} 1318}
1218 1319
1219sub swap_out { 1320sub swap_out {
1220 my ($self) = @_; 1321 my ($self) = @_;
1221 1322
1323 # save first because save cedes
1324 $self->save;
1325
1326 my $lock = cf::lock_acquire "map_data:" . $self->path;
1327
1222 return if $self->players; 1328 return if $self->players;
1223 return if $self->in_memory != cf::MAP_IN_MEMORY; 1329 return if $self->in_memory != cf::MAP_IN_MEMORY;
1224 return if $self->{deny_save}; 1330 return if $self->{deny_save};
1225 1331
1226 $self->save;
1227 $self->clear; 1332 $self->clear;
1228 $self->in_memory (cf::MAP_SWAPPED); 1333 $self->in_memory (cf::MAP_SWAPPED);
1229} 1334}
1230 1335
1336sub reset_at {
1337 my ($self) = @_;
1338
1339 # TODO: safety, remove and allow resettable per-player maps
1340 return 1e99 if $self->{path}{user_rel};
1341 return 1e99 if $self->{deny_reset};
1342
1343 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1344 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1345
1346 $time + $to
1347}
1348
1231sub should_reset { 1349sub should_reset {
1232 my ($map) = @_;
1233
1234 # TODO: safety, remove and allow resettable per-player maps
1235 return if $map->{path}{user_rel};#d#
1236 return if $map->{deny_reset};
1237 #return unless $map->reset_timeout;
1238
1239 my $time = $map->fixed_resettime ? $map->{instantiate_time} : $map->last_access;
1240
1241 $time + ($map->reset_timeout || $DEFAULT_RESET) < $cf::RUNTIME
1242}
1243
1244sub reset {
1245 my ($self) = @_; 1350 my ($self) = @_;
1246 1351
1247 return if $self->players; 1352 $self->reset_at <= $cf::RUNTIME
1248 return if $self->{path}{user_rel};#d# 1353}
1249 1354
1250 warn "resetting map ", $self->path;#d# 1355sub unlink_save {
1356 my ($self) = @_;
1251 1357
1252 utf8::encode (my $save = $self->{path}->save_path); 1358 utf8::encode (my $save = $self->{path}->save_path);
1253 aioreq_pri 3; IO::AIO::aio_unlink $save; 1359 aioreq_pri 3; IO::AIO::aio_unlink $save;
1254 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst"; 1360 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
1361}
1362
1363sub rename {
1364 my ($self, $new_path) = @_;
1365
1366 $self->unlink_save;
1367
1368 delete $cf::MAP{$self->path};
1369 $self->{path} = new cf::path $new_path;
1370 $self->path ($self->{path}->as_string);
1371 $cf::MAP{$self->path} = $self;
1372
1373 $self->save;
1374}
1375
1376sub reset {
1377 my ($self) = @_;
1378
1379 my $lock = cf::lock_acquire "map_data:" . $self->path;
1380
1381 return if $self->players;
1382 return if $self->{path}{user_rel};#d#
1383
1384 warn "resetting map ", $self->path;#d#
1385
1386 delete $cf::MAP{$self->path};
1255 1387
1256 $_->clear_links_to ($self) for values %cf::MAP; 1388 $_->clear_links_to ($self) for values %cf::MAP;
1257 1389
1390 $self->unlink_save;
1258 $self->clear; 1391 $self->destroy;
1259 $self->in_memory (cf::MAP_SWAPPED); 1392}
1260 utf8::encode ($self->{load_path} = $self->{path}->load_path); 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
1261} 1403}
1262 1404
1263sub customise_for { 1405sub customise_for {
1264 my ($map, $ob) = @_; 1406 my ($map, $ob) = @_;
1265 1407
1266 if ($map->per_player) { 1408 if ($map->per_player) {
1267 return cf::map::find_map "~" . $ob->name . "/" . $map->{path}{path}; 1409 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1268 } 1410 }
1269 1411
1270 $map 1412 $map
1271} 1413}
1272 1414
1273sub emergency_save { 1415sub emergency_save {
1274 local $cf::FREEZE = 1; 1416 my $freeze_guard = cf::freeze_mainloop;
1275 1417
1276 warn "enter emergency map save\n"; 1418 warn "enter emergency map save\n";
1277 1419
1278 cf::sync_job { 1420 cf::sync_job {
1279 warn "begin emergency map save\n"; 1421 warn "begin emergency map save\n";
… …
1330 (ref $cf::CFG{"may_$access"} 1472 (ref $cf::CFG{"may_$access"}
1331 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}} 1473 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}}
1332 : $cf::CFG{"may_$access"}) 1474 : $cf::CFG{"may_$access"})
1333} 1475}
1334 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
1335sub cf::object::player::enter_link { 1495sub cf::object::player::enter_link {
1336 my ($self) = @_; 1496 my ($self) = @_;
1337 1497
1498 $self->deactivate_recursive;
1499
1338 return if $self->map == $LINK_MAP; 1500 return if $self->map == $LINK_MAP;
1339 1501
1340 $self->{_link_pos} = [$self->map->{path}, $self->x, $self->y] 1502 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1341 if $self->map; 1503 if $self->map;
1342 1504
1343 $self->enter_map ($LINK_MAP, 20, 20); 1505 $self->enter_map ($LINK_MAP, 20, 20);
1344 $self->deactivate_recursive;
1345} 1506}
1346 1507
1347sub cf::object::player::leave_link { 1508sub cf::object::player::leave_link {
1348 my ($self, $map, $x, $y) = @_; 1509 my ($self, $map, $x, $y) = @_;
1349 1510
1350 my $link_pos = delete $self->{_link_pos}; 1511 my $link_pos = delete $self->{_link_pos};
1351 1512
1352 unless ($map) { 1513 unless ($map) {
1353 $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1354
1355 # restore original map position 1514 # restore original map position
1356 ($map, $x, $y) = @{ $link_pos || [] }; 1515 ($map, $x, $y) = @{ $link_pos || [] };
1357 $map = cf::map::find_map $map; 1516 $map = cf::map::find $map;
1358 1517
1359 unless ($map) { 1518 unless ($map) {
1360 ($map, $x, $y) = @$EMERGENCY_POSITION; 1519 ($map, $x, $y) = @$EMERGENCY_POSITION;
1361 $map = cf::map::find_map $map 1520 $map = cf::map::find $map
1362 or die "FATAL: cannot load emergency map\n"; 1521 or die "FATAL: cannot load emergency map\n";
1363 } 1522 }
1364 } 1523 }
1365 1524
1366 ($x, $y) = (-1, -1) 1525 ($x, $y) = (-1, -1)
… …
1374 1533
1375 $self->activate_recursive; 1534 $self->activate_recursive;
1376 $self->enter_map ($map, $x, $y); 1535 $self->enter_map ($map, $x, $y);
1377} 1536}
1378 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
1379=item $player_object->goto_map ($map, $x, $y) 1571=item $player_object->goto ($path, $x, $y)
1380 1572
1381=cut 1573=cut
1382 1574
1383sub cf::object::player::goto_map { 1575sub cf::object::player::goto {
1384 my ($self, $path, $x, $y) = @_; 1576 my ($self, $path, $x, $y) = @_;
1385 1577
1386 $self->enter_link; 1578 $self->enter_link;
1387 1579
1388 (Coro::async { 1580 (async {
1389 $path = new cf::path $path; 1581 $path = new cf::path $path;
1390 1582
1391 my $map = cf::map::find_map $path->as_string; 1583 my $map = cf::map::find $path->as_string;
1392 $map = $map->customise_for ($self) if $map; 1584 $map = $map->customise_for ($self) if $map;
1393 1585
1394 warn "entering ", $map->path, " at ($x, $y)\n" 1586# warn "entering ", $map->path, " at ($x, $y)\n"
1395 if $map; 1587# if $map;
1588
1589 $map or $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1396 1590
1397 $self->leave_link ($map, $x, $y); 1591 $self->leave_link ($map, $x, $y);
1398 })->prio (1); 1592 })->prio (1);
1399} 1593}
1400 1594
… …
1453 1647
1454 return unless $self->type == cf::PLAYER; 1648 return unless $self->type == cf::PLAYER;
1455 1649
1456 $self->enter_link; 1650 $self->enter_link;
1457 1651
1458 (Coro::async { 1652 (async {
1653 $self->deactivate_recursive; # just to be sure
1459 unless (eval { 1654 unless (eval {
1460
1461 prepare_random_map $exit 1655 prepare_random_map $exit
1462 if $exit->slaying eq "/!"; 1656 if $exit->slaying eq "/!";
1463 1657
1464 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;
1465 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp); 1659 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1466 1660
1467 1; 1661 1;
1468 }) { 1662 }) {
1469 $self->message ("Something went wrong deep within the crossfire server. " 1663 $self->message ("Something went wrong deep within the crossfire server. "
1470 . "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. "
… …
1527 on_reply => sub { 1721 on_reply => sub {
1528 my ($ns, $msg) = @_; 1722 my ($ns, $msg) = @_;
1529 1723
1530 # this weird shuffling is so that direct followup queries 1724 # this weird shuffling is so that direct followup queries
1531 # get handled first 1725 # get handled first
1532 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
1533 1728
1534 (shift @$queue)->[1]->($msg); 1729 (shift @$queue)->[1]->($msg);
1535 1730
1536 push @{ $ns->{query_queue} }, @$queue; 1731 push @{ $ns->{query_queue} }, @$queue;
1537 1732
… …
1543 } 1738 }
1544 } 1739 }
1545 }, 1740 },
1546); 1741);
1547 1742
1548=item $client->coro (\&cb) 1743=item $client->async (\&cb)
1549 1744
1550Create a new coroutine, running the specified callback. The coroutine will 1745Create a new coroutine, running the specified callback. The coroutine will
1551be automatically cancelled when the client gets destroyed (e.g. on logout, 1746be automatically cancelled when the client gets destroyed (e.g. on logout,
1552or loss of connection). 1747or loss of connection).
1553 1748
1554=cut 1749=cut
1555 1750
1556sub cf::client::coro { 1751sub cf::client::async {
1557 my ($self, $cb) = @_; 1752 my ($self, $cb) = @_;
1558 1753
1559 my $coro; $coro = async { 1754 my $coro = &Coro::async ($cb);
1560 eval {
1561 $cb->();
1562 };
1563 warn $@ if $@;
1564 };
1565 1755
1566 $coro->on_destroy (sub { 1756 $coro->on_destroy (sub {
1567 delete $self->{_coro}{$coro+0}; 1757 delete $self->{_coro}{$coro+0};
1568 }); 1758 });
1569 1759
… …
1741 1931
1742{ 1932{
1743 my $path = cf::localdir . "/database.pst"; 1933 my $path = cf::localdir . "/database.pst";
1744 1934
1745 sub db_load() { 1935 sub db_load() {
1746 warn "loading database $path\n";#d# remove later
1747 $DB = stat $path ? Storable::retrieve $path : { }; 1936 $DB = stat $path ? Storable::retrieve $path : { };
1748 } 1937 }
1749 1938
1750 my $pid; 1939 my $pid;
1751 1940
1752 sub db_save() { 1941 sub db_save() {
1753 warn "saving database $path\n";#d# remove later
1754 waitpid $pid, 0 if $pid; 1942 waitpid $pid, 0 if $pid;
1755 if (0 == ($pid = fork)) { 1943 if (0 == ($pid = fork)) {
1756 $DB->{_meta}{version} = 1; 1944 $DB->{_meta}{version} = 1;
1757 Storable::nstore $DB, "$path~"; 1945 Storable::nstore $DB, "$path~";
1758 rename "$path~", $path; 1946 rename "$path~", $path;
… …
1806 open my $fh, "<:utf8", cf::confdir . "/config" 1994 open my $fh, "<:utf8", cf::confdir . "/config"
1807 or return; 1995 or return;
1808 1996
1809 local $/; 1997 local $/;
1810 *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 }
1811} 2012}
1812 2013
1813sub main { 2014sub main {
1814 # we must not ever block the main coroutine 2015 # we must not ever block the main coroutine
1815 local $Coro::idle = sub { 2016 local $Coro::idle = sub {
1816 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#
1817 (Coro::unblock_sub {
1818 Event::one_event; 2018 async { Event::one_event };
1819 })->();
1820 }; 2019 };
1821 2020
1822 cfg_load; 2021 cfg_load;
1823 db_load; 2022 db_load;
1824 load_extensions; 2023 load_extensions;
… …
1826} 2025}
1827 2026
1828############################################################################# 2027#############################################################################
1829# initialisation 2028# initialisation
1830 2029
1831sub perl_reload() { 2030sub reload() {
1832 # can/must only be called in main 2031 # can/must only be called in main
1833 if ($Coro::current != $Coro::main) { 2032 if ($Coro::current != $Coro::main) {
1834 warn "can only reload from main coroutine\n"; 2033 warn "can only reload from main coroutine\n";
1835 return; 2034 return;
1836 } 2035 }
1837 2036
1838 warn "reloading..."; 2037 warn "reloading...";
1839 2038
1840 local $FREEZE = 1; 2039 my $guard = freeze_mainloop;
1841 cf::emergency_save; 2040 cf::emergency_save;
1842 2041
1843 eval { 2042 eval {
1844 # 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
1845 2044
… …
1963 $cf::MAP{$LINK_MAP->path} = $LINK_MAP; 2162 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
1964} 2163}
1965 2164
1966register "<global>", __PACKAGE__; 2165register "<global>", __PACKAGE__;
1967 2166
1968register_command "perl-reload" => sub { 2167register_command "reload" => sub {
1969 my ($who, $arg) = @_; 2168 my ($who, $arg) = @_;
1970 2169
1971 if ($who->flag (FLAG_WIZ)) { 2170 if ($who->flag (FLAG_WIZ)) {
1972 $who->message ("start of reload."); 2171 $who->message ("start of reload.");
1973 perl_reload; 2172 reload;
1974 $who->message ("end of reload."); 2173 $who->message ("end of reload.");
1975 } 2174 }
1976}; 2175};
1977 2176
1978unshift @INC, $LIBDIR; 2177unshift @INC, $LIBDIR;
… …
1981 reentrant => 0, 2180 reentrant => 0,
1982 prio => 0, 2181 prio => 0,
1983 at => $NEXT_TICK || $TICK, 2182 at => $NEXT_TICK || $TICK,
1984 data => WF_AUTOCANCEL, 2183 data => WF_AUTOCANCEL,
1985 cb => sub { 2184 cb => sub {
1986 unless ($FREEZE) {
1987 cf::server_tick; # one server iteration 2185 cf::server_tick; # one server iteration
1988 $RUNTIME += $TICK; 2186 $RUNTIME += $TICK;
1989 }
1990
1991 $NEXT_TICK += $TICK; 2187 $NEXT_TICK += $TICK;
1992 2188
1993 # 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
1994 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2190 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
1995 2191
… …
2018 or warn "ERROR: unable to write runtime file: $!"; 2214 or warn "ERROR: unable to write runtime file: $!";
2019 })->(); 2215 })->();
2020 }, 2216 },
2021); 2217);
2022 2218
2219END { cf::emergency_save }
2220
20231 22211
2024 2222

Diff Legend

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