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.121 by root, Tue Jan 2 11:11:52 2007 UTC vs.
Revision 1.144 by root, Sun Jan 7 18:01:10 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 = ();
… …
47our %CFG; 47our %CFG;
48 48
49our $UPTIME; $UPTIME ||= time; 49our $UPTIME; $UPTIME ||= time;
50our $RUNTIME; 50our $RUNTIME;
51 51
52our %PLAYER; # all users
52our %MAP; # all maps 53our %MAP; # all maps
53our $LINK_MAP; # the special {link} map 54our $LINK_MAP; # the special {link} map
54our $FREEZE;
55our $RANDOM_MAPS = cf::localdir . "/random"; 55our $RANDOM_MAPS = cf::localdir . "/random";
56our %EXT_CORO; 56our %EXT_CORO; # coroutines bound to extensions
57 57
58binmode STDOUT; 58binmode STDOUT;
59binmode STDERR; 59binmode STDERR;
60 60
61# read virtual server time, if available 61# read virtual server time, if available
… …
71mkdir cf::localdir . "/" . cf::uniquedir; 71mkdir cf::localdir . "/" . cf::uniquedir;
72mkdir $RANDOM_MAPS; 72mkdir $RANDOM_MAPS;
73 73
74# a special map that is always available 74# a special map that is always available
75our $LINK_MAP; 75our $LINK_MAP;
76 76our $EMERGENCY_POSITION;
77our $EMERGENCY_POSITION = $cf::CFG{emergency_position} || ["/world/world_105_115", 5, 37];
78 77
79############################################################################# 78#############################################################################
80 79
81=head2 GLOBAL VARIABLES 80=head2 GLOBAL VARIABLES
82 81
… …
181sub to_json($) { 180sub to_json($) {
182 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs 181 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
183 JSON::Syck::Dump $_[0] 182 JSON::Syck::Dump $_[0]
184} 183}
185 184
186=item my $guard = cf::guard { BLOCK }
187
188Run the given callback when the guard object gets destroyed (useful for
189coroutine cancellations).
190
191You can call C<< ->cancel >> on the guard object to stop the block from
192being executed.
193
194=cut
195
196sub guard(&) {
197 bless \(my $cb = $_[0]), cf::guard::;
198}
199
200sub cf::guard::cancel {
201 ${$_[0]} = sub { };
202}
203
204sub cf::guard::DESTROY {
205 ${$_[0]}->();
206}
207
208=item cf::lock_wait $string 185=item cf::lock_wait $string
209 186
210Wait until the given lock is available. See cf::lock_acquire. 187Wait until the given lock is available. See cf::lock_acquire.
211 188
212=item my $lock = cf::lock_acquire $string 189=item my $lock = cf::lock_acquire $string
213 190
214Wait until the given lock is available and then acquires it and returns 191Wait until the given lock is available and then acquires it and returns
215a guard object. If the guard object gets destroyed (goes out of scope, 192a Coro::guard object. If the guard object gets destroyed (goes out of scope,
216for example when the coroutine gets canceled), the lock is automatically 193for example when the coroutine gets canceled), the lock is automatically
217returned. 194returned.
218 195
219Lock names should begin with a unique identifier (for example, find_map 196Lock names should begin with a unique identifier (for example, cf::map::find
220uses map_find and load_map uses map_load). 197uses map_find and cf::map::load uses map_load).
221 198
222=cut 199=cut
223 200
224our %LOCK; 201our %LOCK;
225 202
… …
239 # wait, to be sure we are not locked 216 # wait, to be sure we are not locked
240 lock_wait $key; 217 lock_wait $key;
241 218
242 $LOCK{$key} = []; 219 $LOCK{$key} = [];
243 220
244 cf::guard { 221 Coro::guard {
245 # wake up all waiters, to be on the safe side 222 # wake up all waiters, to be on the safe side
246 $_->ready for @{ delete $LOCK{$key} }; 223 $_->ready for @{ delete $LOCK{$key} };
247 } 224 }
248} 225}
226
227sub freeze_mainloop {
228 return unless $TICK_WATCHER->is_active;
229
230 my $guard = Coro::guard { $TICK_WATCHER->start };
231 $TICK_WATCHER->stop;
232 $guard
233}
234
235=item cf::async { BLOCK }
236
237Currently the same as Coro::async_pool, meaning you cannot use
238C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
239thing you are allowed to do is call C<prio> on it.
240
241=cut
242
243BEGIN { *async = \&Coro::async_pool }
249 244
250=item cf::sync_job { BLOCK } 245=item cf::sync_job { BLOCK }
251 246
252The design of crossfire+ requires that the main coro ($Coro::main) is 247The design of crossfire+ requires that the main coro ($Coro::main) is
253always able to handle events or runnable, as crossfire+ is only partly 248always able to handle events or runnable, as crossfire+ is only partly
… …
267 # this is the main coro, too bad, we have to block 262 # this is the main coro, too bad, we have to block
268 # till the operation succeeds, freezing the server :/ 263 # till the operation succeeds, freezing the server :/
269 264
270 # TODO: use suspend/resume instead 265 # TODO: use suspend/resume instead
271 # (but this is cancel-safe) 266 # (but this is cancel-safe)
272 local $FREEZE = 1; 267 my $freeze_guard = freeze_mainloop;
273 268
274 my $busy = 1; 269 my $busy = 1;
275 my @res; 270 my @res;
276 271
277 (Coro::async { 272 (async {
278 @res = eval { $job->() }; 273 @res = eval { $job->() };
279 warn $@ if $@; 274 warn $@ if $@;
280 undef $busy; 275 undef $busy;
281 })->prio (Coro::PRIO_MAX); 276 })->prio (Coro::PRIO_MAX);
282 277
283 while ($busy) { 278 while ($busy) {
284 Coro::cede_notself; 279 Coro::cede or Event::one_event;
285 Event::one_event unless Coro::nready;
286 } 280 }
287 281
288 wantarray ? @res : $res[0] 282 wantarray ? @res : $res[0]
289 } else { 283 } else {
290 # we are in another coroutine, how wonderful, everything just works 284 # we are in another coroutine, how wonderful, everything just works
291 285
292 $job->() 286 $job->()
293 } 287 }
294} 288}
295 289
296=item $coro = cf::coro { BLOCK } 290=item $coro = cf::async_ext { BLOCK }
297 291
298Creates and returns a new coro. This coro is automcatially being canceled 292Like async, but this coro is automcatially being canceled when the
299when the extension calling this is being unloaded. 293extension calling this is being unloaded.
300 294
301=cut 295=cut
302 296
303sub coro(&) { 297sub async_ext(&) {
304 my $cb = shift; 298 my $cb = shift;
305 299
306 my $coro; $coro = async { 300 my $coro = &Coro::async ($cb);
307 eval {
308 $cb->();
309 };
310 warn $@ if $@;
311 };
312 301
313 $coro->on_destroy (sub { 302 $coro->on_destroy (sub {
314 delete $EXT_CORO{$coro+0}; 303 delete $EXT_CORO{$coro+0};
315 }); 304 });
316 $EXT_CORO{$coro+0} = $coro; 305 $EXT_CORO{$coro+0} = $coro;
… …
1083 1072
1084=head2 CORE EXTENSIONS 1073=head2 CORE EXTENSIONS
1085 1074
1086Functions and methods that extend core crossfire objects. 1075Functions and methods that extend core crossfire objects.
1087 1076
1077=cut
1078
1079package cf::player;
1080
1088=head3 cf::player 1081=head3 cf::player
1089 1082
1090=over 4 1083=over 4
1091 1084
1092=item cf::player::exists $login 1085=item cf::player::find $login
1093 1086
1094Returns true when the given account exists. 1087Returns the given player object, loading it if necessary (might block).
1095 1088
1096=cut 1089=cut
1097 1090
1098sub cf::player::exists($) { 1091sub path($) {
1099 cf::player::find $_[0] 1092 sprintf "%s/%s/%s/%s.pl",
1100 or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2; 1093 cf::localdir, cf::playerdir,
1094 (ref $_[0] ? $_[0]->ob->name : $_[0]) x 2
1095}
1096
1097sub find_active($) {
1098 $cf::PLAYER{$_[0]}
1099 and $cf::PLAYER{$_[0]}->active
1100 and $cf::PLAYER{$_[0]}
1101}
1102
1103sub exists($) {
1104 my ($login) = @_;
1105
1106 $cf::PLAYER{$login}
1107 or cf::sync_job { !aio_stat $login }
1108}
1109
1110sub find($) {
1111 return $cf::PLAYER{$_[0]} || do {
1112 my $login = $_[0];
1113
1114 my $guard = cf::lock_acquire "user_find:$login";
1115
1116 $cf::PLAYER{$login} ||= (load_pl path $login or return);
1117 };
1118}
1119
1120sub save($) {
1121 my ($pl) = @_;
1122
1123 return if $pl->{deny_save};
1124
1125 my $path = path $pl;
1126 my $guard = cf::lock_acquire "user_save:$path";
1127
1128 return if $pl->{deny_save};
1129 $pl->{last_save} = $cf::RUNTIME;
1130
1131 Coro::cede;
1132 $pl->save_pl ($path);
1133 Coro::cede;
1134}
1135
1136sub new($) {
1137 my ($login) = @_;
1138
1139 my $self = create;
1140
1141 $self->ob->name ($login);
1142 $self->{deny_save} = 1;
1143
1144 $cf::PLAYER{$login} = $self;
1145
1146 $self
1101} 1147}
1102 1148
1103=item $player->ext_reply ($msgid, $msgtype, %msg) 1149=item $player->ext_reply ($msgid, $msgtype, %msg)
1104 1150
1105Sends an ext reply to the player. 1151Sends an ext reply to the player.
1106 1152
1107=cut 1153=cut
1108 1154
1109sub cf::player::ext_reply($$$%) { 1155sub ext_reply($$$%) {
1110 my ($self, $id, %msg) = @_; 1156 my ($self, $id, %msg) = @_;
1111 1157
1112 $msg{msgid} = $id; 1158 $msg{msgid} = $id;
1113 1159
1114 $self->send ("ext " . to_json \%msg); 1160 $self->send ("ext " . cf::to_json \%msg);
1115} 1161}
1162
1163package cf;
1116 1164
1117=back 1165=back
1118 1166
1119 1167
1120=head3 cf::map 1168=head3 cf::map
… …
1126package cf::map; 1174package cf::map;
1127 1175
1128use Fcntl; 1176use Fcntl;
1129use Coro::AIO; 1177use Coro::AIO;
1130 1178
1131our $MAX_RESET = 7200; 1179our $MAX_RESET = 3600;
1132our $DEFAULT_RESET = 3600; 1180our $DEFAULT_RESET = 3000;
1133 1181
1134sub generate_random_map { 1182sub generate_random_map {
1135 my ($path, $rmp) = @_; 1183 my ($path, $rmp) = @_;
1136 1184
1137 # mit "rum" bekleckern, nicht 1185 # mit "rum" bekleckern, nicht
… …
1153# and all this just because we cannot iterate over 1201# and all this just because we cannot iterate over
1154# all maps in C++... 1202# all maps in C++...
1155sub change_all_map_light { 1203sub change_all_map_light {
1156 my ($change) = @_; 1204 my ($change) = @_;
1157 1205
1158 $_->change_map_light ($change) for values %cf::MAP; 1206 $_->change_map_light ($change)
1207 for grep $_->outdoor, values %cf::MAP;
1159} 1208}
1160 1209
1161sub try_load_header($) { 1210sub try_load_header($) {
1162 my ($path) = @_; 1211 my ($path) = @_;
1163 1212
… …
1166 or return; 1215 or return;
1167 1216
1168 my $map = cf::map::new 1217 my $map = cf::map::new
1169 or return; 1218 or return;
1170 1219
1220 # for better error messages only, will be overwritten
1221 $map->path ($path);
1222
1171 $map->load_header ($path) 1223 $map->load_header ($path)
1172 or return; 1224 or return;
1173 1225
1174 $map->{load_path} = $path; 1226 $map->{load_path} = $path;
1175 1227
1176 $map 1228 $map
1177} 1229}
1178 1230
1231sub find;
1179sub find_map { 1232sub find {
1180 my ($path, $origin) = @_; 1233 my ($path, $origin) = @_;
1181 1234
1182 #warn "find_map<$path,$origin>\n";#d# 1235 #warn "find<$path,$origin>\n";#d#
1183 1236
1184 $path = new cf::path $path, $origin && $origin->path; 1237 $path = new cf::path $path, $origin && $origin->path;
1185 my $key = $path->as_string; 1238 my $key = $path->as_string;
1186 1239
1187 cf::lock_wait "map_find:$key"; 1240 cf::lock_wait "map_find:$key";
… …
1190 my $guard = cf::lock_acquire "map_find:$key"; 1243 my $guard = cf::lock_acquire "map_find:$key";
1191 1244
1192 # do it the slow way 1245 # do it the slow way
1193 my $map = try_load_header $path->save_path; 1246 my $map = try_load_header $path->save_path;
1194 1247
1248 Coro::cede;
1249
1195 if ($map) { 1250 if ($map) {
1251 $map->last_access ((delete $map->{last_access})
1252 || $cf::RUNTIME); #d#
1196 # safety 1253 # safety
1197 $map->{instantiate_time} = $cf::RUNTIME 1254 $map->{instantiate_time} = $cf::RUNTIME
1198 if $map->{instantiate_time} > $cf::RUNTIME; 1255 if $map->{instantiate_time} > $cf::RUNTIME;
1199 } else { 1256 } else {
1200 if (my $rmp = $path->random_map_params) { 1257 if (my $rmp = $path->random_map_params) {
… …
1205 1262
1206 $map or return; 1263 $map or return;
1207 1264
1208 $map->{load_original} = 1; 1265 $map->{load_original} = 1;
1209 $map->{instantiate_time} = $cf::RUNTIME; 1266 $map->{instantiate_time} = $cf::RUNTIME;
1267 $map->last_access ($cf::RUNTIME);
1210 $map->instantiate; 1268 $map->instantiate;
1211 1269
1212 # per-player maps become, after loading, normal maps 1270 # per-player maps become, after loading, normal maps
1213 $map->per_player (0) if $path->{user_rel}; 1271 $map->per_player (0) if $path->{user_rel};
1214 } 1272 }
1215 1273
1216 $map->path ($key); 1274 $map->path ($key);
1217 $map->{path} = $path; 1275 $map->{path} = $path;
1218 $map->{last_save} = $cf::RUNTIME; 1276 $map->{last_save} = $cf::RUNTIME;
1219 $map->last_access ($cf::RUNTIME); 1277
1278 Coro::cede;
1220 1279
1221 if ($map->should_reset) { 1280 if ($map->should_reset) {
1222 $map->reset; 1281 $map->reset;
1282 undef $guard;
1223 $map = find_map $path; 1283 $map = find $path
1284 or return;
1224 } 1285 }
1225 1286
1226 $cf::MAP{$key} = $map 1287 $cf::MAP{$key} = $map
1227 } 1288 }
1228} 1289}
… …
1249 if (aio_open $uniq, O_RDONLY, 0) { 1310 if (aio_open $uniq, O_RDONLY, 0) {
1250 $self->clear_unique_items; 1311 $self->clear_unique_items;
1251 $self->load_objects ($uniq, 0); 1312 $self->load_objects ($uniq, 0);
1252 } 1313 }
1253 } 1314 }
1315
1316 Coro::cede;
1254 1317
1255 # now do the right thing for maps 1318 # now do the right thing for maps
1256 $self->link_multipart_objects; 1319 $self->link_multipart_objects;
1257 1320
1258 if ($self->{path}->is_style_map) { 1321 if ($self->{path}->is_style_map) {
… …
1266 $self->difficulty ($self->estimate_difficulty) 1329 $self->difficulty ($self->estimate_difficulty)
1267 unless $self->difficulty; 1330 unless $self->difficulty;
1268 $self->activate; 1331 $self->activate;
1269 } 1332 }
1270 1333
1334 Coro::cede;
1335
1271 $self->in_memory (cf::MAP_IN_MEMORY); 1336 $self->in_memory (cf::MAP_IN_MEMORY);
1272} 1337}
1273 1338
1274sub load_map_sync { 1339sub find_sync {
1275 my ($path, $origin) = @_; 1340 my ($path, $origin) = @_;
1276 1341
1277 #warn "load_map_sync<$path, $origin>\n";#d# 1342 cf::sync_job { cf::map::find $path, $origin }
1343}
1278 1344
1279 cf::sync_job { 1345sub do_load_sync {
1280 my $map = cf::map::find_map $path, $origin 1346 my ($map) = @_;
1281 or return; 1347
1282 $map->load; 1348 cf::sync_job { $map->load };
1283 $map
1284 }
1285} 1349}
1286 1350
1287sub save { 1351sub save {
1288 my ($self) = @_; 1352 my ($self) = @_;
1289 1353
1354 my $lock = cf::lock_acquire "map_data:" . $self->path;
1355
1290 $self->{last_save} = $cf::RUNTIME; 1356 $self->{last_save} = $cf::RUNTIME;
1291 1357
1292 return unless $self->dirty; 1358 return unless $self->dirty;
1293 1359
1294 my $save = $self->{path}->save_path; utf8::encode $save; 1360 my $save = $self->{path}->save_path; utf8::encode $save;
1295 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1361 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;
1296 1362
1297 $self->{load_path} = $save; 1363 $self->{load_path} = $save;
1298 1364
1299 return if $self->{deny_save}; 1365 return if $self->{deny_save};
1366
1367 local $self->{last_access} = $self->last_access;#d#
1368
1369 cf::async {
1370 $_->contr->save for $self->players;
1371 };
1300 1372
1301 if ($uniq) { 1373 if ($uniq) {
1302 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1374 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1303 $self->save_objects ($uniq, cf::IO_UNIQUES); 1375 $self->save_objects ($uniq, cf::IO_UNIQUES);
1304 } else { 1376 } else {
… …
1307} 1379}
1308 1380
1309sub swap_out { 1381sub swap_out {
1310 my ($self) = @_; 1382 my ($self) = @_;
1311 1383
1384 # save first because save cedes
1385 $self->save;
1386
1387 my $lock = cf::lock_acquire "map_data:" . $self->path;
1388
1312 return if $self->players; 1389 return if $self->players;
1313 return if $self->in_memory != cf::MAP_IN_MEMORY; 1390 return if $self->in_memory != cf::MAP_IN_MEMORY;
1314 return if $self->{deny_save}; 1391 return if $self->{deny_save};
1315 1392
1316 $self->save;
1317 $self->clear; 1393 $self->clear;
1318 $self->in_memory (cf::MAP_SWAPPED); 1394 $self->in_memory (cf::MAP_SWAPPED);
1319} 1395}
1320 1396
1321sub reset_at { 1397sub reset_at {
… …
1359} 1435}
1360 1436
1361sub reset { 1437sub reset {
1362 my ($self) = @_; 1438 my ($self) = @_;
1363 1439
1440 my $lock = cf::lock_acquire "map_data:" . $self->path;
1441
1364 return if $self->players; 1442 return if $self->players;
1365 return if $self->{path}{user_rel};#d# 1443 return if $self->{path}{user_rel};#d#
1366 1444
1367 warn "resetting map ", $self->path;#d# 1445 warn "resetting map ", $self->path;#d#
1368 1446
… …
1387 1465
1388sub customise_for { 1466sub customise_for {
1389 my ($map, $ob) = @_; 1467 my ($map, $ob) = @_;
1390 1468
1391 if ($map->per_player) { 1469 if ($map->per_player) {
1392 return cf::map::find_map "~" . $ob->name . "/" . $map->{path}{path}; 1470 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1393 } 1471 }
1394 1472
1395 $map 1473 $map
1396} 1474}
1397 1475
1398sub emergency_save { 1476sub emergency_save {
1399 local $cf::FREEZE = 1; 1477 my $freeze_guard = cf::freeze_mainloop;
1400 1478
1401 warn "enter emergency map save\n"; 1479 warn "enter emergency perl save\n";
1402 1480
1403 cf::sync_job { 1481 cf::sync_job {
1482 warn "begin emergency player save\n";
1483 $_->save for values %cf::PLAYER;
1484 warn "end emergency player save\n";
1485
1404 warn "begin emergency map save\n"; 1486 warn "begin emergency map save\n";
1405 $_->save for values %cf::MAP; 1487 $_->save for values %cf::MAP;
1488 warn "end emergency map save\n";
1406 }; 1489 };
1407 1490
1408 warn "end emergency map save\n"; 1491 warn "leave emergency perl save\n";
1409} 1492}
1410 1493
1411package cf; 1494package cf;
1412 1495
1413=back 1496=back
… …
1494 my $link_pos = delete $self->{_link_pos}; 1577 my $link_pos = delete $self->{_link_pos};
1495 1578
1496 unless ($map) { 1579 unless ($map) {
1497 # restore original map position 1580 # restore original map position
1498 ($map, $x, $y) = @{ $link_pos || [] }; 1581 ($map, $x, $y) = @{ $link_pos || [] };
1499 $map = cf::map::find_map $map; 1582 $map = cf::map::find $map;
1500 1583
1501 unless ($map) { 1584 unless ($map) {
1502 ($map, $x, $y) = @$EMERGENCY_POSITION; 1585 ($map, $x, $y) = @$EMERGENCY_POSITION;
1503 $map = cf::map::find_map $map 1586 $map = cf::map::find $map
1504 or die "FATAL: cannot load emergency map\n"; 1587 or die "FATAL: cannot load emergency map\n";
1505 } 1588 }
1506 } 1589 }
1507 1590
1508 ($x, $y) = (-1, -1) 1591 ($x, $y) = (-1, -1)
… …
1512 ($x, $y) = ($map->enter_x, $map->enter_y) 1595 ($x, $y) = ($map->enter_x, $map->enter_y)
1513 if $x <=0 && $y <= 0; 1596 if $x <=0 && $y <= 0;
1514 1597
1515 $map->load; 1598 $map->load;
1516 1599
1600 return unless $self->contr->active;
1517 $self->activate_recursive; 1601 $self->activate_recursive;
1518 $self->enter_map ($map, $x, $y); 1602 $self->enter_map ($map, $x, $y);
1519} 1603}
1520 1604
1521cf::player->attach ( 1605cf::player->attach (
… …
1534 1618
1535 # try to abort aborted map switching on player login :) 1619 # try to abort aborted map switching on player login :)
1536 # should happen only on crashes 1620 # should happen only on crashes
1537 if ($pl->ob->{_link_pos}) { 1621 if ($pl->ob->{_link_pos}) {
1538 $pl->ob->enter_link; 1622 $pl->ob->enter_link;
1539 Coro::async { 1623 (async {
1540 # we need this sleep as the login has a concurrent enter_exit running 1624 # we need this sleep as the login has a concurrent enter_exit running
1541 # and this sleep increases chances of the player not ending up in scorn 1625 # and this sleep increases chances of the player not ending up in scorn
1626 $pl->ob->reply (undef,
1627 "There was an internal problem at your last logout, "
1628 . "the server will try to bring you to your intended destination in a second.",
1629 cf::NDI_RED);
1542 Coro::Timer::sleep 1; 1630 Coro::Timer::sleep 1;
1543 $pl->ob->leave_link; 1631 $pl->ob->leave_link;
1544 }; 1632 })->prio (2);
1545 } 1633 }
1546 }, 1634 },
1547); 1635);
1548 1636
1549=item $player_object->goto_map ($path, $x, $y) 1637=item $player_object->goto ($path, $x, $y)
1550 1638
1551=cut 1639=cut
1552 1640
1553sub cf::object::player::goto_map { 1641sub cf::object::player::goto {
1554 my ($self, $path, $x, $y) = @_; 1642 my ($self, $path, $x, $y) = @_;
1555 1643
1556 $self->enter_link; 1644 $self->enter_link;
1557 1645
1558 (Coro::async { 1646 (async {
1559 $path = new cf::path $path; 1647 $path = new cf::path $path;
1560 1648
1561 my $map = cf::map::find_map $path->as_string; 1649 my $map = cf::map::find $path->as_string;
1562 $map = $map->customise_for ($self) if $map; 1650 $map = $map->customise_for ($self) if $map;
1563 1651
1564# warn "entering ", $map->path, " at ($x, $y)\n" 1652# warn "entering ", $map->path, " at ($x, $y)\n"
1565# if $map; 1653# if $map;
1566 1654
… …
1625 1713
1626 return unless $self->type == cf::PLAYER; 1714 return unless $self->type == cf::PLAYER;
1627 1715
1628 $self->enter_link; 1716 $self->enter_link;
1629 1717
1630 (Coro::async { 1718 (async {
1719 $self->deactivate_recursive; # just to be sure
1631 unless (eval { 1720 unless (eval {
1632
1633 prepare_random_map $exit 1721 prepare_random_map $exit
1634 if $exit->slaying eq "/!"; 1722 if $exit->slaying eq "/!";
1635 1723
1636 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1724 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1637 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp); 1725 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1638 1726
1639 1; 1727 1;
1640 }) { 1728 }) {
1641 $self->message ("Something went wrong deep within the crossfire server. " 1729 $self->message ("Something went wrong deep within the crossfire server. "
1642 . "I'll try to bring you back to the map you were before. " 1730 . "I'll try to bring you back to the map you were before. "
… …
1699 on_reply => sub { 1787 on_reply => sub {
1700 my ($ns, $msg) = @_; 1788 my ($ns, $msg) = @_;
1701 1789
1702 # this weird shuffling is so that direct followup queries 1790 # this weird shuffling is so that direct followup queries
1703 # get handled first 1791 # get handled first
1704 my $queue = delete $ns->{query_queue}; 1792 my $queue = delete $ns->{query_queue}
1793 or return; # be conservative, not sure how that can happen, but we saw a crash here
1705 1794
1706 (shift @$queue)->[1]->($msg); 1795 (shift @$queue)->[1]->($msg);
1707 1796
1708 push @{ $ns->{query_queue} }, @$queue; 1797 push @{ $ns->{query_queue} }, @$queue;
1709 1798
… …
1715 } 1804 }
1716 } 1805 }
1717 }, 1806 },
1718); 1807);
1719 1808
1720=item $client->coro (\&cb) 1809=item $client->async (\&cb)
1721 1810
1722Create a new coroutine, running the specified callback. The coroutine will 1811Create a new coroutine, running the specified callback. The coroutine will
1723be automatically cancelled when the client gets destroyed (e.g. on logout, 1812be automatically cancelled when the client gets destroyed (e.g. on logout,
1724or loss of connection). 1813or loss of connection).
1725 1814
1726=cut 1815=cut
1727 1816
1728sub cf::client::coro { 1817sub cf::client::async {
1729 my ($self, $cb) = @_; 1818 my ($self, $cb) = @_;
1730 1819
1731 my $coro; $coro = async { 1820 my $coro = &Coro::async ($cb);
1732 eval {
1733 $cb->();
1734 };
1735 warn $@ if $@;
1736 };
1737 1821
1738 $coro->on_destroy (sub { 1822 $coro->on_destroy (sub {
1739 delete $self->{_coro}{$coro+0}; 1823 delete $self->{_coro}{$coro+0};
1740 }); 1824 });
1741 1825
… …
1976 open my $fh, "<:utf8", cf::confdir . "/config" 2060 open my $fh, "<:utf8", cf::confdir . "/config"
1977 or return; 2061 or return;
1978 2062
1979 local $/; 2063 local $/;
1980 *CFG = YAML::Syck::Load <$fh>; 2064 *CFG = YAML::Syck::Load <$fh>;
2065
2066 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2067
2068 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2069 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2070
2071 if (exists $CFG{mlockall}) {
2072 eval {
2073 $CFG{mlockall} ? &mlockall : &munlockall
2074 and die "WARNING: m(un)lockall failed: $!\n";
2075 };
2076 warn $@ if $@;
2077 }
1981} 2078}
1982 2079
1983sub main { 2080sub main {
1984 # we must not ever block the main coroutine 2081 # we must not ever block the main coroutine
1985 local $Coro::idle = sub { 2082 local $Coro::idle = sub {
1986 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2083 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
1987 (Coro::unblock_sub {
1988 Event::one_event; 2084 async { Event::one_event };
1989 })->();
1990 }; 2085 };
1991 2086
1992 cfg_load; 2087 cfg_load;
1993 db_load; 2088 db_load;
1994 load_extensions; 2089 load_extensions;
… …
2005 return; 2100 return;
2006 } 2101 }
2007 2102
2008 warn "reloading..."; 2103 warn "reloading...";
2009 2104
2010 local $FREEZE = 1; 2105 my $guard = freeze_mainloop;
2011 cf::emergency_save; 2106 cf::emergency_save;
2012 2107
2013 eval { 2108 eval {
2014 # if anything goes wrong in here, we should simply crash as we already saved 2109 # if anything goes wrong in here, we should simply crash as we already saved
2015 2110
… …
2077 cf::load_extensions; 2172 cf::load_extensions;
2078 2173
2079 # reattach attachments to objects 2174 # reattach attachments to objects
2080 warn "reattach"; 2175 warn "reattach";
2081 _global_reattach; 2176 _global_reattach;
2177 reattach $_ for values %MAP;
2082 }; 2178 };
2083 2179
2084 if ($@) { 2180 if ($@) {
2085 warn $@; 2181 warn $@;
2086 warn "error while reloading, exiting."; 2182 warn "error while reloading, exiting.";
… …
2102 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path"; 2198 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2103 $LINK_MAP->in_memory (MAP_IN_MEMORY); 2199 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2104 2200
2105 # dirty hack because... archetypes are not yet loaded 2201 # dirty hack because... archetypes are not yet loaded
2106 Event->timer ( 2202 Event->timer (
2107 after => 2, 2203 after => 10,
2108 cb => sub { 2204 cb => sub {
2109 $_[0]->w->cancel; 2205 $_[0]->w->cancel;
2110 2206
2111 # provide some exits "home" 2207 # provide some exits "home"
2112 my $exit = cf::object::new "exit"; 2208 my $exit = cf::object::new "exit";
… …
2151 reentrant => 0, 2247 reentrant => 0,
2152 prio => 0, 2248 prio => 0,
2153 at => $NEXT_TICK || $TICK, 2249 at => $NEXT_TICK || $TICK,
2154 data => WF_AUTOCANCEL, 2250 data => WF_AUTOCANCEL,
2155 cb => sub { 2251 cb => sub {
2156 unless ($FREEZE) {
2157 cf::server_tick; # one server iteration 2252 cf::server_tick; # one server iteration
2158 $RUNTIME += $TICK; 2253 $RUNTIME += $TICK;
2159 }
2160
2161 $NEXT_TICK += $TICK; 2254 $NEXT_TICK += $TICK;
2162 2255
2163 # if we are delayed by four ticks or more, skip them all 2256 # if we are delayed by four ticks or more, skip them all
2164 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2257 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2165 2258
… …
2188 or warn "ERROR: unable to write runtime file: $!"; 2281 or warn "ERROR: unable to write runtime file: $!";
2189 })->(); 2282 })->();
2190 }, 2283 },
2191); 2284);
2192 2285
2286END { cf::emergency_save }
2287
21931 22881
2194 2289

Diff Legend

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