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.123 by root, Tue Jan 2 19:18:33 2007 UTC vs.
Revision 1.143 by root, Sun Jan 7 02:39:14 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
… …
1167 or return; 1215 or return;
1168 1216
1169 my $map = cf::map::new 1217 my $map = cf::map::new
1170 or return; 1218 or return;
1171 1219
1220 # for better error messages only, will be overwritten
1221 $map->path ($path);
1222
1172 $map->load_header ($path) 1223 $map->load_header ($path)
1173 or return; 1224 or return;
1174 1225
1175 $map->{load_path} = $path; 1226 $map->{load_path} = $path;
1176 1227
1177 $map 1228 $map
1178} 1229}
1179 1230
1231sub find;
1180sub find_map { 1232sub find {
1181 my ($path, $origin) = @_; 1233 my ($path, $origin) = @_;
1182 1234
1183 #warn "find_map<$path,$origin>\n";#d# 1235 #warn "find<$path,$origin>\n";#d#
1184 1236
1185 $path = new cf::path $path, $origin && $origin->path; 1237 $path = new cf::path $path, $origin && $origin->path;
1186 my $key = $path->as_string; 1238 my $key = $path->as_string;
1187 1239
1188 cf::lock_wait "map_find:$key"; 1240 cf::lock_wait "map_find:$key";
… …
1191 my $guard = cf::lock_acquire "map_find:$key"; 1243 my $guard = cf::lock_acquire "map_find:$key";
1192 1244
1193 # do it the slow way 1245 # do it the slow way
1194 my $map = try_load_header $path->save_path; 1246 my $map = try_load_header $path->save_path;
1195 1247
1248 Coro::cede;
1249
1196 if ($map) { 1250 if ($map) {
1251 $map->last_access ((delete $map->{last_access})
1252 || $cf::RUNTIME); #d#
1197 # safety 1253 # safety
1198 $map->{instantiate_time} = $cf::RUNTIME 1254 $map->{instantiate_time} = $cf::RUNTIME
1199 if $map->{instantiate_time} > $cf::RUNTIME; 1255 if $map->{instantiate_time} > $cf::RUNTIME;
1200 } else { 1256 } else {
1201 if (my $rmp = $path->random_map_params) { 1257 if (my $rmp = $path->random_map_params) {
… …
1206 1262
1207 $map or return; 1263 $map or return;
1208 1264
1209 $map->{load_original} = 1; 1265 $map->{load_original} = 1;
1210 $map->{instantiate_time} = $cf::RUNTIME; 1266 $map->{instantiate_time} = $cf::RUNTIME;
1267 $map->last_access ($cf::RUNTIME);
1211 $map->instantiate; 1268 $map->instantiate;
1212 1269
1213 # per-player maps become, after loading, normal maps 1270 # per-player maps become, after loading, normal maps
1214 $map->per_player (0) if $path->{user_rel}; 1271 $map->per_player (0) if $path->{user_rel};
1215 } 1272 }
1216 1273
1217 $map->path ($key); 1274 $map->path ($key);
1218 $map->{path} = $path; 1275 $map->{path} = $path;
1219 $map->{last_save} = $cf::RUNTIME; 1276 $map->{last_save} = $cf::RUNTIME;
1220 $map->last_access ($cf::RUNTIME); 1277
1278 Coro::cede;
1221 1279
1222 if ($map->should_reset) { 1280 if ($map->should_reset) {
1223 $map->reset; 1281 $map->reset;
1224 undef $guard; 1282 undef $guard;
1225 $map = find_map $path; 1283 $map = find $path
1284 or return;
1226 } 1285 }
1227 1286
1228 $cf::MAP{$key} = $map 1287 $cf::MAP{$key} = $map
1229 } 1288 }
1230} 1289}
… …
1251 if (aio_open $uniq, O_RDONLY, 0) { 1310 if (aio_open $uniq, O_RDONLY, 0) {
1252 $self->clear_unique_items; 1311 $self->clear_unique_items;
1253 $self->load_objects ($uniq, 0); 1312 $self->load_objects ($uniq, 0);
1254 } 1313 }
1255 } 1314 }
1315
1316 Coro::cede;
1256 1317
1257 # now do the right thing for maps 1318 # now do the right thing for maps
1258 $self->link_multipart_objects; 1319 $self->link_multipart_objects;
1259 1320
1260 if ($self->{path}->is_style_map) { 1321 if ($self->{path}->is_style_map) {
… …
1268 $self->difficulty ($self->estimate_difficulty) 1329 $self->difficulty ($self->estimate_difficulty)
1269 unless $self->difficulty; 1330 unless $self->difficulty;
1270 $self->activate; 1331 $self->activate;
1271 } 1332 }
1272 1333
1334 Coro::cede;
1335
1273 $self->in_memory (cf::MAP_IN_MEMORY); 1336 $self->in_memory (cf::MAP_IN_MEMORY);
1274} 1337}
1275 1338
1276sub load_map_sync { 1339sub find_sync {
1277 my ($path, $origin) = @_; 1340 my ($path, $origin) = @_;
1278 1341
1279 #warn "load_map_sync<$path, $origin>\n";#d# 1342 cf::sync_job { cf::map::find $path, $origin }
1343}
1280 1344
1281 cf::sync_job { 1345sub do_load_sync {
1282 my $map = cf::map::find_map $path, $origin 1346 my ($map) = @_;
1283 or return; 1347
1284 $map->load; 1348 cf::sync_job { $map->load };
1285 $map
1286 }
1287} 1349}
1288 1350
1289sub save { 1351sub save {
1290 my ($self) = @_; 1352 my ($self) = @_;
1291 1353
1354 my $lock = cf::lock_acquire "map_data:" . $self->path;
1355
1292 $self->{last_save} = $cf::RUNTIME; 1356 $self->{last_save} = $cf::RUNTIME;
1293 1357
1294 return unless $self->dirty; 1358 return unless $self->dirty;
1295 1359
1296 my $save = $self->{path}->save_path; utf8::encode $save; 1360 my $save = $self->{path}->save_path; utf8::encode $save;
1297 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1361 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;
1298 1362
1299 $self->{load_path} = $save; 1363 $self->{load_path} = $save;
1300 1364
1301 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 };
1302 1372
1303 if ($uniq) { 1373 if ($uniq) {
1304 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1374 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1305 $self->save_objects ($uniq, cf::IO_UNIQUES); 1375 $self->save_objects ($uniq, cf::IO_UNIQUES);
1306 } else { 1376 } else {
… …
1309} 1379}
1310 1380
1311sub swap_out { 1381sub swap_out {
1312 my ($self) = @_; 1382 my ($self) = @_;
1313 1383
1384 # save first because save cedes
1385 $self->save;
1386
1387 my $lock = cf::lock_acquire "map_data:" . $self->path;
1388
1314 return if $self->players; 1389 return if $self->players;
1315 return if $self->in_memory != cf::MAP_IN_MEMORY; 1390 return if $self->in_memory != cf::MAP_IN_MEMORY;
1316 return if $self->{deny_save}; 1391 return if $self->{deny_save};
1317 1392
1318 $self->save;
1319 $self->clear; 1393 $self->clear;
1320 $self->in_memory (cf::MAP_SWAPPED); 1394 $self->in_memory (cf::MAP_SWAPPED);
1321} 1395}
1322 1396
1323sub reset_at { 1397sub reset_at {
… …
1361} 1435}
1362 1436
1363sub reset { 1437sub reset {
1364 my ($self) = @_; 1438 my ($self) = @_;
1365 1439
1440 my $lock = cf::lock_acquire "map_data:" . $self->path;
1441
1366 return if $self->players; 1442 return if $self->players;
1367 return if $self->{path}{user_rel};#d# 1443 return if $self->{path}{user_rel};#d#
1368 1444
1369 warn "resetting map ", $self->path;#d# 1445 warn "resetting map ", $self->path;#d#
1370 1446
… …
1389 1465
1390sub customise_for { 1466sub customise_for {
1391 my ($map, $ob) = @_; 1467 my ($map, $ob) = @_;
1392 1468
1393 if ($map->per_player) { 1469 if ($map->per_player) {
1394 return cf::map::find_map "~" . $ob->name . "/" . $map->{path}{path}; 1470 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1395 } 1471 }
1396 1472
1397 $map 1473 $map
1398} 1474}
1399 1475
1400sub emergency_save { 1476sub emergency_save {
1401 local $cf::FREEZE = 1; 1477 my $freeze_guard = cf::freeze_mainloop;
1402 1478
1403 warn "enter emergency map save\n"; 1479 warn "enter emergency map save\n";
1404 1480
1405 cf::sync_job { 1481 cf::sync_job {
1406 warn "begin emergency map save\n"; 1482 warn "begin emergency map save\n";
… …
1496 my $link_pos = delete $self->{_link_pos}; 1572 my $link_pos = delete $self->{_link_pos};
1497 1573
1498 unless ($map) { 1574 unless ($map) {
1499 # restore original map position 1575 # restore original map position
1500 ($map, $x, $y) = @{ $link_pos || [] }; 1576 ($map, $x, $y) = @{ $link_pos || [] };
1501 $map = cf::map::find_map $map; 1577 $map = cf::map::find $map;
1502 1578
1503 unless ($map) { 1579 unless ($map) {
1504 ($map, $x, $y) = @$EMERGENCY_POSITION; 1580 ($map, $x, $y) = @$EMERGENCY_POSITION;
1505 $map = cf::map::find_map $map 1581 $map = cf::map::find $map
1506 or die "FATAL: cannot load emergency map\n"; 1582 or die "FATAL: cannot load emergency map\n";
1507 } 1583 }
1508 } 1584 }
1509 1585
1510 ($x, $y) = (-1, -1) 1586 ($x, $y) = (-1, -1)
… …
1514 ($x, $y) = ($map->enter_x, $map->enter_y) 1590 ($x, $y) = ($map->enter_x, $map->enter_y)
1515 if $x <=0 && $y <= 0; 1591 if $x <=0 && $y <= 0;
1516 1592
1517 $map->load; 1593 $map->load;
1518 1594
1595 return unless $self->contr->active;
1519 $self->activate_recursive; 1596 $self->activate_recursive;
1520 $self->enter_map ($map, $x, $y); 1597 $self->enter_map ($map, $x, $y);
1521} 1598}
1522 1599
1523cf::player->attach ( 1600cf::player->attach (
… …
1536 1613
1537 # try to abort aborted map switching on player login :) 1614 # try to abort aborted map switching on player login :)
1538 # should happen only on crashes 1615 # should happen only on crashes
1539 if ($pl->ob->{_link_pos}) { 1616 if ($pl->ob->{_link_pos}) {
1540 $pl->ob->enter_link; 1617 $pl->ob->enter_link;
1541 Coro::async { 1618 (async {
1542 # we need this sleep as the login has a concurrent enter_exit running 1619 # we need this sleep as the login has a concurrent enter_exit running
1543 # and this sleep increases chances of the player not ending up in scorn 1620 # and this sleep increases chances of the player not ending up in scorn
1621 $pl->ob->reply (undef,
1622 "There was an internal problem at your last logout, "
1623 . "the server will try to bring you to your intended destination in a second.",
1624 cf::NDI_RED);
1544 Coro::Timer::sleep 1; 1625 Coro::Timer::sleep 1;
1545 $pl->ob->leave_link; 1626 $pl->ob->leave_link;
1546 }; 1627 })->prio (2);
1547 } 1628 }
1548 }, 1629 },
1549); 1630);
1550 1631
1551=item $player_object->goto_map ($path, $x, $y) 1632=item $player_object->goto ($path, $x, $y)
1552 1633
1553=cut 1634=cut
1554 1635
1555sub cf::object::player::goto_map { 1636sub cf::object::player::goto {
1556 my ($self, $path, $x, $y) = @_; 1637 my ($self, $path, $x, $y) = @_;
1557 1638
1558 $self->enter_link; 1639 $self->enter_link;
1559 1640
1560 (Coro::async { 1641 (async {
1561 $path = new cf::path $path; 1642 $path = new cf::path $path;
1562 1643
1563 my $map = cf::map::find_map $path->as_string; 1644 my $map = cf::map::find $path->as_string;
1564 $map = $map->customise_for ($self) if $map; 1645 $map = $map->customise_for ($self) if $map;
1565 1646
1566# warn "entering ", $map->path, " at ($x, $y)\n" 1647# warn "entering ", $map->path, " at ($x, $y)\n"
1567# if $map; 1648# if $map;
1568 1649
… …
1627 1708
1628 return unless $self->type == cf::PLAYER; 1709 return unless $self->type == cf::PLAYER;
1629 1710
1630 $self->enter_link; 1711 $self->enter_link;
1631 1712
1632 (Coro::async { 1713 (async {
1714 $self->deactivate_recursive; # just to be sure
1633 unless (eval { 1715 unless (eval {
1634
1635 prepare_random_map $exit 1716 prepare_random_map $exit
1636 if $exit->slaying eq "/!"; 1717 if $exit->slaying eq "/!";
1637 1718
1638 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1719 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1639 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp); 1720 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1640 1721
1641 1; 1722 1;
1642 }) { 1723 }) {
1643 $self->message ("Something went wrong deep within the crossfire server. " 1724 $self->message ("Something went wrong deep within the crossfire server. "
1644 . "I'll try to bring you back to the map you were before. " 1725 . "I'll try to bring you back to the map you were before. "
… …
1701 on_reply => sub { 1782 on_reply => sub {
1702 my ($ns, $msg) = @_; 1783 my ($ns, $msg) = @_;
1703 1784
1704 # this weird shuffling is so that direct followup queries 1785 # this weird shuffling is so that direct followup queries
1705 # get handled first 1786 # get handled first
1706 my $queue = delete $ns->{query_queue}; 1787 my $queue = delete $ns->{query_queue}
1788 or return; # be conservative, not sure how that can happen, but we saw a crash here
1707 1789
1708 (shift @$queue)->[1]->($msg); 1790 (shift @$queue)->[1]->($msg);
1709 1791
1710 push @{ $ns->{query_queue} }, @$queue; 1792 push @{ $ns->{query_queue} }, @$queue;
1711 1793
… …
1717 } 1799 }
1718 } 1800 }
1719 }, 1801 },
1720); 1802);
1721 1803
1722=item $client->coro (\&cb) 1804=item $client->async (\&cb)
1723 1805
1724Create a new coroutine, running the specified callback. The coroutine will 1806Create a new coroutine, running the specified callback. The coroutine will
1725be automatically cancelled when the client gets destroyed (e.g. on logout, 1807be automatically cancelled when the client gets destroyed (e.g. on logout,
1726or loss of connection). 1808or loss of connection).
1727 1809
1728=cut 1810=cut
1729 1811
1730sub cf::client::coro { 1812sub cf::client::async {
1731 my ($self, $cb) = @_; 1813 my ($self, $cb) = @_;
1732 1814
1733 my $coro; $coro = async { 1815 my $coro = &Coro::async ($cb);
1734 eval {
1735 $cb->();
1736 };
1737 warn $@ if $@;
1738 };
1739 1816
1740 $coro->on_destroy (sub { 1817 $coro->on_destroy (sub {
1741 delete $self->{_coro}{$coro+0}; 1818 delete $self->{_coro}{$coro+0};
1742 }); 1819 });
1743 1820
… …
1978 open my $fh, "<:utf8", cf::confdir . "/config" 2055 open my $fh, "<:utf8", cf::confdir . "/config"
1979 or return; 2056 or return;
1980 2057
1981 local $/; 2058 local $/;
1982 *CFG = YAML::Syck::Load <$fh>; 2059 *CFG = YAML::Syck::Load <$fh>;
2060
2061 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2062
2063 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2064 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2065
2066 if (exists $CFG{mlockall}) {
2067 eval {
2068 $CFG{mlockall} ? &mlockall : &munlockall
2069 and die "WARNING: m(un)lockall failed: $!\n";
2070 };
2071 warn $@ if $@;
2072 }
1983} 2073}
1984 2074
1985sub main { 2075sub main {
1986 # we must not ever block the main coroutine 2076 # we must not ever block the main coroutine
1987 local $Coro::idle = sub { 2077 local $Coro::idle = sub {
1988 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2078 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
1989 (Coro::unblock_sub {
1990 Event::one_event; 2079 async { Event::one_event };
1991 })->();
1992 }; 2080 };
1993 2081
1994 cfg_load; 2082 cfg_load;
1995 db_load; 2083 db_load;
1996 load_extensions; 2084 load_extensions;
… …
2007 return; 2095 return;
2008 } 2096 }
2009 2097
2010 warn "reloading..."; 2098 warn "reloading...";
2011 2099
2012 local $FREEZE = 1; 2100 my $guard = freeze_mainloop;
2013 cf::emergency_save; 2101 cf::emergency_save;
2014 2102
2015 eval { 2103 eval {
2016 # if anything goes wrong in here, we should simply crash as we already saved 2104 # if anything goes wrong in here, we should simply crash as we already saved
2017 2105
… …
2104 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path"; 2192 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2105 $LINK_MAP->in_memory (MAP_IN_MEMORY); 2193 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2106 2194
2107 # dirty hack because... archetypes are not yet loaded 2195 # dirty hack because... archetypes are not yet loaded
2108 Event->timer ( 2196 Event->timer (
2109 after => 2, 2197 after => 10,
2110 cb => sub { 2198 cb => sub {
2111 $_[0]->w->cancel; 2199 $_[0]->w->cancel;
2112 2200
2113 # provide some exits "home" 2201 # provide some exits "home"
2114 my $exit = cf::object::new "exit"; 2202 my $exit = cf::object::new "exit";
… …
2153 reentrant => 0, 2241 reentrant => 0,
2154 prio => 0, 2242 prio => 0,
2155 at => $NEXT_TICK || $TICK, 2243 at => $NEXT_TICK || $TICK,
2156 data => WF_AUTOCANCEL, 2244 data => WF_AUTOCANCEL,
2157 cb => sub { 2245 cb => sub {
2158 unless ($FREEZE) {
2159 cf::server_tick; # one server iteration 2246 cf::server_tick; # one server iteration
2160 $RUNTIME += $TICK; 2247 $RUNTIME += $TICK;
2161 }
2162
2163 $NEXT_TICK += $TICK; 2248 $NEXT_TICK += $TICK;
2164 2249
2165 # if we are delayed by four ticks or more, skip them all 2250 # if we are delayed by four ticks or more, skip them all
2166 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2251 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2167 2252
… …
2190 or warn "ERROR: unable to write runtime file: $!"; 2275 or warn "ERROR: unable to write runtime file: $!";
2191 })->(); 2276 })->();
2192 }, 2277 },
2193); 2278);
2194 2279
2280END { cf::emergency_save }
2281
21951 22821
2196 2283

Diff Legend

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